Work towards cptx deprecation (#497)

* work towards cptx deprecation * fix test * fix vendors test * fix bad default for arista
openconfig · Feb 20, 2024 · 39a7e78 · 39a7e78
1 parent 1d152af
commit 39a7e78
Show file tree

Hide file tree

Showing 11 changed files with 114 additions and 612 deletions.
diff --git a/cloudbuild/vendors/testbed.textproto b/cloudbuild/vendors/testbed.textproto
@@ -19,40 +19,10 @@ duts {
   ports {
     id: "port6"
   }
-  ports {
-    id: "port7"
-  }
-}
-duts {
-  id: "cptx"
-  vendor: JUNIPER
-  hardware_model: "cptx"
-  ports {
-    id: "port1"
-  }
-  ports {
-    id: "port2"
-  }
-  ports {
-    id: "port3"
-  }
-  ports {
-    id: "port4"
-  }
-  ports {
-    id: "port5"
-  }
-  ports {
-    id: "port6"
-  }
-  ports {
-    id: "port7"
-  }
 }
 duts {
   id: "ncptx"
   vendor: JUNIPER
-  hardware_model: "ncptx"
   ports {
     id: "port1"
   }
@@ -71,9 +41,6 @@ duts {
   ports {
     id: "port6"
   }
-  ports {
-    id: "port7"
-  }
 }
 duts {
   id: "srl"
@@ -96,9 +63,6 @@ duts {
   ports {
     id: "port6"
   }
-  ports {
-    id: "port7"
-  }
 }
 duts {
   id: "xrd"
@@ -122,9 +86,6 @@ duts {
   ports {
     id: "port6"
   }
-  ports {
-    id: "port7"
-  }
 }
 duts {
   id: "e8000"
@@ -148,9 +109,6 @@ duts {
   ports {
     id: "port6"
   }
-  ports {
-    id: "port7"
-  }
 }
 duts {
   id: "lemming"
@@ -173,9 +131,6 @@ duts {
   ports {
     id: "port6"
   }
-  ports {
-    id: "port7"
-  }
 }
 ates {
   id: "otg"
@@ -198,120 +153,89 @@ ates {
   ports {
     id: "port6"
   }
-  ports {
-    id: "port7"
-  }
 }
 links {
   a: "otg:port1"
   b: "ceos:port1"
 }
 links {
   a: "otg:port2"
-  b: "cptx:port1"
-}
-links {
-  a: "otg:port3"
   b: "ncptx:port1"
 }
 links {
-  a: "otg:port4"
+  a: "otg:port3"
   b: "srl:port1"
 }
 links {
-  a: "otg:port5"
+  a: "otg:port4"
   b: "xrd:port1"
 }
 links {
-  a: "otg:port6"
+  a: "otg:port5"
   b: "e8000:port1"
 }
 links {
-  a: "otg:port7"
+  a: "otg:port6"
   b: "lemming:port1"
 }
 links {
   a: "ceos:port2"
-  b: "cptx:port2"
-}
-links {
-  a: "ceos:port3"
   b: "ncptx:port2"
 }
 links {
-  a: "ceos:port4"
+  a: "ceos:port3"
   b: "srl:port2"
 }
 links {
-  a: "ceos:port5"
+  a: "ceos:port4"
   b: "xrd:port2"
 }
 links {
-  a: "ceos:port6"
+  a: "ceos:port5"
   b: "e8000:port2"
 }
 links {
-  a: "ceos:port7"
+  a: "ceos:port6"
   b: "lemming:port2"
 }
 links {
-  a: "cptx:port3"
-  b: "ncptx:port3"
-}
-links {
-  a: "cptx:port4"
+  a: "ncptx:port3"
   b: "srl:port3"
 }
 links {
-  a: "cptx:port5"
+  a: "ncptx:port4"
   b: "xrd:port3"
 }
 links {
-  a: "cptx:port6"
+  a: "ncptx:port5"
   b: "e8000:port3"
 }
 links {
-  a: "cptx:port7"
+  a: "ncptx:port6"
   b: "lemming:port3"
 }
 links {
-  a: "ncptx:port4"
-  b: "srl:port4"
-}
-links {
-  a: "ncptx:port5"
+  a: "srl:port4"
   b: "xrd:port4"
 }
 links {
-  a: "ncptx:port6"
+  a: "srl:port5"
   b: "e8000:port4"
 }
 links {
-  a: "ncptx:port7"
+  a: "srl:port6"
   b: "lemming:port4"
 }
 links {
-  a: "srl:port5"
-  b: "xrd:port5"
-}
-links {
-  a: "srl:port6"
+  a: "xrd:port5"
   b: "e8000:port5"
 }
-links {
-  a: "srl:port7"
-  b: "lemming:port5"
-}
 links {
   a: "xrd:port6"
-  b: "e8000:port6"
+  b: "lemming:port5"
 }
 links {
-  a: "xrd:port7"
+  a: "e8000:port6"
   b: "lemming:port6"
 }
-links {
-  a: "e8000:port7"
-  b: "lemming:port7"
-}