projects
/
osm
/
SO.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bug 50 Cloud-init support in SO for ssh key injection
[osm/SO.git]
/
rwlaunchpad
/
plugins
/
rwnsm
/
rift
/
tasklets
/
rwnsmtasklet
/
cloud.py
diff --git
a/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/cloud.py
b/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/cloud.py
index
5326ca1
..
6be3761
100644
(file)
--- a/
rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/cloud.py
+++ b/
rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/cloud.py
@@
-40,7
+40,7
@@
class RwNsPlugin(rwnsmplugin.NsmPluginBase):
self._log = log
self._loop = loop
self._log = log
self._loop = loop
- def create_nsr(self, nsr_msg, nsd):
+ def create_nsr(self, nsr_msg, nsd
,key_pairs=None
):
"""
Create Network service record
"""
"""
Create Network service record
"""
@@
-124,15
+124,6
@@
class NsmPlugins(object):
return self._plugin_classes[name]
return self._plugin_classes[name]
-class ROAccountConfigSubscriber(mano_dts.AbstractConfigSubscriber):
-
- def key_name(self):
- return "name"
-
- def get_xpath(self):
- return("C,/rw-launchpad:resource-orchestrator")
-
-
class CloudAccountConfigSubscriber:
def __init__(self, log, dts, log_hdl):
self._dts = dts
class CloudAccountConfigSubscriber:
def __init__(self, log, dts, log_hdl):
self._dts = dts
@@
-180,7
+171,7
@@
class ROAccountPluginSelector(object):
self._nsm_plugins = NsmPlugins()
self._nsm_plugins = NsmPlugins()
- self._ro_sub = ROAccountConfigSubscriber(
+ self._ro_sub =
mano_dts.
ROAccountConfigSubscriber(
self._log,
self._dts,
self._loop,
self._log,
self._dts,
self._loop,