From: Philip Joseph <philip.joseph@riftio.com>
Date: Mon, 6 Feb 2017 06:53:19 +0000 (+0530)
Subject: Merge v1.1 to master_vca_intg
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fchanges%2F68%2F1068%2F1;p=osm%2FSO.git

Merge v1.1 to master_vca_intg

Signed-off-by: Philip Joseph <philip.joseph@riftio.com>
---

fdc99cc2344cbe561c78527565bacc797ef096e3
diff --cc rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/cloud.py
index 63c804c8,007e62ca..d7bb0444
--- a/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/cloud.py
+++ b/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/cloud.py
@@@ -40,7 -40,10 +40,10 @@@ class RwNsPlugin(rwnsmplugin.NsmPluginB
          self._log = log
          self._loop = loop
  
+     def set_state(self, nsr_id, state):
+         pass
+ 
 -    def create_nsr(self, nsr_msg, nsd,key_pairs=None):
 +    def create_nsr(self, nsr_msg, nsd, key_pairs=None, ssh_key=None):
          """
          Create Network service record
          """
diff --cc rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/rwnsmplugin.py
index 3febfd12,77fa57cc..b07e917e
--- a/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/rwnsmplugin.py
+++ b/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/rwnsmplugin.py
@@@ -48,7 -48,12 +48,12 @@@ class NsmPluginBase(object)
      def nsm(self):
          return self._nsm
  
+     @abc.abstractmethod
+     def set_state(self, nsr_id, state):
+         pass
+ 
+     @abc.abstractmethod
 -    def create_nsr(self, nsr):
 +    def create_nsr(self, nsr, nsd, key_pairs=None, ssh_key=None):
          """ Create an NSR """
          pass