Rename vnf_base to vnf

Change-Id: I0b8b9b2e85717fc92a233e4f7344b3419421778d
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

diff --git a/functest/core/vnf_base.py b/functest/core/vnf.py
similarity index 100%
rename from functest/core/vnf_base.py
rename to functest/core/vnf.py

diff --git a/functest/opnfv_tests/vnf/aaa/aaa.py b/functest/opnfv_tests/vnf/aaa/aaa.py
index 1a484dd..f23adb5 100755 (executable)
--- a/functest/opnfv_tests/vnf/aaa/aaa.py
+++ b/functest/opnfv_tests/vnf/aaa/aaa.py
@@ -13,10 +13,10 @@ import sys
 import argparse
 
 import functest.core.testcase as testcase
-import functest.core.vnf_base as vnf_base
+import functest.core.vnf as vnf
 
 
-class AaaVnf(vnf_base.VnfOnBoardingBase):
+class AaaVnf(vnf.VnfOnBoardingBase):
 
     logger = logging.getLogger(__name__)
 

diff --git a/functest/opnfv_tests/vnf/ims/clearwater_ims_base.py b/functest/opnfv_tests/vnf/ims/clearwater_ims_base.py
index f3bb301..4bd3dc4 100644 (file)
--- a/functest/opnfv_tests/vnf/ims/clearwater_ims_base.py
+++ b/functest/opnfv_tests/vnf/ims/clearwater_ims_base.py
@@ -13,12 +13,12 @@ import shutil
 
 import requests
 
-import functest.core.vnf_base as vnf_base
+import functest.core.vnf as vnf
 from functest.utils.constants import CONST
 import functest.utils.functest_utils as ft_utils
 
 
-class ClearwaterOnBoardingBase(vnf_base.VnfOnBoardingBase):
+class ClearwaterOnBoardingBase(vnf.VnfOnBoardingBase):
 
     def __init__(self, **kwargs):
         self.logger = logging.getLogger(__name__)

diff --git a/functest/opnfv_tests/vnf/ims/orchestra_ims.py b/functest/opnfv_tests/vnf/ims/orchestra_ims.py
index 95751d4..128ea36 100755 (executable)
--- a/functest/opnfv_tests/vnf/ims/orchestra_ims.py
+++ b/functest/opnfv_tests/vnf/ims/orchestra_ims.py
@@ -9,15 +9,15 @@
 
 import json
 import logging
+import os
 import socket
 import sys
 import time
 import yaml
 
-import functest.core.vnf_base as vnf_base
+import functest.core.vnf as vnf
 import functest.utils.functest_utils as ft_utils
 import functest.utils.openstack_utils as os_utils
-import os
 from functest.utils.constants import CONST
 
 from org.openbaton.cli.agents.agents import MainAgent
@@ -76,7 +76,7 @@ def servertest(host, port):
             return True
 
 
-class ImsVnf(vnf_base.VnfOnBoardingBase):
+class ImsVnf(vnf.VnfOnBoardingBase):
 
     def __init__(self, project='functest', case_name='orchestra_ims',
                  repo='', cmd=''):

diff --git a/functest/tests/unit/core/test_vnf_base.py b/functest/tests/unit/core/test_vnf.py
similarity index 90%
rename from functest/tests/unit/core/test_vnf_base.py
rename to functest/tests/unit/core/test_vnf.py
index 540cf61..a0e7330 100644 (file)
--- a/functest/tests/unit/core/test_vnf_base.py
+++ b/functest/tests/unit/core/test_vnf.py
@@ -10,7 +10,7 @@
 import logging
 import unittest
 
-from functest.core import vnf_base
+from functest.core import vnf
 
 
 class VnfBaseTesting(unittest.TestCase):
@@ -18,8 +18,8 @@ class VnfBaseTesting(unittest.TestCase):
     logging.disable(logging.CRITICAL)
 
     def setUp(self):
-        self.test = vnf_base.VnfOnBoardingBase(project='functest',
-                                               case_name='aaa')
+        self.test = vnf.VnfOnBoardingBase(project='functest',
+                                          case_name='aaa')
         self.test.project = "functest"
         self.test.start_time = "1"
         self.test.stop_time = "5"