zuul v3 gate changes

This patch updates our tox_install_project.sh script to account for zuul
v3 changes. The changes are made to be backwards compatible so the
script should also still work with zuul v2 jobs. Also see the depends on
patch for the project-config changes needed for our zuul v3 support.

It also includes some updates to the UTs to skip tests that were
introduced in neutron causing our ocata UTs to fail.

Depends-On: I9ac364dc27dc091cce56179707d21527f166229f

Change-Id: I104335376fe9161e2b649979e75571a847195d53

tools/tox_install_project.sh

@@ -18,10 +18,12 @@ MOD=$2
 shift 2
 
 ZUUL_CLONER=/usr/zuul-env/bin/zuul-cloner
-neutron_installed=$(echo "import ${MOD}" | python 2>/dev/null ; echo $?)
+project_installed=$(echo "import ${MOD}" | python 2>/dev/null ; echo $?)
 BRANCH_NAME=stable/ocata
+PROJ_DIR=${HOME}/src/git.openstack.org/openstack/${PROJ}
 
 set -e
+set -x
 
 CONSTRAINTS_FILE=$1
 shift
@@ -31,10 +33,15 @@ if [ $CONSTRAINTS_FILE != "unconstrained" ]; then
     install_cmd="$install_cmd -c$CONSTRAINTS_FILE"
 fi
 
-if [ $neutron_installed -eq 0 ]; then
+if [ $project_installed -eq 0 ]; then
     echo "ALREADY INSTALLED" > /tmp/tox_install-${PROJ}.txt
     echo "${PROJ} already installed; using existing package"
+    echo "import ${MOD};print(${MOD})" | python
+elif [ -d "$PROJ_DIR" ]; then
+    echo "FOUND code at $PROJ_DIR - using"
+    $install_cmd --no-deps -U -e ${PROJ_DIR}
 elif [ -x "$ZUUL_CLONER" ]; then
+    echo "${PROJ} not installed; using zuul cloner"
     echo "ZUUL CLONER" > /tmp/tox_install-${PROJ}.txt
     cwd=$(/bin/pwd)
     cd /tmp
@@ -47,6 +54,7 @@ elif [ -x "$ZUUL_CLONER" ]; then
     $install_cmd -e .
     cd "$cwd"
 else
+    echo "${PROJ} not installed; using egg"
     echo "PIP HARDCODE" > /tmp/tox_install-${PROJ}.txt
     $install_cmd -U -egit+https://git.openstack.org/openstack/${PROJ}@${BRANCH_NAME}#egg=${PROJ}
 fi

vmware_nsx/tests/unit/nsx_v/test_plugin.py

@@ -1640,6 +1640,12 @@ class TestSubnetsV2(NsxVPluginV2TestCase,
     def test_create_subnet_V6_pd_no_mode(self):
         self.skipTest('No DHCP v6 Support yet')
 
+    def test_create_subnet_ipv6_slaac_with_ip_already_allocated(self):
+        self.skipTest('No DHCP v6 Support yet')
+
+    def test_create_subnet_dhcpv6_stateless_with_ip_already_allocated(self):
+        self.skipTest('No DHCP v6 Support yet')
+
     def _create_subnet_bulk(self, fmt, number, net_id, name,
                             ip_version=4, **kwargs):
         base_data = {'subnet': {'network_id': net_id,
@@ -1807,6 +1813,12 @@ class TestSubnetPoolsV2(NsxVPluginV2TestCase, test_plugin.TestSubnetsV2):
     def test_create_subnet_V6_pd_slaac(self):
         self.skipTest('No DHCP v6 Support yet')
 
+    def test_create_subnet_ipv6_slaac_with_ip_already_allocated(self):
+        self.skipTest('No DHCP v6 Support yet')
+
+    def test_create_subnet_dhcpv6_stateless_with_ip_already_allocated(self):
+        self.skipTest('No DHCP v6 Support yet')
+
     def test_create_subnet_dhcpv6_stateless_with_port_on_network(self):
         self.skipTest('Not supported')
 

vmware_nsx/tests/unit/services/ipam/test_nsxv3_driver.py

@@ -113,6 +113,12 @@ class TestNsxv3IpamSubnets(test_plugin.TestSubnetsV2, MockIPPools):
         super(TestNsxv3IpamSubnets, self).setUp()
         self.patch_nsxlib_ipam()
 
+    def test_create_subnet_ipv6_slaac_with_ip_already_allocated(self):
+        self.skipTest('Allocating a specific IP is not supported')
+
+    def test_create_subnet_dhcpv6_stateless_with_ip_already_allocated(self):
+        self.skipTest('Allocating a specific IP is not supported')
+
     def test_update_subnet_gw_ip_in_use_by_router_returns_409(self):
         self.skipTest('Allocating a specific IP is not supported')