-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2020 Cisco and/or its affiliates.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
from resources.libraries.python.Constants import Constants
from resources.libraries.python.InterfaceUtil import InterfaceUtil, \
InterfaceStatusFlags
+from resources.libraries.python.IPAddress import IPAddress
from resources.libraries.python.IPUtil import IPUtil
from resources.libraries.python.PapiExecutor import PapiSocketExecutor
from resources.libraries.python.topology import Topology
)
cmd2 = u"vxlan_add_del_tunnel"
args2 = dict(
- is_add=1,
- is_ipv6=0,
+ is_add=True,
instance=Constants.BITWISE_NON_ZERO,
src_address=None,
dst_address=None,
args1[u"prefix"] = IPUtil.create_prefix_object(
src_ip, 128 if src_ip_start.version == 6 else 32
)
- args2[u"src_address"] = getattr(src_ip, u"packed")
- args2[u"dst_address"] = getattr(dst_ip, u"packed")
+ args2[u"src_address"] = IPAddress.create_ip_address_object(
+ src_ip
+ )
+ args2[u"dst_address"] = IPAddress.create_ip_address_object(
+ dst_ip
+ )
args2[u"vni"] = int(vni_start) + i
args3[u"vlan_id"] = i + 1
history = bool(not 1 < i < vxlan_count - 1)
args1[u"neighbor"][u"ip_address"] = \
str(dst_ip_start + i * ip_step)
args2[u"route"][u"prefix"][u"address"][u"un"] = \
- IPUtil.union_addr(dst_ip_start + i * ip_step)
+ IPAddress.union_addr(dst_ip_start + i * ip_step)
args2[u"route"][u"paths"][0][u"nh"][u"address"] = \
- IPUtil.union_addr(dst_ip_start + i * ip_step)
+ IPAddress.union_addr(dst_ip_start + i * ip_step)
args3[u"rx_sw_if_index"] = Topology.get_interface_sw_index(
node, f"vxlan_tunnel{i+1}"
)