projects
/
osm
/
SO.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update from RIFT as of 696b75d2fe9fb046261b08c616f1bcf6c0b54a9b second try
[osm/SO.git]
/
rwlaunchpad
/
plugins
/
rwvns
/
vala
/
rwsdn_openstack
/
rwsdn_openstack.py
diff --git
a/rwlaunchpad/plugins/rwvns/vala/rwsdn_openstack/rwsdn_openstack.py
b/rwlaunchpad/plugins/rwvns/vala/rwsdn_openstack/rwsdn_openstack.py
index
a9ff983
..
ee4e63b
100644
(file)
--- a/
rwlaunchpad/plugins/rwvns/vala/rwsdn_openstack/rwsdn_openstack.py
+++ b/
rwlaunchpad/plugins/rwvns/vala/rwsdn_openstack/rwsdn_openstack.py
@@
-94,7
+94,9
@@
class OpenstackL2PortChainingDriver(object):
cert_validate = kwargs['cert_validate'] if 'cert_validate' in kwargs else False
region = kwargs['region_name'] if 'region_name' in kwargs else False
cert_validate = kwargs['cert_validate'] if 'cert_validate' in kwargs else False
region = kwargs['region_name'] if 'region_name' in kwargs else False
- discover = ks_drv.KeystoneVersionDiscover(kwargs['auth_url'], logger = self.log)
+ discover = ks_drv.KeystoneVersionDiscover(kwargs['auth_url'],
+ cert_validate,
+ logger = self.log)
(major, minor) = discover.get_version()
self.sess_drv = sess_drv.SessionDriver(auth_method = 'password',
(major, minor) = discover.get_version()
self.sess_drv = sess_drv.SessionDriver(auth_method = 'password',
@@
-112,7
+114,7
@@
class OpenstackL2PortChainingDriver(object):
logger = self.log)
def validate_account_creds(self):
logger = self.log)
def validate_account_creds(self):
- status = RwsdnalYang.
Sdn
ConnectionStatus()
+ status = RwsdnalYang.
YangData_RwProject_Project_SdnAccounts_SdnAccountList_
ConnectionStatus()
try:
self.sess_drv.invalidate_auth_token()
self.sess_drv.auth_token
try:
self.sess_drv.invalidate_auth_token()
self.sess_drv.auth_token
@@
-279,7
+281,7
@@
class SdnOpenstackPlugin(GObject.Object, RwSdn.Topology):
Returns:
Validation Code and Details String
"""
Returns:
Validation Code and Details String
"""
- status = RwsdnalYang.
Sdn
ConnectionStatus()
+ status = RwsdnalYang.
YangData_RwProject_Project_SdnAccounts_SdnAccountList_
ConnectionStatus()
try:
drv = self._use_driver(account)
drv.validate_account_creds()
try:
drv = self._use_driver(account)
drv.validate_account_creds()
@@
-322,7
+324,7
@@
class SdnOpenstackPlugin(GObject.Object, RwSdn.Topology):
else:
prev_vm_id = path.vnfr_ids[0].vdu_list[0].vm_id
port_list.append((path.vnfr_ids[0].vdu_list[0].port_id, path.vnfr_ids[0].vdu_list[0].port_id))
else:
prev_vm_id = path.vnfr_ids[0].vdu_list[0].vm_id
port_list.append((path.vnfr_ids[0].vdu_list[0].port_id, path.vnfr_ids[0].vdu_list[0].port_id))
- vnffg_id = drv.create_port_chain(vnffg.name, port_list)
+ vnffg_id = drv.
portchain_drv.
create_port_chain(vnffg.name, port_list)
return vnffg_id
@rwstatus
return vnffg_id
@rwstatus
@@
-390,7
+392,7
@@
class SdnOpenstackPlugin(GObject.Object, RwSdn.Topology):
@param account - a SDN account
"""
self.log.debug('Received get VNFFG rendered path for account %s ', account)
@param account - a SDN account
"""
self.log.debug('Received get VNFFG rendered path for account %s ', account)
- vnffg_rsps = RwsdnalYang.
VNFFG
RenderedPaths()
+ vnffg_rsps = RwsdnalYang.
YangData_RwProject_Project_Vnffg
RenderedPaths()
drv = self._use_driver(account)
port_chain_list = drv.get_port_chain_list()
for port_chain in port_chain_list:
drv = self._use_driver(account)
port_chain_list = drv.get_port_chain_list()
for port_chain in port_chain_list: