summaryrefslogtreecommitdiffstats
path: root/test/test_stats_client.py
diff options
context:
space:
mode:
authorBeno�t Ganne <bganne@cisco.com>2021-06-25 15:45:05 +0000
committerBenoît Ganne <bganne@cisco.com>2021-06-25 17:59:18 +0200
commit7816403eb2b539c259250ed82cd8367f74fec0e9 (patch)
tree8713cc122f5f89bff6d79dfe4e71001008ed9df7 /test/test_stats_client.py
parentc9ae8cfaccd75fbc2dc27bdebccdbd14fc0cb60c (diff)
stats: revert "add a retry mechanism in a symlink test"
This reverts commit d70777aa60a87001f323f3b226d7e5cee2cd23d8. Reason for revert: wrong fix Type: fix Change-Id: Ibff1b977eae8d2cc85888165ebf83c42eb661698 Signed-off-by: Benoît Ganne <bganne@cisco.com>
Diffstat (limited to 'test/test_stats_client.py')
-rw-r--r--test/test_stats_client.py16
1 files changed, 1 insertions, 15 deletions
diff --git a/test/test_stats_client.py b/test/test_stats_client.py
index e5b6aa79386..7e17e2a1fdd 100644
--- a/test/test_stats_client.py
+++ b/test/test_stats_client.py
@@ -2,8 +2,6 @@
import unittest
import psutil
-import sys
-import six
from vpp_papi.vpp_stats import VPPStats
from framework import tag_fixme_vpp_workers
@@ -110,19 +108,7 @@ class StatsClientTestCase(VppTestCase):
# We wait for nodes symlinks to update (interfaces created/deleted).
# ... and packets to be sent
self.sleep(0.1)
- for _ in range(5):
- try:
- vectors = self.statistics.get_counter('/nodes/pg1-tx/vectors')
- if vectors[0] == 0:
- raise ValueError("Nodes counters are not up to date")
- break
- except:
- t, v, tb = sys.exc_info()
-
- self.sleep(0.1)
- continue
- else:
- six.reraise(t, v, tb)
+ vectors = self.statistics.get_counter('/nodes/pg1-tx/vectors')
self.assertEqual(tx[0]['bytes'] - tx_before_sending[0]['bytes'],
bytes_to_send)
f } /* Literal */ .highlight .n { color: #f8f8f2 } /* Name */ .highlight .o { color: #f92672 } /* Operator */ .highlight .p { color: #f8f8f2 } /* Punctuation */ .highlight .ch { color: #75715e } /* Comment.Hashbang */ .highlight .cm { color: #75715e } /* Comment.Multiline */ .highlight .cp { color: #75715e } /* Comment.Preproc */ .highlight .cpf { color: #75715e } /* Comment.PreprocFile */ .highlight .c1 { color: #75715e } /* Comment.Single */ .highlight .cs { color: #75715e } /* Comment.Special */ .highlight .gd { color: #f92672 } /* Generic.Deleted */ .highlight .ge { font-style: italic } /* Generic.Emph */ .highlight .gi { color: #a6e22e } /* Generic.Inserted */ .highlight .gs { font-weight: bold } /* Generic.Strong */ .highlight .gu { color: #75715e } /* Generic.Subheading */ .highlight .kc { color: #66d9ef } /* Keyword.Constant */ .highlight .kd { color: #66d9ef } /* Keyword.Declaration */ .highlight .kn { color: #f92672 } /* Keyword.Namespace */ .highlight .kp { color: #66d9ef } /* Keyword.Pseudo */ .highlight .kr { color: #66d9ef } /* Keyword.Reserved */ .highlight .kt { color: #66d9ef } /* Keyword.Type */ .highlight .ld { color: #e6db74 } /* Literal.Date */ .highlight .m { color: #ae81ff } /* Literal.Number */ .highlight .s { color: #e6db74 } /* Literal.String */ .highlight .na { color: #a6e22e } /* Name.Attribute */ .highlight .nb { color: #f8f8f2 } /* Name.Builtin */ .highlight .nc { color: #a6e22e } /* Name.Class */ .highlight .no { color: #66d9ef } /* Name.Constant */ .highlight .nd { color: #a6e22e } /* Name.Decorator */ .highlight .ni { color: #f8f8f2 } /* Name.Entity */ .highlight .ne { color: #a6e22e } /* Name.Exception */ .highlight .nf { color: #a6e22e } /* Name.Function */ .highlight .nl { color: #f8f8f2 } /* Name.Label */ .highlight .nn { color: #f8f8f2 } /* Name.Namespace */ .highlight .nx { color: #a6e22e } /* Name.Other */ .highlight .py { color: #f8f8f2 } /* Name.Property */ .highlight .nt { color: #f92672 } /* Name.Tag */ .highlight .nv { color: #f8f8f2 } /* Name.Variable */ .highlight .ow { color: #f92672 } /* Operator.Word */ .highlight .w { color: #f8f8f2 } /* Text.Whitespace */ .highlight .mb { color: #ae81ff } /* Literal.Number.Bin */ .highlight .mf { color: #ae81ff } /* Literal.Number.Float */ .highlight .mh { color: #ae81ff } /* Literal.Number.Hex */ .highlight .mi { color: #ae81ff } /* Literal.Number.Integer */ .highlight .mo { color: #ae81ff } /* Literal.Number.Oct */ .highlight .sa { color: #e6db74 } /* Literal.String.Affix */ .highlight .sb { color: #e6db74 } /* Literal.String.Backtick */ .highlight .sc { color: #e6db74 } /* Literal.String.Char */ .highlight .dl { color: #e6db74 } /* Literal.String.Delimiter */ .highlight .sd { color: #e6db74 } /* Literal.String.Doc */ .highlight .s2 { color: #e6db74 } /* Literal.String.Double */ .highlight .se { color: #ae81ff } /* Literal.String.Escape */ .highlight .sh { color: #e6db74 } /* Literal.String.Heredoc */ .highlight .si { color: #e6db74 } /* Literal.String.Interpol */ .highlight .sx { color: #e6db74 } /* Literal.String.Other */ .highlight .sr { color: #e6db74 } /* Literal.String.Regex */ .highlight .s1 { color: #e6db74 } /* Literal.String.Single */ .highlight .ss { color: #e6db74 } /* Literal.String.Symbol */ .highlight .bp { color: #f8f8f2 } /* Name.Builtin.Pseudo */ .highlight .fm { color: #a6e22e } /* Name.Function.Magic */ .highlight .vc { color: #f8f8f2 } /* Name.Variable.Class */ .highlight .vg { color: #f8f8f2 } /* Name.Variable.Global */ .highlight .vi { color: #f8f8f2 } /* Name.Variable.Instance */ .highlight .vm { color: #f8f8f2 } /* Name.Variable.Magic */ .highlight .il { color: #ae81ff } /* Literal.Number.Integer.Long */ } @media (prefers-color-scheme: light) { .highlight .hll { background-color: #ffffcc } .highlight .c { color: #888888 } /* Comment */ .highlight .err { color: #a61717; background-color: #e3d2d2 } /* Error */ .highlight .k { color: #008800; font-weight: bold } /* Keyword */ .highlight .ch { color: #888888 } /* Comment.Hashbang */ .highlight .cm { color: #888888 } /* Comment.Multiline */ .highlight .cp { color: #cc0000; font-weight: bold } /* Comment.Preproc */ .highlight .cpf { color: #888888 } /* Comment.PreprocFile */ .highlight .c1 { color: #888888 } /* Comment.Single */ .highlight .cs { color: #cc0000; font-weight: bold; background-color: #fff0f0 } /* Comment.Special */ .highlight .gd { color: #000000; background-color: #ffdddd } /* Generic.Deleted */ .highlight .ge { font-style: italic } /* Generic.Emph */ .highlight .gr { color: #aa0000 } /* Generic.Error */ .highlight .gh { color: #333333 } /* Generic.Heading */ .highlight .gi { color: #000000; background-color: #ddffdd } /* Generic.Inserted */ .highlight .go { color: #888888 } /* Generic.Output */ .highlight .gp { color: #555555 } /* Generic.Prompt */ .highlight .gs { font-weight: bold } /* Generic.Strong */ .highlight .gu { color: #666666 } /* Generic.Subheading */ .highlight .gt { color: #aa0000 } /* Generic.Traceback */ .highlight .kc { color: #008800; font-weight: bold } /* Keyword.Constant */ .highlight .kd { color: #008800; font-weight: bold } /* Keyword.Declaration */ .highlight .kn { color: #008800; font-weight: bold } /* Keyword.Namespace */ .highlight .kp { color: #008800 } /* Keyword.Pseudo */ .highlight .kr { color: #008800; font-weight: bold } /* Keyword.Reserved */ .highlight .kt { color: #888888; font-weight: bold } /* Keyword.Type */ .highlight .m { color: #0000DD; font-weight: bold } /* Literal.Number */ .highlight .s { color: #dd2200; background-color: #fff0f0 } /* Literal.String */ .highlight .na { color: #336699 } /* Name.Attribute */ .highlight .nb { color: #003388 } /* Name.Builtin */ .highlight .nc { color: #bb0066; font-weight: bold } /* Name.Class */ .highlight .no { color: #003366; font-weight: bold } /* Name.Constant */ .highlight .nd { color: #555555 } /* Name.Decorator */ .highlight .ne { color: #bb0066; font-weight: bold } /* Name.Exception */ .highlight .nf { color: #0066bb; font-weight: bold } /* Name.Function */ .highlight .nl { color: #336699; font-style: italic } /* Name.Label */ .highlight .nn { color: #bb0066; font-weight: bold } /* Name.Namespace */ .highlight .py { color: #336699; font-weight: bold } /* Name.Property */ .highlight .nt { color: #bb0066; font-weight: bold } /* Name.Tag */ .highlight .nv { color: #336699 } /* Name.Variable */ .highlight .ow { color: #008800 } /* Operator.Word */ .highlight .w { color: #bbbbbb } /* Text.Whitespace */ .highlight .mb { color: #0000DD; font-weight: bold } /* Literal.Number.Bin */ .highlight .mf { color: #0000DD; font-weight: bold } /* Literal.Number.Float */ .highlight .mh { color: #0000DD; font-weight: bold } /* Literal.Number.Hex */ .highlight .mi { color: #0000DD; font-weight: bold } /* Literal.Number.Integer */ .highlight .mo { color: #0000DD; font-weight: bold } /* Literal.Number.Oct */ .highlight .sa { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Affix */ .highlight .sb { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Backtick */ .highlight .sc { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Char */ .highlight .dl { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Delimiter */ .highlight .sd { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Doc */ .highlight .s2 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Double */ .highlight .se { color: #0044dd; background-color: #fff0f0 } /* Literal.String.Escape */ .highlight .sh { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Heredoc */ .highlight .si { color: #3333bb; background-color: #fff0f0 } /* Literal.String.Interpol */ .highlight .sx { color: #22bb22; background-color: #f0fff0 } /* Literal.String.Other */ .highlight .sr { color: #008800; background-color: #fff0ff } /* Literal.String.Regex */ .highlight .s1 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Single */ .highlight .ss { color: #aa6600; background-color: #fff0f0 } /* Literal.String.Symbol */ .highlight .bp { color: #003388 } /* Name.Builtin.Pseudo */ .highlight .fm { color: #0066bb; font-weight: bold } /* Name.Function.Magic */ .highlight .vc { color: #336699 } /* Name.Variable.Class */ .highlight .vg { color: #dd7700 } /* Name.Variable.Global */ .highlight .vi { color: #3333bb } /* Name.Variable.Instance */ .highlight .vm { color: #336699 } /* Name.Variable.Magic */ .highlight .il { color: #0000DD; font-weight: bold } /* Literal.Number.Integer.Long */ }
/*
 * test.c : MAP unit tests
 *
 * Copyright (c) 2016 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:
 *
 *     http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

#include <assert.h>
#include "map.h"

static map_domain_t *
get_domain(ip4_address_t * ip4_prefix, u8 ip4_prefix_len,
	   ip6_address_t * ip6_prefix, u8 ip6_prefix_len,
	   ip6_address_t * ip6_src, u8 ip6_src_len,
	   u8 ea_bits_len, u8 psid_offset,
	   u8 psid_length, u16 mtu, u8 flags)
{
  map_domain_t * d = malloc(sizeof(*d));
  u8 suffix_len;

  /* EA bits must be within the first 64 bits */
  if (ea_bits_len > 0 && (ip6_prefix_len + ea_bits_len) > 64)
    return NULL;

  /* Init domain struct */
  d->ip4_prefix.as_u32 = ip4_prefix->as_u32;
  d->ip4_prefix_len = ip4_prefix_len;
  d->ip6_prefix = *ip6_prefix;
  d->ip6_prefix_len = ip6_prefix_len;
  d->ip6_src = *ip6_src;
  d->ip6_src_len = ip6_src_len;
  d->ea_bits_len = ea_bits_len;
  d->psid_offset = psid_offset;
  d->psid_length = psid_length;
  d->mtu = mtu;
  d->flags = flags;

  /* How many, and which bits to grab from the IPv4 DA */
  if (ip4_prefix_len + ea_bits_len < 32)
    {
      d->flags |= MAP_DOMAIN_PREFIX;
      d->suffix_shift = 32 - ip4_prefix_len - ea_bits_len;
      suffix_len = ea_bits_len;
    }
  else
    {
      d->suffix_shift = 0;
      suffix_len = 32 - ip4_prefix_len;
    }
  d->suffix_mask = (1 << suffix_len) - 1;

  d->psid_shift = 16 - psid_length - psid_offset;
  d->psid_mask = (1 << d->psid_length) - 1;

  if (ip6_prefix_len + suffix_len + d->psid_length > 64)
    return NULL;

  d->ea_shift = 64 - ip6_prefix_len - suffix_len - d->psid_length;

  return d;
}


/*
 * VPP-340:
 * map_add_domain ip4-pfx 20.0.0.0/8 ip6-pfx 2001:db8::/40 ip6-src 2001:db8:ffff::/96 ea-bits-len 24 psid-offset 0 psid-len 0 map-t
 * IPv4 src = 100.0.0.1
 * IPv4 dst = 20.169.201.219
 * UDP dest port = 1232
 * IPv6 src = 2001:db8:ffff::6400:1
 * IPv6 dst = a9c9:dfb8::14a9:c9db:0
 * a9c9:dfb8::14a9:c9db:0 != 2001:db8:a9:c9db:0:14a9:c9db:0
 */
static void
test_map_t_destaddr (void)
{
  ip4_address_t ip4_prefix;
  ip6_address_t ip6_prefix;
  ip6_address_t ip6_src;

  ip4_prefix.as_u32 = clib_host_to_net_u32(0x14000000);
  ip6_prefix.as_u64[0] = clib_host_to_net_u64(0x20010db800000000);
  ip6_prefix.as_u64[1] = 0;
  ip6_src.as_u64[0] = clib_host_to_net_u64(0x20010db8ffff0000);
  map_domain_t * d = get_domain (&ip4_prefix, 8, &ip6_prefix, 40, &ip6_src, 96, 24, 0, 0, 0, MAP_DOMAIN_TRANSLATION);

  ip6_address_t dst6;

  dst6.as_u64[0] = map_get_pfx(d, 0x14a9c9db, 1232);
  dst6.as_u64[1] = map_get_sfx(d, 0x14a9c9db, 1232);
  assert(dst6.as_u64[0] == 0x20010db800a9c9db);
  assert(dst6.as_u64[1] == 0x000014a9c9db0000);
}

/*
 * VPP-228
 * ip4-pfx 20.0.0.0/8
 * ip6-pfx 2001:db8::/<n>
 * ip6-src 2001:db8:ffff::1
 * ea-bits-len 16 psid-offset 6 psid-len 8
 * 20.169.201.219 port 1232
 */
static void
test_map_eabits (void)
{
  ip4_address_t ip4_prefix;
  ip6_address_t ip6_prefix;
  ip6_address_t ip6_src;
  ip6_address_t dst6;

  ip4_prefix.as_u32 = clib_host_to_net_u32(0x14000000);
  ip6_prefix.as_u64[0] = clib_host_to_net_u64(0x20010db800000000);
  ip6_prefix.as_u64[1] = 0;
  ip6_src.as_u64[0] = clib_host_to_net_u64(0x20010db8ffff0000);
  ip6_src.as_u64[1] = clib_host_to_net_u64(0x0000000000000001);
  map_domain_t * d = get_domain (&ip4_prefix, 16, &ip6_prefix, 48, &ip6_src,
				 128, 16, 6, 8, 0, 0);
  assert(!d);

  //20.0.0.0/8	2001:db8::/32	4	2001:db8:a000::14a0:0:0
  d = get_domain (&ip4_prefix, 8, &ip6_prefix, 32, &ip6_src,
		  128, 4, 0, 0, 0, 0);
  dst6.as_u64[0] = map_get_pfx(d, 0x14a9c9db, 1232);
  dst6.as_u64[1] = map_get_sfx(d, 0x14a9c9db, 1232);
  assert(dst6.as_u64[0] == 0x20010db8a0000000);
  assert(dst6.as_u64[1] == 0x000014a000000000);

  //20.0.0.0/8	2001:db8::/32	8	2001:db8:a900::14a9:0:0
  d = get_domain (&ip4_prefix, 8, &ip6_prefix, 32, &ip6_src,
		  128, 8, 0, 0, 0, 0);
  dst6.as_u64[0] = map_get_pfx(d, 0x14a9c9db, 1232);
  dst6.as_u64[1] = map_get_sfx(d, 0x14a9c9db, 1232);
  assert(dst6.as_u64[0] == 0x20010db8a9000000);
  assert(dst6.as_u64[1] == 0x000014a900000000);

  //20.0.0.0/8	2001:db8::/32	10	2001:db8:a9c0::14a9:c000:0
  d = get_domain (&ip4_prefix, 8, &ip6_prefix, 32, &ip6_src,
		  128, 10, 0, 0, 0, 0);
  dst6.as_u64[0] = map_get_pfx(d, 0x14a9c9db, 1232);
  dst6.as_u64[1] = map_get_sfx(d, 0x14a9c9db, 1232);
  assert(dst6.as_u64[0] == 0x20010db8a9c00000);
  assert(dst6.as_u64[1] == 0x000014a9c0000000);

  //20.0.0.0/8	2001:db8::/32	16	2001:db8:a9c9::14a9:c900:0
  d = get_domain (&ip4_prefix, 8, &ip6_prefix, 32, &ip6_src,
		  128, 16, 0, 0, 0, 0);
  dst6.as_u64[0] = map_get_pfx(d, 0x14a9c9db, 1232);
  dst6.as_u64[1] = map_get_sfx(d, 0x14a9c9db, 1232);
  assert(dst6.as_u64[0] == 0x20010db8a9c90000);
  assert(dst6.as_u64[1] == 0x000014a9c9000000);

  //20.0.0.0/8	2001:db8::/32	20	2001:db8:a9c9:d000:0:14a9:c9d0:0
  d = get_domain (&ip4_prefix, 8, &ip6_prefix, 32, &ip6_src,
		  128, 20, 0, 0, 0, 0);
  dst6.as_u64[0] = map_get_pfx(d, 0x14a9c9db, 1232);
  dst6.as_u64[1] = map_get_sfx(d, 0x14a9c9db, 1232);
  assert(dst6.as_u64[0] == 0x20010db8a9c9d000);
  assert(dst6.as_u64[1] == 0x000014a9c9d00000);

  //20.0.0.0/8	2001:db8::/32	23	2001:db8:a9c9:da00:0:14a9:c9da:0
  d = get_domain (&ip4_prefix, 8, &ip6_prefix, 32, &ip6_src,
		  128, 23, 0, 0, 0, 0);
  dst6.as_u64[0] = map_get_pfx(d, 0x14a9c9db, 1232);
  dst6.as_u64[1] = map_get_sfx(d, 0x14a9c9db, 1232);
  assert(dst6.as_u64[0] == 0x20010db8a9c9da00);
  assert(dst6.as_u64[1] == 0x000014a9c9da0000);

  //20.169.201.0/24	2001:db8::/32	7	2001:db8:da00::14a9:c9da:0
  d = get_domain (&ip4_prefix, 8, &ip6_prefix, 32, &ip6_src,
		  128, 7, 0, 0, 0, 0);
  dst6.as_u64[0] = map_get_pfx(d, 0x14a9c9db, 1232);
  dst6.as_u64[1] = map_get_sfx(d, 0x14a9c9db, 1232);
  assert(dst6.as_u64[0] == 0x20010db8a8000000);
  assert(dst6.as_u64[1] == 0x000014a800000000);
}

#define foreach_test_case			\
  _(map_t_destaddr)				\
  _(map_eabits)

static void
run_tests (void)
{
#define _(_test_name)				\
  test_ ## _test_name ();

  foreach_test_case
#undef _
}

int main()
{
  run_tests ();
  return 0;
}