refactor(buf): standard format updates for evpn and cloud

Signed-off-by: Mark Sanders <marksanders194@gmail.com>

Author: sandersms

network/cloud/bgp.proto

@@ -4,16 +4,14 @@
 syntax = "proto3";
 package opi_api.network.cloud.v1alpha1;
 
-option java_package = "opi_api.network.cloud.v1alpha1";
-option java_multiple_files = true;
-option java_outer_classname = "DeviceProto";
-
-option go_package = "github.com/opiproject/opi-api/network/cloud/v1alpha1/gen/go";
-
+import "google/api/resource.proto";
+import "google/protobuf/timestamp.proto";
 import "network/opinetcommon/networktypes.proto";
 
-import "google/protobuf/timestamp.proto";
-import "google/api/resource.proto";
+option go_package = "github.com/opiproject/opi-api/network/cloud/v1alpha1/gen/go";
+option java_multiple_files = true;
+option java_outer_classname = "DeviceProto";
+option java_package = "opi_api.network.cloud.v1alpha1";
 
 // device capabilities indicate the capabilities of software/hardware
 // as exposed by current firmware of the device. This can help cloud controller
@@ -64,7 +62,7 @@ message DeviceSpec {
   // number and type of pcie functions exposed
   PCIeFunctionsSpec pcie_functions = 5;
   // ovelay routing
-  bool overlay_routing_enabled = 6; 
+  bool overlay_routing_enabled = 6;
   // system name is used as named identifier in protocols (e.g. LLDP)
   string systemname = 7;
   // management network details
@@ -122,15 +120,15 @@ message DeviceStatus {
 // system events happened during device operations
 message SystemEvent {
   // event timestamp
-  google.protobuf.Timestamp event_time  = 1;
+  google.protobuf.Timestamp event_time = 1;
   // name of the event
-  string                    event_description = 2;
+  string event_description = 2;
 }
 
 // critical alerts effecting the health of the system
 message SystemAlert {
   // alert timestamp
-  google.protobuf.Timestamp alert_time  = 1;
+  google.protobuf.Timestamp alert_time = 1;
   // name of the alert
-  string                    alert_description = 2;
+  string alert_description = 2;
 }

network/cloud/cloudrpc.proto

@@ -4,14 +4,13 @@
 syntax = "proto3";
 package opi_api.network.cloud.v1alpha1;
 
-option java_package = "opi_api.network.cloud.v1alpha1";
-option java_multiple_files = true;
-option java_outer_classname = "InterfaceProto";
+import "google/api/resource.proto";
+import "network/opinetcommon/networktypes.proto";
 
 option go_package = "github.com/opiproject/opi-api/network/cloud/v1alpha1/gen/go";
-
-import "network/opinetcommon/networktypes.proto";
-import "google/api/resource.proto";
+option java_multiple_files = true;
+option java_outer_classname = "InterfaceProto";
+option java_package = "opi_api.network.cloud.v1alpha1";
 
 // interface - ethernet interface (layer2 and layer3 configuration)
 message Interface {
@@ -43,9 +42,9 @@ message InterfaceSpec {
     // layer3 interface configuration
     L3IfSpec l3_if_spec = 5;
     // loopback interface configuration
-    LoopbackIfSpec loopback_if_spec  = 6;
+    LoopbackIfSpec loopback_if_spec = 6;
     // control interface configuration
-    ControlIfSpec control_if_spec   = 7;
+    ControlIfSpec control_if_spec = 7;
     // host facing interface's configuration
     HostIfSpec host_if_spec = 8;
   }
@@ -121,15 +120,15 @@ message HostIfSpec {
   bytes mac_address = 3;
   // interface name (this can be populated from what is obtaine from the driver
   // for easier troublsehooting, or other operations
-  string  ifname = 4;
+  string ifname = 4;
 }
 
 // operational status of uplink interface
 message UplinkIfStatus {
   // hw specific index associated with this uplink, useful for operations
-  int32     hw_if_idx     = 1;
+  int32 hw_if_idx = 1;
   // hw port number is hw identifier of the port, usefor for operations
-  int32     hw_port_number = 2;
+  int32 hw_port_number = 2;
 }
 
 // operational status of loopback interface
@@ -155,16 +154,16 @@ message InterfaceStatus {
   // encoded interface index of this interface
   // (-- api-linter: core::0141::forbidden-types=disabled
   //     aip.dev/not-precedent: interface index is an opaque uint32 value. --)
-  uint32             if_index           = 1;
+  uint32 if_index = 1;
   // operational status of the interface
-  IfStatus           oper_status        = 2;
+  IfStatus oper_status = 2;
   oneof ifstatus {
     // uplink specific status
-    UplinkIfStatus   uplink_if_status   = 3;
+    UplinkIfStatus uplink_if_status = 3;
     // loopback interface specific status
     LoopbackIfStatus loopback_if_status = 4;
     // host interface specific status
-    HostIfStatus     host_if_status     = 5;
+    HostIfStatus host_if_status = 5;
   }
 }
 
@@ -173,17 +172,17 @@ enum IfType {
   // unspecified
   IF_TYPE_UNSPECIFIED = 0;
   // uplink interface
-  IF_TYPE_UPLINK      = 1;
+  IF_TYPE_UPLINK = 1;
   // uplink port-channel interface
-  IF_TYPE_UPLINK_PC   = 2;
+  IF_TYPE_UPLINK_PC = 2;
   // L3 interface
-  IF_TYPE_L3          = 3;
+  IF_TYPE_L3 = 3;
   // loopback interface
-  IF_TYPE_LOOPBACK    = 4;
+  IF_TYPE_LOOPBACK = 4;
   // inband management/control interface
-  IF_TYPE_CONTROL     = 5;
+  IF_TYPE_CONTROL = 5;
   // host visible PF/VF device
-  IF_TYPE_HOST        = 6;
+  IF_TYPE_HOST = 6;
 }
 
 // IfStatus status reflects the operational status of Interface
@@ -193,7 +192,7 @@ enum IfStatus {
   // unknown
   IF_STATUS_UNSPECIFIED = 0;
   // interface is up
-  IF_STATUS_UP          = 1;
+  IF_STATUS_UP = 1;
   // interface is down
-  IF_STATUS_DOWN        = 2;
+  IF_STATUS_DOWN = 2;
 }

network/cloud/device.proto

@@ -4,14 +4,13 @@
 syntax = "proto3";
 package opi_api.network.cloud.v1alpha1;
 
-option java_package = "opi_api.network.cloud.v1alpha1";
-option java_multiple_files = true;
-option java_outer_classname = "MappingProto";
+import "google/api/resource.proto";
+import "network/opinetcommon/networktypes.proto";
 
 option go_package = "github.com/opiproject/opi-api/network/cloud/v1alpha1/gen/go";
-
-import "network/opinetcommon/networktypes.proto";
-import "google/api/resource.proto";
+option java_multiple_files = true;
+option java_outer_classname = "MappingProto";
+option java_package = "opi_api.network.cloud.v1alpha1";
 
 // mapping object
 message Mapping {
@@ -41,21 +40,21 @@ message MappingSpec {
   string subnet_name_ref = 3;
   // mapping's destination information
   oneof dstinfo {
-      // if IP is that of local vnic, corresponding vnic id
-      // this is mandatory attribute for local IP mappings
-      string vnic_name_ref = 4;
-      // Tunnel ID of the remote TEP for remote mapping
-      // this is mandatory attribute for remote MAC/IP mappings for
-      // non-ECMP cases
-      string  tunnel_name_ref = 5;
-      // overlay nexthop/TEP group for remote mappings
-      // this is mandatory attribute for remote MAC/IP mappings for ECMP cases
-      string nh_group_name_ref = 6;
+    // if IP is that of local vnic, corresponding vnic id
+    // this is mandatory attribute for local IP mappings
+    string vnic_name_ref = 4;
+    // Tunnel ID of the remote TEP for remote mapping
+    // this is mandatory attribute for remote MAC/IP mappings for
+    // non-ECMP cases
+    string tunnel_name_ref = 5;
+    // overlay nexthop/TEP group for remote mappings
+    // this is mandatory attribute for remote MAC/IP mappings for ECMP cases
+    string nh_group_name_ref = 6;
   }
   // overlay MAC address of this mapping
   bytes mac_addr = 7;
   // fabric encap information specific to this mapping, if any
-  network.opinetcommon.v1alpha1.Encap  encap = 8;
+  network.opinetcommon.v1alpha1.Encap encap = 8;
   // public IP, if overlay IP has corresponding public IP
   network.opinetcommon.v1alpha1.IPAddress public_ip = 9;
   // tag/label/security group of this IP mapping, these tags/labels/SGs can be
@@ -87,7 +86,7 @@ message MappingStatus {
 // L3MappingKey is the 2nd-ary key of the remote IP mapping
 message L3MappingKey {
   // virtual private cloud of the IP mapping
-  string vpc_name_ref  = 1;
+  string vpc_name_ref = 1;
   // private/overlay IP of the mapping
   network.opinetcommon.v1alpha1.IPAddress ip_address = 2;
 }
@@ -115,7 +114,7 @@ message MappingLookupFilter {
     // MAC mapping key
     L2MappingKey mac_key = 5;
     // IP address
-    network.opinetcommon.v1alpha1.IPAddress ip_address  = 6;
+    network.opinetcommon.v1alpha1.IPAddress ip_address = 6;
     // MAC address
     bytes mac_address = 7;
     // VPC id
@@ -128,16 +127,16 @@ enum MappingType {
   // unspecified
   MAPPING_TYPE_UNSPECIFIED = 0;
   // MAPPING_TYPE_VPC is used for regular VPC endpoints and is the default
-  MAPPING_TYPE_VPC         = 1;
+  MAPPING_TYPE_VPC = 1;
   // MAPPING_TYPE_SERVICE is used for mappings that represent service endpoints
-  MAPPING_TYPE_SERVICE     = 2;
+  MAPPING_TYPE_SERVICE = 2;
   // MAPPING_TYPE_LB_VIP is used for mappings that represent load balancer service VIP
-  MAPPING_TYPE_LB_VIP      = 3;
+  MAPPING_TYPE_LB_VIP = 3;
 }
 
 // mapping key type can be L2 or L3
 enum MappingKeyType {
-  // unspecified 
+  // unspecified
   MAPPING_KEY_TYPE_UNSPECIFIED = 0;
   // l2 mapping
   MAPPING_KEY_TYPE_L2 = 1;

network/cloud/interface.proto

@@ -4,14 +4,13 @@
 syntax = "proto3";
 package opi_api.network.cloud.v1alpha1;
 
-option java_package = "opi_api.network.cloud.v1alpha1";
-option java_multiple_files = true;
-option java_outer_classname = "NetworkPolicyProto";
+import "google/api/resource.proto";
+import "network/opinetcommon/networktypes.proto";
 
 option go_package = "github.com/opiproject/opi-api/network/cloud/v1alpha1/gen/go";
-
-import "network/opinetcommon/networktypes.proto";
-import "google/api/resource.proto";
+option java_multiple_files = true;
+option java_outer_classname = "NetworkPolicyProto";
+option java_package = "opi_api.network.cloud.v1alpha1";
 
 // security policy object
 message SecurityPolicy {
@@ -48,7 +47,7 @@ message SecurityPolicySpec {
   // that is also not set then  default "deny" action is enforced
   // When no policy is configured on subnet and vnic, this knob doesn't
   // apply and traffic is allowed in that case
-  network.opinetcommon.v1alpha1.SecurityRuleAction  default_security_action = 4;
+  network.opinetcommon.v1alpha1.SecurityRuleAction default_security_action = 4;
   // list of security rules
   repeated SecurityRuleInfo rules = 5;
   // PolicyRuleFormat indicates whether the policy is set of flattened rules
@@ -58,7 +57,7 @@ message SecurityPolicySpec {
 
 // SecurityRuleInfo is a single rule in the security policy
 message SecurityRuleInfo {
-  // rule id needed for incremental rule ADD/DEL/UPD 
+  // rule id needed for incremental rule ADD/DEL/UPD
   // (-- api-linter: core::0122::name-suffix=disabled
   //     aip.dev/not-precedent: security rule info is user assigned name for each rule. --)
   string rule_name = 1;
@@ -73,7 +72,7 @@ message SecurityRuleAttrs {
   // packet, the first such matching rule in the policy is picked (i.e., based
   // on the order, first in the list of such matching rules)
   // range:0-65534
-  int32 priority= 1;
+  int32 priority = 1;
   // rule match criteria
   network.opinetcommon.v1alpha1.RuleMatch match = 2;
   // action to take when this rule is matched
@@ -142,11 +141,11 @@ message ALGSpec {
   // ALG specific options, if any
   oneof alg_options {
     // ftp alg options
-    FTPOptions    ftp_options    = 3;
-    // dns alg options 
-    DNSOptions    dns_options    = 4;
+    FTPOptions ftp_options = 3;
+    // dns alg options
+    DNSOptions dns_options = 4;
     // msrpc options
-    MSRPCOptions  msrpc_options  = 5;
+    MSRPCOptions msrpc_options = 5;
     // sunrpc options
     SunRPCOptions sunrpc_options = 6;
   }
@@ -195,8 +194,7 @@ message SecurityRuleSpec {
 }
 
 // operational status of the security rule, if any
-message SecurityRuleStatus {
-}
+message SecurityRuleStatus {}
 
 // security profile object
 message SecurityProfile {
@@ -263,8 +261,7 @@ message SecurityProfileSpec {
 }
 
 // operational status of security profile, if any
-message SecurityProfileStatus {
-}
+message SecurityProfileStatus {}
 
 // PolicyLookupMatch captures all the policy lookup match conditions
 message PolicyLookupMatch {
@@ -310,7 +307,7 @@ message SecurityPolicyLookupRequest {
   // lookup_info is mandatory
   oneof lookup_info {
     // security policy uuid to do the lookup in
-    string policy_name_ref= 1;
+    string policy_name_ref = 1;
     // vnic specific policies will be evaluated when vnic info is provided
     VnicLookupInfo vnic_lookup_info = 2;
   }
@@ -334,7 +331,7 @@ message PolicyLookupResult {
 
 // types of security policies
 enum SecurityPolicyType {
-  // unspecified 
+  // unspecified
   SECURITY_POLICY_TYPE_UNSPECIFIED = 0;
   // UNDERLAY security policy object is singleton object per DSC
   SECURITY_POLICY_TYPE_UNDERLAY = 1;
@@ -349,17 +346,17 @@ enum ALGType {
   // unspecified
   ALG_TYPE_UNSPECIFIED = 0;
   // TFTP ALG
-  ALG_TYPE_TFTP        = 1;
+  ALG_TYPE_TFTP = 1;
   // FTP ALG
-  ALG_TYPE_FTP         = 2;
+  ALG_TYPE_FTP = 2;
   // DNS ALG
-  ALG_TYPE_DNS         = 3;
+  ALG_TYPE_DNS = 3;
   // SUNRPC ALG
-  ALG_TYPE_SUNRPC      = 4;
+  ALG_TYPE_SUNRPC = 4;
   // MSRPC ALG
-  ALG_TYPE_MSRPC       = 5;
+  ALG_TYPE_MSRPC = 5;
   // RTSP ALG
-  ALG_TYPE_RTSP        = 6;
+  ALG_TYPE_RTSP = 6;
 }
 
 // PolicyRuleFormat captures what format is used for the rules in a given
@@ -381,5 +378,5 @@ enum PolicyRuleFormat {
   // as match conditions
   // In this format, ALL the rules must use SrcIPList, DstIPList,
   // PortList, ICMPMatchList attributes only, whereever applicable
-  POLICY_RULE_FORMAT_COMPACT   = 2;
+  POLICY_RULE_FORMAT_COMPACT = 2;
 }