Removed link-up/link-down from if state setup

Change-Id: Ic30102159dc53c2dfc8827bb3a78d040cc336166
Signed-off-by: Matus Fabian <matfabia@cisco.com>

diff --git a/resources/libraries/python/InterfaceUtil.py b/resources/libraries/python/InterfaceUtil.py
index bc8bf94..38b476e 100644 (file)
--- 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':
         """
         if node['type'] == NodeType.DUT:
             if state == 'up':

-                state = 'admin-up link-up'
+                state = 'admin-up'

             elif state == 'down':
             elif state == 'down':

-                state = 'admin-down link-down'
+                state = 'admin-down'

             else:
                 raise Exception('Unexpected interface state: {}'.format(state))
 
             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 e1d36b6..d35dd59 100644 (file)
--- 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
 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 da1040e..d004336 100644 (file)
--- 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}
 sw_interface_set_l2_xconnect rx_sw_if_index {interface1} tx_sw_if_index {interface2}