Merge pull request #30 from futurewei-cloud/lxie/webserver

Add version number, add veth name and mac address to port, and add tunnel id to vpc and subnet
futurewei-cloud · Jul 30, 2019 · 30bf6de · 30bf6de
2 parents 1f056fb + ece4410
commit 30bf6de
Show file tree

Hide file tree

Showing 8 changed files with 1,547 additions and 878 deletions.
diff --git a/src/com/futurewei/alioth/controller/schema/Port.java b/src/com/futurewei/alioth/controller/schema/Port.java
diff --git a/src/com/futurewei/alioth/controller/schema/SecurityGroup.java b/src/com/futurewei/alioth/controller/schema/SecurityGroup.java
diff --git a/src/com/futurewei/alioth/controller/schema/Subnet.java b/src/com/futurewei/alioth/controller/schema/Subnet.java
diff --git a/src/com/futurewei/alioth/controller/schema/Vpc.java b/src/com/futurewei/alioth/controller/schema/Vpc.java
diff --git a/src/schema/proto3/port.proto b/src/schema/proto3/port.proto
@@ -8,12 +8,16 @@ option java_outer_classname = "Port";
 import "common.proto";
 
 message PortConfiguration {
-  string project_id = 1;
-  string network_id = 2;
-  string id = 3;
-  string name = 4;
-  bool admin_state_up = 5;
-
+  int32 version = 1;
+
+  string project_id = 2;
+  string network_id = 3;
+  string id = 4;
+  string name = 5;
+  bool admin_state_up = 6;
+  string mac_address = 7;
+  string veth_name = 8;
+
   message FixedIp {
     string subnet_id = 1;
     string ip_address = 2;
@@ -33,10 +37,10 @@ message PortConfiguration {
     string value = 2;
   }
 
-  repeated FixedIp fixed_ips = 6;
-  repeated SecurityGroupId security_group_ids = 7;
-  repeated AllowAddressPair allow_address_pairs = 8;
-  repeated ExtraDhcpOption extra_dhcp_options = 9;
+  repeated FixedIp fixed_ips = 9;
+  repeated SecurityGroupId security_group_ids = 10;
+  repeated AllowAddressPair allow_address_pairs = 11;
+  repeated ExtraDhcpOption extra_dhcp_options = 12;
 }
 
 message PortState {

diff --git a/src/schema/proto3/securitygroup.proto b/src/schema/proto3/securitygroup.proto
@@ -8,9 +8,11 @@ option java_outer_classname = "SecurityGroup";
 import "common.proto";
 
 message SecurityGroupConfiguration {
-  string project_id = 1;
-  string vpc_id = 2;
-  string name = 3;
+  int32 version = 1;
+
+  string project_id = 2;
+  string vpc_id = 3;
+  string name = 4;
 
   enum Direction {
     EGRESS = 0;
@@ -30,7 +32,7 @@ message SecurityGroupConfiguration {
     string remote_group_id = 9;
   }
 
-  repeated SecurityGroupRule security_group_rules = 4;
+  repeated SecurityGroupRule security_group_rules = 5;
 }
 
 message SecurityGroupState {

diff --git a/src/schema/proto3/subnet.proto b/src/schema/proto3/subnet.proto
@@ -8,17 +8,20 @@ option java_outer_classname = "Subnet";
 import "common.proto";
 
 message SubnetConfiguration {
-  string project_id = 1;
-  string vpc_id = 2;
-  string id = 3;
-  string name = 4;
-  string cidr = 5;
-
-  string gateway_ip = 6;
-  bool dhcp_enable = 7;
-  string availability_zone = 8;
-  string primary_dns = 9;
-  string secondary_dns = 10;
+  int32 version = 1;
+
+  string project_id = 2;
+  string vpc_id = 3;
+  string id = 4;
+  string name = 5;
+  string cidr = 6;
+  int64 tunnel_id = 7;
+
+  string gateway_ip = 8;
+  bool dhcp_enable = 9;
+  string availability_zone = 10;
+  string primary_dns = 11;
+  string secondary_dns = 12;
 
   message DnsEntry {
     string entry = 1;
@@ -34,9 +37,9 @@ message SubnetConfiguration {
     string ip_address = 3;
   }
 
-  repeated DnsEntry dns_list = 11;
-  repeated SecurityGroupId security_group_ids = 12;
-  repeated TransitSwitchIp transit_switch_ips = 13;
+  repeated DnsEntry dns_list = 13;
+  repeated SecurityGroupId security_group_ids = 14;
+  repeated TransitSwitchIp transit_switch_ips = 15;
 }
 message SubnetState {
   OperationType operation_type = 1;

diff --git a/src/schema/proto3/vpc.proto b/src/schema/proto3/vpc.proto
@@ -8,11 +8,14 @@ option java_outer_classname = "Vpc";
 import "common.proto";
 
 message VpcConfiguration {
-  string project_id = 1;
-  string id  = 2;
-  string name = 3;
-  string cidr = 4;
-
+  int32 version = 1;
+
+  string project_id = 2;
+  string id  = 3;
+  string name = 4;
+  string cidr = 5;
+  int64 tunnel_id = 6;
+
   message SubnetId {
     string id = 1;
   }
@@ -27,9 +30,9 @@ message VpcConfiguration {
     string ip_address = 2;
   }
 
-  repeated SubnetId subnet_ids = 5;
-  repeated Route routes = 6;
-  repeated TransitRouterIp transit_router_ips = 7;
+  repeated SubnetId subnet_ids = 7;
+  repeated Route routes = 8;
+  repeated TransitRouterIp transit_router_ips = 9;
 }
 
 message VpcState {