aboutsummaryrefslogtreecommitdiffstats
path: root/resources/tools/presentation/specification.yaml
diff options
context:
space:
mode:
authorTibor Frank <tifrank@cisco.com>2020-03-19 10:10:17 +0100
committerTibor Frank <tifrank@cisco.com>2020-03-19 10:18:18 +0100
commit012d8ed852b5f77825952fc7afba487d89db64c3 (patch)
treea2556c40bee522d242269c6abc81325db1f3c2ea /resources/tools/presentation/specification.yaml
parent26192706aea7d2763fe2f53c12c23366cc4e08db (diff)
Report: Add data
Change-Id: I0ef25059f362c7d7b5c5190164cfdc8bff4ae3f1 Signed-off-by: Tibor Frank <tifrank@cisco.com>
Diffstat (limited to 'resources/tools/presentation/specification.yaml')
-rw-r--r--resources/tools/presentation/specification.yaml22
1 files changed, 10 insertions, 12 deletions
diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml
index 5586c83fc6..c30da0fd56 100644
--- a/resources/tools/presentation/specification.yaml
+++ b/resources/tools/presentation/specification.yaml
@@ -276,7 +276,6 @@
- 47 # NDRPDR sel
- 48 # NDRPDR sel
- 49 # NDRPDR sel
- - 50 # NDRPDR sel
plot-vpp-hdrh-lat-3n-skx:
csit-vpp-perf-verify-2001-3n-skx:
@@ -290,7 +289,6 @@
- 47 # NDRPDR sel
- 48 # NDRPDR sel
- 49 # NDRPDR sel
- - 50 # NDRPDR sel
plot-vpp-nfv-3n-skx-mrr:
csit-vpp-perf-verify-2001-3n-skx:
@@ -306,7 +304,7 @@
- 37 # NDRPDR sel xxv710
- 41 # NDRPDR sel xxv710
- 42 # NDRPDR sel xxv710
- - 44 # NDRPDR sel xxv710
+ - 43 # NDRPDR sel xxv710
- 45 # NDRPDR sel xxv710
- 30 # NDRPDR sel x710
- 31 # NDRPDR sel x710
@@ -314,6 +312,7 @@
- 38 # NDRPDR sel x710
- 39 # NDRPDR sel x710
- 40 # NDRPDR sel x710
+ - 44 # NDRPDR sel x710
- 46 # NDRPDR sel x710
- 47 # NDRPDR sel x710
- 48 # NDRPDR sel x710
@@ -595,7 +594,6 @@
- 47 # NDRPDR sel
- 48 # NDRPDR sel
- 49 # NDRPDR sel
- - 50 # NDRPDR sel
vpp-nic-comparison-2n-skx:
csit-vpp-perf-verify-2001-2n-skx:
@@ -856,7 +854,6 @@
- 47 # NDRPDR sel
- 48 # NDRPDR sel
- 49 # NDRPDR sel
- - 50 # NDRPDR sel
vpp-performance-changes-3n-skx:
- "vpp-performance-changes-3n-skx-h1"
- "vpp-performance-changes-3n-skx-ref"
@@ -1234,7 +1231,7 @@
- 37 # NDRPDR sel xxv710
- 41 # NDRPDR sel xxv710
- 42 # NDRPDR sel xxv710
- - 44 # NDRPDR sel xxv710
+ - 43 # NDRPDR sel xxv710
- 45 # NDRPDR sel xxv710
- 30 # NDRPDR sel x710
- 31 # NDRPDR sel x710
@@ -1242,6 +1239,7 @@
- 38 # NDRPDR sel x710
- 39 # NDRPDR sel x710
- 40 # NDRPDR sel x710
+ - 44 # NDRPDR sel x710
- 46 # NDRPDR sel x710
- 47 # NDRPDR sel x710
- 48 # NDRPDR sel x710
@@ -1323,7 +1321,6 @@
- 47 # NDRPDR sel
- 48 # NDRPDR sel
- 49 # NDRPDR sel
- - 50 # NDRPDR sel
vpp-compare-testbeds:
- "vpp-compare-testbeds-ref"
- "vpp-compare-testbeds-cmp"
@@ -1447,7 +1444,7 @@
- 37 # NDRPDR sel xxv710
- 41 # NDRPDR sel xxv710
- 42 # NDRPDR sel xxv710
- - 44 # NDRPDR sel xxv710
+ - 43 # NDRPDR sel xxv710
- 45 # NDRPDR sel xxv710
- 30 # NDRPDR sel x710
- 31 # NDRPDR sel x710
@@ -1455,6 +1452,7 @@
- 38 # NDRPDR sel x710
- 39 # NDRPDR sel x710
- 40 # NDRPDR sel x710
+ - 44 # NDRPDR sel x710
- 46 # NDRPDR sel x710
- 47 # NDRPDR sel x710
- 48 # NDRPDR sel x710
@@ -1521,7 +1519,6 @@
- 47 # NDRPDR sel
- 48 # NDRPDR sel
- 49 # NDRPDR sel
- - 50 # NDRPDR sel
vpp-compare-topologies-cmp:
# TODO: Add the data
csit-vpp-perf-verify-2001-2n-skx:
@@ -1559,7 +1556,7 @@
- 37 # NDRPDR sel xxv710
- 41 # NDRPDR sel xxv710
- 42 # NDRPDR sel xxv710
- - 44 # NDRPDR sel xxv710
+ - 43 # NDRPDR sel xxv710
- 45 # NDRPDR sel xxv710
- 30 # NDRPDR sel x710
- 31 # NDRPDR sel x710
@@ -1567,6 +1564,7 @@
- 38 # NDRPDR sel x710
- 39 # NDRPDR sel x710
- 40 # NDRPDR sel x710
+ - 44 # NDRPDR sel x710
- 46 # NDRPDR sel x710
- 47 # NDRPDR sel x710
- 48 # NDRPDR sel x710
@@ -2381,7 +2379,6 @@
- 47 # NDRPDR sel
- 48 # NDRPDR sel
- 49 # NDRPDR sel
- - 50 # NDRPDR sel
- 50 # MRR sel
csit-vpp-perf-verify-1904-2n-skx:
@@ -2654,7 +2651,7 @@
- 37 # NDRPDR sel xxv710
- 41 # NDRPDR sel xxv710
- 42 # NDRPDR sel xxv710
- - 44 # NDRPDR sel xxv710
+ - 43 # NDRPDR sel xxv710
- 45 # NDRPDR sel xxv710
- 30 # NDRPDR sel x710
- 31 # NDRPDR sel x710
@@ -2662,6 +2659,7 @@
- 38 # NDRPDR sel x710
- 39 # NDRPDR sel x710
- 40 # NDRPDR sel x710
+ - 44 # NDRPDR sel x710
- 46 # NDRPDR sel x710
- 47 # NDRPDR sel x710
- 48 # NDRPDR sel x710
an class="n">test self.id = id def add_vpp_config(self): self.test.vapi.ipsec_spd_add_del(self.id) self.test.registry.register(self, self.test.logger) def remove_vpp_config(self): self.test.vapi.ipsec_spd_add_del(self.id, is_add=0) def object_id(self): return "ipsec-spd-%d" % self.id def query_vpp_config(self): spds = self.test.vapi.ipsec_spds_dump() for spd in spds: if spd.spd_id == self.id: return True return False class VppIpsecSpdItfBinding(VppObject): """ VPP SPD DB to interface binding (i.e. this SPD is used on this interface) """ def __init__(self, test, spd, itf): self.test = test self.spd = spd self.itf = itf def add_vpp_config(self): self.test.vapi.ipsec_interface_add_del_spd(self.spd.id, self.itf.sw_if_index) self.test.registry.register(self, self.test.logger) def remove_vpp_config(self): self.test.vapi.ipsec_interface_add_del_spd(self.spd.id, self.itf.sw_if_index, is_add=0) def object_id(self): return "bind-%s-to-%s" % (self.spd.id, self.itf) def query_vpp_config(self): bs = self.test.vapi.ipsec_spd_interface_dump() for b in bs: if b.sw_if_index == self.itf.sw_if_index: return True return False class VppIpsecSpdEntry(VppObject): """ VPP SPD DB Entry """ def __init__(self, test, spd, sa_id, local_start, local_stop, remote_start, remote_stop, proto, priority=100, policy=None, is_outbound=1, remote_port_start=0, remote_port_stop=65535, local_port_start=0, local_port_stop=65535): self.test = test self.spd = spd self.sa_id = sa_id self.local_start = ip_address(text_type(local_start)) self.local_stop = ip_address(text_type(local_stop)) self.remote_start = ip_address(text_type(remote_start)) self.remote_stop = ip_address(text_type(remote_stop)) self.proto = proto self.is_outbound = is_outbound self.priority = priority if not policy: self.policy = (VppEnum.vl_api_ipsec_spd_action_t. IPSEC_API_SPD_ACTION_BYPASS) else: self.policy = policy self.is_ipv6 = (0 if self.local_start.version == 4 else 1) self.local_port_start = local_port_start self.local_port_stop = local_port_stop self.remote_port_start = remote_port_start self.remote_port_stop = remote_port_stop def add_vpp_config(self): rv = self.test.vapi.ipsec_spd_entry_add_del( self.spd.id, self.sa_id, self.local_start, self.local_stop, self.remote_start, self.remote_stop, protocol=self.proto, is_ipv6=self.is_ipv6, is_outbound=self.is_outbound, priority=self.priority, policy=self.policy, local_port_start=self.local_port_start, local_port_stop=self.local_port_stop, remote_port_start=self.remote_port_start, remote_port_stop=self.remote_port_stop) self.stat_index = rv.stat_index self.test.registry.register(self, self.test.logger) def remove_vpp_config(self): self.test.vapi.ipsec_spd_entry_add_del( self.spd.id, self.sa_id, self.local_start, self.local_stop, self.remote_start, self.remote_stop, protocol=self.proto, is_ipv6=self.is_ipv6, is_outbound=self.is_outbound, priority=self.priority, policy=self.policy, local_port_start=self.local_port_start, local_port_stop=self.local_port_stop, remote_port_start=self.remote_port_start, remote_port_stop=self.remote_port_stop, is_add=0) def object_id(self): return "spd-entry-%d-%d-%d-%d-%d-%d" % (self.spd.id, self.priority, self.policy, self.is_outbound, self.is_ipv6, self.remote_port_start) def query_vpp_config(self): ss = self.test.vapi.ipsec_spd_dump(self.spd.id) for s in ss: if s.entry.sa_id == self.sa_id and \ s.entry.is_outbound == self.is_outbound and \ s.entry.priority == self.priority and \ s.entry.policy == self.policy and \ s.entry.remote_address_start == self.remote_start and \ s.entry.remote_port_start == self.remote_port_start: return True return False def get_stats(self): c = self.test.statistics.get_counter("/net/ipsec/policy") return c[0][self.stat_index] class VppIpsecSA(VppObject): """ VPP SAD Entry """ def __init__(self, test, id, spi, integ_alg, integ_key, crypto_alg, crypto_key, proto, tun_src=None, tun_dst=None, flags=None, salt=0): e = VppEnum.vl_api_ipsec_sad_flags_t self.test = test self.id = id self.spi = spi self.integ_alg = integ_alg self.integ_key = integ_key self.crypto_alg = crypto_alg self.crypto_key = crypto_key self.proto = proto self.salt = salt self.tun_src = tun_src self.tun_dst = tun_dst if not flags: self.flags = e.IPSEC_API_SAD_FLAG_NONE else: self.flags = flags if (tun_src): self.tun_src = ip_address(text_type(tun_src)) self.flags = self.flags | e.IPSEC_API_SAD_FLAG_IS_TUNNEL if (self.tun_src.version == 6): self.flags = self.flags | e.IPSEC_API_SAD_FLAG_IS_TUNNEL_V6 if (tun_dst): self.tun_dst = ip_address(text_type(tun_dst)) def add_vpp_config(self): r = self.test.vapi.ipsec_sad_entry_add_del( self.id, self.spi, self.integ_alg, self.integ_key, self.crypto_alg, self.crypto_key, self.proto, (self.tun_src if self.tun_src else []), (self.tun_dst if self.tun_dst else []), flags=self.flags, salt=self.salt) self.stat_index = r.stat_index self.test.registry.register(self, self.test.logger) def remove_vpp_config(self): self.test.vapi.ipsec_sad_entry_add_del( self.id, self.spi, self.integ_alg, self.integ_key, self.crypto_alg, self.crypto_key, self.proto, (self.tun_src if self.tun_src else []), (self.tun_dst if self.tun_dst else []), flags=self.flags, is_add=0) def object_id(self): return "ipsec-sa-%d" % self.id def query_vpp_config(self): bs = self.test.vapi.ipsec_sa_dump() for b in bs: if b.entry.sad_id == self.id: return True return False def get_stats(self): c = self.test.statistics.get_counter("/net/ipsec/sa") return c[0][self.stat_index] class VppIpsecTunProtect(VppObject): """ VPP IPSEC tunnel protection """ def __init__(self, test, itf, sa_out, sas_in): self.test = test self.itf = itf self.sas_in = [] for sa in sas_in: self.sas_in.append(sa.id) self.sa_out = sa_out.id def update_vpp_config(self, sa_out, sas_in): self.sas_in = [] for sa in sas_in: self.sas_in.append(sa.id) self.sa_out = sa_out.id self.test.vapi.ipsec_tunnel_protect_update( tunnel={ 'sw_if_index': self.itf._sw_if_index, 'n_sa_in': len(self.sas_in), 'sa_out': self.sa_out, 'sa_in': self.sas_in}) def object_id(self): return "ipsec-tun-protect-%s" % self.itf def add_vpp_config(self): self.test.vapi.ipsec_tunnel_protect_update( tunnel={ 'sw_if_index': self.itf._sw_if_index, 'n_sa_in': len(self.sas_in), 'sa_out': self.sa_out, 'sa_in': self.sas_in}) self.test.registry.register(self, self.test.logger) def remove_vpp_config(self): self.test.vapi.ipsec_tunnel_protect_del( sw_if_index=self.itf.sw_if_index) def query_vpp_config(self): bs = self.test.vapi.ipsec_tunnel_protect_dump( sw_if_index=self.itf.sw_if_index) for b in bs: if b.tun.sw_if_index == self.itf.sw_if_index: return True return False