tcp: better estimate snd space for rxt with no sacks

[vpp.git] / test / vpp_ip_route.py

diff --git a/test/vpp_ip_route.py b/test/vpp_ip_route.py
index b7ceb34..db5f4b6 100644 (file)
--- a/test/vpp_ip_route.py
+++ b/test/vpp_ip_route.py
@@ -143,9 +143,6 @@ class VppIpTable(VppObject):
                           self.table_id,
                           inet=AF_INET6 if self.is_ip6 == 1 else AF_INET)
 
-    def __str__(self):
-        return self.object_id()
-
     def object_id(self):
         return ("table-%s-%d" %
                 ("v6" if self.is_ip6 == 1 else "v4",
@@ -178,9 +175,6 @@ class VppIpInterfaceAddress(VppObject):
                                        self.prefix.length,
                                        self.intf.sw_if_index)
 
-    def __str__(self):
-        return self.object_id()
-
     def object_id(self):
         return "interface-ip-%s-%s" % (self.intf, self.prefix)
 
@@ -214,9 +208,6 @@ class VppIpInterfaceBind(VppObject):
             self.intf.sw_if_index,
             self.table.is_ip6).vrf_id == self.table.table_id
 
-    def __str__(self):
-        return self.object_id()
-
     def object_id(self):
         return "interface-bind-%s-%s" % (self.intf, self.table)
 
@@ -296,7 +287,7 @@ class VppRoutePath(object):
         self.next_hop_id = next_hop_id
         self.is_dvr = is_dvr
 
-    def encode_labels(self):
+    def encode_labels(self, pad_labels=False):
         lstack = []
         for l in self.nh_labels:
             if type(l) == VppMplsLabel:
@@ -304,9 +295,12 @@ class VppRoutePath(object):
             else:
                 lstack.append({'label': l,
                                'ttl': 255})
+        if (pad_labels):
+            while (len(lstack) < 16):
+                lstack.append({})
         return lstack
 
-    def encode(self):
+    def encode(self, pad_labels=False):
         return {'next_hop': self.nh_addr,
                 'weight': 1,
                 'preference': 0,
@@ -316,7 +310,7 @@ class VppRoutePath(object):
                 'afi': self.proto,
                 'is_udp_encap': self.is_udp_encap,
                 'n_labels': len(self.nh_labels),
-                'label_stack': self.encode_labels()}
+                'label_stack': self.encode_labels(pad_labels)}
 
     def __eq__(self, other):
         if isinstance(other, self.__class__):
@@ -453,9 +447,6 @@ class VppIpRoute(VppObject):
                           self.table_id,
                           inet=AF_INET6 if self.is_ip6 == 1 else AF_INET)
 
-    def __str__(self):
-        return self.object_id()
-
     def object_id(self):
         return ("%d:%s/%d"
                 % (self.table_id,
@@ -579,9 +570,6 @@ class VppIpMRoute(VppObject):
                            self.table_id,
                            inet=AF_INET6 if self.is_ip6 == 1 else AF_INET)
 
-    def __str__(self):
-        return self.object_id()
-
     def object_id(self):
         if self.is_ip6:
             return ("%d:(%s,%s/%d)"
@@ -667,9 +655,6 @@ class VppMplsIpBind(VppObject):
                 return True
         return False
 
-    def __str__(self):
-        return self.object_id()
-
     def object_id(self):
         return ("%d:%s binds %d:%s/%d"
                 % (self.table_id,
@@ -705,9 +690,6 @@ class VppMplsTable(VppObject):
             return True
         return False
 
-    def __str__(self):
-        return self.object_id()
-
     def object_id(self):
         return ("table-mpls-%d" % (self.table_id))
 
@@ -766,9 +748,6 @@ class VppMplsRoute(VppObject):
         return find_mpls_route(self._test, self.table_id,
                                self.local_label, self.eos_bit)
 
-    def __str__(self):
-        return self.object_id()
-
     def object_id(self):
         return ("%d:%s/%d"
                 % (self.table_id,