Code Review
/
vfc
/
gvnfm
/
vnflcm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Refactor create vm logic
[vfc/gvnfm/vnflcm.git]
/
lcm
/
lcm
/
pub
/
vimapi
/
api.py
diff --git
a/lcm/lcm/pub/vimapi/api.py
b/lcm/lcm/pub/vimapi/api.py
index
721ab70
..
64f40ca
100644
(file)
--- a/
lcm/lcm/pub/vimapi/api.py
+++ b/
lcm/lcm/pub/vimapi/api.py
@@
-20,7
+20,7
@@
from .exceptions import VimException
VIM_DRIVER_BASE_URL = "openoapi/multivim/v1"
def call(vim_id, tenant_id, res, method, data=''):
VIM_DRIVER_BASE_URL = "openoapi/multivim/v1"
def call(vim_id, tenant_id, res, method, data=''):
- if data and not isinstance(a, (str, unicode)):
+ if data and not isinstance(
dat
a, (str, unicode)):
data = json.JSONEncoder().encode(data)
url = "{base_url}/{vim_id}{tenant_id}/{res}".format(
base_url=VIM_DRIVER_BASE_URL,
data = json.JSONEncoder().encode(data)
url = "{base_url}/{vim_id}{tenant_id}/{res}".format(
base_url=VIM_DRIVER_BASE_URL,
@@
-105,16
+105,16
@@
def list_flavor(vim_id, tenant_id):
######################################################################
def create_vm(vim_id, tenant_id, data):
######################################################################
def create_vm(vim_id, tenant_id, data):
- return call(vim_id, tenant_id, "
vm
s", "POST", data)
+ return call(vim_id, tenant_id, "
server
s", "POST", data)
def delete_vm(vim_id, tenant_id, vm_id):
def delete_vm(vim_id, tenant_id, vm_id):
- return call(vim_id, tenant_id, "
vm
s/%s" % vm_id, "DELETE")
+ return call(vim_id, tenant_id, "
server
s/%s" % vm_id, "DELETE")
def get_vm(vim_id, tenant_id, vm_id):
def get_vm(vim_id, tenant_id, vm_id):
- return call(vim_id, tenant_id, "
vm
s/%s" % vm_id, "GET")
+ return call(vim_id, tenant_id, "
server
s/%s" % vm_id, "GET")
def list_vm(vim_id, tenant_id):
def list_vm(vim_id, tenant_id):
- return call(vim_id, tenant_id, "
vm
s", "GET")
+ return call(vim_id, tenant_id, "
server
s", "GET")
######################################################################
######################################################################