aboutsummaryrefslogtreecommitdiffstats
path: root/functest/opnfv_tests/vnf
diff options
context:
space:
mode:
Diffstat (limited to 'functest/opnfv_tests/vnf')
-rw-r--r--functest/opnfv_tests/vnf/ims/clearwater.py (renamed from functest/opnfv_tests/vnf/vIMS/clearwater.py)2
-rwxr-xr-xfunctest/opnfv_tests/vnf/ims/create_venv.sh (renamed from functest/opnfv_tests/vnf/vIMS/create_venv.sh)0
-rw-r--r--functest/opnfv_tests/vnf/ims/orchestrator.py (renamed from functest/opnfv_tests/vnf/vIMS/orchestrator.py)2
-rw-r--r--functest/opnfv_tests/vnf/ims/requirements.pip (renamed from functest/opnfv_tests/vnf/vIMS/requirements.pip)0
-rwxr-xr-xfunctest/opnfv_tests/vnf/ims/vims.py (renamed from functest/opnfv_tests/vnf/vIMS/vIMS.py)10
-rw-r--r--functest/opnfv_tests/vnf/rnc/__init__.py (renamed from functest/opnfv_tests/vnf/vRNC/__init__.py)0
-rw-r--r--[-rwxr-xr-x]functest/opnfv_tests/vnf/rnc/parser.py (renamed from functest/opnfv_tests/vnf/vRNC/parser.py)0
7 files changed, 7 insertions, 7 deletions
diff --git a/functest/opnfv_tests/vnf/vIMS/clearwater.py b/functest/opnfv_tests/vnf/ims/clearwater.py
index 7236f4fb..eb0abacd 100644
--- a/functest/opnfv_tests/vnf/vIMS/clearwater.py
+++ b/functest/opnfv_tests/vnf/ims/clearwater.py
@@ -12,7 +12,7 @@
########################################################################
-class clearwater:
+class Clearwater:
def __init__(self, inputs={}, orchestrator=None, logger=None):
self.config = inputs
diff --git a/functest/opnfv_tests/vnf/vIMS/create_venv.sh b/functest/opnfv_tests/vnf/ims/create_venv.sh
index 575fd177..575fd177 100755
--- a/functest/opnfv_tests/vnf/vIMS/create_venv.sh
+++ b/functest/opnfv_tests/vnf/ims/create_venv.sh
diff --git a/functest/opnfv_tests/vnf/vIMS/orchestrator.py b/functest/opnfv_tests/vnf/ims/orchestrator.py
index 61157a4f..5f84df00 100644
--- a/functest/opnfv_tests/vnf/vIMS/orchestrator.py
+++ b/functest/opnfv_tests/vnf/ims/orchestrator.py
@@ -21,7 +21,7 @@ from git import Repo
import functest.utils.functest_logger as ft_logger
-class orchestrator:
+class Orchestrator:
def __init__(self, testcase_dir, inputs={}):
self.testcase_dir = testcase_dir
diff --git a/functest/opnfv_tests/vnf/vIMS/requirements.pip b/functest/opnfv_tests/vnf/ims/requirements.pip
index ab26f6e0..ab26f6e0 100644
--- a/functest/opnfv_tests/vnf/vIMS/requirements.pip
+++ b/functest/opnfv_tests/vnf/ims/requirements.pip
diff --git a/functest/opnfv_tests/vnf/vIMS/vIMS.py b/functest/opnfv_tests/vnf/ims/vims.py
index 4cc8ce30..fe888b69 100755
--- a/functest/opnfv_tests/vnf/vIMS/vIMS.py
+++ b/functest/opnfv_tests/vnf/ims/vims.py
@@ -27,8 +27,8 @@ from neutronclient.v2_0 import client as ntclient
import functest.utils.functest_logger as ft_logger
import functest.utils.functest_utils as ft_utils
import functest.utils.openstack_utils as os_utils
-from clearwater import clearwater
-from orchestrator import orchestrator
+from clearwater import Clearwater
+from orchestrator import Orchestrator
import functest.utils.functest_constants as ft_constants
pp = pprint.PrettyPrinter(indent=4)
@@ -49,7 +49,7 @@ logger = ft_logger.Logger("vIMS").getLogger()
# Cloudify parameters
-VIMS_DIR = os.path.join(ft_constants.FUNCTEST_TEST_DIR, 'vnf/vIMS/')
+VIMS_DIR = os.path.join(ft_constants.FUNCTEST_TEST_DIR, 'vnf/ims/')
VIMS_DATA_DIR = ft_constants.VIMS_DATA_DIR
VIMS_TEST_DIR = ft_constants.VIMS_TEST_DIR
VIMS_TENANT_NAME = ft_constants.VIMS_TENANT_NAME
@@ -328,7 +328,7 @@ def main():
public_auth_url = keystone.service_catalog.url_for(
service_type='identity', endpoint_type='publicURL')
- cfy = orchestrator(VIMS_DATA_DIR, CFY_INPUTS)
+ cfy = Orchestrator(VIMS_DATA_DIR, CFY_INPUTS)
cfy.set_credentials(username=ks_creds['username'], password=ks_creds[
'password'], tenant_name=ks_creds['tenant_name'],
@@ -413,7 +413,7 @@ def main():
# ############### CLEARWATER INITIALISATION ################
- cw = clearwater(CW_INPUTS, cfy, logger)
+ cw = Clearwater(CW_INPUTS, cfy, logger)
logger.info("Collect flavor id for all clearwater vm")
nova = nvclient.Client("2", **nv_creds)
diff --git a/functest/opnfv_tests/vnf/vRNC/__init__.py b/functest/opnfv_tests/vnf/rnc/__init__.py
index e69de29b..e69de29b 100644
--- a/functest/opnfv_tests/vnf/vRNC/__init__.py
+++ b/functest/opnfv_tests/vnf/rnc/__init__.py
diff --git a/functest/opnfv_tests/vnf/vRNC/parser.py b/functest/opnfv_tests/vnf/rnc/parser.py
index c8d82bf7..c8d82bf7 100755..100644
--- a/functest/opnfv_tests/vnf/vRNC/parser.py
+++ b/functest/opnfv_tests/vnf/rnc/parser.py