projects
/
osm
/
SO.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SDN Accounts refactoring
[osm/SO.git]
/
rwlaunchpad
/
plugins
/
rwvns
/
vala
/
rwsdn_odl
/
rwsdn_odl.py
diff --git
a/rwlaunchpad/plugins/rwvns/vala/rwsdn_odl/rwsdn_odl.py
b/rwlaunchpad/plugins/rwvns/vala/rwsdn_odl/rwsdn_odl.py
index
3eb39fc
..
2727d8a
100644
(file)
--- a/
rwlaunchpad/plugins/rwvns/vala/rwsdn_odl/rwsdn_odl.py
+++ b/
rwlaunchpad/plugins/rwvns/vala/rwsdn_odl/rwsdn_odl.py
@@
-26,7
+26,7
@@
import time
import gi
gi.require_version('RwTypes', '1.0')
import gi
gi.require_version('RwTypes', '1.0')
-gi.require_version('RwsdnYang', '1.0')
+gi.require_version('Rwsdn
al
Yang', '1.0')
gi.require_version('RwSdn', '1.0')
gi.require_version('RwTopologyYang','1.0')
gi.require_version('RwSdn', '1.0')
gi.require_version('RwTopologyYang','1.0')
@@
-34,7
+34,7
@@
from gi.repository import (
GObject,
RwSdn, # Vala package
RwTypes,
GObject,
RwSdn, # Vala package
RwTypes,
- RwsdnYang,
+ Rwsdn
al
Yang,
RwTopologyYang as RwTl,
)
RwTopologyYang as RwTl,
)
@@
-336,7
+336,7
@@
class SdnOdl(object):
"""
Validate the SDN account credentials by accessing the rest API using the provided credentials
"""
"""
Validate the SDN account credentials by accessing the rest API using the provided credentials
"""
- status = RwsdnYang.SdnConnectionStatus()
+ status = Rwsdn
al
Yang.SdnConnectionStatus()
url = '{}/{}'.format(account.odl.url,"restconf")
try:
r=requests.get(url,auth=(account.odl.username,account.odl.password))
url = '{}/{}'.format(account.odl.url,"restconf")
try:
r=requests.get(url,auth=(account.odl.username,account.odl.password))
@@
-354,7
+354,6
@@
class SdnOdl(object):
status.status = "failure"
status.details = "Connection Failed (Invlaid URL): %s" % str(e)
else:
status.status = "failure"
status.details = "Connection Failed (Invlaid URL): %s" % str(e)
else:
- print("SDN Successfully connected")
status.status = "success"
status.details = "Connection was successful"
status.status = "success"
status.details = "Connection was successful"
@@
-935,7
+934,7
@@
class SdnOdl(object):
self.delete_all_sf(account)
def _fill_rsp_list(self,sfc_rsp_list,sff_list):
self.delete_all_sf(account)
def _fill_rsp_list(self,sfc_rsp_list,sff_list):
- vnffg_rsps = RwsdnYang.VNFFGRenderedPaths()
+ vnffg_rsps = Rwsdn
al
Yang.VNFFGRenderedPaths()
for sfc_rsp in sfc_rsp_list['rendered-service-paths']['rendered-service-path']:
rsp = vnffg_rsps.vnffg_rendered_path.add()
rsp.name = sfc_rsp['name']
for sfc_rsp in sfc_rsp_list['rendered-service-paths']['rendered-service-path']:
rsp = vnffg_rsps.vnffg_rendered_path.add()
rsp.name = sfc_rsp['name']