Merge v1.1 to master_vca_intg

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

diff --cc models/plugins/yang/mano-types.yang
Simple merge

diff --cc models/plugins/yang/nsd.yang
Simple merge

diff --cc models/plugins/yang/vnfd.yang
Simple merge

diff --cc rwcm/plugins/rwconman/rift/tasklets/rwconmantasklet/rwconman_config.py
Simple merge

diff --cc rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/cloud.py
index 63c804c,007e62c..d7bb044
--- 1/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/cloud.py
--- 2/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 create_nsr(self, nsr_msg, nsd,key_pairs=None):
+     def set_state(self, nsr_id, state):
+         pass
+ 
 +    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/openmano_nsm.py
Simple merge

diff --cc rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/rwnsmplugin.py
index 3febfd1,77fa57c..b07e917
--- 1/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/rwnsmplugin.py
--- 2/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
  
 -    def create_nsr(self, nsr):
+     @abc.abstractmethod
+     def set_state(self, nsr_id, state):
+         pass
+ 
+     @abc.abstractmethod
 +    def create_nsr(self, nsr, nsd, key_pairs=None, ssh_key=None):
          """ Create an NSR """
          pass
  

diff --cc rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/rwnsmtasklet.py
Simple merge

diff --cc rwlaunchpad/plugins/rwvnfm/rift/tasklets/rwvnfmtasklet/rwvnfmtasklet.py
Simple merge