aboutsummaryrefslogtreecommitdiffstats
path: root/resources
diff options
context:
space:
mode:
authorMatus Fabian <matfabia@cisco.com>2016-02-19 11:58:27 +0100
committerGerrit Code Review <gerrit@fd.io>2016-02-19 13:36:45 +0000
commitf36857344062402e41419ee37abfec76bf8ad2ff (patch)
tree33dfc3172a938d4ad0965494616b8c7e1ee05a87 /resources
parentbfde681c3d8ae0008ecec131a18d3a2560a046ae (diff)
Removed link-up/link-down from if state setup
Change-Id: Ic30102159dc53c2dfc8827bb3a78d040cc336166 Signed-off-by: Matus Fabian <matfabia@cisco.com>
Diffstat (limited to 'resources')
-rw-r--r--resources/libraries/python/InterfaceUtil.py4
-rw-r--r--resources/templates/vat/l2_bridge_domain.vat4
-rw-r--r--resources/templates/vat/l2_xconnect.vat4
3 files changed, 6 insertions, 6 deletions
diff --git a/resources/libraries/python/InterfaceUtil.py b/resources/libraries/python/InterfaceUtil.py
index bc8bf94a9b..38b476ed52 100644
--- a/resources/libraries/python/InterfaceUtil.py
+++ b/resources/libraries/python/InterfaceUtil.py
@@ -37,9 +37,9 @@ class InterfaceUtil(object):
"""
if node['type'] == NodeType.DUT:
if state == 'up':
- state = 'admin-up link-up'
+ state = 'admin-up'
elif state == 'down':
- state = 'admin-down link-down'
+ state = 'admin-down'
else:
raise Exception('Unexpected interface state: {}'.format(state))
diff --git a/resources/templates/vat/l2_bridge_domain.vat b/resources/templates/vat/l2_bridge_domain.vat
index e1d36b6bcf..d35dd59b85 100644
--- a/resources/templates/vat/l2_bridge_domain.vat
+++ b/resources/templates/vat/l2_bridge_domain.vat
@@ -1,5 +1,5 @@
-sw_interface_set_flags sw_if_index {sw_if_id1} admin-up link-up
-sw_interface_set_flags sw_if_index {sw_if_id2} admin-up link-up
+sw_interface_set_flags sw_if_index {sw_if_id1} admin-up
+sw_interface_set_flags sw_if_index {sw_if_id2} admin-up
bridge_domain_add_del bd_id {bd_id} flood 1 uu-flood 1 forward 1 learn {learn} arp-term 0
sw_interface_set_l2_bridge sw_if_index {sw_if_id1} bd_id {bd_id} shg 0 enable
sw_interface_set_l2_bridge sw_if_index {sw_if_id2} bd_id {bd_id} shg 0 enable
diff --git a/resources/templates/vat/l2_xconnect.vat b/resources/templates/vat/l2_xconnect.vat
index da1040e963..d004336c7b 100644
--- a/resources/templates/vat/l2_xconnect.vat
+++ b/resources/templates/vat/l2_xconnect.vat
@@ -1,3 +1,3 @@
-sw_interface_set_flags sw_if_index {interface1} admin-up link-up
-sw_interface_set_flags sw_if_index {interface2} admin-up link-up
+sw_interface_set_flags sw_if_index {interface1} admin-up
+sw_interface_set_flags sw_if_index {interface2} admin-up
sw_interface_set_l2_xconnect rx_sw_if_index {interface1} tx_sw_if_index {interface2}