aboutsummaryrefslogtreecommitdiffstats
path: root/functest/core
diff options
context:
space:
mode:
authorMorgan Richomme <morgan.richomme@orange.com>2017-02-09 16:11:50 +0100
committerMorgan Richomme <morgan.richomme@orange.com>2017-02-09 16:16:57 +0100
commit8b35da62ccae000db2ff665b622b3808b2537844 (patch)
tree4e288316d0e25b59b7eacb8fea94ffd9c4da6bbe /functest/core
parenta34f23295ba75694d2837687df3ada5541489a25 (diff)
[WIP] update cloudify_ims case
bug fixes + adaptation to abstraction class JIRA: FUNCTEST-710 Change-Id: I687876637bd9eeeba9256e28b98a1e3a4f5c3e22 Signed-off-by: Morgan Richomme <morgan.richomme@orange.com>
Diffstat (limited to 'functest/core')
-rw-r--r--functest/core/vnf_base.py26
1 files changed, 0 insertions, 26 deletions
diff --git a/functest/core/vnf_base.py b/functest/core/vnf_base.py
index 4d019858..44b4ae04 100644
--- a/functest/core/vnf_base.py
+++ b/functest/core/vnf_base.py
@@ -7,12 +7,10 @@
# which accompanies this distribution, and is available at
# http://www.apache.org/licenses/LICENSE-2.0
-import os
import time
import inspect
-
import functest.utils.functest_logger as ft_logger
import functest.utils.openstack_utils as os_utils
import functest.utils.functest_utils as ft_utils
@@ -161,30 +159,6 @@ class VnfOnBoardingBase(base.TestcaseBase):
"username": self.tenant_name,
"password": self.tenant_name,
})
- self.glance_client = os_utils.get_glance_client(self.creds)
- self.logger.info("Upload some OS images if it doesn't exist")
-
- temp_dir = os.path.join(self.data_dir, "tmp/")
- for image_name, image_url in self.images.iteritems():
- image_id = os_utils.get_image_id(self.glance_client, image_name)
-
- if image_id == '':
- self.logger.info("""%s image doesn't exist on glance repository. Try
- downloading this image and upload on glance !""" % image_name)
- image_id = os_utils.download_and_add_image_on_glance(
- self.glance_client, image_name, image_url, temp_dir)
-
- if image_id == '':
- self.step_failure(
- "Failed to find or upload required OS "
- "image for this deployment")
-
- self.logger.info("Update security group quota for this tenant")
-
- if not os_utils.update_sg_quota(self.neutron_client,
- tenant_id, 50, 100):
- self.step_failure("Failed to update security group quota" +
- " for tenant " + self.tenant_name)
# orchestrator is not mandatory to dpeloy and test VNF
def deploy_orchestrator(self, **kwargs):