opiproject / opi-api

Open Programmable Infrastructure API and Behavioral Model
Apache License 2.0
31 stars 40 forks source link

AdminState redeclared in this block #289

Closed glimchb closed 1 year ago

glimchb commented 1 year ago
opinetcommon/v1alpha1/networktypes.proto:283:enum AdminState {
opinetcommon/v1alpha1/openconfig_interfaces.proto:259:enum AdminState {
glimchb commented 1 year ago

possible solution for your consideration:

diff --git a/network/opinetcommon/v1alpha1/openconfig_interfaces.proto b/network/opinetcommon/v1alpha1/openconfig_interfaces.proto
index 5a4a011..25e3f39 100644
--- a/network/opinetcommon/v1alpha1/openconfig_interfaces.proto
+++ b/network/opinetcommon/v1alpha1/openconfig_interfaces.proto
@@ -13,6 +13,7 @@ option java_outer_classname = "OpenconfigInterfacesProto";

 option go_package = "github.com/opiproject/opi-api/network/v1alpha1/gen/go";

+import "networktypes.proto";
 import "google/api/client.proto";
 import "google/api/resource.proto";
 import "google/api/annotations.proto";
@@ -126,7 +127,7 @@ message State {
     // Interface Index
     uint32 ifindex = 7;
     // Admin State
-    AdminState admin_state = 8;
+    network.opinetcommon.v1alpha1.AdminState admin_state = 8;
     // Operational State
     OperState oper_state = 9;
     // Last Change
@@ -255,17 +256,6 @@ enum InterfaceType {
     LOOPBACK = 2;
 }

-// Admin State Enumeration
-enum AdminState {
-    // Unspecified
-    ADMIN_STATE_UNSPECIFIED = 0;
-    // Up
-    ADMIN_STATE_UP = 1;
-    // Down
-    ADMIN_STATE_DOWN = 2;
-    // Testing
-    ADMIN_STATE_TESTING = 3;
-}
 // Operational State Enumeration
 enum OperState {
     // Unspecified
(END)
glimchb commented 1 year ago

temp workaround #290