X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2FTestConfig.py;h=5887c11a9f8277fc4b77219f52638f4219bc0f36;hb=669d320bc64e41f879c047a39a66b8ec99bf4b1e;hp=5c441df09e397f1622fdefe85cfb724f8500c24b;hpb=f88a3d9178dfbd73d0479f9aa2f5224e0c89ca1f;p=csit.git diff --git a/resources/libraries/python/TestConfig.py b/resources/libraries/python/TestConfig.py index 5c441df09e..5887c11a9f 100644 --- a/resources/libraries/python/TestConfig.py +++ b/resources/libraries/python/TestConfig.py @@ -166,8 +166,6 @@ class TestConfig(object): sw_if_index=InterfaceUtil.get_interface_index( node, node_vlan_if), vlan_id=None) - err_msg = 'Failed to create VXLAN and VLAN interfaces on host {host}'.\ - format(host=node['host']) with PapiSocketExecutor(node) as papi_exec: for i in xrange(0, vxlan_count): @@ -179,17 +177,15 @@ class TestConfig(object): "has been reached.") vxlan_count = i break - args1['address'] = src_ip.packed - args2['src_address'] = src_ip.packed - args2['dst_address'] = dst_ip.packed + args1['address'] = getattr(src_ip, 'packed') + args2['src_address'] = getattr(src_ip, 'packed') + args2['dst_address'] = getattr(dst_ip, 'packed') args2['vni'] = int(vni_start) + i args3['vlan_id'] = i + 1 history = False if 1 < i < vxlan_count else True papi_exec.add(cmd1, history=history, **args1).\ add(cmd2, history=history, **args2).\ add(cmd3, history=history, **args3) - if i > 0 and i % (Constants.PAPI_MAX_API_BULK / 3) == 0: - papi_exec.get_replies(err_msg) papi_exec.get_replies() return vxlan_count @@ -258,8 +254,6 @@ class TestConfig(object): args2 = dict( sw_if_index=None, admin_up_down=1) - err_msg = 'Failed to put VXLAN and VLAN interfaces up on host {host}'. \ - format(host=node['host']) with PapiSocketExecutor(node) as papi_exec: for i in xrange(0, vxlan_count): @@ -296,8 +290,6 @@ class TestConfig(object): history = False if 1 < i < vxlan_count else True papi_exec.add(cmd, history=history, **args1). \ add(cmd, history=history, **args2) - if i > 0 and i % (Constants.PAPI_MAX_API_BULK / 2) == 0: - papi_exec.get_replies(err_msg) papi_exec.add(cmd, **args1).add(cmd, **args2) papi_exec.get_replies() @@ -398,8 +390,6 @@ class TestConfig(object): shg=0, port_type=0, enable=1) - err_msg = 'Failed to put VXLAN and VLAN interfaces to bridge domain ' \ - 'on host {host}'.format(host=node['host']) with PapiSocketExecutor(node) as papi_exec: for i in xrange(0, vxlan_count): @@ -420,6 +410,4 @@ class TestConfig(object): add(cmd2, history=history, **args2). \ add(cmd3, history=history, **args3). \ add(cmd3, history=history, **args4) - if i > 0 and i % (Constants.PAPI_MAX_API_BULK / 4) == 0: - papi_exec.get_replies(err_msg) papi_exec.get_replies()