Merge "giving some love to make clean"

diff --git a/ci/PR_revision.log b/ci/PR_revision.log
index 16cf08f..78cd709 100644 (file)
--- a/ci/PR_revision.log
+++ b/ci/PR_revision.log
@@ -45,3 +45,4 @@
 86,Moves sdnvpn config to env file
 87,Pass vlan flag to fdio module when vlan is used for tenant network
 88,Default tenant_nic to its physical name
+89,Add enic workaround for UCS with OVS DPDK

diff --git a/config/network/network_settings.yaml b/config/network/network_settings.yaml
index ab9ed96..ee5537d 100644 (file)
--- a/config/network/network_settings.yaml
+++ b/config/network/network_settings.yaml
@@ -89,6 +89,7 @@ networks:                            # Network configurations
     mtu: 64000                       # Tenant network MTU
     overlay_id_range: 2,65535        # Tenant network Overlay segmentation ID range:
                                      # VNI, VLAN-ID, etc.
+    vlan_id_range: 1,1000            # Tenant physical network VLAN-ID range
     segmentation_type: vxlan         # Tenant network segmentation type:
                                      # vlan, vxlan, gre
     nic_mapping:                     # Mapping of network configuration for Overcloud Nodes

diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh
index 18d1ec4..2146cf8 100755 (executable)
--- a/lib/overcloud-deploy-functions.sh
+++ b/lib/overcloud-deploy-functions.sh
@@ -108,13 +108,6 @@ EOF
                                                  --run-command "sed -i 's/\\(^\\s\\+\\)\\(start_daemon "$OVS_VSWITCHD_PRIORITY"\\)/\\1umask 0002 \\&\\& \\2/' /usr/share/openvswitch/scripts/ovs-ctl" \
                                                  -a overcloud-full.qcow2
       fi
-
-      if [ "${deploy_options_array['sfc']}" == 'True' ]; then
-          # upgrade ovs into ovs 2.5.90 with NSH function
-          LIBGUESTFS_BACKEND=direct virt-customize --run-command "yum install -y /root/ovs/rpm/rpmbuild/RPMS/x86_64/${ovs_kmod_rpm_name}" \
-                                                   --run-command "yum upgrade -y /root/ovs/rpm/rpmbuild/RPMS/x86_64/${ovs_rpm_name}" \
-                                                   -a overcloud-full.qcow2
-      fi
 EOI
 
   elif [ "${deploy_options_array['dataplane']}" != 'ovs' ]; then
@@ -122,6 +115,15 @@ EOI
     exit 1
   fi
 
+  if [ "${deploy_options_array['sfc']}" == 'True' && "${deploy_options_array['sdn_controller']}" == 'onos' ]; then
+      # upgrade ovs into ovs 2.5.90 with NSH function
+    ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI
+      LIBGUESTFS_BACKEND=direct virt-customize --run-command "yum install -y /root/ovs/rpm/rpmbuild/RPMS/x86_64/${ovs_kmod_rpm_name}" \
+                                               --run-command "yum upgrade -y /root/ovs/rpm/rpmbuild/RPMS/x86_64/${ovs_rpm_name}" \
+                                               -a overcloud-full.qcow2
+EOI
+  fi
+
   if [ "$debug" == 'TRUE' ]; then
     ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" "LIBGUESTFS_BACKEND=direct virt-customize -a overcloud-full.qcow2 --root-password password:opnfvapex"
   fi

diff --git a/lib/python/apex/network_environment.py b/lib/python/apex/network_environment.py
index 5cb2d0c..bbe8ee6 100644 (file)
--- a/lib/python/apex/network_environment.py
+++ b/lib/python/apex/network_environment.py
@@ -116,6 +116,12 @@ class NetworkEnvironment(dict):
                   'end': str(tenant_range[1])}]
             tenant_cidr = nets[TENANT_NETWORK]['cidr']
             self[param_def]['TenantNetCidr'] = str(tenant_cidr)
+            if 'vlan_id_range' in nets[TENANT_NETWORK].keys():
+                tenant_vlan_range = \
+                    nets[TENANT_NETWORK]['vlan_id_range'].split(',')
+                self[param_def]['NeutronNetworkVLANRanges'] = \
+                    "datacentre:" + tenant_vlan_range[0] + ':' \
+                    + tenant_vlan_range[1]
             if tenant_cidr.version == 6:
                 postfix = '/tenant_v6.yaml'
             else:

diff --git a/tests/smoke_tests/execute_smoke_tests.sh b/tests/smoke_tests/execute_smoke_tests.sh
index 245ccc5..6f9e17f 100755 (executable)
--- a/tests/smoke_tests/execute_smoke_tests.sh
+++ b/tests/smoke_tests/execute_smoke_tests.sh
@@ -3,4 +3,4 @@
 cd ~/provisioning/python
 export PYTHONPATH=$PYTHONPATH:$(pwd)
 
-python unit_test_suite.py ~stack/overcloudrc
\ No newline at end of file
+python unit_test_suite.py -e ~stack/overcloudrc -n external -l INFO
\ No newline at end of file

diff --git a/tests/smoke_tests/prepare_undercloud.yml b/tests/smoke_tests/prepare_undercloud.yml
index 8f0cb70..d4e318a 100644 (file)
--- a/tests/smoke_tests/prepare_undercloud.yml
+++ b/tests/smoke_tests/prepare_undercloud.yml
@@ -13,4 +13,4 @@
    - pip: name=PyYAML
    - pip: name=ansible==2.1.0
 
-   - git: repo=https://nougat.cablelabs.com/SNAPS/provisioning.git dest=~/provisioning
+   - git: repo=https://gerrit.cablelabs.com/snaps-provisioning dest=~/provisioning