diff options
Diffstat (limited to 'functest/opnfv_tests')
| -rw-r--r-- | functest/opnfv_tests/vnf/epc/juju_epc.py | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/functest/opnfv_tests/vnf/epc/juju_epc.py b/functest/opnfv_tests/vnf/epc/juju_epc.py index ada11c3a..052efd3f 100644 --- a/functest/opnfv_tests/vnf/epc/juju_epc.py +++ b/functest/opnfv_tests/vnf/epc/juju_epc.py @@ -9,7 +9,6 @@ """Juju testcase implementation.""" import logging -import shutil import os import time import json @@ -17,7 +16,7 @@ import sys from copy import deepcopy from urlparse import urljoin -import functest.core.vnf as vnf +from functest.core import vnf from functest.opnfv_tests.openstack.snaps import snaps_utils from functest.utils.constants import CONST import functest.utils.openstack_utils as os_utils @@ -170,8 +169,6 @@ class JujuEpc(vnf.VnfOnBoarding): 'vnf_{}_external_router'.format(self.case_name)) dns_nameserver = CONST.__getattribute__( 'vnf_{}_dns_nameserver'.format(self.case_name)) - ext_net_name = CONST.__getattribute__( - 'vnf_{}_external_network_name'.format(self.case_name)) self.__logger.info("Creating full network ...") subnet_settings = SubnetConfig(name=private_subnet_name, @@ -203,22 +200,6 @@ class JujuEpc(vnf.VnfOnBoarding): self.__logger.info("Juju Bootstrap: Skip creation of flavors") flavor_creator.create() self.created_object.append(flavor_creator) - self.__logger.info("Installing Dependency Packages .......") - source_dir = "/src/epc-requirements/juju_bin_build" - if os.path.exists(source_dir): - shutil.rmtree(source_dir) - os.makedirs(source_dir) - os.environ['GOPATH'] = str(source_dir) - os.environ['GOBIN'] = str(source_dir) + "/bin" - os.environ['PATH'] = ((os.path.expandvars('$GOPATH')) + ":" + - (os.path.expandvars('$GOBIN')) + ":" + - (os.path.expandvars('$PATH'))) - os.system('go get -d -v github.com/juju/juju/...') - os.chdir(source_dir + "/src" + "/github.com" + "/juju" + "/juju") - os.system('git checkout tags/juju-2.2.5') - os.system('go get github.com/rogpeppe/godeps') - os.system('godeps -u dependencies.tsv') - os.system('go install -v github.com/juju/juju/...') self.__logger.info("Creating Cloud for Abot-epc .....") os.system('juju add-cloud abot-epc -f {}'.format(self.filename)) os.system('juju add-credential abot-epc -f {}'.format(self.filename)) |