Browse code

Merge pull request #11493 from dcbw/fewer-errors-deleting-qos

Merged by openshift-bot

OpenShift Bot authored on 2016/11/05 06:00:38
Showing 1 changed files
... ...
@@ -73,8 +73,8 @@ del_ovs_flows() {
73 73
     ovs-ofctl -O OpenFlow13 del-flows br0 "arp,nw_dst=${ipaddr}"
74 74
     ovs-ofctl -O OpenFlow13 del-flows br0 "arp,nw_src=${ipaddr}"
75 75
 
76
-    qos=$(ovs-vsctl get port ${veth_host} qos)
77
-    if [ "$qos" != "[]" ]; then
76
+    qos=$(ovs-vsctl get port ${veth_host} qos || true)
77
+    if [ -n "${qos}" -a "${qos}" != "[]" ]; then
78 78
         ovs-vsctl clear port ${veth_host} qos
79 79
         ovs-vsctl --if-exists destroy qos ${qos}
80 80
     fi