Fixed breakage in function proto-types due to scaling changes

[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 05be1aa..343f809 100644 (file)
--- a/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/cloud.py
+++ b/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/cloud.py
@@ -1,5 +1,5 @@
 
-# 
+#
 #   Copyright 2016 RIFT.IO Inc
 #
 #   Licensed under the Apache License, Version 2.0 (the "License");
@@ -40,6 +40,9 @@ class RwNsPlugin(rwnsmplugin.NsmPluginBase):
         self._log = log
         self._loop = loop
 
+    def set_state(self, nsr_id, state):
+        pass
+
     def create_nsr(self, nsr_msg, nsd,key_pairs=None):
         """
         Create Network service record
@@ -58,7 +61,7 @@ class RwNsPlugin(rwnsmplugin.NsmPluginBase):
         yield from nsr.instantiate(config_xact)
 
     @asyncio.coroutine
-    def instantiate_vnf(self, nsr, vnfr):
+    def instantiate_vnf(self, nsr, vnfr, scaleout=False):
         """
         Instantiate NSR with the passed nsr id
         """
@@ -140,7 +143,7 @@ class CloudAccountConfigSubscriber:
         if account_name in self._cloud_sub.accounts:
             self._log.debug("Cloud accnt msg is %s",self._cloud_sub.accounts[account_name].account_msg)
             if self._cloud_sub.accounts[account_name].account_msg.has_field("sdn_account"):
-                sdn_account = self._cloud_sub.accounts[account_name].account_msg.sdn_account 
+                sdn_account = self._cloud_sub.accounts[account_name].account_msg.sdn_account
                 self._log.info("SDN associated with Cloud name %s is %s", account_name, sdn_account)
                 return sdn_account
             else:
@@ -177,7 +180,7 @@ class ROAccountPluginSelector(object):
                 self._loop,
                 callback=self.on_ro_account_change
                 )
-        self._nsr_sub = mano_dts.NsInstanceConfigSubscriber(
+        self._nsr_sub = mano_dts.NsrCatalogSubscriber(
                 self._log,
                 self._dts,
                 self._loop,