Acc Tests: Fixing subnet creation and re-enabling sharedfilesystem (#1717)

jtopjian · web-flow · commit 13466e32a4a3 · 2019-09-25T09:02:48.000-06:00
diff --git a/script/acceptancetest b/script/acceptancetest
@@ -75,9 +75,7 @@ acceptance/openstack/networking/v2/extensions/trunks
 
 acceptance/openstack/objectstorage/v1
 acceptance/openstack/orchestration/v1
-
-# Disabled temporarily
-#acceptance/openstack/sharedfilesystems/v2
+acceptance/openstack/sharedfilesystems/v2
 
 # No suitable endpoint could be found in the service catalog
 # acceptance/openstack/workflow/v2
diff --git a/script/stackenv b/script/stackenv
@@ -1,13 +1,13 @@
 # Prep the testing environment by creating the required testing resources and
-# environment variables. This env is for theopenlab CI jobs, you might need 
+# environment variables. This env is for theopenlab CI jobs, you might need
 # to modify this according to your setup
 
 pushd /opt/stack/new/devstack
 source openrc admin admin
 openstack flavor create m1.acctest --id 99 --ram 512 --disk 5 --vcpu 1 --ephemeral 10
 openstack flavor create m1.resize --id 98 --ram 512 --disk 6 --vcpu 1 --ephemeral 10
 _NETWORK_ID=$(openstack network show private -c id -f value)
-_SUBNET_ID=$(openstack subnet show private_subnet -c id -f value)
+_SUBNET_ID=$(openstack subnet show private-subnet -c id -f value)
 _EXTGW_ID=$(openstack network show public -c id -f value)
 _IMAGE=$(openstack image list | grep -i cirros | head -n 1)
 _IMAGE_ID=$(echo $_IMAGE | awk -F\| '{print $2}' | tr -d ' ')
@@ -23,4 +23,3 @@ echo export OS_FLAVOR_ID_RESIZE=98 >> openrc
 echo export OS_DOMAIN_ID=default >> openrc
 source openrc admin admin
 popd
-
