From cec83f8cb1a038e7cb35833fdb3dc13827ea17ea Mon Sep 17 00:00:00 2001 From: Goutham Pacha Ravi Date: Sun, 26 Apr 2020 02:03:10 -0700 Subject: [PATCH] [CI] Fix grenade share networks test This job fails because it's expecting network subnet details to be in a format that was revised in API version 2.51. This change can be backported to stable/ussuri and only impacts the CI. Change-Id: I3731e6acffccd2ecb398f3b5cf81a5f294c51f45 Signed-off-by: Goutham Pacha Ravi (cherry picked from commit e0da21fe8d49c06be929c21cde48605f9fabbc40) --- devstack/upgrade/resources.sh | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/devstack/upgrade/resources.sh b/devstack/upgrade/resources.sh index ca2e465a89..395cda2aa4 100755 --- a/devstack/upgrade/resources.sh +++ b/devstack/upgrade/resources.sh @@ -247,8 +247,24 @@ function scenario_2_verify_attach_ss_to_sn { } assert share-network-show fake_sn_name description fake_sn_description - assert share-network-show fake_sn_name neutron_net_id fake_net - assert share-network-show fake_sn_name neutron_subnet_id fake_subnet + # From API version 2.51, share-network-show command doesn't have + # neutron_net_id and neutron_subnet_id, that information is in + # "share-network-subnets" + assert "--os-share-api-version 2.50 share-network-show" fake_sn_name neutron_net_id fake_net + assert "--os-share-api-version 2.50 share-network-show" fake_sn_name neutron_subnet_id fake_subnet + + share_network_subnets=$(manila share-network-show fake_sn_name | grep share_network_subnets) + if [[ ! -z "$share_network_subnets" ]]; then + neutron_net_id=$(echo $share_network_subnets | tr ',' '\n' | grep neutron_net_id | cut -d "'" -f4) + neutron_subnet_id=$(echo $share_network_subnets | tr ',' '\n' | grep neutron_subnet_id | cut -d "'" -f4) + + if [[ $neutron_net_id != fake_net ]]; then + die $LINENO "Neutron net ID for share network isn't fake_net, it is $neutron_net_id" + fi + if [[ $neutron_subnet_id != fake_subnet ]]; then + die $LINENO "Neutron subnet ID for share network isn't fake_subnet, it is $neutron_subnet_id" + fi + fi assert security-service-show fake_ss_name description fake_ss_description assert security-service-show fake_ss_name dns_ip fake_dns_ip