separated enterprise code from orchestrator for sharing

.testr.conf

@@ -2,6 +2,6 @@
 test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \
              OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \
              OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-60} \
-             ${PYTHON:-python} -m subunit.run discover -t ./ ${OS_TEST_PATH:-./gbpservice/neutron/tests/unit} $LISTOPT $IDOPTION
+             ${PYTHON:-python} -m subunit.run discover -t ./ ${OS_TEST_PATH:-./gbpservice} $LISTOPT $IDOPTION
 test_id_option=--load-list $IDFILE
 test_list_option=--list

devstack/README-NFP-Advanced-Mode

@@ -12,15 +12,22 @@ Fresh Installation Steps:
 
 (3) Configure local.conf
     # Modify NFP_DEVSTACK_MODE to 'advanced'
-    # Modify the GBPSERVICE_BRANCH to point to the top patch in devstack changeset refs/changes/05/335405
     # Configure following external network details,
       EXT_NET_GATEWAY=
       EXT_NET_ALLOCATION_POOL_START=
       EXT_NET_ALLOCATION_POOL_END=
       EXT_NET_CIDR= 
-    # Configure the following image paths,
+    # Configure the Configurator VM image path(optional),
+    # If configured, install step uploads the specified image
+    # If not configured, install step will build a new one and upload it
+      ConfiguratorQcow2Image=
+    # Configure the Service VM image paths(optional),
+    # If configured, install step uploads the specified images
+    # If not configured, install step ignores uploading these service images
       VyosQcow2Image=
-      Haproxy_LBaasV2_Qcow2Image=
+      HaproxyQcow2Image=
+    # Configure PUBLIC_INTERFACE with the public interface name
+    # Modify the GBPSERVICE_BRANCH to point to the top patch in devstack changeset refs/changes/05/335405
 
 (4) Install devstack.
     # ./stack.sh

devstack/Readme-NFP-install.txt

@@ -17,48 +17,25 @@ Fresh Installation Steps:
 
     * Advanced Mode Configuration:
         # Devstack installation in enterprise mode
-            Example: [[ $ENABLE_NFP = True ]] && NFP_DEVSTACK_MODE=advanced
-        # Change the value of GBPSERVICE_BRANCH to use different branch(in OC repo)/patch(in Openstack repo)
-        # External network details
-             EXT_NET_GATEWAY=
-             EXT_NET_ALLOCATION_POOL_START=
-             EXT_NET_ALLOCATION_POOL_END=
-             EXT_NET_CIDR=
-        # VyOS image path
-            * Available only at 192.168.100.135:/home/stack/service_images/vyos.qcow2
-            Example: VyosQcow2Image=/home/stack/images/vyos.qcow2
-        # Haproxy LBaaS V2 image path
-            Haproxy_LBaasV2_Qcow2Image=
-        # Public interface
-            Example: PUBLIC_INTERFACE=eth1
-
-    * Enterprise Mode Configuration:
-        # Devstack installation in enterprise mode
-            Example: [[ $ENABLE_NFP = True ]] && NFP_DEVSTACK_MODE=enterprise
-        # Change the value of GBPSERVICE_BRANCH to use different branch
+              NFP_DEVSTACK_MODE=advanced
         # External network details
-            EXT_NET_GATEWAY=
-            EXT_NET_ALLOCATION_POOL_START=
-            EXT_NET_ALLOCATION_POOL_END=
-            EXT_NET_CIDR=
-        # VyOS image path
-            * Available only at 192.168.100.135:/home/stack/service_images/vyos.qcow2
-            Example: VyosQcow2Image=/home/stack/images/vyos.qcow2
-        # Haproxy LBaaS V2 image path
-            Haproxy_LBaasV2_Qcow2Image=
-        # Public interface
-            Example: PUBLIC_INTERFACE=eth1
-        # Visibility GIT Repository Credentials
-            GIT_ACCESS_USERNAME=
-            GIT_ACCESS_PASSWORD=
-        # Docker image path
-            * Available only at 192.168.100.50. Change and configure for different nework
-            DOCKER_IMAGES_URL=http://192.168.100.50/docker_images/
-        # ASAv image path
-            AsavQcow2Image=
-        # PaloAlto image path
-            PaloAltoQcow2Image=
-
+              EXT_NET_GATEWAY=
+              EXT_NET_ALLOCATION_POOL_START=
+              EXT_NET_ALLOCATION_POOL_END=
+              EXT_NET_CIDR=
+        # Configurator VM image path, its optional
+        # If configured, install step uploads the specified image
+        # If not configured, install step will build a new one and upload it
+              ConfiguratorQcow2Image=
+        # Service VM image paths, they are optional
+        # One can build service images referring to the section "Build service images".
+        # If configured, install step uploads the specified images
+        # If not configured, install step ignores uploading these service images.
+              VyosQcow2Image=
+              HaproxyQcow2Image=
+        # Public interface name
+              PUBLIC_INTERFACE=
+        # Change the value of GBPSERVICE_BRANCH to use different branch(in OC repo)/patch(in Openstack repo)
 
 (4) Run stack.sh from the /home/stack/devstack/ directory
     # ./stack.sh
@@ -77,3 +54,36 @@ Re-installation Steps:
 
 (2) Follow the fresh installation steps
 
+
+Build service images:
+====================
+
+Steps to get the scripts to build images
+ # git clone -b mitaka_21st_march_base --single-branch https://github.com/oneconvergence/group-based-policy.git /home/stack/gbp_mitaka_21st_march_base
+
+Steps to setup the diskimage build
+ # sudo -H -E pip install -r /home/stack/gbp_mitaka_21st_march_base/gbpservice/tests/contrib/diskimage-create/requirements.txt
+ # sudo apt-get install -y --force-yes qemu-utils
+ # sudo apt-get install -y --force-yes dpkg-dev
+
+Steps to build VyOS service image:
+ # cd /home/stack/gbp_mitaka_21st_march_base/gbpservice/tests/contrib/diskimage-create/vyos/
+ # sudo python vyos_image_create.py vyos_conf.json
+Image location:
+ # /home/stack/gbp_mitaka_21st_march_base/gbpservice/tests/contrib/diskimage-create/vyos/output/vyos.qcow2
+
+Steps to build Haproxy service image:
+ # cd /home/stack/gbp_mitaka_21st_march_base/gbpservice/tests/contrib/diskimage-create/
+ # sudo python build_image.py haproxy_conf.json
+Image location:
+ # /home/stack/gbp_mitaka_21st_march_base/gbpservice/tests/contrib/diskimage-create/output/haproxy.qcow2
+
+
+Upload service images:
+=====================
+
+Steps to upload VyOS service image:
+ # glance image-create --name vyos --disk-format qcow2 --container-format bare --visibility public --file /home/stack/gbp_mitaka_21st_march_base/gbpservice/tests/contrib/diskimage-create/vyos/output/vyos.qcow2
+
+Steps to upload Haproxy service image:
+ # glance image-create --name haproxy --disk-format qcow2 --container-format bare --visibility public --file /home/stack/gbp_mitaka_21st_march_base/gbpservice/tests/contrib/diskimage-create/output/haproxy.qcow2