diff options
| author |   Aimee Ukasick <aimeeu.opensource@gmail.com> | 2017-01-25 16:27:11 -0600 |
|---|---|---|
| committer | Aimee Ukasick <aimeeu.opensource@gmail.com> | 2017-01-25 16:31:20 -0600 |
| commit | 04ddd3ab3fac7006262dce63e5f5c5d727c00bc5 (patch) | |
| tree | 6751b824c468d69bbb9b051f0a3c50af70023b10 | |
| parent | 7098ee2eda61fbe65db6f4ebf5ecb24c3b193e91 (diff) | |
Update for Danube/Newton
JIRA: COPPER-2
Update instructions to note that the script can be run on DevStack.
Update CLI class to show network.
Change-Id: Ia65528ac078b53da4351315c639290dde348d095
Signed-off-by: Aimee Ukasick <aimeeu.opensource@gmail.com>
| -rw-r--r-- | tests/smtp_ingress.sh | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/tests/smtp_ingress.sh b/tests/smtp_ingress.sh index 860803f..7a7d828 100644 --- a/tests/smtp_ingress.sh +++ b/tests/smtp_ingress.sh @@ -20,12 +20,15 @@ # # Status: this is a work in progress, under test. # -# Prequisite: OPFNV installed per JOID or Apex installer +# Prequisite: +# - OpenStack Congress installed as part of an OpenStack deployment, +# e.g. via Devstack or OPFNV # - OpenStack CLI environment variables setup +# # How to use: -# # Create Congress policy and resources that exercise policy # $ bash smtp_ingress.sh -# # After test, cleanup +# +# After test, cleanup # $ bash smtp_ingress-clean.sh pass() { @@ -55,13 +58,14 @@ fi # Find external network if any, and details function get_external_net () { + echo "get_external_net()" network_ids=($(neutron net-list|grep -v "+"|grep -v name|awk '{print $2}')) for id in ${network_ids[@]}; do [[ $(neutron net-show ${id}|grep 'router:external'|grep -i "true") != "" ]] && ext_net_id=${id} done if [[ $ext_net_id ]]; then - EXTERNAL_NETWORK_NAME=$(openstack network show $ext_net_id | awk "/ name / { print \$4 }") - EXTERNAL_SUBNET_ID=$(openstack network show $EXTERNAL_NETWORK_NAME | awk "/ subnets / { print \$4 }") + EXTERNAL_NETWORK_NAME=$(neutron net-show $ext_net_id | awk "/ name / { print \$4 }") + EXTERNAL_SUBNET_ID=$(neutron net-show $EXTERNAL_NETWORK_NAME | awk "/ subnets / { print \$4 }") else echo "External network not found" echo "Create external network" |