fix fwd proto

openconfig · Jul 23, 2024 · 396ff82 · 396ff82
1 parent 3d799bf
commit 396ff82
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 29 deletions.
diff --git a/examples/forward/.topology.textproto.swp b/examples/forward/.topology.textproto.swp
diff --git a/examples/forward/topology.textproto b/examples/forward/topology.textproto
@@ -17,21 +17,29 @@ nodes: {
     vendor_data {
       [type.googleapis.com/forward.ForwardConfig] {
         wires: {
-          a: Interface {
-            name: "eth1"
+          a: {
+            interface: {
+              name: "eth1"
+            }
           }
-          z: LocalNode {
-            name: "fwd2"
-            interface: "eth1"
+          z: {
+            local_node: {
+              name: "fwd2"
+              interface: "eth1"
+            }
           }
         }
         wires: {
-          a: LocalNode {
-            name: "fw2"
-            interface: "eth2"
+          a: {
+            local_node: {
+              name: "fw2"
+              interface: "eth2"
+            }
           }
-          z: Interface {
-            name: "eth2"
+          z: {
+            interface: {
+              name: "eth2"
+            }
           }
         }
       }
@@ -46,21 +54,29 @@ nodes: {
     vendor_data {
       [type.googleapis.com/forward.ForwardConfig] {
         wires: {
-          a: Interface {
-            name: "eth2"
+          a: {
+            interface: {
+              name: "eth2"
+            }
           }
-          z: LocalNode {
-            name: "fwd1"
-            interface: "eth2"
+          z: {
+            local_node: {
+              name: "fwd1"
+              interface: "eth2"
+            }
           }
         }
         wires: {
-          a: LocalNode {
-            name: "fw1"
-            interface: "eth1"
+          a: {
+            local_node: {
+              name: "fw1"
+              interface: "eth1"
+            }
           }
-          z: Interface {
-            name: "eth1"
+          z: {
+            interface: {
+              name: "eth1"
+            }
           }
         }
       }

diff --git a/proto/forward.proto b/proto/forward.proto
@@ -27,8 +27,8 @@ message ForwardConfig {
 message Wire {
   // The a endpoint serves as the client endpoint in the bidirectional stream.
   Endpoint a = 1;
-  // The b endpoint serves as the server endpoint in the bidirectional stream.
-  Endpoint b = 2;
+  // The z endpoint serves as the server endpoint in the bidirectional stream.
+  Endpoint z = 2;
 }
 
 message Endpoint {

diff --git a/proto/forward/forward.pb.go b/proto/forward/forward.pb.go