From: velandy Date: Mon, 1 May 2017 16:39:13 +0000 (-0400) Subject: Fixed breakage in function proto-types due to scaling changes X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=4a4a3c6a58e071ac0edf767ce50d02be81cb6346;p=osm%2FSO.git Fixed breakage in function proto-types due to scaling changes Change-Id: I4dc470df259b5de23f152a1e0fec549ce9319721 Signed-off-by: velandy --- diff --git a/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/cloud.py b/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/cloud.py index 007e62ca..343f8094 100644 --- 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"); @@ -61,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 """ @@ -143,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: diff --git a/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/rwnsmplugin.py b/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/rwnsmplugin.py index 77fa57cc..352a4825 100755 --- a/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/rwnsmplugin.py +++ b/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/rwnsmplugin.py @@ -1,4 +1,4 @@ -# +# # Copyright 2016 RIFT.IO Inc # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -70,7 +70,7 @@ class NsmPluginBase(object): @abc.abstractmethod @asyncio.coroutine - def instantiate_vnf(self, nsr, vnfr): + def instantiate_vnf(self, nsr, vnfr, scaleout=False): """ Instantiate the virtual network function """ pass