aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatus Fabian <matfabia@cisco.com>2016-02-18 13:54:18 +0100
committerGerrit Code Review <gerrit@fd.io>2016-02-19 09:46:07 +0000
commitb2f08497cf7c31c4e8b3276ef8b7091242770ae3 (patch)
tree27e95a358ea6157df5ff8373e5414edef94995c0
parentd5d2fa499ffc49c7ab72dc772820627ba6c43a22 (diff)
IPv6 VPP setup changed to VAT templates
Change-Id: I54c79ab1b76af93d46f6ee6f391ba2807a3be772 Signed-off-by: Matus Fabian <matfabia@cisco.com>
-rw-r--r--resources/libraries/python/IPv6Setup.py62
1 files changed, 25 insertions, 37 deletions
diff --git a/resources/libraries/python/IPv6Setup.py b/resources/libraries/python/IPv6Setup.py
index edd5d2cc6e..0798a98f4d 100644
--- a/resources/libraries/python/IPv6Setup.py
+++ b/resources/libraries/python/IPv6Setup.py
@@ -15,9 +15,9 @@
from ssh import SSH
from ipaddress import IPv6Network
-from topology import NodeType
-from topology import Topology
+from topology import NodeType, Topology
from constants import Constants
+from VatExecutor import VatTerminal
from robot.api import logger
@@ -160,26 +160,22 @@ class IPv6Setup(object):
:type addr: str
:type prefix: str
"""
+ sw_if_index = Topology.get_interface_sw_index(node, interface)
+ vat = VatTerminal(node)
+ vat.vat_terminal_exec_cmd_from_template('add_ip_address.vat',
+ sw_if_index=sw_if_index,
+ address=addr,
+ prefix_length=prefix)
+ vat.vat_terminal_exec_cmd_from_template('set_if_state.vat',
+ sw_if_index=sw_if_index,
+ state='admin-up')
+ vat.vat_terminal_close()
+
ssh = SSH()
ssh.connect(node)
-
- cmd = '{c}'.format(c=Constants.VAT_BIN_NAME)
- cmd_input = 'sw_interface_add_del_address {dev} {ip}/{p}'.format(
- dev=interface, ip=addr, p=prefix)
- (ret_code, _, _) = ssh.exec_command_sudo(cmd, cmd_input)
- if int(ret_code) != 0:
- raise Exception('VPP sw_interface_add_del_address failed on {h}'
- .format(h=node['host']))
-
- cmd_input = 'sw_interface_set_flags {dev} admin-up'.format(
- dev=interface)
- (ret_code, _, _) = ssh.exec_command_sudo(cmd, cmd_input)
- if int(ret_code) != 0:
- raise Exception('VPP sw_interface_set_flags failed on {h}'.format(
- h=node['host']))
-
cmd_input = 'exec show int'
- (ret_code, stdout, stderr) = ssh.exec_command_sudo(cmd, cmd_input)
+ (ret_code, stdout, stderr) = ssh.exec_command_sudo(
+ Constants.VAT_BIN_NAME, cmd_input)
logger.debug('ret: {0}'.format(ret_code))
logger.debug('stdout: {0}'.format(stdout))
logger.debug('stderr: {0}'.format(stderr))
@@ -197,24 +193,16 @@ class IPv6Setup(object):
:type addr: str
:type prefix: str
"""
- ssh = SSH()
- ssh.connect(node)
-
- cmd = '{c}'.format(c=Constants.VAT_BIN_NAME)
- cmd_input = 'sw_interface_add_del_address {dev} {ip}/{p} del'.format(
- dev=interface, ip=addr, p=prefix)
- (ret_code, _, _) = ssh.exec_command_sudo(cmd, cmd_input)
- if int(ret_code) != 0:
- raise Exception(
- 'sw_interface_add_del_address failed on {h}'.
- format(h=node['host']))
-
- cmd_input = 'sw_interface_set_flags {dev} admin-down'.format(
- dev=interface)
- (ret_code, _, _) = ssh.exec_command_sudo(cmd, cmd_input)
- if int(ret_code) != 0:
- raise Exception('VPP sw_interface_set_flags failed on {h}'.format(
- h=node['host']))
+ sw_if_index = Topology.get_interface_sw_index(node, interface)
+ vat = VatTerminal(node)
+ vat.vat_terminal_exec_cmd_from_template('del_ip_address.vat',
+ sw_if_index=sw_if_index,
+ address=addr,
+ prefix_length=prefix)
+ vat.vat_terminal_exec_cmd_from_template('set_if_state.vat',
+ sw_if_index=sw_if_index,
+ state='admin-down')
+ vat.vat_terminal_close()
@staticmethod
def vpp_ra_supress_link_layer(node, interface):