api: Fix RemovePrivate Enum

Use _UNSPECIFIED prefix for zero.

Signed-off-by: FUJITA Tomonori <[email protected]>

Author: fujita

api/gobgp.pb.go

@@ -294,9 +294,9 @@ func showNeighbor(args []string) error {
 		elems = append(elems, fmt.Sprintf("Allow Own AS: %d", as))
 	}
 	switch p.Conf.RemovePrivate {
-	case api.RemovePrivate_REMOVE_ALL:
+	case api.RemovePrivate_REMOVE_PRIVATE_ALL:
 		elems = append(elems, "Remove private AS: all")
-	case api.RemovePrivate_REPLACE:
+	case api.RemovePrivate_REMOVE_PRIVATE_REPLACE:
 		elems = append(elems, "Remove private AS: replace")
 	}
 	if p.Conf.ReplacePeerAsn {
@@ -1390,9 +1390,9 @@ func modNeighbor(cmdType string, args []string) error {
 		if option, ok := m["remove-private-as"]; ok {
 			switch option[0] {
 			case "all":
-				peer.Conf.RemovePrivate = api.RemovePrivate_REMOVE_ALL
+				peer.Conf.RemovePrivate = api.RemovePrivate_REMOVE_PRIVATE_ALL
 			case "replace":
-				peer.Conf.RemovePrivate = api.RemovePrivate_REPLACE
+				peer.Conf.RemovePrivate = api.RemovePrivate_REMOVE_PRIVATE_REPLACE
 			default:
 				return fmt.Errorf("invalid remove-private-as value: all or replace")
 			}

cmd/gobgp/neighbor.go

@@ -459,9 +459,9 @@ func NewPeerFromConfigStruct(pconf *Neighbor) *api.Peer {
 	var removePrivate api.RemovePrivate
 	switch pconf.Config.RemovePrivateAs {
 	case REMOVE_PRIVATE_AS_OPTION_ALL:
-		removePrivate = api.RemovePrivate_REMOVE_ALL
+		removePrivate = api.RemovePrivate_REMOVE_PRIVATE_ALL
 	case REMOVE_PRIVATE_AS_OPTION_REPLACE:
-		removePrivate = api.RemovePrivate_REPLACE
+		removePrivate = api.RemovePrivate_REMOVE_PRIVATE_REPLACE
 	}
 	var admin_state api.PeerState_AdminState
 	switch s.AdminState {

pkg/config/oc/util.go

@@ -695,9 +695,9 @@ func newNeighborFromAPIStruct(a *api.Peer) (*oc.Neighbor, error) {
 		pconf.Config.SendSoftwareVersion = a.Conf.SendSoftwareVersion
 
 		switch a.Conf.RemovePrivate {
-		case api.RemovePrivate_REMOVE_ALL:
+		case api.RemovePrivate_REMOVE_PRIVATE_ALL:
 			pconf.Config.RemovePrivateAs = oc.REMOVE_PRIVATE_AS_OPTION_ALL
-		case api.RemovePrivate_REPLACE:
+		case api.RemovePrivate_REMOVE_PRIVATE_REPLACE:
 			pconf.Config.RemovePrivateAs = oc.REMOVE_PRIVATE_AS_OPTION_REPLACE
 		}
 
@@ -822,9 +822,9 @@ func newPeerGroupFromAPIStruct(a *api.PeerGroup) (*oc.PeerGroup, error) {
 		pconf.Config.SendSoftwareVersion = a.Conf.SendSoftwareVersion
 
 		switch a.Conf.RemovePrivate {
-		case api.RemovePrivate_REMOVE_ALL:
+		case api.RemovePrivate_REMOVE_PRIVATE_ALL:
 			pconf.Config.RemovePrivateAs = oc.REMOVE_PRIVATE_AS_OPTION_ALL
-		case api.RemovePrivate_REPLACE:
+		case api.RemovePrivate_REMOVE_PRIVATE_REPLACE:
 			pconf.Config.RemovePrivateAs = oc.REMOVE_PRIVATE_AS_OPTION_REPLACE
 		}
 

pkg/server/grpc_server.go

@@ -737,9 +737,9 @@ enum PeerType {
 }
 
 enum RemovePrivate {
-  REMOVE_NONE = 0;
-  REMOVE_ALL = 1;
-  REPLACE = 2;
+  REMOVE_PRIVATE_UNSPECIFIED = 0;
+  REMOVE_PRIVATE_ALL = 1;
+  REMOVE_PRIVATE_REPLACE = 2;
 }
 
 message PeerConf {