summaryrefslogtreecommitdiffstats
path: root/test/vpp_papi_provider.py
diff options
context:
space:
mode:
authorNeale Ranns <nranns@cisco.com>2019-02-28 11:11:39 +0000
committerNeale Ranns <nranns@cisco.com>2019-03-06 12:15:10 +0000
commit4ba67723d716660c56326ce498b99a060a9471b1 (patch)
tree10f2fc773e660bad99ee6b7ae7845b1f23102bb8 /test/vpp_papi_provider.py
parent6955595a577e1b7d316b5b69267bf1d1d951a4ab (diff)
GBP: use sclass in the DP for policy
Change-Id: I154e18f22ec7708127b8ade98e80546ab1dcd05b Signed-off-by: Neale Ranns <nranns@cisco.com>
Diffstat (limited to 'test/vpp_papi_provider.py')
-rw-r--r--test/vpp_papi_provider.py26
1 files changed, 13 insertions, 13 deletions
diff --git a/test/vpp_papi_provider.py b/test/vpp_papi_provider.py
index 9955518b2ef..5975b571899 100644
--- a/test/vpp_papi_provider.py
+++ b/test/vpp_papi_provider.py
@@ -3553,7 +3553,7 @@ class VppPapiProvider(object):
'enable_ip6': 1 if enable_ip6 else 0,
})
- def gbp_endpoint_add(self, sw_if_index, ips, mac, epg, flags,
+ def gbp_endpoint_add(self, sw_if_index, ips, mac, sclass, flags,
tun_src, tun_dst):
""" GBP endpoint Add """
return self.api(self.papi.gbp_endpoint_add,
@@ -3562,7 +3562,7 @@ class VppPapiProvider(object):
'ips': ips,
'n_ips': len(ips),
'mac': mac,
- 'epg_id': epg,
+ 'sclass': sclass,
'flags': flags,
'tun': {
'src': tun_src,
@@ -3579,7 +3579,7 @@ class VppPapiProvider(object):
return self.api(self.papi.gbp_endpoint_dump,
{'_no_type_conversion': True})
- def gbp_endpoint_group_add(self, epg, sclass, bd,
+ def gbp_endpoint_group_add(self, vnid, sclass, bd,
rd, uplink_sw_if_index,
retention):
""" GBP endpoint group Add """
@@ -3589,15 +3589,15 @@ class VppPapiProvider(object):
'uplink_sw_if_index': uplink_sw_if_index,
'bd_id': bd,
'rd_id': rd,
- 'epg_id': epg,
+ 'vnid': vnid,
'sclass': sclass,
'retention': retention
}})
- def gbp_endpoint_group_del(self, epg):
+ def gbp_endpoint_group_del(self, sclass):
""" GBP endpoint group Del """
return self.api(self.papi.gbp_endpoint_group_del,
- {'epg_id': epg})
+ {'sclass': sclass})
def gbp_endpoint_group_dump(self):
""" GBP endpoint group Dump """
@@ -3652,14 +3652,14 @@ class VppPapiProvider(object):
""" GBP Route Domain Dump """
return self.api(self.papi.gbp_route_domain_dump, {})
- def gbp_recirc_add_del(self, is_add, sw_if_index, epg, is_ext):
+ def gbp_recirc_add_del(self, is_add, sw_if_index, sclass, is_ext):
""" GBP recirc Add/Del """
return self.api(self.papi.gbp_recirc_add_del,
{'is_add': is_add,
'recirc': {
'is_ext': is_ext,
'sw_if_index': sw_if_index,
- 'epg_id': epg}})
+ 'sclass': sclass}})
def gbp_recirc_dump(self):
""" GBP recirc Dump """
@@ -3681,14 +3681,14 @@ class VppPapiProvider(object):
def gbp_subnet_add_del(self, is_add, rd_id,
prefix, type,
sw_if_index=0xffffffff,
- epg_id=0xffff):
+ sclass=0xffff):
""" GBP Subnet Add/Del """
return self.api(self.papi.gbp_subnet_add_del,
{'is_add': is_add,
'subnet': {
'type': type,
'sw_if_index': sw_if_index,
- 'epg_id': epg_id,
+ 'sclass': sclass,
'prefix': prefix,
'rd_id': rd_id}})
@@ -3697,15 +3697,15 @@ class VppPapiProvider(object):
return self.api(self.papi.gbp_subnet_dump,
{'_no_type_conversion': True})
- def gbp_contract_add_del(self, is_add, src_epg, dst_epg, acl_index,
+ def gbp_contract_add_del(self, is_add, sclass, dclass, acl_index,
rules, allowed_ethertypes):
""" GBP contract Add/Del """
return self.api(self.papi.gbp_contract_add_del,
{'is_add': is_add,
'contract': {
'acl_index': acl_index,
- 'src_epg': src_epg,
- 'dst_epg': dst_epg,
+ 'sclass': sclass,
+ 'dclass': dclass,
'n_rules': len(rules),
'rules': rules,
'n_ether_types': len(allowed_ethertypes),