aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Pauls <michael.pauls@fokus.fraunhofer.de>2017-09-11 17:43:56 +0200
committerMichael Pauls <michael.pauls@fokus.fraunhofer.de>2017-09-11 17:43:56 +0200
commitd898c8db976d24303d9c625460fbe32872ffb7c2 (patch)
treeecf9da4177fed39b4228a8426c88e349d9b7e781
parent90f7a7de0d911c6c8cc472add5f7cde163bf148e (diff)
set marketplace port to 8080 for NFVO
Change-Id: I336b54e63fcb4a7e64f139628536f334c86b1745 JIRA: ORCHESTRA-17 Signed-off-by: Michael Pauls <michael.pauls@fokus.fraunhofer.de>
-rw-r--r--functest/opnfv_tests/vnf/ims/orchestra_clearwaterims.py6
-rw-r--r--functest/opnfv_tests/vnf/ims/orchestra_openims.py6
2 files changed, 8 insertions, 4 deletions
diff --git a/functest/opnfv_tests/vnf/ims/orchestra_clearwaterims.py b/functest/opnfv_tests/vnf/ims/orchestra_clearwaterims.py
index c924a3470..5b2e585ed 100644
--- a/functest/opnfv_tests/vnf/ims/orchestra_clearwaterims.py
+++ b/functest/opnfv_tests/vnf/ims/orchestra_clearwaterims.py
@@ -130,6 +130,8 @@ def get_userdata(orchestrator=dict):
orchestrator['gvnfm']['userdata']['url'])
userdata += "sed -i '113i"'\ \ \ \ '"sleep 60' " \
"/etc/openbaton/openbaton-vnfm-generic-user-data.sh\n"
+ userdata += ("sed -i s/nfvo.marketplace.port=8082/nfvo.marketplace."
+ "port=8080/g /etc/openbaton/openbaton-nfvo.properties\n")
userdata += "echo \"Starting NFVO\"\n"
userdata += "service openbaton-nfvo restart\n"
userdata += "echo \"Starting Generic VNFM\"\n"
@@ -141,13 +143,13 @@ def get_userdata(orchestrator=dict):
class ClearwaterImsVnf(vnf.VnfOnBoarding):
"""Clearwater IMS VNF deployed with openBaton orchestrator"""
- logger = logging.getLogger(__name__)
+ # logger = logging.getLogger(__name__)
def __init__(self, **kwargs):
if "case_name" not in kwargs:
kwargs["case_name"] = "orchestra_clearwaterims"
super(ClearwaterImsVnf, self).__init__(**kwargs)
- # self.logger = logging.getLogger("functest.ci.run_tests.orchestra")
+ self.logger = logging.getLogger("functest.ci.run_tests.orchestra")
self.logger.info("kwargs %s", (kwargs))
self.case_dir = pkg_resources.resource_filename(
diff --git a/functest/opnfv_tests/vnf/ims/orchestra_openims.py b/functest/opnfv_tests/vnf/ims/orchestra_openims.py
index aae35146f..fa700890c 100644
--- a/functest/opnfv_tests/vnf/ims/orchestra_openims.py
+++ b/functest/opnfv_tests/vnf/ims/orchestra_openims.py
@@ -130,6 +130,8 @@ def get_userdata(orchestrator=dict):
orchestrator['gvnfm']['userdata']['url'])
userdata += "sed -i '113i"'\ \ \ \ '"sleep 60' " \
"/etc/openbaton/openbaton-vnfm-generic-user-data.sh\n"
+ userdata += ("sed -i s/nfvo.marketplace.port=8082/nfvo.marketplace."
+ "port=8080/g /etc/openbaton/openbaton-nfvo.properties\n")
userdata += "echo \"Starting NFVO\"\n"
userdata += "service openbaton-nfvo restart\n"
userdata += "echo \"Starting Generic VNFM\"\n"
@@ -141,13 +143,13 @@ def get_userdata(orchestrator=dict):
class OpenImsVnf(vnf.VnfOnBoarding):
"""OpenIMS VNF deployed with openBaton orchestrator"""
- logger = logging.getLogger(__name__)
+ # logger = logging.getLogger(__name__)
def __init__(self, **kwargs):
if "case_name" not in kwargs:
kwargs["case_name"] = "orchestra_openims"
super(OpenImsVnf, self).__init__(**kwargs)
- # self.logger = logging.getLogger("functest.ci.run_tests.orchestra")
+ self.logger = logging.getLogger("functest.ci.run_tests.orchestra")
self.logger.info("kwargs %s", (kwargs))
self.case_dir = pkg_resources.resource_filename(