diff --git a/tests/data/dt-berlin-pod-gpon-adtran-sadis-DT.json b/tests/data/dt-berlin-pod-gpon-adtran-sadis-DT.json
index 9a01c51..67de072 100644
--- a/tests/data/dt-berlin-pod-gpon-adtran-sadis-DT.json
+++ b/tests/data/dt-berlin-pod-gpon-adtran-sadis-DT.json
@@ -14,7 +14,7 @@
             "id": "LBADTN2038AD991",
             "hardwareIdentifier": "00:24:45:c2:a4:b2",
             "nasId": "LBADTN2038AD991",
-            "uplinkPort": 1048576
+            "uplinkPort": 16777216
           },
           {
             "id": "SCOMa0302125-1",
diff --git a/tests/data/dt-berlin-pod-gpon-sadis-DT.json b/tests/data/dt-berlin-pod-gpon-sadis-DT.json
index 44708e0..d2ac939 100644
--- a/tests/data/dt-berlin-pod-gpon-sadis-DT.json
+++ b/tests/data/dt-berlin-pod-gpon-sadis-DT.json
@@ -14,7 +14,7 @@
             "id": "EC1912001814",
             "hardwareIdentifier": "80:a2:35:4d:24:c0",
             "nasId": "EC1912001814",
-            "uplinkPort": 1048576
+            "uplinkPort": 16777216
           },
           {
             "id": "SCOM00001c82-1",
diff --git a/tests/data/dt-berlin-pod-multi-olt-sadis-DT.json b/tests/data/dt-berlin-pod-multi-olt-sadis-DT.json
index 2ea0c6e..8406476 100644
--- a/tests/data/dt-berlin-pod-multi-olt-sadis-DT.json
+++ b/tests/data/dt-berlin-pod-multi-olt-sadis-DT.json
@@ -14,13 +14,13 @@
             "id": "EC1912001814",
             "hardwareIdentifier": "80:a2:35:4d:24:c0",
             "nasId": "EC1912001814",
-            "uplinkPort": 1048576
+            "uplinkPort": 16777216
           },
           {
             "id": "EC1729003539",
             "hardwareIdentifier": "a8:2b:b5:6d:1a:95",
             "nasId": "EC1729003539",
-            "uplinkPort": 1048576
+            "uplinkPort": 16777216
           },
           {
             "id": "SCOM00001c82-1",
diff --git a/tests/data/dt-berlin-pod-openonugo-sadis-DT.json b/tests/data/dt-berlin-pod-openonugo-sadis-DT.json
index 44708e0..d2ac939 100644
--- a/tests/data/dt-berlin-pod-openonugo-sadis-DT.json
+++ b/tests/data/dt-berlin-pod-openonugo-sadis-DT.json
@@ -14,7 +14,7 @@
             "id": "EC1912001814",
             "hardwareIdentifier": "80:a2:35:4d:24:c0",
             "nasId": "EC1912001814",
-            "uplinkPort": 1048576
+            "uplinkPort": 16777216
           },
           {
             "id": "SCOM00001c82-1",
diff --git a/tests/data/dt-berlin-pod-sadis.json b/tests/data/dt-berlin-pod-sadis.json
index 68aa5cd..bf8c026 100644
--- a/tests/data/dt-berlin-pod-sadis.json
+++ b/tests/data/dt-berlin-pod-sadis.json
@@ -14,7 +14,7 @@
             "id": "EC1729003539",
             "hardwareIdentifier": "a8:2b:b5:6d:1a:95",
             "nasId": "EC1729003539",
-            "uplinkPort": 1048576
+            "uplinkPort": 16777216
           },
           {
             "id": "ALPHe3d1cf5c-1",
diff --git a/tests/data/flex-ocp-cord-multi-uni-sadis-TT.json b/tests/data/flex-ocp-cord-multi-uni-sadis-TT.json
index c4a0691..8566a0d 100644
--- a/tests/data/flex-ocp-cord-multi-uni-sadis-TT.json
+++ b/tests/data/flex-ocp-cord-multi-uni-sadis-TT.json
@@ -333,7 +333,7 @@
           "id" : "EC1838000853",
           "hardwareIdentifier" : "00:00:00:00:00:01",
           "ipAddress" : "10.192.20.206",
-          "uplinkPort" : "1048576"
+          "uplinkPort" : "16777216"
         } ]
       }
     },
diff --git a/tests/data/flex-ocp-cord-openonupy-sadis-TT.json b/tests/data/flex-ocp-cord-openonupy-sadis-TT.json
index dc53b4f..f948198 100644
--- a/tests/data/flex-ocp-cord-openonupy-sadis-TT.json
+++ b/tests/data/flex-ocp-cord-openonupy-sadis-TT.json
@@ -225,7 +225,7 @@
           "id" : "EC1838000853",
           "hardwareIdentifier" : "00:00:00:00:00:01",
           "ipAddress" : "10.192.20.206",
-          "uplinkPort" : "1048576"
+          "uplinkPort" : "16777216"
         } ]
       }
     },
diff --git a/tests/data/flex-ocp-cord-openonupy-sadis.json b/tests/data/flex-ocp-cord-openonupy-sadis.json
index ae0e9a1..4950744 100644
--- a/tests/data/flex-ocp-cord-openonupy-sadis.json
+++ b/tests/data/flex-ocp-cord-openonupy-sadis.json
@@ -64,7 +64,7 @@
             "hardwareIdentifier": "aa:bb:cc:dd:ee:ff",
             "ipAddress": "10.192.20.206",
             "nasId": "EC1838000853",
-            "uplinkPort": 1048576
+            "uplinkPort": 16777216
           }
         ]
       },
diff --git a/tests/data/flex-ocp-cord-sadis-TT-multi-tcont-1.json b/tests/data/flex-ocp-cord-sadis-TT-multi-tcont-1.json
index faa38f8..86246dc 100644
--- a/tests/data/flex-ocp-cord-sadis-TT-multi-tcont-1.json
+++ b/tests/data/flex-ocp-cord-sadis-TT-multi-tcont-1.json
@@ -262,7 +262,7 @@
           "id" : "EC1838000853",
           "hardwareIdentifier" : "00:00:00:00:00:01",
           "ipAddress" : "10.192.20.206",
-          "uplinkPort" : "1048576"
+          "uplinkPort" : "16777216"
         } ]
       }
     },
diff --git a/tests/data/flex-ocp-cord-sadis-TT-multi-tcont.json b/tests/data/flex-ocp-cord-sadis-TT-multi-tcont.json
index bf3ea79..d485eb9 100644
--- a/tests/data/flex-ocp-cord-sadis-TT-multi-tcont.json
+++ b/tests/data/flex-ocp-cord-sadis-TT-multi-tcont.json
@@ -241,7 +241,7 @@
           "id" : "EC1838000853",
           "hardwareIdentifier" : "00:00:00:00:00:01",
           "ipAddress" : "10.192.20.206",
-          "uplinkPort" : "1048576"
+          "uplinkPort" : "16777216"
         } ]
       }
     },
diff --git a/tests/data/flex-ocp-cord-sadis-TT.json b/tests/data/flex-ocp-cord-sadis-TT.json
index 2baa675..fc43089 100644
--- a/tests/data/flex-ocp-cord-sadis-TT.json
+++ b/tests/data/flex-ocp-cord-sadis-TT.json
@@ -227,7 +227,7 @@
           "id" : "EC1838000853",
           "hardwareIdentifier" : "00:00:00:00:00:01",
           "ipAddress" : "10.192.20.206",
-          "uplinkPort" : "1048576"
+          "uplinkPort" : "16777216"
         } ]
       }
     },
diff --git a/tests/data/flex-ocp-cord-sadis.json b/tests/data/flex-ocp-cord-sadis.json
index b30e9d1..5b1eccb 100644
--- a/tests/data/flex-ocp-cord-sadis.json
+++ b/tests/data/flex-ocp-cord-sadis.json
@@ -64,7 +64,7 @@
             "hardwareIdentifier": "aa:bb:cc:dd:ee:ff",
             "ipAddress": "10.192.20.206",
             "nasId": "EC1838000853",
-            "uplinkPort": 1048576
+            "uplinkPort": 16777216
           }
         ]
       },
diff --git a/tests/data/infosys-pod-sadis.json b/tests/data/infosys-pod-sadis.json
index 6e390ce..14cc63b 100644
--- a/tests/data/infosys-pod-sadis.json
+++ b/tests/data/infosys-pod-sadis.json
@@ -36,7 +36,7 @@
             "hardwareIdentifier": "aa:bb:cc:dd:ee:ff",
             "ipAddress": "192.168.10.75",
             "nasId": "EC1917000123",
-            "uplinkPort": 1048576
+            "uplinkPort": 16777216
           }
         ]
       },
diff --git a/tests/data/menlo-certification-pod-radisys-1600g-sadis-DT.json b/tests/data/menlo-certification-pod-radisys-1600g-sadis-DT.json
index f8310bd..08debea 100644
--- a/tests/data/menlo-certification-pod-radisys-1600g-sadis-DT.json
+++ b/tests/data/menlo-certification-pod-radisys-1600g-sadis-DT.json
@@ -14,7 +14,7 @@
             "id":"722033738988",
             "nasId":"722033738988",
             "hardwareIdentifier": "28:12:02:15:31:31",
-            "uplinkPort":1048576
+            "uplinkPort":16777216
           },
           {
             "id":"SCOM00001c8d-1",
diff --git a/tests/data/menlo-certification-pod-radisys-1600x-sadis-DT.json b/tests/data/menlo-certification-pod-radisys-1600x-sadis-DT.json
index 3c8a656..f4eeeaf 100644
--- a/tests/data/menlo-certification-pod-radisys-1600x-sadis-DT.json
+++ b/tests/data/menlo-certification-pod-radisys-1600x-sadis-DT.json
@@ -14,7 +14,7 @@
             "id":"722033038194",
             "nasId":"722033038194",
             "hardwareIdentifier": "28:11:23:19:44:49",
-            "uplinkPort":1048576
+            "uplinkPort":16777216
           },
           {
             "id":"SCOMa0108adf-1",
diff --git a/tests/data/menlo-certification-pod-radisys-3200g-sadis-DT.json b/tests/data/menlo-certification-pod-radisys-3200g-sadis-DT.json
index 5dc6c90..630134f 100644
--- a/tests/data/menlo-certification-pod-radisys-3200g-sadis-DT.json
+++ b/tests/data/menlo-certification-pod-radisys-3200g-sadis-DT.json
@@ -14,7 +14,7 @@
             "id":"722033538840",
             "nasId":"722033538840",
             "hardwareIdentifier": "28:b9:d9:e3:6c:06",
-            "uplinkPort":1048576
+            "uplinkPort":16777216
           },
           {
             "id":"SCOM00001c7f-1",
diff --git a/tests/data/menlo-certification-pod-radisys-gpon-sadis.json b/tests/data/menlo-certification-pod-radisys-gpon-sadis.json
index ef7e168..9024609 100644
--- a/tests/data/menlo-certification-pod-radisys-gpon-sadis.json
+++ b/tests/data/menlo-certification-pod-radisys-gpon-sadis.json
@@ -14,7 +14,7 @@
             "id":"722033538840",
             "nasId":"722033538840",
             "hardwareIdentifier": "28:b9:d9:e3:6c:06",
-            "uplinkPort":1048576
+            "uplinkPort":16777216
           },
           {
             "id":"SCOMa0108af9-1",
diff --git a/tests/data/onf-demo-pod-gpon-sadis-DT.json b/tests/data/onf-demo-pod-gpon-sadis-DT.json
index 89f137a..33dad32 100644
--- a/tests/data/onf-demo-pod-gpon-sadis-DT.json
+++ b/tests/data/onf-demo-pod-gpon-sadis-DT.json
@@ -52,7 +52,7 @@
             "hardwareIdentifier": "80:a2:35:4d:28:c0",
             "ipAddress": "10.90.0.115",
             "nasId": "EC1912001818",
-            "uplinkPort": 1048576
+            "uplinkPort": 16777216
           }
         ]
       },
diff --git a/tests/data/onf-demo-pod-openonugo-sadis-DT.json b/tests/data/onf-demo-pod-openonugo-sadis-DT.json
index 160b319..70a3480 100644
--- a/tests/data/onf-demo-pod-openonugo-sadis-DT.json
+++ b/tests/data/onf-demo-pod-openonugo-sadis-DT.json
@@ -67,7 +67,7 @@
             "hardwareIdentifier": "aa:bb:cc:dd:ee:ff",
             "ipAddress": "10.192.20.206",
             "nasId": "EC1904000654",
-            "uplinkPort": 1048576
+            "uplinkPort": 16777216
           }
         ]
       },
diff --git a/tests/data/onf-demo-pod-openonugo-sadis.json b/tests/data/onf-demo-pod-openonugo-sadis.json
index 85a74ad..22b18b7 100644
--- a/tests/data/onf-demo-pod-openonugo-sadis.json
+++ b/tests/data/onf-demo-pod-openonugo-sadis.json
@@ -64,7 +64,7 @@
             "hardwareIdentifier": "aa:bb:cc:dd:ee:ff",
             "ipAddress": "10.192.20.206",
             "nasId": "EC1904000654",
-            "uplinkPort": 1048576
+            "uplinkPort": 16777216
           }
         ]
       },
diff --git a/tests/data/onf-demo-pod-sadis-DT.json b/tests/data/onf-demo-pod-sadis-DT.json
index 160b319..70a3480 100644
--- a/tests/data/onf-demo-pod-sadis-DT.json
+++ b/tests/data/onf-demo-pod-sadis-DT.json
@@ -67,7 +67,7 @@
             "hardwareIdentifier": "aa:bb:cc:dd:ee:ff",
             "ipAddress": "10.192.20.206",
             "nasId": "EC1904000654",
-            "uplinkPort": 1048576
+            "uplinkPort": 16777216
           }
         ]
       },
diff --git a/tests/data/onf-demo-pod-sadis.json b/tests/data/onf-demo-pod-sadis.json
index 85a74ad..22b18b7 100644
--- a/tests/data/onf-demo-pod-sadis.json
+++ b/tests/data/onf-demo-pod-sadis.json
@@ -64,7 +64,7 @@
             "hardwareIdentifier": "aa:bb:cc:dd:ee:ff",
             "ipAddress": "10.192.20.206",
             "nasId": "EC1904000654",
-            "uplinkPort": 1048576
+            "uplinkPort": 16777216
           }
         ]
       },
diff --git a/tests/data/onf-soak-pod-openonugo-sadis.json b/tests/data/onf-soak-pod-openonugo-sadis.json
index 63c228d..94332d8 100644
--- a/tests/data/onf-soak-pod-openonugo-sadis.json
+++ b/tests/data/onf-soak-pod-openonugo-sadis.json
@@ -43,7 +43,7 @@
             "hardwareIdentifier": "aa:bb:cc:dd:ee:ff",
             "ipAddress": "10.192.20.206",
             "nasId": "EC1721000208",
-            "uplinkPort": 1048576
+            "uplinkPort": 16777216
           }
         ]
       },
diff --git a/tests/data/onf-soak-pod-sadis-DT.json b/tests/data/onf-soak-pod-sadis-DT.json
index b79e236..324ca96 100644
--- a/tests/data/onf-soak-pod-sadis-DT.json
+++ b/tests/data/onf-soak-pod-sadis-DT.json
@@ -46,7 +46,7 @@
             "hardwareIdentifier": "aa:bb:cc:dd:ee:ff",
             "ipAddress": "10.192.20.206",
             "nasId": "EC1721000208",
-            "uplinkPort": 1048576
+            "uplinkPort": 16777216
           }
         ]
       },
diff --git a/tests/data/onf-soak-pod-sadis.json b/tests/data/onf-soak-pod-sadis.json
index 0a87854..bb1075d 100644
--- a/tests/data/onf-soak-pod-sadis.json
+++ b/tests/data/onf-soak-pod-sadis.json
@@ -44,7 +44,7 @@
             "hardwareIdentifier": "aa:bb:cc:dd:ee:ff",
             "ipAddress": "10.192.20.206",
             "nasId": "EC1721000208",
-            "uplinkPort": 1048576
+            "uplinkPort": 16777216
           }
         ]
       },
diff --git a/tests/data/onlab-pod1-sadis.json b/tests/data/onlab-pod1-sadis.json
index cb4b9ec..e6ae77e 100644
--- a/tests/data/onlab-pod1-sadis.json
+++ b/tests/data/onlab-pod1-sadis.json
@@ -77,7 +77,7 @@
             "hardwareIdentifier": "aa:bb:cc:dd:ee:ff",
             "ipAddress": "10.192.20.206",
             "nasId": "EC1838000853",
-            "uplinkPort": 1048576
+            "uplinkPort": 16777216
           }
         ]
       },
diff --git a/tests/data/tucson-pod-DT-sadis.json b/tests/data/tucson-pod-DT-sadis.json
index 331a181..4e39517 100644
--- a/tests/data/tucson-pod-DT-sadis.json
+++ b/tests/data/tucson-pod-DT-sadis.json
@@ -14,7 +14,7 @@
             "id": "EC1925000157",
             "hardwareIdentifier": "0f:f1:ce:c0:ff:ee",
             "nasId": "EC1925000157",
-            "uplinkPort": 1048576
+            "uplinkPort": 16777216
           },
           {
             "id": "ALPHe3d1ce7b-1",
diff --git a/tests/data/tucson-pod-sadis.json b/tests/data/tucson-pod-sadis.json
index a027e68..5cc9369 100644
--- a/tests/data/tucson-pod-sadis.json
+++ b/tests/data/tucson-pod-sadis.json
@@ -14,7 +14,7 @@
             "id": "EC1925000157",
             "hardwareIdentifier": "0f:f1:ce:c0:ff:ee",
             "nasId": "EC1925000157",
-            "uplinkPort": 1048576
+            "uplinkPort": 16777216
           },
           {
             "id": "ALPHe3d1ce7b-1",