Code Review
/
multicloud
/
framework.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Change multivim to multicloud
[multicloud/framework.git]
/
multivimbroker
/
multivimbroker
/
pub
/
utils
/
syscomm.py
diff --git
a/multivimbroker/multivimbroker/pub/utils/syscomm.py
b/multivimbroker/multivimbroker/pub/utils/syscomm.py
index
07606bf
..
cdc6480
100644
(file)
--- a/
multivimbroker/multivimbroker/pub/utils/syscomm.py
+++ b/
multivimbroker/multivimbroker/pub/utils/syscomm.py
@@
-12,47
+12,46
@@
import inspect
import re
import inspect
import re
-import multivimbroker.pub.exceptions as
exceptions
+import multivimbroker.pub.exceptions as exceptions
from multivimbroker.pub.msapi.extsys import get_vim_by_id
from multivimbroker.pub.msapi.extsys import get_vim_by_id
+
+
def fun_name():
return inspect.stack()[1][3]
def fun_name():
return inspect.stack()[1][3]
+# Which headers are hop-by-hop headers by default
+HOP_BY_HOP = ['connection', 'keep-alive', 'proxy-authenticate',
+ 'proxy-authorization', 'te', 'trailers',
+ 'transfer-encoding', 'upgrade']
-# Which headers are hop-by-hop headers by default
-HOP_BY_HOP = ['connection', 'keep-alive', 'proxy-authenticate', 'proxy-authorization', 'te', 'trailers', 'transfer-encoding', 'upgrade']
def getHeadersKeys(response):
hopbyhop = HOP_BY_HOP
def getHeadersKeys(response):
hopbyhop = HOP_BY_HOP
- hopbyhop.extend([x.strip() for x in response.get('connection', '').split(',')])
+ hopbyhop.extend([x.strip()
+ for x in response.get('connection', '').split(',')])
return [header for header in response.keys() if header not in hopbyhop]
return [header for header in response.keys() if header not in hopbyhop]
-
def findMultivimDriver(vim=None):
if vim and vim["type"] == "openstack":
if vim["version"] == "kilo":
def findMultivimDriver(vim=None):
if vim and vim["type"] == "openstack":
if vim["version"] == "kilo":
- multivimdriver = "multi
vim
-kilo"
+ multivimdriver = "multi
cloud
-kilo"
elif vim["version"] == "newton":
elif vim["version"] == "newton":
- multivimdriver = "multi
vim
-newton"
+ multivimdriver = "multi
cloud
-newton"
else:
# if vim type is openstack, use latest "newton" version as default
else:
# if vim type is openstack, use latest "newton" version as default
- multivimdriver = "multi
vim
-newton"
+ multivimdriver = "multi
cloud
-newton"
elif vim and vim["type"] == "vmware":
elif vim and vim["type"] == "vmware":
-
multivimdriver = "multivim
-vio"
+
multivimdriver = "multicloud
-vio"
else:
else:
- raise exceptions.NotFound("Not support VIM type")
- return multivimdriver
-
+ raise exceptions.NotFound("Not support VIM type")
+ return multivimdriver
-def getMultivimDriver(vimid,full_path=""):
-
- multivim = "multivim"
+def getMultivimDriver(vimid, full_path=""):
+ multcloud = "multicloud"
vim = get_vim_by_id(vimid)
vim = get_vim_by_id(vimid)
- if vim["type"] and vim["version"]:
- pass
-
- multivimdriver = findMultivimDriver(vim=vim)
- return re.sub(multivim, multivimdriver, full_path)
+ multclouddriver = findMultivimDriver(vim=vim)
+ return re.sub(multcloud, multclouddriver, full_path)