diff options
author | Bin Yang <bin.yang@windriver.com> | 2019-04-27 15:39:21 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2019-04-27 15:39:21 +0000 |
commit | 619ccde3c59cdbf5066a667d2bbea465d4a68984 (patch) | |
tree | fbb48b848717c5af96ab8223e0b574524583d9e2 | |
parent | 4a4ca50227f3442ffea819544527790d540a7e2a (diff) | |
parent | d7a2267ece49e6a79e54f01a2c90a618f7efb811 (diff) |
Merge "Fix multus and ovn tests"
-rwxr-xr-x | kud/tests/multus.sh | 10 | ||||
-rwxr-xr-x | kud/tests/ovn4nfv.sh | 7 |
2 files changed, 11 insertions, 6 deletions
diff --git a/kud/tests/multus.sh b/kud/tests/multus.sh index 859fa3bb..2cff84bd 100755 --- a/kud/tests/multus.sh +++ b/kud/tests/multus.sh @@ -29,12 +29,14 @@ setup $multus_deployment_name deployment_pod=$(kubectl get pods | grep $multus_deployment_name | awk '{print $1}') echo "===== $deployment_pod details =====" kubectl exec -it $deployment_pod -- ip a -multus_nic=$(kubectl exec -it $deployment_pod -- ifconfig | grep "eth1") -if [ -z "$multus_nic" ]; then - echo "The $deployment_pod pod doesn't contain the eth1 nic" +multus_nic=$(kubectl exec -it $deployment_pod -- ip a) +if [[ $multus_nic != *"net1"* ]]; then + echo "The $deployment_pod pod doesn't contain the net1 nic" exit 1 +else + echo "Test Completed!" fi -popd # Teardown teardown $multus_deployment_name +popd diff --git a/kud/tests/ovn4nfv.sh b/kud/tests/ovn4nfv.sh index 37fddfd8..de8631f4 100755 --- a/kud/tests/ovn4nfv.sh +++ b/kud/tests/ovn4nfv.sh @@ -33,10 +33,13 @@ setup $ovn4nfv_deployment_name deployment_pod=$(kubectl get pods | grep $ovn4nfv_deployment_name | awk '{print $1}') echo "===== $deployment_pod details =====" kubectl exec -it $deployment_pod -- ip a -multus_nic=$(kubectl exec -it $deployment_pod -- ifconfig | grep "net1") -if [ -z "$multus_nic" ]; then + +ovn_nic=$(kubectl exec -it $deployment_pod -- ip a ) +if [[ $ovn_nic != *"net1"* ]]; then echo "The $deployment_pod pod doesn't contain the net1 nic" exit 1 +else + echo "Test Completed!" fi # Teardown |