add pip package

Change-Id: I8b4d3fa24f6ad7c7f9bb5dc93279c4a48bb0fe86
Signed-off-by: WuKong <rebirthmonkey@gmail.com>

diff --git a/moonv4/development.md b/moonv4/DEV.md
similarity index 81%
rename from moonv4/development.md
rename to moonv4/DEV.md
index bc5f7e9..70bcc4f 100644 (file)
--- a/moonv4/development.md
+++ b/moonv4/DEV.md
@@ -1,8 +1,8 @@
-# Build Python Packages and Containers
+# Build Python Packages and Docker Images
 
 ## Python Package
-### Get the code
-
+### pre-requist
+Get the code
 ```bash
 git clone https://git.opnfv.org/moon
 cd moon/moonv4
@@ -10,20 +10,51 @@ export MOON_HOME=$(pwd)
 sudo ln -s $(pwd)/conf /etc/moon
 ```
 
-### Build python packages for all components
+Install python wheel
 ```bash
-sudo pip3 install pip --upgrade
-cd ${MOON_HOME}/bin
-source build_all.sh
+sudo apt install python3-wheel
 ```
 
-### moon_db
+Install pip twine
+```bash
+sudo pip install twine
+```
 
+Package code, wheel is a new format instead of `tar.gz`
+```bash
+python setup.py sdist bdist_wheel
+```
 
-### utilities
+Upload to PyPi
+```bash
+twine upload dist/moon_xxx-y.y.y.whl
+twine upload dist/moon_xxx-y.y.y.tar.gz
+```
 
+Install a package from PyPi
+```bash
+sudo pypi install moon_xxx --upgrade
+```
+
+### moon_db
+- change version in `moon_db/__init__.py`
+- add `Changelog`
+
+### moon_utilities
+- change version in `moon_utilities/__init__.py`
+- add `Changelog`
 
 ### moon_orchestrator
+- change version in `moon_orchestrator/__init__.py`
+- add `Changelog`
+
+
+### Build All Pip
+```bash
+sudo pip3 install pip --upgrade
+cd ${MOON_HOME}/bin
+source build_all_pip.sh
+```
 
 
 ## Container

diff --git a/moonv4/bin/build_all_pip.sh b/moonv4/bin/build_all_pip.sh
new file mode 100644 (file)
index 0000000..2b415bf
--- /dev/null
+++ b/moonv4/bin/build_all_pip.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+
+echo Building Moon_DB
+cd $MOON_HOME/moon_db
+python3 setup.py sdist bdist_wheel> /tmp/moon_db.log
+
+
+echo Building Moon_Utilities
+cd $MOON_HOME/moon_utilities
+python3 setup.py sdist bdist_wheel> /tmp/moon_utilities.log
+
+
+echo Building Moon_Orchestrator
+cd $MOON_HOME/moon_orchestrator
+python3 setup.py sdist bdist_wheel> /tmp/moon_orchestrator.log
\ No newline at end of file

diff --git a/moonv4/moon_db/Changelog b/moonv4/moon_db/Changelog
index 94631fc..9295c0d 100644 (file)
--- a/moonv4/moon_db/Changelog
+++ b/moonv4/moon_db/Changelog
@@ -19,3 +19,7 @@ CHANGES
 -----
 - Update setup.py to force the installation of requirements.
 
+1.0.2
+-----
+- Test PyPi upload
+

diff --git a/moonv4/moon_db/moon_db/__init__.py b/moonv4/moon_db/moon_db/__init__.py
index ddfaf2b..bfca6ef 100644 (file)
--- a/moonv4/moon_db/moon_db/__init__.py
+++ b/moonv4/moon_db/moon_db/__init__.py
@@ -3,5 +3,5 @@
 # license which can be found in the file 'LICENSE' in this package distribution
 # or at 'http://www.apache.org/licenses/LICENSE-2.0'.
 
-__version__ = "1.0.1"
+__version__ = "1.0.2"
 

diff --git a/moonv4/moon_orchestrator/Changelog b/moonv4/moon_orchestrator/Changelog
new file mode 100644 (file)
index 0000000..544e8fd
--- /dev/null
+++ b/moonv4/moon_orchestrator/Changelog
@@ -0,0 +1,21 @@
+# Copyright 2015 Open Platform for NFV Project, Inc. and its contributors
+# This software is distributed under the terms and conditions of the 'Apache-2.0'
+# license which can be found in the file 'LICENSE' in this package distribution
+# or at 'http://www.apache.org/licenses/LICENSE-2.0'.
+
+
+CHANGES
+=======
+
+0.1.0
+-----
+- First version of the moon_orchestrator library.
+
+1.0.0
+-----
+- First public version of the moon_orchestrator library.
+
+1.0.1
+-----
+- add Changelog
+

diff --git a/moonv4/moon_orchestrator/moon_orchestrator/__init__.py b/moonv4/moon_orchestrator/moon_orchestrator/__init__.py
index 660beb1..2249a1b 100644 (file)
--- a/moonv4/moon_orchestrator/moon_orchestrator/__init__.py
+++ b/moonv4/moon_orchestrator/moon_orchestrator/__init__.py
@@ -3,4 +3,4 @@
 # license which can be found in the file 'LICENSE' in this package distribution
 # or at 'http://www.apache.org/licenses/LICENSE-2.0'.
 
-__version__ = "1.0.0"
+__version__ = "1.0.1"

diff --git a/moonv4/moon_secrouter/LICENSE b/moonv4/moon_router/LICENSE
similarity index 100%
rename from moonv4/moon_secrouter/LICENSE
rename to moonv4/moon_router/LICENSE

diff --git a/moonv4/moon_secrouter/MANIFEST.in b/moonv4/moon_router/MANIFEST.in
similarity index 100%
rename from moonv4/moon_secrouter/MANIFEST.in
rename to moonv4/moon_router/MANIFEST.in

diff --git a/moonv4/moon_secrouter/README.rst b/moonv4/moon_router/README.rst
similarity index 100%
rename from moonv4/moon_secrouter/README.rst
rename to moonv4/moon_router/README.rst

diff --git a/moonv4/moon_secrouter/doc/api-moon-secrouter.pdf b/moonv4/moon_router/doc/api-moon-secrouter.pdf
similarity index 100%
rename from moonv4/moon_secrouter/doc/api-moon-secrouter.pdf
rename to moonv4/moon_router/doc/api-moon-secrouter.pdf

diff --git a/moonv4/moon_secrouter/doc/api.pdf b/moonv4/moon_router/doc/api.pdf
similarity index 100%
rename from moonv4/moon_secrouter/doc/api.pdf
rename to moonv4/moon_router/doc/api.pdf

diff --git a/moonv4/moon_secrouter/moon_secrouter/__init__.py b/moonv4/moon_router/moon_secrouter/__init__.py
similarity index 100%
rename from moonv4/moon_secrouter/moon_secrouter/__init__.py
rename to moonv4/moon_router/moon_secrouter/__init__.py

diff --git a/moonv4/moon_secrouter/moon_secrouter/__main__.py b/moonv4/moon_router/moon_secrouter/__main__.py
similarity index 100%
rename from moonv4/moon_secrouter/moon_secrouter/__main__.py
rename to moonv4/moon_router/moon_secrouter/__main__.py

diff --git a/moonv4/moon_secrouter/moon_secrouter/api/__init__.py b/moonv4/moon_router/moon_secrouter/api/__init__.py
similarity index 100%
rename from moonv4/moon_secrouter/moon_secrouter/api/__init__.py
rename to moonv4/moon_router/moon_secrouter/api/__init__.py

diff --git a/moonv4/moon_secrouter/moon_secrouter/api/generic.py b/moonv4/moon_router/moon_secrouter/api/generic.py
similarity index 100%
rename from moonv4/moon_secrouter/moon_secrouter/api/generic.py
rename to moonv4/moon_router/moon_secrouter/api/generic.py

diff --git a/moonv4/moon_secrouter/moon_secrouter/api/route.py b/moonv4/moon_router/moon_secrouter/api/route.py
similarity index 100%
rename from moonv4/moon_secrouter/moon_secrouter/api/route.py
rename to moonv4/moon_router/moon_secrouter/api/route.py

diff --git a/moonv4/moon_secrouter/moon_secrouter/messenger.py b/moonv4/moon_router/moon_secrouter/messenger.py
similarity index 100%
rename from moonv4/moon_secrouter/moon_secrouter/messenger.py
rename to moonv4/moon_router/moon_secrouter/messenger.py

diff --git a/moonv4/moon_secrouter/moon_secrouter/server.py b/moonv4/moon_router/moon_secrouter/server.py
similarity index 100%
rename from moonv4/moon_secrouter/moon_secrouter/server.py
rename to moonv4/moon_router/moon_secrouter/server.py

diff --git a/moonv4/moon_secrouter/requirements.txt b/moonv4/moon_router/requirements.txt
similarity index 100%
rename from moonv4/moon_secrouter/requirements.txt
rename to moonv4/moon_router/requirements.txt

diff --git a/moonv4/moon_secrouter/setup.py b/moonv4/moon_router/setup.py
similarity index 100%
rename from moonv4/moon_secrouter/setup.py
rename to moonv4/moon_router/setup.py

diff --git a/moonv4/moon_secrouter/tests/moon_db-0.1.0.tar.gz b/moonv4/moon_router/tests/moon_db-0.1.0.tar.gz
similarity index 100%
rename from moonv4/moon_secrouter/tests/moon_db-0.1.0.tar.gz
rename to moonv4/moon_router/tests/moon_db-0.1.0.tar.gz

diff --git a/moonv4/moon_secrouter/tests/moon_policy-0.1.0.tar.gz b/moonv4/moon_router/tests/moon_policy-0.1.0.tar.gz
similarity index 100%
rename from moonv4/moon_secrouter/tests/moon_policy-0.1.0.tar.gz
rename to moonv4/moon_router/tests/moon_policy-0.1.0.tar.gz

diff --git a/moonv4/moon_utilities/Changelog b/moonv4/moon_utilities/Changelog
index c91a038..bd049b1 100644 (file)
--- a/moonv4/moon_utilities/Changelog
+++ b/moonv4/moon_utilities/Changelog
@@ -19,3 +19,6 @@ CHANGES
 -----
 - Update setup.py to force the installation of requirements.
 
+1.0.2
+-----
+- Test PyPi upload
\ No newline at end of file

diff --git a/moonv4/moon_utilities/moon_utilities/__init__.py b/moonv4/moon_utilities/moon_utilities/__init__.py
index 2249a1b..b254b24 100644 (file)
--- a/moonv4/moon_utilities/moon_utilities/__init__.py
+++ b/moonv4/moon_utilities/moon_utilities/__init__.py
@@ -3,4 +3,4 @@
 # license which can be found in the file 'LICENSE' in this package distribution
 # or at 'http://www.apache.org/licenses/LICENSE-2.0'.
 
-__version__ = "1.0.1"
+__version__ = "1.0.2"

diff --git a/moonv4/templates/moon_keystone/README.md b/moonv4/templates/moon_keystone/README.md
index 77c90e9..cf77a74 100644 (file)
--- a/moonv4/templates/moon_keystone/README.md
+++ b/moonv4/templates/moon_keystone/README.md
@@ -13,7 +13,7 @@ docker build --build-arg https_proxy=http://proxy:3128 --build-arg http_proxy=ht
 ```
 
 
-## set up an execution environment
+## Setup an execution environment
 
 ### clean up if necessary
 ```bash