adding ipv6 support and del/modify to p4runtime_lib

[mc36]

No description provided.

[rst0git]

I'm not sure if using regex pattern to match IPv6 addresses is a good idea because the regex itself is complex and it would be very difficult to debug. An alternative solution could be:

diff --git a/utils/p4runtime_lib/convert.py b/utils/p4runtime_lib/convert.py
index f6580e0..ca452ee 100644
--- a/utils/p4runtime_lib/convert.py
+++ b/utils/p4runtime_lib/convert.py
@@ -35,14 +35,17 @@ def decodeMac(encoded_mac_addr):
     return ':'.join(s.encode('hex') for s in encoded_mac_addr)
 
 ip_pattern = re.compile('^(\d{1,3}\.){3}(\d{1,3})$')
-def matchesIPv4(ip_addr_string):
-    return ip_pattern.match(ip_addr_string) is not None
-
-def encodeIPv4(ip_addr_string):
-    return socket.inet_aton(ip_addr_string)
-
-def decodeIPv4(encoded_ip_addr):
-    return socket.inet_ntoa(encoded_ip_addr)
+def encodeIP(ip_addr_string):
+    if ip_pattern.match(ip_addr_string):
+        return socket.inet_pton(socket.AF_INET, ip_addr_string)
+    return socket.inet_pton(socket.AF_INET6, ip_addr_string)
+
+def decodeIP(encoded_ip_addr):
+    if len(encoded_ip_addr) == 4:
+        return socket.inet_ntop(socket.AF_INET, encoded_ip_addr)
+    if len(encoded_ip_addr) == 16:
+        return socket.inet_ntop(socket.AF_INET6, encoded_ip_addr)
+    raise Exception("Encoded IP address has invalid length %d" % len(encoded_ip_addr))
 
 def bitwidthToBytes(bitwidth):
     return int(math.ceil(bitwidth / 8.0))
@@ -66,11 +69,12 @@ def encode(x, bitwidth):
     if type(x) == str:
         if matchesMac(x):
             encoded_bytes = encodeMac(x)
-        elif matchesIPv4(x):
-            encoded_bytes = encodeIPv4(x)
         else:
-            # Assume that the string is already encoded
-            encoded_bytes = x
+            try:
+                encoded_bytes = encodeIP(x)
+            except socket.error:
+                # Assume that the string is already encoded
+                encoded_bytes = x
     elif type(x) == int:
         encoded_bytes = encodeNum(x, bitwidth)
     else:

[jafingerhut]

@Abhinavcode13 pointed out that this PR's changes should already be mostly covered by #580, and the ability to delete table entries was added in a separate PR some time probably years ago, and recently created #601 adds an updated method for modifying table entries. Closing this issue in favor of those otehrs.