Make sdnvpn a package

- Clean up the test/functest folder and move things to lib/ & artifacts/
- Add a new top level folder for the sdnvpn python code

Change-Id: I5fdc7fa5475fb800f488a17d3481158c9c4f84e1
Signed-off-by: Romanos Skiadas <rski@intracom-telecom.com>

diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644 (file)
index 0000000..9c0fe64
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1 @@
+recursive-include sdnvpn/artifacts *

diff --git a/test/functest/__init__.py b/sdnvpn/__init__.py
similarity index 100%
rename from test/functest/__init__.py
rename to sdnvpn/__init__.py

diff --git a/test/functest/id_rsa b/sdnvpn/artifacts/id_rsa
similarity index 100%
rename from test/functest/id_rsa
rename to sdnvpn/artifacts/id_rsa

diff --git a/sdnvpn/lib/__init__.py b/sdnvpn/lib/__init__.py
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/test/functest/config.py b/sdnvpn/lib/config.py
similarity index 93%
rename from test/functest/config.py
rename to sdnvpn/lib/config.py
index 45611c7..ac9bbe2 100644 (file)
--- a/test/functest/config.py
+++ b/sdnvpn/lib/config.py
@@ -16,9 +16,9 @@ class CommonConfig(object):
     def __init__(self):
         self.repo_path = ft_constants.SDNVPN_REPO_DIR
         self.config_file = os.path.join(self.repo_path,
-                                        'test/functest/config.yaml')
+                                        'sdnvpn/test/functest/config.yaml')
         self.keyfile_path = os.path.join(self.repo_path,
-                                         'test/functest/id_rsa')
+                                         'sdnvpn/artifacts/id_rsa')
         self.test_db = ft_utils.get_functest_config("results.test_db_url")
         self.line_length = 90  # length for the summary table
         self.vm_boot_timeout = 180

diff --git a/test/functest/results.py b/sdnvpn/lib/results.py
similarity index 100%
rename from test/functest/results.py
rename to sdnvpn/lib/results.py

diff --git a/test/functest/utils.py b/sdnvpn/lib/utils.py
similarity index 99%
rename from test/functest/utils.py
rename to sdnvpn/lib/utils.py
index cbfc88d..b551954 100644 (file)
--- a/test/functest/utils.py
+++ b/sdnvpn/lib/utils.py
@@ -14,7 +14,7 @@ import functest.utils.functest_logger as ft_logger
 import functest.utils.openstack_utils as os_utils
 import re
 
-import config as sdnvpn_config
+from sdnvpn.lib import config as sdnvpn_config
 
 logger = ft_logger.Logger("sndvpn_test_utils").getLogger()
 

diff --git a/sdnvpn/test/__init__.py b/sdnvpn/test/__init__.py
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/test/functest/README.md b/sdnvpn/test/functest/README.md
similarity index 100%
rename from test/functest/README.md
rename to sdnvpn/test/functest/README.md

diff --git a/sdnvpn/test/functest/__init__.py b/sdnvpn/test/functest/__init__.py
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/test/functest/config.yaml b/sdnvpn/test/functest/config.yaml
similarity index 100%
rename from test/functest/config.yaml
rename to sdnvpn/test/functest/config.yaml

diff --git a/test/functest/run_tests.py b/sdnvpn/test/functest/run_tests.py
similarity index 98%
rename from test/functest/run_tests.py
rename to sdnvpn/test/functest/run_tests.py
index e05cd7f..15fe1d0 100644 (file)
--- a/test/functest/run_tests.py
+++ b/sdnvpn/test/functest/run_tests.py
@@ -16,7 +16,7 @@ import yaml
 
 import functest.utils.functest_logger as ft_logger
 import functest.utils.functest_utils as ft_utils
-import config as sdnvpn_config
+from sdnvpn.lib import config as sdnvpn_config
 
 
 parser = argparse.ArgumentParser()

diff --git a/test/functest/tempest.py b/sdnvpn/test/functest/tempest.py
similarity index 98%
rename from test/functest/tempest.py
rename to sdnvpn/test/functest/tempest.py
index 9797ced..855ec1b 100644 (file)
--- a/test/functest/tempest.py
+++ b/sdnvpn/test/functest/tempest.py
@@ -15,7 +15,7 @@ import shutil
 
 import functest.utils.functest_logger as ft_logger
 import functest.utils.functest_utils as ft_utils
-import config as sdnvpn_config
+from sdnvpn.lib import config as sdnvpn_config
 
 logger = ft_logger.Logger("sdnvpn-tempest").getLogger()
 

diff --git a/test/functest/tempest_blacklist.txt b/sdnvpn/test/functest/tempest_blacklist.txt
similarity index 100%
rename from test/functest/tempest_blacklist.txt
rename to sdnvpn/test/functest/tempest_blacklist.txt

diff --git a/test/functest/testcase_1.py b/sdnvpn/test/functest/testcase_1.py
similarity index 98%
rename from test/functest/testcase_1.py
rename to sdnvpn/test/functest/testcase_1.py
index 143945d..e1a7577 100644 (file)
--- a/test/functest/testcase_1.py
+++ b/sdnvpn/test/functest/testcase_1.py
@@ -14,9 +14,9 @@ from random import randint
 import functest.utils.functest_logger as ft_logger
 import functest.utils.openstack_utils as os_utils
 
-import utils as test_utils
-import config as sdnvpn_config
-from results import Results
+from sdnvpn.lib import utils as test_utils
+from sdnvpn.lib import config as sdnvpn_config
+from sdnvpn.lib.results import Results
 
 parser = argparse.ArgumentParser()
 

diff --git a/test/functest/testcase_2.py b/sdnvpn/test/functest/testcase_2.py
similarity index 98%
rename from test/functest/testcase_2.py
rename to sdnvpn/test/functest/testcase_2.py
index 2875c5f..0b4e5b4 100644 (file)
--- a/test/functest/testcase_2.py
+++ b/sdnvpn/test/functest/testcase_2.py
@@ -15,9 +15,9 @@ import sys
 import functest.utils.functest_logger as ft_logger
 import functest.utils.openstack_utils as os_utils
 
-import utils as test_utils
-from results import Results
-import config as sdnvpn_config
+import sdnvpn.lib.utils as test_utils
+from sdnvpn.lib.results import Results
+import sdnvpn.lib.config as sdnvpn_config
 
 parser = argparse.ArgumentParser()
 

diff --git a/test/functest/testcase_3.py b/sdnvpn/test/functest/testcase_3.py
similarity index 100%
rename from test/functest/testcase_3.py
rename to sdnvpn/test/functest/testcase_3.py

diff --git a/test/functest/testcase_4.py b/sdnvpn/test/functest/testcase_4.py
similarity index 98%
rename from test/functest/testcase_4.py
rename to sdnvpn/test/functest/testcase_4.py
index 61d8c97..65ee2ee 100644 (file)
--- a/test/functest/testcase_4.py
+++ b/sdnvpn/test/functest/testcase_4.py
@@ -14,9 +14,9 @@ from random import randint
 import functest.utils.functest_logger as ft_logger
 import functest.utils.openstack_utils as os_utils
 
-import utils as test_utils
-from results import Results
-import config as sdnvpn_config
+from sdnvpn.lib import utils as test_utils
+from sdnvpn.lib import config as sdnvpn_config
+from sdnvpn.lib.results import Results
 
 parser = argparse.ArgumentParser()
 

diff --git a/test/functest/testcase_7.py b/sdnvpn/test/functest/testcase_7.py
similarity index 97%
rename from test/functest/testcase_7.py
rename to sdnvpn/test/functest/testcase_7.py
index 0e4a913..fa50888 100644 (file)
--- a/test/functest/testcase_7.py
+++ b/sdnvpn/test/functest/testcase_7.py
@@ -23,9 +23,9 @@ import argparse
 import functest.utils.functest_logger as ft_logger
 import functest.utils.openstack_utils as os_utils
 
-import utils as test_utils
-from results import Results
-import config as sdnvpn_config
+from sdnvpn.lib import utils as test_utils
+from sdnvpn.lib import config as sdnvpn_config
+from sdnvpn.lib.results import Results
 
 parser = argparse.ArgumentParser()
 
@@ -149,5 +149,6 @@ def main():
 
     return results.compile_summary(TESTCASE_CONFIG.success_criteria)
 
+
 if __name__ == '__main__':
     main()

diff --git a/setup.py b/setup.py
new file mode 100644 (file)
index 0000000..6347eb8
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,18 @@
+##############################################################################
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+
+
+from setuptools import setup
+
+
+setup(
+    name="sdnvpn",
+    version="danube",
+    packages=['sdnvpn'],
+    include_package_data=True,
+    package_data={},
+    url="https://www.opnfv.org")