projects
/
osm
/
SO.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Remove config template from use in ping-pong"
[osm/SO.git]
/
rwlaunchpad
/
plugins
/
rwnsm
/
rift
/
tasklets
/
rwnsmtasklet
/
rwvnffgmgr.py
diff --git
a/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/rwvnffgmgr.py
b/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/rwvnffgmgr.py
index
cf83612
..
4d6cde4
100755
(executable)
--- a/
rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/rwvnffgmgr.py
+++ b/
rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/rwvnffgmgr.py
@@
-19,7
+19,7
@@
import asyncio
from gi.repository import (
RwDts as rwdts,
from gi.repository import (
RwDts as rwdts,
- RwsdnYang,
+ Rwsdn
al
Yang,
RwTypes,
ProtobufC,
)
RwTypes,
ProtobufC,
)
@@
-79,7
+79,7
@@
class VnffgMgr(object):
if (account.name in self._account):
self._log.error("SDN Account is already set")
else:
if (account.name in self._account):
self._log.error("SDN Account is already set")
else:
- sdn_account = RwsdnYang.SDNAccount()
+ sdn_account = Rwsdn
al
Yang.SDNAccount()
sdn_account.from_dict(account.as_dict())
sdn_account.name = account.name
self._account[account.name] = sdn_account
sdn_account.from_dict(account.as_dict())
sdn_account.name = account.name
self._account[account.name] = sdn_account
@@
-102,7
+102,7
@@
class VnffgMgr(object):
def get_sdn_account(self, name):
"""
def get_sdn_account(self, name):
"""
- Creates an object for class RwsdnYang.SdnAccount()
+ Creates an object for class Rwsdn
al
Yang.SdnAccount()
"""
if (name in self._account):
return self._account[name]
"""
if (name in self._account):
return self._account[name]
@@
-172,7
+172,7
@@
class VnffgMgr(object):
sdn_plugin = self.get_sdn_plugin(sdn_acct_name)
for rsp in vnffgr.rsp:
sdn_plugin = self.get_sdn_plugin(sdn_acct_name)
for rsp in vnffgr.rsp:
- vnffg = RwsdnYang.VNFFGChain()
+ vnffg = Rwsdn
al
Yang.VNFFGChain()
vnffg.name = rsp.name
vnffg.classifier_name = rsp.classifier_name
vnffg.name = rsp.name
vnffg.classifier_name = rsp.classifier_name
@@
-230,7
+230,7
@@
class VnffgMgr(object):
else:
self._log.error("No RSP wiht name %s found; Skipping classifier %s creation",classifier.rsp_id_ref,classifier.name)
continue
else:
self._log.error("No RSP wiht name %s found; Skipping classifier %s creation",classifier.rsp_id_ref,classifier.name)
continue
- vnffgcl = RwsdnYang.VNFFGClassifier()
+ vnffgcl = Rwsdn
al
Yang.VNFFGClassifier()
vnffgcl.name = classifier.name
vnffgcl.rsp_name = cl_rsp_name
vnffgcl.port_id = vnffgr_cl[0].port_id
vnffgcl.name = classifier.name
vnffgcl.rsp_name = cl_rsp_name
vnffgcl.port_id = vnffgr_cl[0].port_id