summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2018-06-17 13:36:12 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2018-06-17 13:38:41 +0200
commitab24f04ce0a27686e5f0c3f465ccb0ff06c48dfe (patch)
tree01bbcabca9a075d8b8f762d6889c4d13f86ac624
parent383ed86699816f633f007c515338d0fa022bf4fc (diff)
Fix invalid method names in vnfs
Change-Id: Icff1a53ffd7b59d46543b79571b45872a9f243c3 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
-rw-r--r--functest/opnfv_tests/vnf/epc/juju_epc.py6
-rw-r--r--functest/opnfv_tests/vnf/ims/cloudify_ims.py11
2 files changed, 8 insertions, 9 deletions
diff --git a/functest/opnfv_tests/vnf/epc/juju_epc.py b/functest/opnfv_tests/vnf/epc/juju_epc.py
index 54eeeac8a..75d3157b7 100644
--- a/functest/opnfv_tests/vnf/epc/juju_epc.py
+++ b/functest/opnfv_tests/vnf/epc/juju_epc.py
@@ -130,7 +130,7 @@ class JujuEpc(vnf.VnfOnBoarding):
self.res_dir = os.path.join(
getattr(config.CONF, 'dir_results'), self.case_name)
- def _bypass_juju_network_discovery_bug(self, name):
+ def _bypass_juju_netdiscovery_bug(self, name):
user_creator = OpenStackUser(
self.snaps_creds,
UserConfig(
@@ -157,7 +157,7 @@ class JujuEpc(vnf.VnfOnBoarding):
def _register_credentials_v2(self):
self.__logger.info("Creating Credentials for Abot-epc .....")
- user_creator = self._bypass_juju_network_discovery_bug(
+ user_creator = self._bypass_juju_netdiscovery_bug(
'juju_network_discovery_bug')
snaps_creds = user_creator.get_os_creds(self.snaps_creds.project_name)
self.__logger.debug("snaps creds: %s", snaps_creds)
@@ -175,7 +175,7 @@ class JujuEpc(vnf.VnfOnBoarding):
def _register_credentials_v3(self):
self.__logger.info("Creating Credentials for Abot-epc .....")
- user_creator = self._bypass_juju_network_discovery_bug(
+ user_creator = self._bypass_juju_netdiscovery_bug(
'juju_network_discovery_bug')
snaps_creds = user_creator.get_os_creds(self.snaps_creds.project_name)
self.__logger.debug("snaps creds: %s", snaps_creds)
diff --git a/functest/opnfv_tests/vnf/ims/cloudify_ims.py b/functest/opnfv_tests/vnf/ims/cloudify_ims.py
index 71aaa3008..4ac79b55d 100644
--- a/functest/opnfv_tests/vnf/ims/cloudify_ims.py
+++ b/functest/opnfv_tests/vnf/ims/cloudify_ims.py
@@ -348,11 +348,10 @@ class CloudifyIms(clearwater_ims_base.ClearwaterOnBoardingBase):
descriptor.get('name'),
self.vnf.get('inputs'))
- wait_for_execution(cfy_client,
- _get_deployment_environment_creation_execution(
- cfy_client, descriptor.get('name')),
- self.__logger,
- timeout=300)
+ wait_for_execution(
+ cfy_client,
+ get_execution_id(cfy_client, descriptor.get('name')),
+ self.__logger, timeout=300)
self.__logger.info("Start the VNF Instance deployment")
execution = cfy_client.executions.start(descriptor.get('name'),
@@ -530,7 +529,7 @@ def wait_for_execution(client, execution, logger, timeout=3600, ):
return execution
-def _get_deployment_environment_creation_execution(client, deployment_id):
+def get_execution_id(client, deployment_id):
"""
Get the execution id of a env preparation.