diff options
| author |   Jan Gelety <jgelety@cisco.com> | 2020-03-11 03:16:24 +0100 |
|---|---|---|
| committer | Jan Gelety <jgelety@cisco.com> | 2020-03-13 16:32:45 +0000 |
| commit | ee33baa6d09b759876441ecde725da95f604fedd (patch) | |
| tree | ae726367d71e0f792d19d8c2cceb08865bab813a /resources/libraries/python/TestConfig.py | |
| parent | 10cd5da7d0e84c8d3bb48a6d671219ea87aeadf4 (diff) | |
Use separate module for ip address object
Reason: with upcomming vpp api changes the ip object will be used
in more csit python libraries, e.g. InterfaceUtil.py, so we need
to avoid circular import issue
(e.g. InterfaceUtil.pyu <-> IPUtil.py)
Change-Id: Ia658b187d4e326f58e33019dd54f8ac7b9137d78
Signed-off-by: Jan Gelety <jgelety@cisco.com>
Diffstat (limited to 'resources/libraries/python/TestConfig.py')
| -rw-r--r-- | resources/libraries/python/TestConfig.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/resources/libraries/python/TestConfig.py b/resources/libraries/python/TestConfig.py index 28778b2c31..6366f2e3fb 100644 --- a/resources/libraries/python/TestConfig.py +++ b/resources/libraries/python/TestConfig.py @@ -1,4 +1,4 @@ -# 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: @@ -19,6 +19,7 @@ from robot.api import logger 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 @@ -423,9 +424,9 @@ class TestConfig: 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}" ) |