From 206c5a988ab003af7c04b82044eb565d8b3bcfb7 Mon Sep 17 00:00:00 2001 From: Harry Huang Date: Tue, 13 Mar 2018 10:52:01 +0800 Subject: [PATCH] Modify repo structure JIRA: - 1. keep modules in lib directory instead of auto Change-Id: Ie4c51b28554575bafbaa89c5f57309a786b903e0 Signed-off-by: Harry Huang --- lib/auto.egg-info/PKG-INFO | 10 ++++++++++ lib/auto.egg-info/SOURCES.txt | 11 +++++++++++ lib/auto.egg-info/dependency_links.txt | 1 + lib/auto.egg-info/requires.txt | 2 ++ lib/auto.egg-info/top_level.txt | 1 + {auto => lib/auto}/__init__.py | 0 {auto => lib/auto}/testcase/resiliency/AutoResilIftCloud.py | 0 {auto => lib/auto}/testcase/resiliency/AutoResilItfOS.py | 0 .../auto}/testcase/resiliency/AutoResilItfVNFMNFVO.py | 0 {auto => lib/auto}/testcase/resiliency/AutoResilMain.py | 0 {auto => lib/auto}/testcase/resiliency/AutoResilMgTestDef.py | 0 {auto => lib/auto}/testcase/resiliency/AutoResilRunTest.py | 0 {auto => lib/auto}/testcase/vnf/vbng/MANIFEST.json | 0 {auto => lib/auto}/testcase/vnf/vbng/base_vcpe_vbng.env | 0 {auto => lib/auto}/testcase/vnf/vbng/base_vcpe_vbng.yaml | 0 {auto => lib/auto}/testcase/vnf/vbrgemu/MANIFEST.json | 0 {auto => lib/auto}/testcase/vnf/vbrgemu/base_vcpe_vbrgemu.env | 0 .../auto}/testcase/vnf/vbrgemu/base_vcpe_vbrgemu.yaml | 0 {auto => lib/auto}/testcase/vnf/vgmux/MANIFEST.json | 0 {auto => lib/auto}/testcase/vnf/vgmux/base_vcpe_vgmux.env | 0 {auto => lib/auto}/testcase/vnf/vgmux/base_vcpe_vgmux.yaml | 0 {auto => lib/auto}/testcase/vnf/vgw/MANIFEST.json | 0 {auto => lib/auto}/testcase/vnf/vgw/base_vcpe_vgw.env | 0 {auto => lib/auto}/testcase/vnf/vgw/base_vcpe_vgw.yaml | 0 {auto => lib/auto}/util/__init__.py | 0 {auto => lib/auto}/util/openstack_lib.py | 0 {auto => lib/auto}/util/util.py | 0 {auto => lib/auto}/util/yaml_type.py | 0 setup.py | 3 ++- 29 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 lib/auto.egg-info/PKG-INFO create mode 100644 lib/auto.egg-info/SOURCES.txt create mode 100644 lib/auto.egg-info/dependency_links.txt create mode 100644 lib/auto.egg-info/requires.txt create mode 100644 lib/auto.egg-info/top_level.txt rename {auto => lib/auto}/__init__.py (100%) rename {auto => lib/auto}/testcase/resiliency/AutoResilIftCloud.py (100%) rename {auto => lib/auto}/testcase/resiliency/AutoResilItfOS.py (100%) rename {auto => lib/auto}/testcase/resiliency/AutoResilItfVNFMNFVO.py (100%) rename {auto => lib/auto}/testcase/resiliency/AutoResilMain.py (100%) rename {auto => lib/auto}/testcase/resiliency/AutoResilMgTestDef.py (100%) rename {auto => lib/auto}/testcase/resiliency/AutoResilRunTest.py (100%) rename {auto => lib/auto}/testcase/vnf/vbng/MANIFEST.json (100%) rename {auto => lib/auto}/testcase/vnf/vbng/base_vcpe_vbng.env (100%) rename {auto => lib/auto}/testcase/vnf/vbng/base_vcpe_vbng.yaml (100%) rename {auto => lib/auto}/testcase/vnf/vbrgemu/MANIFEST.json (100%) rename {auto => lib/auto}/testcase/vnf/vbrgemu/base_vcpe_vbrgemu.env (100%) rename {auto => lib/auto}/testcase/vnf/vbrgemu/base_vcpe_vbrgemu.yaml (100%) rename {auto => lib/auto}/testcase/vnf/vgmux/MANIFEST.json (100%) rename {auto => lib/auto}/testcase/vnf/vgmux/base_vcpe_vgmux.env (100%) rename {auto => lib/auto}/testcase/vnf/vgmux/base_vcpe_vgmux.yaml (100%) rename {auto => lib/auto}/testcase/vnf/vgw/MANIFEST.json (100%) rename {auto => lib/auto}/testcase/vnf/vgw/base_vcpe_vgw.env (100%) rename {auto => lib/auto}/testcase/vnf/vgw/base_vcpe_vgw.yaml (100%) rename {auto => lib/auto}/util/__init__.py (100%) rename {auto => lib/auto}/util/openstack_lib.py (100%) rename {auto => lib/auto}/util/util.py (100%) rename {auto => lib/auto}/util/yaml_type.py (100%) diff --git a/lib/auto.egg-info/PKG-INFO b/lib/auto.egg-info/PKG-INFO new file mode 100644 index 0000000..d0a669b --- /dev/null +++ b/lib/auto.egg-info/PKG-INFO @@ -0,0 +1,10 @@ +Metadata-Version: 1.0 +Name: auto +Version: 1.0.0 +Summary: UNKNOWN +Home-page: UNKNOWN +Author: UNKNOWN +Author-email: UNKNOWN +License: UNKNOWN +Description: UNKNOWN +Platform: UNKNOWN diff --git a/lib/auto.egg-info/SOURCES.txt b/lib/auto.egg-info/SOURCES.txt new file mode 100644 index 0000000..ede3967 --- /dev/null +++ b/lib/auto.egg-info/SOURCES.txt @@ -0,0 +1,11 @@ +setup.py +lib/auto/__init__.py +lib/auto.egg-info/PKG-INFO +lib/auto.egg-info/SOURCES.txt +lib/auto.egg-info/dependency_links.txt +lib/auto.egg-info/requires.txt +lib/auto.egg-info/top_level.txt +lib/auto/util/__init__.py +lib/auto/util/openstack_lib.py +lib/auto/util/util.py +lib/auto/util/yaml_type.py \ No newline at end of file diff --git a/lib/auto.egg-info/dependency_links.txt b/lib/auto.egg-info/dependency_links.txt new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/lib/auto.egg-info/dependency_links.txt @@ -0,0 +1 @@ + diff --git a/lib/auto.egg-info/requires.txt b/lib/auto.egg-info/requires.txt new file mode 100644 index 0000000..472fa91 --- /dev/null +++ b/lib/auto.egg-info/requires.txt @@ -0,0 +1,2 @@ +GitPython +pycrypto diff --git a/lib/auto.egg-info/top_level.txt b/lib/auto.egg-info/top_level.txt new file mode 100644 index 0000000..865faf1 --- /dev/null +++ b/lib/auto.egg-info/top_level.txt @@ -0,0 +1 @@ +auto diff --git a/auto/__init__.py b/lib/auto/__init__.py similarity index 100% rename from auto/__init__.py rename to lib/auto/__init__.py diff --git a/auto/testcase/resiliency/AutoResilIftCloud.py b/lib/auto/testcase/resiliency/AutoResilIftCloud.py similarity index 100% rename from auto/testcase/resiliency/AutoResilIftCloud.py rename to lib/auto/testcase/resiliency/AutoResilIftCloud.py diff --git a/auto/testcase/resiliency/AutoResilItfOS.py b/lib/auto/testcase/resiliency/AutoResilItfOS.py similarity index 100% rename from auto/testcase/resiliency/AutoResilItfOS.py rename to lib/auto/testcase/resiliency/AutoResilItfOS.py diff --git a/auto/testcase/resiliency/AutoResilItfVNFMNFVO.py b/lib/auto/testcase/resiliency/AutoResilItfVNFMNFVO.py similarity index 100% rename from auto/testcase/resiliency/AutoResilItfVNFMNFVO.py rename to lib/auto/testcase/resiliency/AutoResilItfVNFMNFVO.py diff --git a/auto/testcase/resiliency/AutoResilMain.py b/lib/auto/testcase/resiliency/AutoResilMain.py similarity index 100% rename from auto/testcase/resiliency/AutoResilMain.py rename to lib/auto/testcase/resiliency/AutoResilMain.py diff --git a/auto/testcase/resiliency/AutoResilMgTestDef.py b/lib/auto/testcase/resiliency/AutoResilMgTestDef.py similarity index 100% rename from auto/testcase/resiliency/AutoResilMgTestDef.py rename to lib/auto/testcase/resiliency/AutoResilMgTestDef.py diff --git a/auto/testcase/resiliency/AutoResilRunTest.py b/lib/auto/testcase/resiliency/AutoResilRunTest.py similarity index 100% rename from auto/testcase/resiliency/AutoResilRunTest.py rename to lib/auto/testcase/resiliency/AutoResilRunTest.py diff --git a/auto/testcase/vnf/vbng/MANIFEST.json b/lib/auto/testcase/vnf/vbng/MANIFEST.json similarity index 100% rename from auto/testcase/vnf/vbng/MANIFEST.json rename to lib/auto/testcase/vnf/vbng/MANIFEST.json diff --git a/auto/testcase/vnf/vbng/base_vcpe_vbng.env b/lib/auto/testcase/vnf/vbng/base_vcpe_vbng.env similarity index 100% rename from auto/testcase/vnf/vbng/base_vcpe_vbng.env rename to lib/auto/testcase/vnf/vbng/base_vcpe_vbng.env diff --git a/auto/testcase/vnf/vbng/base_vcpe_vbng.yaml b/lib/auto/testcase/vnf/vbng/base_vcpe_vbng.yaml similarity index 100% rename from auto/testcase/vnf/vbng/base_vcpe_vbng.yaml rename to lib/auto/testcase/vnf/vbng/base_vcpe_vbng.yaml diff --git a/auto/testcase/vnf/vbrgemu/MANIFEST.json b/lib/auto/testcase/vnf/vbrgemu/MANIFEST.json similarity index 100% rename from auto/testcase/vnf/vbrgemu/MANIFEST.json rename to lib/auto/testcase/vnf/vbrgemu/MANIFEST.json diff --git a/auto/testcase/vnf/vbrgemu/base_vcpe_vbrgemu.env b/lib/auto/testcase/vnf/vbrgemu/base_vcpe_vbrgemu.env similarity index 100% rename from auto/testcase/vnf/vbrgemu/base_vcpe_vbrgemu.env rename to lib/auto/testcase/vnf/vbrgemu/base_vcpe_vbrgemu.env diff --git a/auto/testcase/vnf/vbrgemu/base_vcpe_vbrgemu.yaml b/lib/auto/testcase/vnf/vbrgemu/base_vcpe_vbrgemu.yaml similarity index 100% rename from auto/testcase/vnf/vbrgemu/base_vcpe_vbrgemu.yaml rename to lib/auto/testcase/vnf/vbrgemu/base_vcpe_vbrgemu.yaml diff --git a/auto/testcase/vnf/vgmux/MANIFEST.json b/lib/auto/testcase/vnf/vgmux/MANIFEST.json similarity index 100% rename from auto/testcase/vnf/vgmux/MANIFEST.json rename to lib/auto/testcase/vnf/vgmux/MANIFEST.json diff --git a/auto/testcase/vnf/vgmux/base_vcpe_vgmux.env b/lib/auto/testcase/vnf/vgmux/base_vcpe_vgmux.env similarity index 100% rename from auto/testcase/vnf/vgmux/base_vcpe_vgmux.env rename to lib/auto/testcase/vnf/vgmux/base_vcpe_vgmux.env diff --git a/auto/testcase/vnf/vgmux/base_vcpe_vgmux.yaml b/lib/auto/testcase/vnf/vgmux/base_vcpe_vgmux.yaml similarity index 100% rename from auto/testcase/vnf/vgmux/base_vcpe_vgmux.yaml rename to lib/auto/testcase/vnf/vgmux/base_vcpe_vgmux.yaml diff --git a/auto/testcase/vnf/vgw/MANIFEST.json b/lib/auto/testcase/vnf/vgw/MANIFEST.json similarity index 100% rename from auto/testcase/vnf/vgw/MANIFEST.json rename to lib/auto/testcase/vnf/vgw/MANIFEST.json diff --git a/auto/testcase/vnf/vgw/base_vcpe_vgw.env b/lib/auto/testcase/vnf/vgw/base_vcpe_vgw.env similarity index 100% rename from auto/testcase/vnf/vgw/base_vcpe_vgw.env rename to lib/auto/testcase/vnf/vgw/base_vcpe_vgw.env diff --git a/auto/testcase/vnf/vgw/base_vcpe_vgw.yaml b/lib/auto/testcase/vnf/vgw/base_vcpe_vgw.yaml similarity index 100% rename from auto/testcase/vnf/vgw/base_vcpe_vgw.yaml rename to lib/auto/testcase/vnf/vgw/base_vcpe_vgw.yaml diff --git a/auto/util/__init__.py b/lib/auto/util/__init__.py similarity index 100% rename from auto/util/__init__.py rename to lib/auto/util/__init__.py diff --git a/auto/util/openstack_lib.py b/lib/auto/util/openstack_lib.py similarity index 100% rename from auto/util/openstack_lib.py rename to lib/auto/util/openstack_lib.py diff --git a/auto/util/util.py b/lib/auto/util/util.py similarity index 100% rename from auto/util/util.py rename to lib/auto/util/util.py diff --git a/auto/util/yaml_type.py b/lib/auto/util/yaml_type.py similarity index 100% rename from auto/util/yaml_type.py rename to lib/auto/util/yaml_type.py diff --git a/setup.py b/setup.py index c7ec804..59a3c91 100644 --- a/setup.py +++ b/setup.py @@ -22,7 +22,8 @@ with open(requirement_path, 'r') as fd: setup( name="auto", version='1.0.0', - packages=find_packages(), + package_dir={'': 'lib'}, + packages=find_packages('lib'), include_package_data=True, install_requires=requirements ) -- 2.16.6