From 72d80db450e355eb819096aa2459c9725e767a7d Mon Sep 17 00:00:00 2001 From: Li Ting Wong Date: Thu, 15 Jan 2026 05:22:20 +0000 Subject: [PATCH 1/2] add networkcontrollerconfig --- go.mod | 6 + go.sum | 9 + .../moc_cloudagent_logicalnetwork.proto | 1 + .../moc_cloudagent_logicalnetwork.pb.go | 104 ++++----- .../moc_cloudagent_virtualnetwork.pb.go | 198 ++++++++++++++++-- .../moc_cloudagent_virtualnetwork.proto | 13 ++ rpc/common/moc_common_networkcommon.pb.go | 189 ++++++++++++----- rpc/common/moc_common_networkcommon.proto | 8 + 8 files changed, 409 insertions(+), 119 deletions(-) diff --git a/go.mod b/go.mod index 557d92e6..527d2e46 100644 --- a/go.mod +++ b/go.mod @@ -23,9 +23,15 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect golang.org/x/net v0.42.0 // indirect golang.org/x/sys v0.34.0 // indirect +<<<<<<< Updated upstream golang.org/x/text v0.31.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20251111163417-95abcf5c77ba // indirect google.golang.org/protobuf v1.36.10 // indirect +======= + golang.org/x/text v0.33.0 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20260114163908-3f89685c29c3 // indirect + google.golang.org/protobuf v1.36.11 // indirect +>>>>>>> Stashed changes ) replace ( diff --git a/go.sum b/go.sum index 41869ff9..e8c5407b 100644 --- a/go.sum +++ b/go.sum @@ -82,6 +82,7 @@ golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxb golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +<<<<<<< Updated upstream gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk= gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E= google.golang.org/genproto/googleapis/rpc v0.0.0-20251111163417-95abcf5c77ba h1:UKgtfRM7Yh93Sya0Fo8ZzhDP4qBckrrxEr2oF5UIVb8= @@ -90,6 +91,14 @@ google.golang.org/grpc v1.76.0 h1:UnVkv1+uMLYXoIz6o7chp59WfQUYA2ex/BXQ9rHZu7A= google.golang.org/grpc v1.76.0/go.mod h1:Ju12QI8M6iQJtbcsV+awF5a4hfJMLi4X0JLo94ULZ6c= google.golang.org/protobuf v1.36.10 h1:AYd7cD/uASjIL6Q9LiTjz8JLcrh/88q5UObnmY3aOOE= google.golang.org/protobuf v1.36.10/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco= +======= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260114163908-3f89685c29c3 h1:C4WAdL+FbjnGlpp2S+HMVhBeCq2Lcib4xZqfPNF6OoQ= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260114163908-3f89685c29c3/go.mod h1:j9x/tPzZkyxcgEFkiKEEGxfvyumM01BEtsW8xzOahRQ= +google.golang.org/grpc v1.59.0 h1:Z5Iec2pjwb+LEOqzpB2MR12/eKFhDPhuqW91O+4bwUk= +google.golang.org/grpc v1.59.0/go.mod h1:aUPDwccQo6OTjy7Hct4AfBPD1GptF4fyUjIkQ9YtF98= +google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE= +google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco= +>>>>>>> Stashed changes gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= diff --git a/rpc/cloudagent/network/logicalnetwork/moc_cloudagent_logicalnetwork.proto b/rpc/cloudagent/network/logicalnetwork/moc_cloudagent_logicalnetwork.proto index e3e4df20..aceea472 100644 --- a/rpc/cloudagent/network/logicalnetwork/moc_cloudagent_logicalnetwork.proto +++ b/rpc/cloudagent/network/logicalnetwork/moc_cloudagent_logicalnetwork.proto @@ -42,6 +42,7 @@ message LogicalNetwork { string macPoolName = 7 [(sensitive) = true]; Tags tags = 8; repeated AdvancedNetworkPolicy advancedPolicies = 9; + NetworkControllerConfig networkControllerConfig = 10; } message LogicalSubnet { diff --git a/rpc/cloudagent/network/moc_cloudagent_logicalnetwork.pb.go b/rpc/cloudagent/network/moc_cloudagent_logicalnetwork.pb.go index 6693d636..f25f8413 100644 --- a/rpc/cloudagent/network/moc_cloudagent_logicalnetwork.pb.go +++ b/rpc/cloudagent/network/moc_cloudagent_logicalnetwork.pb.go @@ -226,6 +226,7 @@ type LogicalNetwork struct { MacPoolName string `protobuf:"bytes,7,opt,name=macPoolName,proto3" json:"macPoolName,omitempty"` Tags *common.Tags `protobuf:"bytes,8,opt,name=tags,proto3" json:"tags,omitempty"` AdvancedPolicies []*common.AdvancedNetworkPolicy `protobuf:"bytes,9,rep,name=advancedPolicies,proto3" json:"advancedPolicies,omitempty"` + NetworkControllerConfig *common.NetworkControllerConfig `protobuf:"bytes,10,opt,name=networkControllerConfig,proto3" json:"networkControllerConfig,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -319,6 +320,13 @@ func (m *LogicalNetwork) GetAdvancedPolicies() []*common.AdvancedNetworkPolicy { return nil } +func (m *LogicalNetwork) GetNetworkControllerConfig() *common.NetworkControllerConfig { + if m != nil { + return m.NetworkControllerConfig + } + return nil +} + type LogicalSubnet struct { Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` Id string `protobuf:"bytes,2,opt,name=id,proto3" json:"id,omitempty"` @@ -452,53 +460,55 @@ func init() { } var fileDescriptor_37e4212e5c247b0a = []byte{ - // 735 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x54, 0xdd, 0x6e, 0xe3, 0x44, - 0x14, 0xc6, 0x49, 0x36, 0x3f, 0x27, 0x24, 0xa0, 0x01, 0xb6, 0x56, 0xc4, 0x56, 0x91, 0x97, 0x5d, - 0xe5, 0x06, 0x5b, 0x84, 0xbf, 0x4b, 0xd4, 0x88, 0x05, 0xad, 0x04, 0x25, 0x9a, 0xae, 0xf6, 0x02, - 0x21, 0x55, 0x93, 0xf1, 0x24, 0x1d, 0x6a, 0x7b, 0xdc, 0x99, 0x71, 0x4b, 0xe1, 0x05, 0xb8, 0xe5, - 0x09, 0x78, 0x01, 0x2e, 0xe1, 0xf1, 0x90, 0x90, 0x4f, 0xc6, 0x69, 0x1c, 0x5a, 0x48, 0x2f, 0x7a, - 0x65, 0xfb, 0x7c, 0xdf, 0xf9, 0xce, 0x39, 0xdf, 0x8c, 0x0f, 0x3c, 0x4d, 0x15, 0x3f, 0xe5, 0x89, - 0x2a, 0x62, 0xb6, 0x12, 0x99, 0x3d, 0x4d, 0xd4, 0x4a, 0x72, 0x96, 0x64, 0xc2, 0x5e, 0x29, 0x7d, - 0x1e, 0xe6, 0x5a, 0x59, 0x45, 0x1e, 0xa7, 0x8a, 0x87, 0x37, 0xa4, 0xd0, 0xa1, 0xa3, 0xc3, 0x95, - 0x52, 0xab, 0x44, 0x44, 0xc8, 0x5a, 0x14, 0xcb, 0xe8, 0x4a, 0xb3, 0x3c, 0x17, 0xda, 0xac, 0xf3, - 0x46, 0x07, 0x28, 0xae, 0xd2, 0x54, 0x65, 0xee, 0xe1, 0x80, 0xc3, 0x2d, 0xc0, 0x89, 0x6d, 0xe3, - 0xc1, 0xef, 0x1e, 0xbc, 0xf7, 0xcd, 0xba, 0x93, 0xe3, 0x35, 0x4c, 0xc5, 0x45, 0x21, 0x8c, 0x25, - 0x73, 0x78, 0xab, 0x0e, 0x18, 0xdf, 0x1b, 0x37, 0x27, 0xfd, 0xe9, 0xf3, 0xf0, 0xf6, 0x26, 0xc3, - 0x1d, 0x9d, 0xdd, 0x74, 0xf2, 0x09, 0x0c, 0xbe, 0xcb, 0x85, 0x66, 0x56, 0xaa, 0xec, 0xd5, 0x75, - 0x2e, 0xfc, 0xc6, 0xd8, 0x9b, 0x0c, 0xa7, 0x43, 0xd4, 0xdb, 0x20, 0xb4, 0x4e, 0x0a, 0xfe, 0xf4, - 0xe0, 0xf1, 0x6e, 0x87, 0x26, 0x57, 0x99, 0x11, 0x0f, 0xd0, 0xe2, 0x14, 0xda, 0x54, 0x98, 0x22, - 0xb1, 0xd8, 0x5b, 0x7f, 0x3a, 0x0a, 0xd7, 0xc6, 0x87, 0x95, 0xf1, 0xe1, 0x4c, 0xa9, 0xe4, 0x35, - 0x4b, 0x0a, 0x41, 0x1d, 0x93, 0xbc, 0x0b, 0x8f, 0x5e, 0x68, 0xad, 0xb4, 0xdf, 0x1c, 0x7b, 0x93, - 0x1e, 0x5d, 0x7f, 0x04, 0x17, 0xf0, 0xa4, 0x2e, 0x3e, 0xd7, 0x82, 0x9f, 0x09, 0xfe, 0x70, 0xfe, - 0x06, 0x3f, 0xc2, 0xe1, 0x5d, 0x25, 0x9d, 0x61, 0x37, 0xe3, 0x79, 0xf7, 0x1f, 0xaf, 0xb1, 0x3d, - 0xde, 0x6f, 0x4d, 0x18, 0xd6, 0x8b, 0x11, 0x02, 0xad, 0x8c, 0xa5, 0x02, 0xa5, 0x7b, 0x14, 0xdf, - 0xc9, 0x10, 0x1a, 0x32, 0x76, 0x99, 0x0d, 0x19, 0x93, 0x2f, 0xa0, 0x63, 0x8a, 0x45, 0x26, 0xac, - 0xf1, 0x9b, 0x38, 0xec, 0xb3, 0xff, 0x19, 0xf6, 0x04, 0xd9, 0xb4, 0xca, 0x22, 0x33, 0x78, 0xdf, - 0x31, 0x5e, 0x4b, 0x6d, 0x0b, 0x96, 0xc8, 0x9f, 0xf1, 0xaa, 0xbc, 0xc8, 0xd8, 0x22, 0x11, 0xb1, - 0xdf, 0x1a, 0x7b, 0x93, 0x2e, 0xfd, 0x4f, 0x0e, 0x79, 0x0a, 0x6d, 0x63, 0x99, 0x2d, 0x8c, 0xff, - 0x08, 0x5d, 0xe8, 0x63, 0x0f, 0x27, 0x18, 0xa2, 0x0e, 0x22, 0x01, 0xbc, 0x99, 0x28, 0x8e, 0x79, - 0xc7, 0xe5, 0x54, 0x6d, 0x9c, 0xa1, 0x16, 0x23, 0xcf, 0xa1, 0x9f, 0x32, 0x3e, 0x57, 0x2a, 0x41, - 0x4a, 0xa7, 0xa4, 0xcc, 0x5a, 0xbf, 0xfe, 0xe5, 0x7b, 0x74, 0x1b, 0x20, 0x4f, 0xa0, 0x65, 0xd9, - 0xca, 0xf8, 0x5d, 0x2c, 0xd7, 0xc3, 0x72, 0xaf, 0xd8, 0xca, 0x50, 0x0c, 0x93, 0xaf, 0xe0, 0x6d, - 0x16, 0x5f, 0xb2, 0x8c, 0x8b, 0x78, 0xae, 0x12, 0xc9, 0xa5, 0x30, 0x7e, 0x0f, 0xdd, 0x19, 0x21, - 0xf5, 0xc8, 0x81, 0xd5, 0xa9, 0x96, 0x9c, 0x6b, 0xfa, 0xaf, 0x9c, 0xe0, 0x8f, 0x26, 0x0c, 0x6a, - 0xb6, 0xed, 0x75, 0x24, 0x1f, 0xc0, 0x80, 0xc5, 0xb1, 0x16, 0xc6, 0xcc, 0xb5, 0x58, 0xca, 0x9f, - 0xdc, 0x35, 0xae, 0x07, 0x49, 0x00, 0x6d, 0xad, 0x0a, 0x2b, 0x8c, 0xdf, 0xc2, 0xce, 0x00, 0x3b, - 0xa3, 0x65, 0x88, 0x3a, 0x84, 0x7c, 0x0e, 0xc0, 0x92, 0xca, 0x20, 0xf4, 0x76, 0x38, 0x3d, 0x40, - 0xde, 0xcb, 0xf9, 0xd1, 0x06, 0xf8, 0x56, 0xd8, 0x33, 0x15, 0xd3, 0x2d, 0x6a, 0xd9, 0xe6, 0x65, - 0xc2, 0x32, 0xf4, 0x78, 0x40, 0xf1, 0x9d, 0x3c, 0x83, 0x8e, 0xcc, 0x4b, 0x07, 0x8d, 0xdf, 0xc1, - 0x8a, 0x7d, 0xa7, 0x54, 0xc6, 0x68, 0x85, 0x91, 0x31, 0x34, 0xe3, 0xac, 0x72, 0xb6, 0x8b, 0x94, - 0x2f, 0x33, 0xe3, 0x0e, 0xa1, 0x84, 0xc8, 0x08, 0xba, 0xd2, 0xcc, 0x8b, 0x45, 0x22, 0xb9, 0xdf, - 0xc3, 0xdb, 0xb1, 0xf9, 0xde, 0x1c, 0x0c, 0xdc, 0x7e, 0x30, 0x3f, 0xc0, 0x81, 0xbb, 0x48, 0x27, - 0x82, 0x17, 0x5a, 0xda, 0xeb, 0xaf, 0xb5, 0x2a, 0x72, 0x2a, 0x96, 0x7e, 0x1f, 0x33, 0x02, 0xcc, - 0x38, 0xbe, 0x9d, 0x23, 0xb4, 0xc8, 0xb8, 0xa0, 0x77, 0x49, 0x4c, 0xff, 0xf6, 0xe0, 0x9d, 0xfa, - 0x2f, 0x74, 0x54, 0xfe, 0x01, 0x44, 0x42, 0xfb, 0x65, 0x76, 0xa9, 0xce, 0x05, 0xf9, 0x70, 0xcf, - 0x4d, 0xb0, 0xde, 0x28, 0xa3, 0x70, 0x5f, 0xfa, 0x7a, 0x1b, 0x04, 0x6f, 0x90, 0x5f, 0xa0, 0x5b, - 0xed, 0x08, 0xf2, 0xe9, 0x7e, 0xd9, 0x3b, 0x6b, 0x6c, 0xf4, 0xd9, 0x7d, 0xd3, 0xaa, 0xe2, 0xb3, - 0x8f, 0xbe, 0x8f, 0x56, 0xd2, 0x9e, 0x15, 0x8b, 0x90, 0xab, 0x34, 0x4a, 0x25, 0xd7, 0xca, 0xa8, - 0xa5, 0x8d, 0x52, 0xc5, 0x23, 0x9d, 0xf3, 0xe8, 0x46, 0x33, 0x72, 0x9a, 0x8b, 0x36, 0xee, 0xa9, - 0x8f, 0xff, 0x09, 0x00, 0x00, 0xff, 0xff, 0xce, 0x6d, 0x63, 0x28, 0x4c, 0x07, 0x00, 0x00, + // 763 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x54, 0xdd, 0x6e, 0x1b, 0x45, + 0x14, 0x66, 0x63, 0xd7, 0xb1, 0x8f, 0x89, 0x41, 0x03, 0x34, 0x2b, 0xab, 0x8d, 0xac, 0x2d, 0xad, + 0x72, 0xc3, 0x5a, 0x98, 0xbf, 0x4b, 0x94, 0x94, 0x82, 0x2a, 0x41, 0xb0, 0x26, 0x55, 0x2e, 0x10, + 0x52, 0x35, 0x9e, 0x1d, 0x3b, 0x43, 0x67, 0x67, 0xb6, 0x33, 0xb3, 0x29, 0x81, 0x17, 0xe0, 0x2d, + 0x78, 0x01, 0x2e, 0xe1, 0xa1, 0x78, 0x08, 0x24, 0xb4, 0xc7, 0xb3, 0x8e, 0xd7, 0x24, 0xd4, 0xbd, + 0xc8, 0x95, 0xbd, 0xe7, 0xfb, 0xce, 0x77, 0x7e, 0xbe, 0xdd, 0x03, 0x0f, 0x72, 0xc3, 0x9f, 0x73, + 0x65, 0xca, 0x8c, 0x2d, 0x84, 0xf6, 0xcf, 0x95, 0x59, 0x48, 0xce, 0x94, 0x16, 0xfe, 0x95, 0xb1, + 0x2f, 0xd2, 0xc2, 0x1a, 0x6f, 0xc8, 0xdd, 0xdc, 0xf0, 0xf4, 0x8a, 0x94, 0x06, 0x74, 0x78, 0xb0, + 0x30, 0x66, 0xa1, 0xc4, 0x18, 0x59, 0xb3, 0x72, 0x3e, 0x7e, 0x65, 0x59, 0x51, 0x08, 0xeb, 0x96, + 0x79, 0xc3, 0x7d, 0x14, 0x37, 0x79, 0x6e, 0x74, 0xf8, 0x09, 0xc0, 0xc1, 0x1a, 0x10, 0xc4, 0xd6, + 0xf1, 0xe4, 0xf7, 0x08, 0x3e, 0xf8, 0x76, 0xd9, 0xc9, 0xc9, 0x12, 0xa6, 0xe2, 0x65, 0x29, 0x9c, + 0x27, 0x53, 0x78, 0xa7, 0x09, 0xb8, 0x38, 0x1a, 0xb5, 0x0e, 0xfb, 0x93, 0x47, 0xe9, 0xf5, 0x4d, + 0xa6, 0x1b, 0x3a, 0x9b, 0xe9, 0xe4, 0x53, 0xd8, 0xfb, 0xbe, 0x10, 0x96, 0x79, 0x69, 0xf4, 0xb3, + 0xcb, 0x42, 0xc4, 0x3b, 0xa3, 0xe8, 0x70, 0x30, 0x19, 0xa0, 0xde, 0x0a, 0xa1, 0x4d, 0x52, 0xf2, + 0x67, 0x04, 0x77, 0x37, 0x3b, 0x74, 0x85, 0xd1, 0x4e, 0xdc, 0x42, 0x8b, 0x13, 0xe8, 0x50, 0xe1, + 0x4a, 0xe5, 0xb1, 0xb7, 0xfe, 0x64, 0x98, 0x2e, 0x17, 0x9f, 0xd6, 0x8b, 0x4f, 0x8f, 0x8d, 0x51, + 0x67, 0x4c, 0x95, 0x82, 0x06, 0x26, 0x79, 0x1f, 0xee, 0x3c, 0xb1, 0xd6, 0xd8, 0xb8, 0x35, 0x8a, + 0x0e, 0x7b, 0x74, 0xf9, 0x90, 0xbc, 0x84, 0xfb, 0x4d, 0xf1, 0xa9, 0x15, 0xfc, 0x5c, 0xf0, 0xdb, + 0xdb, 0x6f, 0xf2, 0x13, 0x1c, 0xdc, 0x54, 0x32, 0x2c, 0xec, 0x6a, 0xbc, 0xe8, 0xcd, 0xc7, 0xdb, + 0x59, 0x1f, 0xef, 0xef, 0x16, 0x0c, 0x9a, 0xc5, 0x08, 0x81, 0xb6, 0x66, 0xb9, 0x40, 0xe9, 0x1e, + 0xc5, 0xff, 0x64, 0x00, 0x3b, 0x32, 0x0b, 0x99, 0x3b, 0x32, 0x23, 0x5f, 0xc2, 0xae, 0x2b, 0x67, + 0x5a, 0x78, 0x17, 0xb7, 0x70, 0xd8, 0x87, 0xaf, 0x19, 0xf6, 0x14, 0xd9, 0xb4, 0xce, 0x22, 0xc7, + 0x70, 0x2f, 0x30, 0xce, 0xa4, 0xf5, 0x25, 0x53, 0xf2, 0x17, 0x7c, 0x55, 0x9e, 0x68, 0x36, 0x53, + 0x22, 0x8b, 0xdb, 0xa3, 0xe8, 0xb0, 0x4b, 0xff, 0x97, 0x43, 0x1e, 0x40, 0xc7, 0x79, 0xe6, 0x4b, + 0x17, 0xdf, 0xc1, 0x2d, 0xf4, 0xb1, 0x87, 0x53, 0x0c, 0xd1, 0x00, 0x91, 0x04, 0xde, 0x56, 0x86, + 0x63, 0xde, 0x49, 0x35, 0x55, 0x07, 0x67, 0x68, 0xc4, 0xc8, 0x23, 0xe8, 0xe7, 0x8c, 0x4f, 0x8d, + 0x51, 0x48, 0xd9, 0xad, 0x28, 0xc7, 0xed, 0xdf, 0xfe, 0x8a, 0x23, 0xba, 0x0e, 0x90, 0xfb, 0xd0, + 0xf6, 0x6c, 0xe1, 0xe2, 0x2e, 0x96, 0xeb, 0x61, 0xb9, 0x67, 0x6c, 0xe1, 0x28, 0x86, 0xc9, 0xd7, + 0xf0, 0x2e, 0xcb, 0x2e, 0x98, 0xe6, 0x22, 0x9b, 0x1a, 0x25, 0xb9, 0x14, 0x2e, 0xee, 0xe1, 0x76, + 0x86, 0x48, 0x3d, 0x0a, 0x60, 0xed, 0x6a, 0xc5, 0xb9, 0xa4, 0xff, 0xc9, 0x21, 0x67, 0xb0, 0x1f, + 0xe6, 0x7e, 0x6c, 0xb4, 0xb7, 0x46, 0x29, 0x61, 0x1f, 0x1b, 0x3d, 0x97, 0x8b, 0x18, 0xb0, 0xf2, + 0x3d, 0x94, 0x3b, 0xb9, 0x9e, 0x43, 0x6f, 0x4a, 0x4e, 0xfe, 0x68, 0xc1, 0x5e, 0xc3, 0x8e, 0xad, + 0xac, 0xfe, 0x10, 0xf6, 0x58, 0x96, 0x59, 0xe1, 0xdc, 0xd4, 0x8a, 0xb9, 0xfc, 0x39, 0x7c, 0x1e, + 0xcd, 0x20, 0x49, 0xa0, 0x63, 0x4d, 0xe9, 0x85, 0x8b, 0xdb, 0x38, 0x31, 0x60, 0x8b, 0xb4, 0x0a, + 0xd1, 0x80, 0x90, 0x2f, 0x00, 0x98, 0xaa, 0x17, 0x8f, 0x9e, 0x0d, 0x26, 0xfb, 0xc8, 0x7b, 0x3a, + 0x3d, 0x5a, 0x01, 0xdf, 0x09, 0x7f, 0x6e, 0x32, 0xba, 0x46, 0xad, 0xda, 0xbc, 0x50, 0x4c, 0xa3, + 0x77, 0x7b, 0x14, 0xff, 0x93, 0x87, 0xb0, 0x2b, 0x8b, 0xca, 0x19, 0x17, 0xef, 0x62, 0xc5, 0x7e, + 0x50, 0xaa, 0x62, 0xb4, 0xc6, 0xc8, 0x08, 0x5a, 0x99, 0xae, 0x1d, 0xeb, 0x22, 0xe5, 0x2b, 0xed, + 0x82, 0xb9, 0x15, 0x44, 0x86, 0xd0, 0x95, 0x6e, 0x5a, 0xce, 0x94, 0xe4, 0x71, 0x0f, 0xdf, 0xba, + 0xd5, 0xf3, 0xca, 0x70, 0xb8, 0xde, 0xf0, 0x1f, 0x57, 0x46, 0x9d, 0x0a, 0x5e, 0x5a, 0xe9, 0x2f, + 0xbf, 0xb1, 0xa6, 0x2c, 0xa8, 0x98, 0xc7, 0x7d, 0xcc, 0x48, 0xd6, 0x8d, 0xda, 0xe4, 0x08, 0x2b, + 0x34, 0x17, 0xf4, 0x26, 0x89, 0xc9, 0x3f, 0x11, 0xbc, 0xd7, 0xfc, 0x34, 0x8f, 0xaa, 0x2f, 0x8b, + 0x48, 0xe8, 0x3c, 0xd5, 0x17, 0xe6, 0x85, 0x20, 0x1f, 0x6d, 0x79, 0x61, 0x96, 0x97, 0x6a, 0x98, + 0x6e, 0x4b, 0x5f, 0x5e, 0x99, 0xe4, 0x2d, 0xf2, 0x2b, 0x74, 0xeb, 0xdb, 0x43, 0x3e, 0xdb, 0x2e, + 0x7b, 0xe3, 0x3c, 0x0e, 0x3f, 0x7f, 0xd3, 0xb4, 0xba, 0xf8, 0xf1, 0xc7, 0x3f, 0x8c, 0x17, 0xd2, + 0x9f, 0x97, 0xb3, 0x94, 0x9b, 0x7c, 0x9c, 0x4b, 0x6e, 0x8d, 0x33, 0x73, 0x3f, 0xce, 0x0d, 0x1f, + 0xdb, 0x82, 0x8f, 0xaf, 0x34, 0xc7, 0x41, 0x73, 0xd6, 0xc1, 0xfb, 0xf7, 0xc9, 0xbf, 0x01, 0x00, + 0x00, 0xff, 0xff, 0xd7, 0xbd, 0xe2, 0x59, 0xa4, 0x07, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/rpc/cloudagent/network/moc_cloudagent_virtualnetwork.pb.go b/rpc/cloudagent/network/moc_cloudagent_virtualnetwork.pb.go index 212d761a..8da803cb 100644 --- a/rpc/cloudagent/network/moc_cloudagent_virtualnetwork.pb.go +++ b/rpc/cloudagent/network/moc_cloudagent_virtualnetwork.pb.go @@ -271,22 +271,23 @@ func (m *VirtualNetworkPrecheckResponse) GetError() string { } type VirtualNetwork struct { - Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` - Id string `protobuf:"bytes,2,opt,name=id,proto3" json:"id,omitempty"` - Subnets []*Subnet `protobuf:"bytes,3,rep,name=subnets,proto3" json:"subnets,omitempty"` - Dns *common.Dns `protobuf:"bytes,4,opt,name=dns,proto3" json:"dns,omitempty"` - Type VirtualNetworkType `protobuf:"varint,5,opt,name=type,proto3,enum=moc.cloudagent.network.VirtualNetworkType" json:"type,omitempty"` - Nodefqdn string `protobuf:"bytes,6,opt,name=nodefqdn,proto3" json:"nodefqdn,omitempty"` - GroupName string `protobuf:"bytes,7,opt,name=groupName,proto3" json:"groupName,omitempty"` - Status *common.Status `protobuf:"bytes,8,opt,name=status,proto3" json:"status,omitempty"` - LocationName string `protobuf:"bytes,9,opt,name=locationName,proto3" json:"locationName,omitempty"` - MacPoolName string `protobuf:"bytes,10,opt,name=macPoolName,proto3" json:"macPoolName,omitempty"` - Tags *common.Tags `protobuf:"bytes,12,opt,name=tags,proto3" json:"tags,omitempty"` - LogicalNetwork *common.NetworkReference `protobuf:"bytes,13,opt,name=logicalNetwork,proto3" json:"logicalNetwork,omitempty"` - Cidr []string `protobuf:"bytes,14,rep,name=cidr,proto3" json:"cidr,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + Id string `protobuf:"bytes,2,opt,name=id,proto3" json:"id,omitempty"` + Subnets []*Subnet `protobuf:"bytes,3,rep,name=subnets,proto3" json:"subnets,omitempty"` + Dns *common.Dns `protobuf:"bytes,4,opt,name=dns,proto3" json:"dns,omitempty"` + Type VirtualNetworkType `protobuf:"varint,5,opt,name=type,proto3,enum=moc.cloudagent.network.VirtualNetworkType" json:"type,omitempty"` + Nodefqdn string `protobuf:"bytes,6,opt,name=nodefqdn,proto3" json:"nodefqdn,omitempty"` + GroupName string `protobuf:"bytes,7,opt,name=groupName,proto3" json:"groupName,omitempty"` + Status *common.Status `protobuf:"bytes,8,opt,name=status,proto3" json:"status,omitempty"` + LocationName string `protobuf:"bytes,9,opt,name=locationName,proto3" json:"locationName,omitempty"` + MacPoolName string `protobuf:"bytes,10,opt,name=macPoolName,proto3" json:"macPoolName,omitempty"` + Tags *common.Tags `protobuf:"bytes,12,opt,name=tags,proto3" json:"tags,omitempty"` + LogicalNetwork *common.NetworkReference `protobuf:"bytes,13,opt,name=logicalNetwork,proto3" json:"logicalNetwork,omitempty"` + Cidr []string `protobuf:"bytes,14,rep,name=cidr,proto3" json:"cidr,omitempty"` + NetworkControllerConfig *common.NetworkControllerConfig `protobuf:"bytes,15,opt,name=networkControllerConfig,proto3" json:"networkControllerConfig,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *VirtualNetwork) Reset() { *m = VirtualNetwork{} } @@ -405,6 +406,13 @@ func (m *VirtualNetwork) GetCidr() []string { return nil } +func (m *VirtualNetwork) GetNetworkControllerConfig() *common.NetworkControllerConfig { + if m != nil { + return m.NetworkControllerConfig + } + return nil +} + type Subnet struct { Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` Id string `protobuf:"bytes,2,opt,name=id,proto3" json:"id,omitempty"` @@ -555,6 +563,95 @@ func (m *Ipam) GetSubnets() []*Subnet { return nil } +<<<<<<< Updated upstream +======= +type NetworkControllerConfigRequest struct { + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *NetworkControllerConfigRequest) Reset() { *m = NetworkControllerConfigRequest{} } +func (m *NetworkControllerConfigRequest) String() string { return proto.CompactTextString(m) } +func (*NetworkControllerConfigRequest) ProtoMessage() {} +func (*NetworkControllerConfigRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_65af3e74534f0214, []int{7} +} + +func (m *NetworkControllerConfigRequest) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_NetworkControllerConfigRequest.Unmarshal(m, b) +} +func (m *NetworkControllerConfigRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_NetworkControllerConfigRequest.Marshal(b, m, deterministic) +} +func (m *NetworkControllerConfigRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_NetworkControllerConfigRequest.Merge(m, src) +} +func (m *NetworkControllerConfigRequest) XXX_Size() int { + return xxx_messageInfo_NetworkControllerConfigRequest.Size(m) +} +func (m *NetworkControllerConfigRequest) XXX_DiscardUnknown() { + xxx_messageInfo_NetworkControllerConfigRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_NetworkControllerConfigRequest proto.InternalMessageInfo + +type NetworkControllerConfigResponse struct { + Result *wrappers.BoolValue `protobuf:"bytes,1,opt,name=Result,proto3" json:"Result,omitempty"` + Error string `protobuf:"bytes,2,opt,name=Error,proto3" json:"Error,omitempty"` + Config *common.NetworkControllerConfig `protobuf:"bytes,3,opt,name=Config,proto3" json:"Config,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *NetworkControllerConfigResponse) Reset() { *m = NetworkControllerConfigResponse{} } +func (m *NetworkControllerConfigResponse) String() string { return proto.CompactTextString(m) } +func (*NetworkControllerConfigResponse) ProtoMessage() {} +func (*NetworkControllerConfigResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_65af3e74534f0214, []int{8} +} + +func (m *NetworkControllerConfigResponse) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_NetworkControllerConfigResponse.Unmarshal(m, b) +} +func (m *NetworkControllerConfigResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_NetworkControllerConfigResponse.Marshal(b, m, deterministic) +} +func (m *NetworkControllerConfigResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_NetworkControllerConfigResponse.Merge(m, src) +} +func (m *NetworkControllerConfigResponse) XXX_Size() int { + return xxx_messageInfo_NetworkControllerConfigResponse.Size(m) +} +func (m *NetworkControllerConfigResponse) XXX_DiscardUnknown() { + xxx_messageInfo_NetworkControllerConfigResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_NetworkControllerConfigResponse proto.InternalMessageInfo + +func (m *NetworkControllerConfigResponse) GetResult() *wrappers.BoolValue { + if m != nil { + return m.Result + } + return nil +} + +func (m *NetworkControllerConfigResponse) GetError() string { + if m != nil { + return m.Error + } + return "" +} + +func (m *NetworkControllerConfigResponse) GetConfig() *common.NetworkControllerConfig { + if m != nil { + return m.Config + } + return nil +} + +>>>>>>> Stashed changes func init() { proto.RegisterEnum("moc.cloudagent.network.VirtualNetworkType", VirtualNetworkType_name, VirtualNetworkType_value) proto.RegisterType((*VirtualNetworkRequest)(nil), "moc.cloudagent.network.VirtualNetworkRequest") @@ -564,6 +661,11 @@ func init() { proto.RegisterType((*VirtualNetwork)(nil), "moc.cloudagent.network.VirtualNetwork") proto.RegisterType((*Subnet)(nil), "moc.cloudagent.network.Subnet") proto.RegisterType((*Ipam)(nil), "moc.cloudagent.network.Ipam") +<<<<<<< Updated upstream +======= + proto.RegisterType((*NetworkControllerConfigRequest)(nil), "moc.cloudagent.network.NetworkControllerConfigRequest") + proto.RegisterType((*NetworkControllerConfigResponse)(nil), "moc.cloudagent.network.NetworkControllerConfigResponse") +>>>>>>> Stashed changes } func init() { @@ -571,6 +673,7 @@ func init() { } var fileDescriptor_65af3e74534f0214 = []byte{ +<<<<<<< Updated upstream // 875 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x54, 0xdd, 0x6e, 0xe3, 0x44, 0x14, 0x5e, 0x27, 0x69, 0x7e, 0x8e, 0xdb, 0xd4, 0x1a, 0xd8, 0xad, 0x15, 0xb1, 0x55, 0xe4, 0x15, @@ -627,6 +730,69 @@ var fileDescriptor_65af3e74534f0214 = []byte{ 0x17, 0x57, 0x61, 0x24, 0xb3, 0x41, 0x96, 0x44, 0x4a, 0x6a, 0x39, 0x35, 0x83, 0x4c, 0x46, 0x03, 0x95, 0x47, 0x83, 0x95, 0xcf, 0x41, 0xe5, 0xf3, 0xaa, 0x89, 0xab, 0xf9, 0xd3, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0x96, 0x88, 0x02, 0x94, 0x6a, 0x08, 0x00, 0x00, +======= + // 956 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x55, 0xdd, 0x6e, 0xdc, 0x44, + 0x14, 0xae, 0x77, 0x9d, 0xfd, 0x39, 0x4e, 0x36, 0xd6, 0x40, 0x1b, 0x6b, 0xd5, 0x86, 0x95, 0x2b, + 0xaa, 0x50, 0x09, 0xaf, 0x58, 0x0a, 0xe5, 0x06, 0xa4, 0x24, 0xa0, 0x6a, 0x2b, 0x9a, 0xae, 0x9c, + 0x55, 0x2e, 0x10, 0x52, 0xe5, 0xd8, 0xb3, 0x8e, 0xa9, 0x3d, 0xe3, 0xcc, 0x8c, 0xb7, 0x8a, 0x78, + 0x01, 0xb8, 0xea, 0x33, 0xf0, 0x0e, 0xf0, 0x12, 0xf0, 0x08, 0xbc, 0x0c, 0x9a, 0x63, 0xef, 0x2f, + 0x5d, 0xb4, 0x91, 0xe8, 0x95, 0x3d, 0xf3, 0x7d, 0xe7, 0x3b, 0xe7, 0xcc, 0xf9, 0xc6, 0x86, 0x87, + 0x19, 0x0f, 0x5f, 0x85, 0x29, 0x2f, 0xa2, 0x20, 0xa6, 0x4c, 0xbd, 0x9a, 0x26, 0x42, 0x15, 0x41, + 0xca, 0xa8, 0x7a, 0xc3, 0xc5, 0x6b, 0x2f, 0x17, 0x5c, 0x71, 0x72, 0x2f, 0xe3, 0xa1, 0xb7, 0x20, + 0x79, 0x15, 0xda, 0x3d, 0x8c, 0x39, 0x8f, 0x53, 0xda, 0x47, 0xd6, 0x65, 0x31, 0xe9, 0xbf, 0x11, + 0x41, 0x9e, 0x53, 0x21, 0xcb, 0xb8, 0xee, 0x01, 0x8a, 0xf3, 0x2c, 0xe3, 0xac, 0x7a, 0x54, 0xc0, + 0xe1, 0x12, 0x50, 0x89, 0x2d, 0xe3, 0xee, 0x9f, 0x06, 0xdc, 0xbd, 0x28, 0x2b, 0x39, 0x2b, 0x61, + 0x9f, 0x5e, 0x17, 0x54, 0x2a, 0x32, 0x82, 0xfd, 0x55, 0x40, 0x3a, 0x46, 0xaf, 0x7e, 0x64, 0x0d, + 0x1e, 0x79, 0xef, 0x2e, 0xd2, 0x5b, 0xd3, 0x59, 0x0f, 0x27, 0x4f, 0x60, 0xef, 0x65, 0x4e, 0x45, + 0xa0, 0x12, 0xce, 0xc6, 0x37, 0x39, 0x75, 0x6a, 0x3d, 0xe3, 0xa8, 0x33, 0xe8, 0xa0, 0xde, 0x1c, + 0xf1, 0x57, 0x49, 0xe4, 0x13, 0x68, 0x4e, 0xa9, 0x90, 0x09, 0x67, 0x4e, 0xbd, 0x67, 0x1c, 0x59, + 0x83, 0x7d, 0xe4, 0x1f, 0xe7, 0xc9, 0x45, 0xb9, 0xed, 0xcf, 0x70, 0xf7, 0x77, 0x03, 0xee, 0xad, + 0x37, 0x23, 0x73, 0xce, 0x24, 0x7d, 0x0f, 0xdd, 0x0c, 0xa0, 0xe1, 0x53, 0x59, 0xa4, 0x0a, 0xdb, + 0xb0, 0x06, 0x5d, 0xaf, 0x9c, 0x91, 0x37, 0x9b, 0x91, 0x77, 0xc2, 0x79, 0x7a, 0x11, 0xa4, 0x05, + 0xf5, 0x2b, 0x26, 0xf9, 0x10, 0x76, 0xbe, 0x13, 0x82, 0x0b, 0xec, 0xa4, 0xed, 0x97, 0x0b, 0xf7, + 0x1a, 0x1e, 0xac, 0x8a, 0x8f, 0x04, 0x0d, 0xaf, 0x68, 0xf8, 0xfe, 0x46, 0xe1, 0xfe, 0x04, 0x87, + 0x9b, 0x52, 0x56, 0x07, 0xb6, 0x68, 0xcf, 0xb8, 0x7d, 0x7b, 0xb5, 0xe5, 0xf6, 0xfe, 0x32, 0xa1, + 0xb3, 0x9a, 0x8c, 0x10, 0x30, 0x59, 0x90, 0x51, 0x94, 0x6e, 0xfb, 0xf8, 0x4e, 0x3a, 0x50, 0x4b, + 0xa2, 0x2a, 0xb2, 0x96, 0x44, 0xe4, 0x2b, 0x68, 0xca, 0xe2, 0x92, 0x51, 0x25, 0x9d, 0x3a, 0x36, + 0x7b, 0xb8, 0xa9, 0xd9, 0x73, 0xa4, 0xf9, 0x33, 0x3a, 0xe9, 0x41, 0x3d, 0x62, 0xd2, 0x31, 0xb1, + 0xee, 0x16, 0x46, 0x7d, 0xcb, 0xe4, 0x89, 0xf9, 0xcb, 0x1f, 0x8e, 0xe1, 0x6b, 0x88, 0x7c, 0x03, + 0xa6, 0xd2, 0x06, 0xdc, 0x41, 0x03, 0x3e, 0xde, 0xee, 0x14, 0xb5, 0x1b, 0x7d, 0x8c, 0x23, 0x5d, + 0x68, 0x31, 0x1e, 0xd1, 0xc9, 0x75, 0xc4, 0x9c, 0x06, 0x56, 0x3c, 0x5f, 0x93, 0xfb, 0xd0, 0x8e, + 0x05, 0x2f, 0xf2, 0x33, 0xdd, 0x60, 0x13, 0xc1, 0xc5, 0x06, 0x79, 0x08, 0x0d, 0xa9, 0x02, 0x55, + 0x48, 0xa7, 0x85, 0xe5, 0x59, 0x98, 0xfb, 0x1c, 0xb7, 0xfc, 0x0a, 0x22, 0x2e, 0xec, 0xa6, 0x3c, + 0xc4, 0x2b, 0x80, 0x2a, 0x6d, 0x54, 0x59, 0xd9, 0x23, 0x8f, 0xc0, 0xca, 0x82, 0x70, 0xc4, 0x79, + 0x8a, 0x14, 0xd0, 0x94, 0xaa, 0xc5, 0x65, 0x80, 0x3c, 0x00, 0x53, 0x05, 0xb1, 0x74, 0x76, 0x31, + 0x5d, 0x1b, 0xd3, 0x8d, 0x83, 0x58, 0xfa, 0xb8, 0x4d, 0xbe, 0x86, 0x4e, 0xca, 0xe3, 0x24, 0x9c, + 0x77, 0xe9, 0xec, 0x21, 0xf1, 0x2e, 0x12, 0xe7, 0xb7, 0x68, 0x42, 0x05, 0x65, 0x21, 0xf5, 0xd7, + 0xc8, 0x7a, 0x90, 0x61, 0x12, 0x09, 0xa7, 0xd3, 0xab, 0xeb, 0x41, 0xea, 0x77, 0x72, 0x01, 0x07, + 0xd5, 0x01, 0x9e, 0x72, 0xa6, 0x04, 0x4f, 0x53, 0x2a, 0x4e, 0x39, 0x9b, 0x24, 0xb1, 0xb3, 0x8f, + 0xda, 0xf7, 0x97, 0xb5, 0xd7, 0x39, 0xfe, 0xa6, 0xe0, 0xe7, 0x66, 0xcb, 0xb2, 0x77, 0xdd, 0xbf, + 0x6b, 0xd0, 0x28, 0x07, 0xbe, 0x95, 0x8b, 0x66, 0x05, 0x96, 0x17, 0xae, 0x2c, 0xd0, 0x85, 0x86, + 0xe0, 0x85, 0xa2, 0xda, 0x22, 0xda, 0x58, 0x80, 0xf5, 0xf8, 0x7a, 0xcb, 0xaf, 0x10, 0xf2, 0x14, + 0x20, 0x48, 0x67, 0x07, 0x5e, 0xf9, 0xe4, 0x00, 0x79, 0xc3, 0xd1, 0xf1, 0x1c, 0x78, 0x41, 0xd5, + 0x15, 0x8f, 0xfc, 0x25, 0xaa, 0x4e, 0x38, 0x4d, 0x83, 0xd2, 0x16, 0x7b, 0x3e, 0xbe, 0x93, 0x8f, + 0xa1, 0x99, 0xe4, 0x39, 0xe7, 0xa9, 0x74, 0x9a, 0x98, 0xd1, 0xaa, 0x94, 0xf4, 0x94, 0xfc, 0x19, + 0x46, 0x7e, 0x9c, 0x1f, 0x9c, 0xa4, 0x61, 0x21, 0x12, 0x75, 0x83, 0xbe, 0x11, 0x74, 0x82, 0x0e, + 0xb0, 0x06, 0xee, 0xf2, 0xc1, 0x9d, 0x57, 0x9c, 0x67, 0x9a, 0xb3, 0x98, 0xd0, 0x26, 0x89, 0xb9, + 0x11, 0xe0, 0x9d, 0x46, 0x78, 0x6e, 0xb6, 0x5a, 0x76, 0xdb, 0x1d, 0x83, 0x39, 0xcc, 0x83, 0x4c, + 0x77, 0x81, 0x17, 0xa4, 0x3a, 0x5a, 0x34, 0xfd, 0xd2, 0x85, 0xac, 0xdd, 0xea, 0x42, 0xba, 0x3d, + 0x38, 0xdc, 0x34, 0xed, 0xf2, 0x0b, 0xe7, 0xfe, 0x66, 0xc0, 0x47, 0x1b, 0x29, 0xff, 0xf7, 0x17, + 0x89, 0x3c, 0x81, 0x46, 0x65, 0xc8, 0xfa, 0x16, 0x86, 0xac, 0xb8, 0x8f, 0x7f, 0x35, 0x80, 0xfc, + 0xfb, 0x8b, 0x40, 0x9a, 0x50, 0x3f, 0x3b, 0x1e, 0xdb, 0x77, 0xc8, 0x3e, 0x58, 0x63, 0x11, 0x30, + 0x99, 0x07, 0x82, 0x32, 0x65, 0x1b, 0x64, 0x17, 0x5a, 0xdf, 0x0f, 0x4e, 0x44, 0x12, 0xc5, 0xd4, + 0xae, 0x95, 0xab, 0x71, 0xc1, 0x18, 0x4d, 0xed, 0xba, 0x8e, 0x1a, 0x9e, 0x9e, 0xdb, 0x26, 0xb1, + 0xa0, 0x39, 0x12, 0xc9, 0x34, 0x50, 0xd4, 0xde, 0xd1, 0x8b, 0x97, 0x53, 0x2a, 0xd2, 0xe0, 0xc6, + 0x6e, 0xe8, 0x80, 0x21, 0x53, 0x54, 0xb0, 0x20, 0xb5, 0x9b, 0x7a, 0xf5, 0x22, 0xd1, 0xd5, 0xd3, + 0xc8, 0x6e, 0x0d, 0xde, 0xd6, 0xe1, 0x83, 0xd5, 0x5a, 0x8e, 0xf5, 0x04, 0x48, 0x02, 0x8d, 0x21, + 0x9b, 0xf2, 0xd7, 0x94, 0x7c, 0xba, 0xe5, 0xaf, 0xa1, 0x1c, 0x40, 0xd7, 0xdb, 0x96, 0x5e, 0x0e, + 0xc3, 0xbd, 0x43, 0x7e, 0x86, 0xd6, 0xec, 0xa7, 0x41, 0xbe, 0xd8, 0x2e, 0x7a, 0xed, 0xbf, 0xd6, + 0xfd, 0xf2, 0xb6, 0x61, 0xf3, 0xe4, 0x6f, 0x0d, 0xe8, 0x3e, 0xa3, 0x6a, 0xc3, 0xc8, 0xc8, 0x46, + 0xe1, 0xff, 0xb6, 0x61, 0xf7, 0xe9, 0xad, 0xe3, 0x66, 0x15, 0x9d, 0x7c, 0xf6, 0x43, 0x3f, 0x4e, + 0xd4, 0x55, 0x71, 0xe9, 0x85, 0x3c, 0xeb, 0x67, 0x49, 0x28, 0xb8, 0xe4, 0x13, 0xd5, 0xcf, 0x78, + 0xd8, 0x17, 0x79, 0xd8, 0x5f, 0x88, 0xf6, 0x2b, 0xd1, 0xcb, 0x06, 0x1a, 0xf7, 0xf3, 0x7f, 0x02, + 0x00, 0x00, 0xff, 0xff, 0x63, 0x8c, 0x7a, 0x3d, 0x1a, 0x0a, 0x00, 0x00, +>>>>>>> Stashed changes } // Reference imports to suppress errors if they are not otherwise used. diff --git a/rpc/cloudagent/network/virtualnetwork/moc_cloudagent_virtualnetwork.proto b/rpc/cloudagent/network/virtualnetwork/moc_cloudagent_virtualnetwork.proto index 019f9afc..faef1bc7 100644 --- a/rpc/cloudagent/network/virtualnetwork/moc_cloudagent_virtualnetwork.proto +++ b/rpc/cloudagent/network/virtualnetwork/moc_cloudagent_virtualnetwork.proto @@ -60,6 +60,7 @@ message VirtualNetwork { Tags tags = 12; NetworkReference logicalNetwork = 13; repeated string cidr = 14; + NetworkControllerConfig networkControllerConfig = 15; } message Subnet { @@ -80,6 +81,18 @@ message Ipam { repeated Subnet subnets = 2; } +<<<<<<< Updated upstream +======= +message NetworkControllerConfigRequest { +} + +message NetworkControllerConfigResponse { + google.protobuf.BoolValue Result = 1; + string Error = 2; + NetworkControllerConfig Config = 3; +} + +>>>>>>> Stashed changes service VirtualNetworkAgent { rpc Invoke(VirtualNetworkRequest) returns (VirtualNetworkResponse) {} diff --git a/rpc/common/moc_common_networkcommon.pb.go b/rpc/common/moc_common_networkcommon.pb.go index 04a4dd06..46639df7 100644 --- a/rpc/common/moc_common_networkcommon.pb.go +++ b/rpc/common/moc_common_networkcommon.pb.go @@ -689,6 +689,77 @@ func (m *AdvancedNetworkPolicy) GetEnabled() bool { return false } +type NetworkControllerConfig struct { + IsSdnEnabled bool `protobuf:"varint,1,opt,name=isSdnEnabled,proto3" json:"isSdnEnabled,omitempty"` + IsSdnVnetEnabled bool `protobuf:"varint,2,opt,name=isSdnVnetEnabled,proto3" json:"isSdnVnetEnabled,omitempty"` + IsSdnVnetV2Enabled bool `protobuf:"varint,3,opt,name=isSdnVnetV2Enabled,proto3" json:"isSdnVnetV2Enabled,omitempty"` + IsSdnLBV2Enabled bool `protobuf:"varint,4,opt,name=isSdnLBV2Enabled,proto3" json:"isSdnLBV2Enabled,omitempty"` + IsLegacySdnEnabled bool `protobuf:"varint,5,opt,name=isLegacySdnEnabled,proto3" json:"isLegacySdnEnabled,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *NetworkControllerConfig) Reset() { *m = NetworkControllerConfig{} } +func (m *NetworkControllerConfig) String() string { return proto.CompactTextString(m) } +func (*NetworkControllerConfig) ProtoMessage() {} +func (*NetworkControllerConfig) Descriptor() ([]byte, []int) { + return fileDescriptor_ba09ae1dfdbe03d2, []int{10} +} + +func (m *NetworkControllerConfig) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_NetworkControllerConfig.Unmarshal(m, b) +} +func (m *NetworkControllerConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_NetworkControllerConfig.Marshal(b, m, deterministic) +} +func (m *NetworkControllerConfig) XXX_Merge(src proto.Message) { + xxx_messageInfo_NetworkControllerConfig.Merge(m, src) +} +func (m *NetworkControllerConfig) XXX_Size() int { + return xxx_messageInfo_NetworkControllerConfig.Size(m) +} +func (m *NetworkControllerConfig) XXX_DiscardUnknown() { + xxx_messageInfo_NetworkControllerConfig.DiscardUnknown(m) +} + +var xxx_messageInfo_NetworkControllerConfig proto.InternalMessageInfo + +func (m *NetworkControllerConfig) GetIsSdnEnabled() bool { + if m != nil { + return m.IsSdnEnabled + } + return false +} + +func (m *NetworkControllerConfig) GetIsSdnVnetEnabled() bool { + if m != nil { + return m.IsSdnVnetEnabled + } + return false +} + +func (m *NetworkControllerConfig) GetIsSdnVnetV2Enabled() bool { + if m != nil { + return m.IsSdnVnetV2Enabled + } + return false +} + +func (m *NetworkControllerConfig) GetIsSdnLBV2Enabled() bool { + if m != nil { + return m.IsSdnLBV2Enabled + } + return false +} + +func (m *NetworkControllerConfig) GetIsLegacySdnEnabled() bool { + if m != nil { + return m.IsLegacySdnEnabled + } + return false +} + type ProbeReference struct { ResourceRef *ResourceReference `protobuf:"bytes,1,opt,name=resourceRef,proto3" json:"resourceRef,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -700,7 +771,7 @@ func (m *ProbeReference) Reset() { *m = ProbeReference{} } func (m *ProbeReference) String() string { return proto.CompactTextString(m) } func (*ProbeReference) ProtoMessage() {} func (*ProbeReference) Descriptor() ([]byte, []int) { - return fileDescriptor_ba09ae1dfdbe03d2, []int{10} + return fileDescriptor_ba09ae1dfdbe03d2, []int{11} } func (m *ProbeReference) XXX_Unmarshal(b []byte) error { @@ -739,7 +810,7 @@ func (m *FrontendIPConfigurationReference) Reset() { *m = FrontendIPConf func (m *FrontendIPConfigurationReference) String() string { return proto.CompactTextString(m) } func (*FrontendIPConfigurationReference) ProtoMessage() {} func (*FrontendIPConfigurationReference) Descriptor() ([]byte, []int) { - return fileDescriptor_ba09ae1dfdbe03d2, []int{11} + return fileDescriptor_ba09ae1dfdbe03d2, []int{12} } func (m *FrontendIPConfigurationReference) XXX_Unmarshal(b []byte) error { @@ -778,7 +849,7 @@ func (m *LoadBalancerReference) Reset() { *m = LoadBalancerReference{} } func (m *LoadBalancerReference) String() string { return proto.CompactTextString(m) } func (*LoadBalancerReference) ProtoMessage() {} func (*LoadBalancerReference) Descriptor() ([]byte, []int) { - return fileDescriptor_ba09ae1dfdbe03d2, []int{12} + return fileDescriptor_ba09ae1dfdbe03d2, []int{13} } func (m *LoadBalancerReference) XXX_Unmarshal(b []byte) error { @@ -818,7 +889,7 @@ func (m *BackendAddressPoolReference) Reset() { *m = BackendAddressPoolR func (m *BackendAddressPoolReference) String() string { return proto.CompactTextString(m) } func (*BackendAddressPoolReference) ProtoMessage() {} func (*BackendAddressPoolReference) Descriptor() ([]byte, []int) { - return fileDescriptor_ba09ae1dfdbe03d2, []int{13} + return fileDescriptor_ba09ae1dfdbe03d2, []int{14} } func (m *BackendAddressPoolReference) XXX_Unmarshal(b []byte) error { @@ -870,6 +941,7 @@ func init() { proto.RegisterType((*SubnetReference)(nil), "moc.SubnetReference") proto.RegisterType((*PublicIPAddressReference)(nil), "moc.PublicIPAddressReference") proto.RegisterType((*AdvancedNetworkPolicy)(nil), "moc.AdvancedNetworkPolicy") + proto.RegisterType((*NetworkControllerConfig)(nil), "moc.NetworkControllerConfig") proto.RegisterType((*ProbeReference)(nil), "moc.ProbeReference") proto.RegisterType((*FrontendIPConfigurationReference)(nil), "moc.FrontendIPConfigurationReference") proto.RegisterType((*LoadBalancerReference)(nil), "moc.LoadBalancerReference") @@ -879,56 +951,61 @@ func init() { func init() { proto.RegisterFile("moc_common_networkcommon.proto", fileDescriptor_ba09ae1dfdbe03d2) } var fileDescriptor_ba09ae1dfdbe03d2 = []byte{ - // 812 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0x51, 0x6f, 0xe3, 0x44, - 0x10, 0xae, 0xe3, 0x34, 0x6d, 0x26, 0xba, 0xeb, 0x76, 0xa1, 0xc5, 0x3a, 0x38, 0x28, 0x3e, 0x21, - 0x4a, 0x84, 0x1a, 0xa9, 0x9c, 0x4e, 0x08, 0x09, 0xa4, 0xf4, 0xd2, 0x1e, 0x86, 0x5c, 0xce, 0x38, - 0x69, 0x10, 0x08, 0x54, 0x6d, 0xd6, 0x9b, 0x74, 0x75, 0xf6, 0xae, 0xb5, 0x5e, 0x87, 0x8b, 0xc4, - 0x03, 0x7f, 0x84, 0x9f, 0xc0, 0x7f, 0x44, 0xbb, 0x76, 0x88, 0xef, 0xda, 0x07, 0x1e, 0xf2, 0x36, - 0x33, 0xfb, 0x7d, 0xdf, 0xce, 0x7c, 0x1e, 0xdb, 0xf0, 0x71, 0x2a, 0xe9, 0x0d, 0x95, 0x69, 0x2a, - 0xc5, 0x8d, 0x60, 0xfa, 0x0f, 0xa9, 0x5e, 0x97, 0xd9, 0x59, 0xa6, 0xa4, 0x96, 0xd8, 0x4d, 0x25, - 0x7d, 0xf4, 0x41, 0x0d, 0x54, 0x3f, 0xf5, 0x39, 0xb8, 0x03, 0x91, 0x63, 0x0f, 0xf6, 0x72, 0xa6, - 0x96, 0x4c, 0xe5, 0x9e, 0x73, 0xe2, 0x9e, 0xb6, 0xa3, 0x75, 0x8a, 0x8f, 0xa1, 0x15, 0xcb, 0x94, - 0x70, 0xe1, 0x35, 0x4e, 0x9c, 0xd3, 0x76, 0x54, 0x65, 0xa6, 0x9e, 0x33, 0xa2, 0xe8, 0xad, 0xe7, - 0x5a, 0x42, 0x95, 0x19, 0x25, 0x99, 0x69, 0x2e, 0x45, 0xee, 0x35, 0x4b, 0xa5, 0x2a, 0xf5, 0xbf, - 0x03, 0x08, 0xc2, 0x50, 0xca, 0x24, 0x10, 0x73, 0x89, 0x31, 0x34, 0x8b, 0x9c, 0xc5, 0x9e, 0x63, - 0x55, 0x6d, 0x8c, 0x3f, 0x82, 0x36, 0x59, 0x12, 0x9e, 0x90, 0x59, 0xc2, 0xaa, 0xeb, 0x36, 0x05, - 0xff, 0x1f, 0x07, 0x5a, 0xa5, 0x80, 0x21, 0x0b, 0x92, 0xb2, 0x35, 0xd9, 0xc4, 0xf8, 0x09, 0x34, - 0xf5, 0x2a, 0x2b, 0x79, 0x0f, 0xcf, 0x0f, 0xce, 0x52, 0x49, 0xcf, 0x4a, 0xf8, 0x64, 0x95, 0xb1, - 0xc8, 0x1e, 0xe2, 0xf7, 0x61, 0x37, 0xd7, 0x44, 0x69, 0xcf, 0xb5, 0xcc, 0x32, 0xc1, 0x08, 0x5c, - 0x26, 0x62, 0xaf, 0x69, 0x6b, 0x26, 0x34, 0x62, 0x5c, 0xcc, 0xa5, 0xb7, 0x7b, 0xe2, 0x9c, 0x76, - 0xde, 0x12, 0x33, 0xcd, 0x47, 0xf6, 0x10, 0x3f, 0x86, 0xa6, 0x26, 0x8b, 0xdc, 0x6b, 0x59, 0x50, - 0xdb, 0x82, 0x26, 0x64, 0x91, 0x47, 0xb6, 0xec, 0x2f, 0x60, 0x37, 0x92, 0x85, 0x66, 0xc6, 0x12, - 0xc1, 0xde, 0xe8, 0xef, 0x65, 0x56, 0x35, 0xbc, 0x4e, 0xf1, 0x97, 0x70, 0x18, 0xb3, 0x5c, 0x73, - 0x41, 0x8c, 0x45, 0xa1, 0x62, 0x73, 0xfe, 0xa6, 0x1a, 0xfc, 0xee, 0x81, 0xb1, 0x3c, 0x65, 0x5a, - 0x71, 0x6a, 0xbb, 0x7f, 0x10, 0x55, 0x99, 0xff, 0x39, 0x1c, 0x46, 0x2c, 0x97, 0x85, 0xa2, 0x2c, - 0x62, 0x73, 0xa6, 0x98, 0xa0, 0xec, 0x3e, 0x8b, 0xfc, 0x5f, 0xe0, 0xf1, 0xa8, 0xdc, 0x90, 0x31, - 0xa3, 0x85, 0xe2, 0x7a, 0xf5, 0x42, 0xc9, 0x22, 0xdb, 0x90, 0xbe, 0x86, 0x8e, 0xda, 0x28, 0x59, - 0x6e, 0xe7, 0xfc, 0xd8, 0x0e, 0x76, 0xe7, 0x86, 0xa8, 0x0e, 0xf5, 0xff, 0x72, 0x00, 0x55, 0xda, - 0x5b, 0x90, 0xc3, 0xe7, 0xd0, 0xa9, 0x76, 0x79, 0xb2, 0x79, 0xa6, 0xc8, 0x32, 0x47, 0x9b, 0x7a, - 0x54, 0x07, 0xf9, 0x7f, 0xc2, 0xc1, 0xb8, 0x98, 0x09, 0xa6, 0x37, 0x0d, 0xf4, 0x8c, 0xf3, 0x16, - 0x51, 0x5d, 0x7e, 0x54, 0x97, 0xd8, 0xdc, 0xbd, 0x46, 0xbd, 0xdb, 0x71, 0xe3, 0xff, 0x1b, 0x30, - 0x01, 0x2f, 0x2c, 0x66, 0x09, 0xa7, 0x41, 0xd8, 0x8f, 0x63, 0xc5, 0xf2, 0x7c, 0x1b, 0xb6, 0xfe, - 0x0e, 0x47, 0xfd, 0x78, 0x49, 0x04, 0x65, 0x71, 0xd5, 0x74, 0x28, 0x13, 0x4e, 0x57, 0xb8, 0x5b, - 0x6d, 0xbb, 0x63, 0x9d, 0x39, 0xae, 0x8f, 0x55, 0x22, 0x6a, 0x4b, 0xef, 0xc1, 0x1e, 0x13, 0xe6, - 0x15, 0x8a, 0xed, 0x40, 0xfb, 0xd1, 0x3a, 0xf5, 0x7f, 0x80, 0x87, 0xa1, 0x92, 0x33, 0xb6, 0x8d, - 0x56, 0x7f, 0x83, 0x93, 0x2b, 0x25, 0x85, 0x66, 0x22, 0x0e, 0xc2, 0xe7, 0x52, 0xcc, 0xf9, 0xa2, - 0x50, 0x76, 0x7d, 0xb7, 0xa1, 0xfe, 0x13, 0x1c, 0x0d, 0x25, 0x89, 0x2f, 0x48, 0x62, 0xcc, 0x50, - 0xdb, 0x90, 0xfc, 0xdb, 0x81, 0x0f, 0x2f, 0x08, 0x7d, 0xcd, 0x44, 0x5c, 0x3d, 0x31, 0xf3, 0x7e, - 0x6f, 0x63, 0x7b, 0x07, 0x70, 0x90, 0xbc, 0xdd, 0x6c, 0xb5, 0x49, 0x8f, 0x2c, 0xfb, 0xde, 0x41, - 0xa2, 0x77, 0x29, 0xdd, 0x6f, 0x61, 0x3f, 0x34, 0xdf, 0x68, 0x2a, 0x13, 0xbc, 0x07, 0x6e, 0x3f, - 0x49, 0xd0, 0x8e, 0x09, 0x26, 0x34, 0x43, 0x8e, 0x09, 0xae, 0xe3, 0x0c, 0x35, 0x30, 0x40, 0x2b, - 0xa0, 0x69, 0xb6, 0x7c, 0x8a, 0xdc, 0xff, 0xe2, 0x67, 0xa8, 0xd9, 0xfd, 0x06, 0x70, 0x10, 0xf6, - 0x93, 0x44, 0x52, 0xfb, 0x10, 0x5e, 0x32, 0x7d, 0x2b, 0x63, 0xdc, 0x81, 0xbd, 0x40, 0x2c, 0x49, - 0xc2, 0x63, 0xb4, 0x63, 0x92, 0xc1, 0x4a, 0x90, 0x94, 0x53, 0xe4, 0x18, 0xee, 0x58, 0x13, 0xcd, - 0x29, 0x6a, 0x74, 0x3f, 0x5d, 0x7f, 0xaa, 0xcd, 0x16, 0xe1, 0x16, 0x34, 0xa6, 0x2f, 0x4b, 0xf8, - 0xb4, 0x2c, 0x23, 0xa7, 0x7b, 0x05, 0x9d, 0xda, 0x9b, 0x88, 0xdf, 0x83, 0x83, 0x69, 0x10, 0x4d, - 0xae, 0xfb, 0xc3, 0x9b, 0xd1, 0xe5, 0xe4, 0xe7, 0x57, 0xd1, 0x8f, 0x68, 0xc7, 0x14, 0x87, 0xaf, - 0x5e, 0x04, 0xcf, 0x6b, 0x45, 0x07, 0x3f, 0x80, 0xf6, 0xf5, 0x68, 0x70, 0x79, 0x15, 0x8c, 0x2e, - 0x07, 0xa8, 0xd1, 0xfd, 0x04, 0xda, 0x41, 0x38, 0x65, 0x2a, 0xe7, 0x52, 0xe0, 0x7d, 0x68, 0x06, - 0xe1, 0xf2, 0x29, 0xda, 0xa9, 0xa2, 0x67, 0xc8, 0xe9, 0x7e, 0x01, 0x87, 0x77, 0x16, 0xdb, 0x8e, - 0x31, 0x9a, 0xf6, 0x87, 0xc1, 0xa0, 0xf4, 0x64, 0x3c, 0x18, 0x21, 0xe7, 0xe2, 0xb3, 0x5f, 0x9f, - 0x2c, 0xb8, 0xbe, 0x2d, 0x66, 0x67, 0x54, 0xa6, 0xbd, 0x94, 0x53, 0x25, 0x73, 0x39, 0xd7, 0xbd, - 0x54, 0xd2, 0x9e, 0xca, 0x68, 0xaf, 0xfc, 0xf3, 0xcd, 0x5a, 0xf6, 0xd7, 0xf7, 0xd5, 0xbf, 0x01, - 0x00, 0x00, 0xff, 0xff, 0x54, 0x0a, 0xfa, 0xbf, 0x3a, 0x07, 0x00, 0x00, + // 892 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0x5d, 0x6f, 0x23, 0x35, + 0x14, 0xed, 0x24, 0x69, 0xda, 0xdc, 0xb0, 0x5b, 0xd7, 0xd0, 0xee, 0x68, 0x61, 0xa1, 0xcc, 0x0a, + 0x51, 0x22, 0xd4, 0x48, 0x65, 0xb5, 0x42, 0x48, 0x20, 0xa5, 0x4d, 0xba, 0x0c, 0x64, 0xb3, 0xc3, + 0x24, 0x0d, 0x02, 0x81, 0x2a, 0xc7, 0xe3, 0xa4, 0xd6, 0xce, 0xd8, 0x23, 0x8f, 0x13, 0x36, 0x12, + 0x0f, 0xfc, 0x11, 0x7e, 0x02, 0x3f, 0x8f, 0x77, 0x64, 0xcf, 0xa4, 0x99, 0x7e, 0x3c, 0xf0, 0x90, + 0xb7, 0x7b, 0x8f, 0xcf, 0x39, 0xbe, 0xbe, 0xe3, 0x3b, 0x86, 0x8f, 0x13, 0x49, 0xaf, 0xa8, 0x4c, + 0x12, 0x29, 0xae, 0x04, 0xd3, 0x7f, 0x48, 0xf5, 0x36, 0xcf, 0x4e, 0x52, 0x25, 0xb5, 0xc4, 0xd5, + 0x44, 0xd2, 0xa7, 0x4f, 0x4a, 0xa4, 0xf2, 0xaa, 0xc7, 0xa1, 0xda, 0x15, 0x19, 0x76, 0x61, 0x27, + 0x63, 0x6a, 0xc1, 0x54, 0xe6, 0x3a, 0x47, 0xd5, 0xe3, 0x46, 0xb8, 0x4a, 0xf1, 0x21, 0xd4, 0x23, + 0x99, 0x10, 0x2e, 0xdc, 0xca, 0x91, 0x73, 0xdc, 0x08, 0x8b, 0xcc, 0xe0, 0x19, 0x23, 0x8a, 0x5e, + 0xbb, 0x55, 0x2b, 0x28, 0x32, 0xe3, 0x24, 0x53, 0xcd, 0xa5, 0xc8, 0xdc, 0x5a, 0xee, 0x54, 0xa4, + 0xde, 0x77, 0x00, 0x7e, 0x10, 0x48, 0x19, 0xfb, 0x62, 0x2a, 0x31, 0x86, 0xda, 0x3c, 0x63, 0x91, + 0xeb, 0x58, 0x57, 0x1b, 0xe3, 0x8f, 0xa0, 0x41, 0x16, 0x84, 0xc7, 0x64, 0x12, 0xb3, 0x62, 0xbb, + 0x35, 0xe0, 0xfd, 0xe3, 0x40, 0x3d, 0x37, 0x30, 0x62, 0x41, 0x12, 0xb6, 0x12, 0x9b, 0x18, 0x3f, + 0x87, 0x9a, 0x5e, 0xa6, 0xb9, 0xee, 0xf1, 0xe9, 0xde, 0x49, 0x22, 0xe9, 0x49, 0x4e, 0x1f, 0x2d, + 0x53, 0x16, 0xda, 0x45, 0xfc, 0x01, 0x6c, 0x67, 0x9a, 0x28, 0xed, 0x56, 0xad, 0x32, 0x4f, 0x30, + 0x82, 0x2a, 0x13, 0x91, 0x5b, 0xb3, 0x98, 0x09, 0x8d, 0x19, 0x17, 0x53, 0xe9, 0x6e, 0x1f, 0x39, + 0xc7, 0xcd, 0x5b, 0x66, 0xa6, 0xf8, 0xd0, 0x2e, 0xe2, 0x67, 0x50, 0xd3, 0x64, 0x96, 0xb9, 0x75, + 0x4b, 0x6a, 0x58, 0xd2, 0x88, 0xcc, 0xb2, 0xd0, 0xc2, 0xde, 0x0c, 0xb6, 0x43, 0x39, 0xd7, 0xcc, + 0xb4, 0x44, 0xb0, 0x77, 0xfa, 0x7b, 0x99, 0x16, 0x05, 0xaf, 0x52, 0xfc, 0x25, 0xec, 0x47, 0x2c, + 0xd3, 0x5c, 0x10, 0xd3, 0xa2, 0x40, 0xb1, 0x29, 0x7f, 0x57, 0x1c, 0xfc, 0xfe, 0x82, 0x69, 0x79, + 0xc2, 0xb4, 0xe2, 0xd4, 0x56, 0xff, 0x28, 0x2c, 0x32, 0xef, 0x73, 0xd8, 0x0f, 0x59, 0x26, 0xe7, + 0x8a, 0xb2, 0x90, 0x4d, 0x99, 0x62, 0x82, 0xb2, 0x87, 0x5a, 0xe4, 0xfd, 0x02, 0xcf, 0x06, 0xf9, + 0x0d, 0x19, 0x32, 0x3a, 0x57, 0x5c, 0x2f, 0x5f, 0x29, 0x39, 0x4f, 0xd7, 0xa2, 0xaf, 0xa1, 0xa9, + 0xd6, 0x4e, 0x56, 0xdb, 0x3c, 0x3d, 0xb4, 0x07, 0xbb, 0xb7, 0x43, 0x58, 0xa6, 0x7a, 0x7f, 0x39, + 0x80, 0x0a, 0xef, 0x0d, 0xd8, 0xe1, 0x53, 0x68, 0x16, 0x77, 0x79, 0xb4, 0xfe, 0xa6, 0xc8, 0x2a, + 0x07, 0x6b, 0x3c, 0x2c, 0x93, 0xbc, 0x3f, 0x61, 0x6f, 0x38, 0x9f, 0x08, 0xa6, 0xd7, 0x05, 0xb4, + 0x4d, 0xe7, 0x2d, 0xa3, 0xd8, 0xfc, 0xa0, 0x6c, 0xb1, 0xde, 0x7b, 0xc5, 0xba, 0x5b, 0x71, 0xe5, + 0xff, 0x37, 0x60, 0x04, 0x6e, 0x30, 0x9f, 0xc4, 0x9c, 0xfa, 0x41, 0x27, 0x8a, 0x14, 0xcb, 0xb2, + 0x4d, 0xb4, 0xf5, 0x77, 0x38, 0xe8, 0x44, 0x0b, 0x22, 0x28, 0x8b, 0x8a, 0xa2, 0x03, 0x19, 0x73, + 0xba, 0xc4, 0xad, 0xe2, 0xb6, 0x3b, 0xb6, 0x33, 0x87, 0xe5, 0x63, 0xe5, 0x8c, 0xd2, 0xa5, 0x77, + 0x61, 0x87, 0x09, 0x33, 0x42, 0x91, 0x3d, 0xd0, 0x6e, 0xb8, 0x4a, 0xbd, 0x7f, 0x1d, 0x78, 0x52, + 0xa8, 0xce, 0xa5, 0xd0, 0x4a, 0xc6, 0x31, 0x53, 0xe7, 0x52, 0x4c, 0xf9, 0x0c, 0x7b, 0xf0, 0x1e, + 0xcf, 0x86, 0x91, 0xe8, 0x15, 0x52, 0xc7, 0x4a, 0x6f, 0x61, 0xb8, 0x05, 0xc8, 0xe6, 0x63, 0xc1, + 0x74, 0xef, 0xd6, 0x16, 0xf7, 0x70, 0x7c, 0x02, 0xf8, 0x06, 0x1b, 0x9f, 0xae, 0xd8, 0x55, 0xcb, + 0x7e, 0x60, 0xe5, 0xc6, 0xbb, 0x7f, 0xb6, 0x66, 0xd7, 0x4a, 0xde, 0x25, 0x3c, 0xf7, 0xee, 0xb3, + 0x19, 0xa1, 0xcb, 0x52, 0xc5, 0xdb, 0x2b, 0xef, 0xbb, 0x2b, 0xde, 0x0f, 0xf0, 0x38, 0x50, 0x72, + 0xc2, 0x36, 0xf1, 0x89, 0x7e, 0x83, 0xa3, 0x0b, 0x25, 0x85, 0x66, 0x22, 0xf2, 0x83, 0xbc, 0x77, + 0x73, 0x65, 0xc7, 0x76, 0x13, 0xee, 0x3f, 0xc1, 0x41, 0x5f, 0x92, 0xe8, 0x8c, 0xc4, 0xe6, 0x12, + 0xa8, 0x4d, 0x58, 0xfe, 0xed, 0xc0, 0x87, 0x67, 0x84, 0xbe, 0x65, 0x22, 0x2a, 0x6e, 0xaa, 0xf9, + 0xaf, 0x6d, 0x62, 0x6a, 0xbb, 0xb0, 0x17, 0xdf, 0x2e, 0xb6, 0x98, 0xa0, 0xa7, 0x56, 0xfd, 0xe0, + 0x41, 0xc2, 0xbb, 0x92, 0xd6, 0xb7, 0xb0, 0x1b, 0x98, 0xb7, 0x89, 0xca, 0x18, 0xef, 0x40, 0xb5, + 0x13, 0xc7, 0x68, 0xcb, 0x04, 0x23, 0x9a, 0x22, 0xc7, 0x04, 0x97, 0x51, 0x8a, 0x2a, 0x18, 0xa0, + 0xee, 0xd3, 0x24, 0x5d, 0xbc, 0x40, 0xd5, 0x9b, 0xf8, 0x25, 0xaa, 0xb5, 0xbe, 0x01, 0xec, 0x07, + 0x9d, 0x38, 0x96, 0xd4, 0x7e, 0x84, 0xd7, 0x4c, 0x5f, 0xcb, 0x08, 0x37, 0x61, 0xc7, 0x17, 0x0b, + 0x12, 0xf3, 0x08, 0x6d, 0x99, 0xa4, 0xbb, 0x14, 0x24, 0xe1, 0x14, 0x39, 0x46, 0x3b, 0xd4, 0x44, + 0x73, 0x8a, 0x2a, 0xad, 0x4f, 0x57, 0x4f, 0x94, 0x99, 0x1e, 0x5c, 0x87, 0xca, 0xf8, 0x75, 0x4e, + 0x1f, 0xe7, 0x30, 0x72, 0x5a, 0x17, 0xd0, 0x2c, 0xfd, 0x81, 0xf0, 0xfb, 0xb0, 0x37, 0xf6, 0xc3, + 0xd1, 0x65, 0xa7, 0x7f, 0x35, 0xe8, 0x8d, 0x7e, 0x7e, 0x13, 0xfe, 0x88, 0xb6, 0x0c, 0xd8, 0x7f, + 0xf3, 0xca, 0x3f, 0x2f, 0x81, 0x0e, 0x7e, 0x04, 0x8d, 0xcb, 0x41, 0xb7, 0x77, 0xe1, 0x0f, 0x7a, + 0x5d, 0x54, 0x69, 0x7d, 0x02, 0x0d, 0x3f, 0x18, 0x33, 0x95, 0x71, 0x29, 0xf0, 0x2e, 0xd4, 0xfc, + 0x60, 0xf1, 0x02, 0x6d, 0x15, 0xd1, 0x4b, 0xe4, 0xb4, 0xbe, 0x80, 0xfd, 0x7b, 0x03, 0x6d, 0x8f, + 0x31, 0x18, 0x77, 0xfa, 0x7e, 0x37, 0xef, 0xc9, 0xb0, 0x3b, 0x40, 0xce, 0xd9, 0x67, 0xbf, 0x3e, + 0x9f, 0x71, 0x7d, 0x3d, 0x9f, 0x9c, 0x50, 0x99, 0xb4, 0x13, 0x4e, 0x95, 0xcc, 0xe4, 0x54, 0xb7, + 0x13, 0x49, 0xdb, 0x2a, 0xa5, 0xed, 0xfc, 0xc5, 0x9f, 0xd4, 0xed, 0x93, 0xff, 0xd5, 0x7f, 0x01, + 0x00, 0x00, 0xff, 0xff, 0xc5, 0xa2, 0x7f, 0x7c, 0x32, 0x08, 0x00, 0x00, } diff --git a/rpc/common/moc_common_networkcommon.proto b/rpc/common/moc_common_networkcommon.proto index 593b7c80..98344d10 100644 --- a/rpc/common/moc_common_networkcommon.proto +++ b/rpc/common/moc_common_networkcommon.proto @@ -97,6 +97,14 @@ message AdvancedNetworkPolicy { bool enabled = 2; } +message NetworkControllerConfig { + bool isSdnEnabled = 1; + bool isSdnVnetEnabled = 2; + bool isSdnVnetV2Enabled = 3; + bool isSdnLBV2Enabled = 4; + bool isLegacySdnEnabled = 5; +} + message ProbeReference { ResourceReference resourceRef = 1; From b2f1997900003bb1abb4cb67e43ac4ce4a269b56 Mon Sep 17 00:00:00 2001 From: Li Ting Wong Date: Thu, 15 Jan 2026 05:31:53 +0000 Subject: [PATCH 2/2] fix merge fix go mod fix merge --- go.mod | 8 +- go.sum | 31 +- .../moc_cloudagent_virtualnetwork.pb.go | 272 ++++-------------- .../moc_cloudagent_virtualnetwork.proto | 12 - 4 files changed, 61 insertions(+), 262 deletions(-) diff --git a/go.mod b/go.mod index 527d2e46..ad72b523 100644 --- a/go.mod +++ b/go.mod @@ -14,7 +14,7 @@ require ( github.com/pkg/errors v0.9.1 github.com/stretchr/testify v1.8.3 go.uber.org/multierr v1.11.0 - google.golang.org/grpc v1.76.0 + google.golang.org/grpc v1.59.0 gopkg.in/yaml.v3 v3.0.1 ) @@ -23,15 +23,9 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect golang.org/x/net v0.42.0 // indirect golang.org/x/sys v0.34.0 // indirect -<<<<<<< Updated upstream - golang.org/x/text v0.31.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20251111163417-95abcf5c77ba // indirect - google.golang.org/protobuf v1.36.10 // indirect -======= golang.org/x/text v0.33.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20260114163908-3f89685c29c3 // indirect google.golang.org/protobuf v1.36.11 // indirect ->>>>>>> Stashed changes ) replace ( diff --git a/go.sum b/go.sum index e8c5407b..54650959 100644 --- a/go.sum +++ b/go.sum @@ -3,8 +3,6 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= -github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= -github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/golang-jwt/jwt/v4 v4.5.2 h1:YtQM7lnr8iZ+j5q71MGKkNw9Mn7AjHM68uc9g5fXeUI= github.com/golang-jwt/jwt/v4 v4.5.2/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc= @@ -14,8 +12,6 @@ github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= -github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= -github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hectane/go-acl v0.0.0-20230122075934-ca0b05cb1adb h1:PGufWXXDq9yaev6xX1YQauaO1MV90e6Mpoq1I7Lz/VM= github.com/hectane/go-acl v0.0.0-20230122075934-ca0b05cb1adb/go.mod h1:QiyDdbZLaJ/mZP4Zwc9g2QsfaEA4o7XvvgZegSci5/E= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= @@ -31,18 +27,6 @@ github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gt github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= -go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= -go.opentelemetry.io/otel v1.37.0 h1:9zhNfelUvx0KBfu/gb+ZgeAfAgtWrfHJZcAqFC228wQ= -go.opentelemetry.io/otel v1.37.0/go.mod h1:ehE/umFRLnuLa/vSccNq9oS1ErUlkkK71gMcN34UG8I= -go.opentelemetry.io/otel/metric v1.37.0 h1:mvwbQS5m0tbmqML4NqK+e3aDiO02vsf/WgbsdpcPoZE= -go.opentelemetry.io/otel/metric v1.37.0/go.mod h1:04wGrZurHYKOc+RKeye86GwKiTb9FKm1WHtO+4EVr2E= -go.opentelemetry.io/otel/sdk v1.37.0 h1:ItB0QUqnjesGRvNcmAcU0LyvkVyGJ2xftD29bWdDvKI= -go.opentelemetry.io/otel/sdk v1.37.0/go.mod h1:VredYzxUvuo2q3WRcDnKDjbdvmO0sCzOvVAiY+yUkAg= -go.opentelemetry.io/otel/sdk/metric v1.37.0 h1:90lI228XrB9jCMuSdA0673aubgRobVZFhbjxHHspCPc= -go.opentelemetry.io/otel/sdk/metric v1.37.0/go.mod h1:cNen4ZWfiD37l5NhS+Keb5RXVWZWpRE+9WyVCpbo5ps= -go.opentelemetry.io/otel/trace v1.37.0 h1:HLdcFNbRQBE2imdSEgm/kwqmQj1Or1l/7bW6mxVK7z4= -go.opentelemetry.io/otel/trace v1.37.0/go.mod h1:TlgrlQ+PtQO5XFerSPUYG0JSgGyryXewPGyayAWSBS0= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= golang.org/x/crypto v0.37.0/go.mod h1:vg+k43peMZ0pUMhYmVAWysMK35e6ioLh3wB8ZCAfbVc= @@ -70,8 +54,8 @@ golang.org/x/term v0.31.0/go.mod h1:R4BeIy7D95HzImkxGkTW1UQTtP54tio2RyHz7PwK0aw= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/text v0.24.0/go.mod h1:L8rBsPeo2pSS+xqN0d5u2ikmjtmoJbDBT1b7nHvFCdU= -golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM= -golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM= +golang.org/x/text v0.33.0 h1:B3njUFyqtHDUI5jMn1YIr5B0IE2U0qck04r6d4KPAxE= +golang.org/x/text v0.33.0/go.mod h1:LuMebE6+rBincTi9+xWTY8TztLzKHc/9C1uBCG27+q8= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= @@ -82,23 +66,12 @@ golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxb golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -<<<<<<< Updated upstream -gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk= -gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E= -google.golang.org/genproto/googleapis/rpc v0.0.0-20251111163417-95abcf5c77ba h1:UKgtfRM7Yh93Sya0Fo8ZzhDP4qBckrrxEr2oF5UIVb8= -google.golang.org/genproto/googleapis/rpc v0.0.0-20251111163417-95abcf5c77ba/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk= -google.golang.org/grpc v1.76.0 h1:UnVkv1+uMLYXoIz6o7chp59WfQUYA2ex/BXQ9rHZu7A= -google.golang.org/grpc v1.76.0/go.mod h1:Ju12QI8M6iQJtbcsV+awF5a4hfJMLi4X0JLo94ULZ6c= -google.golang.org/protobuf v1.36.10 h1:AYd7cD/uASjIL6Q9LiTjz8JLcrh/88q5UObnmY3aOOE= -google.golang.org/protobuf v1.36.10/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco= -======= google.golang.org/genproto/googleapis/rpc v0.0.0-20260114163908-3f89685c29c3 h1:C4WAdL+FbjnGlpp2S+HMVhBeCq2Lcib4xZqfPNF6OoQ= google.golang.org/genproto/googleapis/rpc v0.0.0-20260114163908-3f89685c29c3/go.mod h1:j9x/tPzZkyxcgEFkiKEEGxfvyumM01BEtsW8xzOahRQ= google.golang.org/grpc v1.59.0 h1:Z5Iec2pjwb+LEOqzpB2MR12/eKFhDPhuqW91O+4bwUk= google.golang.org/grpc v1.59.0/go.mod h1:aUPDwccQo6OTjy7Hct4AfBPD1GptF4fyUjIkQ9YtF98= google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE= google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco= ->>>>>>> Stashed changes gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= diff --git a/rpc/cloudagent/network/moc_cloudagent_virtualnetwork.pb.go b/rpc/cloudagent/network/moc_cloudagent_virtualnetwork.pb.go index 8da803cb..49a19444 100644 --- a/rpc/cloudagent/network/moc_cloudagent_virtualnetwork.pb.go +++ b/rpc/cloudagent/network/moc_cloudagent_virtualnetwork.pb.go @@ -563,95 +563,6 @@ func (m *Ipam) GetSubnets() []*Subnet { return nil } -<<<<<<< Updated upstream -======= -type NetworkControllerConfigRequest struct { - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *NetworkControllerConfigRequest) Reset() { *m = NetworkControllerConfigRequest{} } -func (m *NetworkControllerConfigRequest) String() string { return proto.CompactTextString(m) } -func (*NetworkControllerConfigRequest) ProtoMessage() {} -func (*NetworkControllerConfigRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_65af3e74534f0214, []int{7} -} - -func (m *NetworkControllerConfigRequest) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_NetworkControllerConfigRequest.Unmarshal(m, b) -} -func (m *NetworkControllerConfigRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_NetworkControllerConfigRequest.Marshal(b, m, deterministic) -} -func (m *NetworkControllerConfigRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_NetworkControllerConfigRequest.Merge(m, src) -} -func (m *NetworkControllerConfigRequest) XXX_Size() int { - return xxx_messageInfo_NetworkControllerConfigRequest.Size(m) -} -func (m *NetworkControllerConfigRequest) XXX_DiscardUnknown() { - xxx_messageInfo_NetworkControllerConfigRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_NetworkControllerConfigRequest proto.InternalMessageInfo - -type NetworkControllerConfigResponse struct { - Result *wrappers.BoolValue `protobuf:"bytes,1,opt,name=Result,proto3" json:"Result,omitempty"` - Error string `protobuf:"bytes,2,opt,name=Error,proto3" json:"Error,omitempty"` - Config *common.NetworkControllerConfig `protobuf:"bytes,3,opt,name=Config,proto3" json:"Config,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *NetworkControllerConfigResponse) Reset() { *m = NetworkControllerConfigResponse{} } -func (m *NetworkControllerConfigResponse) String() string { return proto.CompactTextString(m) } -func (*NetworkControllerConfigResponse) ProtoMessage() {} -func (*NetworkControllerConfigResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_65af3e74534f0214, []int{8} -} - -func (m *NetworkControllerConfigResponse) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_NetworkControllerConfigResponse.Unmarshal(m, b) -} -func (m *NetworkControllerConfigResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_NetworkControllerConfigResponse.Marshal(b, m, deterministic) -} -func (m *NetworkControllerConfigResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_NetworkControllerConfigResponse.Merge(m, src) -} -func (m *NetworkControllerConfigResponse) XXX_Size() int { - return xxx_messageInfo_NetworkControllerConfigResponse.Size(m) -} -func (m *NetworkControllerConfigResponse) XXX_DiscardUnknown() { - xxx_messageInfo_NetworkControllerConfigResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_NetworkControllerConfigResponse proto.InternalMessageInfo - -func (m *NetworkControllerConfigResponse) GetResult() *wrappers.BoolValue { - if m != nil { - return m.Result - } - return nil -} - -func (m *NetworkControllerConfigResponse) GetError() string { - if m != nil { - return m.Error - } - return "" -} - -func (m *NetworkControllerConfigResponse) GetConfig() *common.NetworkControllerConfig { - if m != nil { - return m.Config - } - return nil -} - ->>>>>>> Stashed changes func init() { proto.RegisterEnum("moc.cloudagent.network.VirtualNetworkType", VirtualNetworkType_name, VirtualNetworkType_value) proto.RegisterType((*VirtualNetworkRequest)(nil), "moc.cloudagent.network.VirtualNetworkRequest") @@ -661,11 +572,6 @@ func init() { proto.RegisterType((*VirtualNetwork)(nil), "moc.cloudagent.network.VirtualNetwork") proto.RegisterType((*Subnet)(nil), "moc.cloudagent.network.Subnet") proto.RegisterType((*Ipam)(nil), "moc.cloudagent.network.Ipam") -<<<<<<< Updated upstream -======= - proto.RegisterType((*NetworkControllerConfigRequest)(nil), "moc.cloudagent.network.NetworkControllerConfigRequest") - proto.RegisterType((*NetworkControllerConfigResponse)(nil), "moc.cloudagent.network.NetworkControllerConfigResponse") ->>>>>>> Stashed changes } func init() { @@ -673,126 +579,64 @@ func init() { } var fileDescriptor_65af3e74534f0214 = []byte{ -<<<<<<< Updated upstream - // 875 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x54, 0xdd, 0x6e, 0xe3, 0x44, - 0x14, 0x5e, 0x27, 0x69, 0x7e, 0x8e, 0xdb, 0xd4, 0x1a, 0xd8, 0xad, 0x15, 0xb1, 0x55, 0xe4, 0x15, - 0xab, 0xb2, 0x12, 0x8e, 0x08, 0xbf, 0x37, 0x20, 0xb5, 0x80, 0x50, 0x56, 0x6c, 0x37, 0x9a, 0x46, - 0xbd, 0x40, 0x48, 0xab, 0xa9, 0x3d, 0x49, 0xcd, 0xda, 0x33, 0xee, 0xcc, 0x38, 0xab, 0x8a, 0x17, - 0x80, 0xf7, 0x81, 0x97, 0xe0, 0x15, 0x78, 0x0c, 0xae, 0x91, 0xd0, 0x1c, 0x3b, 0xbf, 0x6c, 0xa5, - 0xf4, 0x62, 0xaf, 0xec, 0x99, 0xef, 0x3b, 0xbf, 0xdf, 0x99, 0x03, 0x4f, 0x32, 0x19, 0xbd, 0x8a, - 0x52, 0x59, 0xc4, 0x6c, 0xc6, 0x85, 0x79, 0x35, 0x4f, 0x94, 0x29, 0x58, 0x2a, 0xb8, 0x79, 0x23, - 0xd5, 0xeb, 0x30, 0x57, 0xd2, 0x48, 0xf2, 0x28, 0x93, 0x51, 0xb8, 0x22, 0x85, 0x15, 0xda, 0x3b, - 0x9e, 0x49, 0x39, 0x4b, 0xf9, 0x00, 0x59, 0x57, 0xc5, 0x74, 0xf0, 0x46, 0xb1, 0x3c, 0xe7, 0x4a, - 0x97, 0x76, 0xbd, 0x23, 0x74, 0x2e, 0xb3, 0x4c, 0x8a, 0xea, 0x53, 0x01, 0xc7, 0x6b, 0x40, 0xe5, - 0x6c, 0x1d, 0x0f, 0xfe, 0x72, 0xe0, 0xe1, 0x65, 0x99, 0xc9, 0x79, 0x09, 0x53, 0x7e, 0x53, 0x70, - 0x6d, 0xc8, 0x18, 0x0e, 0x37, 0x01, 0xed, 0x3b, 0xfd, 0xfa, 0x89, 0x3b, 0x7c, 0x1a, 0xbe, 0x3d, - 0xc9, 0x70, 0xcb, 0xcf, 0xb6, 0x39, 0xf9, 0x0c, 0x0e, 0x5e, 0xe6, 0x5c, 0x31, 0x93, 0x48, 0x31, - 0xb9, 0xcd, 0xb9, 0x5f, 0xeb, 0x3b, 0x27, 0xdd, 0x61, 0x17, 0xfd, 0x2d, 0x11, 0xba, 0x49, 0x22, - 0x1f, 0x41, 0x6b, 0xce, 0x95, 0x4e, 0xa4, 0xf0, 0xeb, 0x7d, 0xe7, 0xc4, 0x1d, 0x1e, 0x22, 0xff, - 0x34, 0x4f, 0x2e, 0xcb, 0x6b, 0xba, 0xc0, 0x83, 0x3f, 0x1c, 0x78, 0xb4, 0x5d, 0x8c, 0xce, 0xa5, - 0xd0, 0xfc, 0x1d, 0x54, 0x33, 0x84, 0x26, 0xe5, 0xba, 0x48, 0x0d, 0x96, 0xe1, 0x0e, 0x7b, 0x61, - 0xa9, 0x51, 0xb8, 0xd0, 0x28, 0x3c, 0x93, 0x32, 0xbd, 0x64, 0x69, 0xc1, 0x69, 0xc5, 0x24, 0xef, - 0xc3, 0xde, 0xf7, 0x4a, 0x49, 0x85, 0x95, 0x74, 0x68, 0x79, 0x08, 0x6e, 0xe0, 0xf1, 0xa6, 0xf3, - 0xb1, 0xe2, 0xd1, 0x35, 0x8f, 0xde, 0x9d, 0x14, 0xc1, 0x2f, 0x70, 0x7c, 0x57, 0xc8, 0xaa, 0x61, - 0xab, 0xf2, 0x9c, 0xfb, 0x97, 0x57, 0x5b, 0x2f, 0xef, 0x9f, 0x3a, 0x74, 0x37, 0x83, 0x11, 0x02, - 0x0d, 0xc1, 0x32, 0x8e, 0xae, 0x3b, 0x14, 0xff, 0x49, 0x17, 0x6a, 0x49, 0x5c, 0x59, 0xd6, 0x92, - 0x98, 0x7c, 0x05, 0x2d, 0x5d, 0x5c, 0x09, 0x6e, 0xb4, 0x5f, 0xc7, 0x62, 0x8f, 0xef, 0x2a, 0xf6, - 0x02, 0x69, 0x74, 0x41, 0x27, 0x7d, 0xa8, 0xc7, 0x42, 0xfb, 0x0d, 0xcc, 0xbb, 0x8d, 0x56, 0xdf, - 0x09, 0x7d, 0xd6, 0xf8, 0xed, 0x4f, 0xdf, 0xa1, 0x16, 0x22, 0xdf, 0x40, 0xc3, 0xd8, 0x01, 0xdc, - 0xc3, 0x01, 0x7c, 0xb6, 0x5b, 0x17, 0xed, 0x34, 0x52, 0xb4, 0x23, 0x3d, 0x68, 0x0b, 0x19, 0xf3, - 0xe9, 0x4d, 0x2c, 0xfc, 0x26, 0x66, 0xbc, 0x3c, 0x93, 0x0f, 0xa0, 0x33, 0x53, 0xb2, 0xc8, 0xcf, - 0x6d, 0x81, 0x2d, 0x04, 0x57, 0x17, 0xe4, 0x09, 0x34, 0xb5, 0x61, 0xa6, 0xd0, 0x7e, 0x1b, 0xd3, - 0x73, 0x31, 0xf6, 0x05, 0x5e, 0xd1, 0x0a, 0x22, 0x01, 0xec, 0xa7, 0x32, 0xc2, 0x27, 0x80, 0x5e, - 0x3a, 0xe8, 0x65, 0xe3, 0x8e, 0x3c, 0x05, 0x37, 0x63, 0xd1, 0x58, 0xca, 0x14, 0x29, 0x60, 0x29, - 0x55, 0x89, 0xeb, 0x00, 0x79, 0x0c, 0x0d, 0xc3, 0x66, 0xda, 0xdf, 0xc7, 0x70, 0x1d, 0x0c, 0x37, - 0x61, 0x33, 0x4d, 0xf1, 0x9a, 0x7c, 0x0d, 0xdd, 0x54, 0xce, 0x92, 0x68, 0x59, 0xa5, 0x7f, 0x80, - 0xc4, 0x87, 0x48, 0x5c, 0xbe, 0xa2, 0x29, 0x57, 0x5c, 0x44, 0x9c, 0x6e, 0x91, 0xad, 0x90, 0x51, - 0x12, 0x2b, 0xbf, 0xdb, 0xaf, 0x5b, 0x21, 0xed, 0xff, 0xf3, 0x46, 0xdb, 0xf5, 0xf6, 0x83, 0xbf, - 0x6b, 0xd0, 0x2c, 0x85, 0xd9, 0x49, 0xed, 0x85, 0xa3, 0xf2, 0x61, 0xe0, 0x3f, 0x09, 0xa0, 0xa9, - 0x64, 0x61, 0xb8, 0x95, 0xd2, 0x0e, 0x00, 0x60, 0x4e, 0xd4, 0x5e, 0xd1, 0x0a, 0x21, 0x5f, 0x02, - 0xb0, 0x74, 0xd1, 0x98, 0x4a, 0xcf, 0x23, 0xe4, 0x8d, 0xc6, 0xa7, 0x4b, 0xe0, 0x05, 0x37, 0xd7, - 0x32, 0xa6, 0x6b, 0x54, 0x1b, 0x70, 0x9e, 0xb2, 0x52, 0xbe, 0x03, 0x8a, 0xff, 0xe4, 0x43, 0x68, - 0x25, 0x79, 0x2e, 0x65, 0xaa, 0xfd, 0x16, 0x46, 0x74, 0x2b, 0x4f, 0xb6, 0x9b, 0x74, 0x81, 0x91, - 0x9f, 0xe1, 0xa8, 0x9a, 0x10, 0xcd, 0xa3, 0x42, 0x25, 0xe6, 0x16, 0xf5, 0x55, 0x7c, 0x8a, 0x4a, - 0xb9, 0xc3, 0x60, 0xbd, 0x79, 0x17, 0x15, 0xe7, 0x07, 0xcb, 0x59, 0x75, 0xf2, 0x2e, 0x17, 0x4b, - 0xc1, 0xe0, 0xad, 0x82, 0x3d, 0x6f, 0xb4, 0xdb, 0x5e, 0x27, 0x98, 0x40, 0x63, 0x94, 0xb3, 0xcc, - 0x56, 0x81, 0x83, 0x5c, 0xb5, 0x16, 0x87, 0x73, 0xed, 0xe1, 0xd4, 0xee, 0xf5, 0x70, 0x9e, 0xfd, - 0xee, 0x00, 0xf9, 0xff, 0xcc, 0x93, 0x16, 0xd4, 0xcf, 0x4f, 0x27, 0xde, 0x03, 0x72, 0x08, 0xee, - 0x44, 0x31, 0xa1, 0x73, 0xa6, 0xb8, 0x30, 0x9e, 0x43, 0xf6, 0xa1, 0xfd, 0xe3, 0xf0, 0x4c, 0x25, - 0xf1, 0x8c, 0x7b, 0xb5, 0xf2, 0x34, 0x29, 0x84, 0xe0, 0xa9, 0x57, 0xb7, 0x56, 0xa3, 0x6f, 0x2f, - 0xbc, 0x06, 0x71, 0xa1, 0x35, 0x56, 0xc9, 0x9c, 0x19, 0xee, 0xed, 0xd9, 0xc3, 0xcb, 0x39, 0x57, - 0x29, 0xbb, 0xf5, 0x9a, 0xd6, 0x60, 0x24, 0x0c, 0x57, 0x82, 0xa5, 0x5e, 0xcb, 0x9e, 0x5e, 0x24, - 0x76, 0x63, 0xf0, 0xd8, 0x6b, 0x0f, 0xff, 0x75, 0xe0, 0xbd, 0xcd, 0x5c, 0x4e, 0x6d, 0xee, 0x24, - 0x81, 0xe6, 0x48, 0xcc, 0xe5, 0x6b, 0x4e, 0x3e, 0xde, 0x71, 0xf9, 0x95, 0x4b, 0xb4, 0x17, 0xee, - 0x4a, 0x2f, 0x17, 0x60, 0xf0, 0x80, 0xfc, 0x0a, 0xed, 0xc5, 0x5a, 0x24, 0x9f, 0xef, 0x66, 0xbd, - 0xb5, 0xb9, 0x7b, 0x5f, 0xdc, 0xd7, 0x6c, 0x11, 0xfc, 0xec, 0x93, 0x9f, 0x06, 0xb3, 0xc4, 0x5c, - 0x17, 0x57, 0x61, 0x24, 0xb3, 0x41, 0x96, 0x44, 0x4a, 0x6a, 0x39, 0x35, 0x83, 0x4c, 0x46, 0x03, - 0x95, 0x47, 0x83, 0x95, 0xcf, 0x41, 0xe5, 0xf3, 0xaa, 0x89, 0xab, 0xf9, 0xd3, 0xff, 0x02, 0x00, - 0x00, 0xff, 0xff, 0x96, 0x88, 0x02, 0x94, 0x6a, 0x08, 0x00, 0x00, -======= - // 956 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x55, 0xdd, 0x6e, 0xdc, 0x44, - 0x14, 0xae, 0x77, 0x9d, 0xfd, 0x39, 0x4e, 0x36, 0xd6, 0x40, 0x1b, 0x6b, 0xd5, 0x86, 0x95, 0x2b, - 0xaa, 0x50, 0x09, 0xaf, 0x58, 0x0a, 0xe5, 0x06, 0xa4, 0x24, 0xa0, 0x6a, 0x2b, 0x9a, 0xae, 0x9c, - 0x55, 0x2e, 0x10, 0x52, 0xe5, 0xd8, 0xb3, 0x8e, 0xa9, 0x3d, 0xe3, 0xcc, 0x8c, 0xb7, 0x8a, 0x78, - 0x01, 0xb8, 0xea, 0x33, 0xf0, 0x0e, 0xf0, 0x12, 0xf0, 0x08, 0xbc, 0x0c, 0x9a, 0x63, 0xef, 0x2f, - 0x5d, 0xb4, 0x91, 0xe8, 0x95, 0x3d, 0xf3, 0x7d, 0xe7, 0x3b, 0xe7, 0xcc, 0xf9, 0xc6, 0x86, 0x87, - 0x19, 0x0f, 0x5f, 0x85, 0x29, 0x2f, 0xa2, 0x20, 0xa6, 0x4c, 0xbd, 0x9a, 0x26, 0x42, 0x15, 0x41, - 0xca, 0xa8, 0x7a, 0xc3, 0xc5, 0x6b, 0x2f, 0x17, 0x5c, 0x71, 0x72, 0x2f, 0xe3, 0xa1, 0xb7, 0x20, - 0x79, 0x15, 0xda, 0x3d, 0x8c, 0x39, 0x8f, 0x53, 0xda, 0x47, 0xd6, 0x65, 0x31, 0xe9, 0xbf, 0x11, - 0x41, 0x9e, 0x53, 0x21, 0xcb, 0xb8, 0xee, 0x01, 0x8a, 0xf3, 0x2c, 0xe3, 0xac, 0x7a, 0x54, 0xc0, - 0xe1, 0x12, 0x50, 0x89, 0x2d, 0xe3, 0xee, 0x9f, 0x06, 0xdc, 0xbd, 0x28, 0x2b, 0x39, 0x2b, 0x61, - 0x9f, 0x5e, 0x17, 0x54, 0x2a, 0x32, 0x82, 0xfd, 0x55, 0x40, 0x3a, 0x46, 0xaf, 0x7e, 0x64, 0x0d, - 0x1e, 0x79, 0xef, 0x2e, 0xd2, 0x5b, 0xd3, 0x59, 0x0f, 0x27, 0x4f, 0x60, 0xef, 0x65, 0x4e, 0x45, - 0xa0, 0x12, 0xce, 0xc6, 0x37, 0x39, 0x75, 0x6a, 0x3d, 0xe3, 0xa8, 0x33, 0xe8, 0xa0, 0xde, 0x1c, - 0xf1, 0x57, 0x49, 0xe4, 0x13, 0x68, 0x4e, 0xa9, 0x90, 0x09, 0x67, 0x4e, 0xbd, 0x67, 0x1c, 0x59, - 0x83, 0x7d, 0xe4, 0x1f, 0xe7, 0xc9, 0x45, 0xb9, 0xed, 0xcf, 0x70, 0xf7, 0x77, 0x03, 0xee, 0xad, - 0x37, 0x23, 0x73, 0xce, 0x24, 0x7d, 0x0f, 0xdd, 0x0c, 0xa0, 0xe1, 0x53, 0x59, 0xa4, 0x0a, 0xdb, - 0xb0, 0x06, 0x5d, 0xaf, 0x9c, 0x91, 0x37, 0x9b, 0x91, 0x77, 0xc2, 0x79, 0x7a, 0x11, 0xa4, 0x05, - 0xf5, 0x2b, 0x26, 0xf9, 0x10, 0x76, 0xbe, 0x13, 0x82, 0x0b, 0xec, 0xa4, 0xed, 0x97, 0x0b, 0xf7, - 0x1a, 0x1e, 0xac, 0x8a, 0x8f, 0x04, 0x0d, 0xaf, 0x68, 0xf8, 0xfe, 0x46, 0xe1, 0xfe, 0x04, 0x87, - 0x9b, 0x52, 0x56, 0x07, 0xb6, 0x68, 0xcf, 0xb8, 0x7d, 0x7b, 0xb5, 0xe5, 0xf6, 0xfe, 0x32, 0xa1, - 0xb3, 0x9a, 0x8c, 0x10, 0x30, 0x59, 0x90, 0x51, 0x94, 0x6e, 0xfb, 0xf8, 0x4e, 0x3a, 0x50, 0x4b, - 0xa2, 0x2a, 0xb2, 0x96, 0x44, 0xe4, 0x2b, 0x68, 0xca, 0xe2, 0x92, 0x51, 0x25, 0x9d, 0x3a, 0x36, - 0x7b, 0xb8, 0xa9, 0xd9, 0x73, 0xa4, 0xf9, 0x33, 0x3a, 0xe9, 0x41, 0x3d, 0x62, 0xd2, 0x31, 0xb1, - 0xee, 0x16, 0x46, 0x7d, 0xcb, 0xe4, 0x89, 0xf9, 0xcb, 0x1f, 0x8e, 0xe1, 0x6b, 0x88, 0x7c, 0x03, - 0xa6, 0xd2, 0x06, 0xdc, 0x41, 0x03, 0x3e, 0xde, 0xee, 0x14, 0xb5, 0x1b, 0x7d, 0x8c, 0x23, 0x5d, - 0x68, 0x31, 0x1e, 0xd1, 0xc9, 0x75, 0xc4, 0x9c, 0x06, 0x56, 0x3c, 0x5f, 0x93, 0xfb, 0xd0, 0x8e, - 0x05, 0x2f, 0xf2, 0x33, 0xdd, 0x60, 0x13, 0xc1, 0xc5, 0x06, 0x79, 0x08, 0x0d, 0xa9, 0x02, 0x55, - 0x48, 0xa7, 0x85, 0xe5, 0x59, 0x98, 0xfb, 0x1c, 0xb7, 0xfc, 0x0a, 0x22, 0x2e, 0xec, 0xa6, 0x3c, - 0xc4, 0x2b, 0x80, 0x2a, 0x6d, 0x54, 0x59, 0xd9, 0x23, 0x8f, 0xc0, 0xca, 0x82, 0x70, 0xc4, 0x79, - 0x8a, 0x14, 0xd0, 0x94, 0xaa, 0xc5, 0x65, 0x80, 0x3c, 0x00, 0x53, 0x05, 0xb1, 0x74, 0x76, 0x31, - 0x5d, 0x1b, 0xd3, 0x8d, 0x83, 0x58, 0xfa, 0xb8, 0x4d, 0xbe, 0x86, 0x4e, 0xca, 0xe3, 0x24, 0x9c, - 0x77, 0xe9, 0xec, 0x21, 0xf1, 0x2e, 0x12, 0xe7, 0xb7, 0x68, 0x42, 0x05, 0x65, 0x21, 0xf5, 0xd7, - 0xc8, 0x7a, 0x90, 0x61, 0x12, 0x09, 0xa7, 0xd3, 0xab, 0xeb, 0x41, 0xea, 0x77, 0x72, 0x01, 0x07, - 0xd5, 0x01, 0x9e, 0x72, 0xa6, 0x04, 0x4f, 0x53, 0x2a, 0x4e, 0x39, 0x9b, 0x24, 0xb1, 0xb3, 0x8f, - 0xda, 0xf7, 0x97, 0xb5, 0xd7, 0x39, 0xfe, 0xa6, 0xe0, 0xe7, 0x66, 0xcb, 0xb2, 0x77, 0xdd, 0xbf, - 0x6b, 0xd0, 0x28, 0x07, 0xbe, 0x95, 0x8b, 0x66, 0x05, 0x96, 0x17, 0xae, 0x2c, 0xd0, 0x85, 0x86, - 0xe0, 0x85, 0xa2, 0xda, 0x22, 0xda, 0x58, 0x80, 0xf5, 0xf8, 0x7a, 0xcb, 0xaf, 0x10, 0xf2, 0x14, - 0x20, 0x48, 0x67, 0x07, 0x5e, 0xf9, 0xe4, 0x00, 0x79, 0xc3, 0xd1, 0xf1, 0x1c, 0x78, 0x41, 0xd5, - 0x15, 0x8f, 0xfc, 0x25, 0xaa, 0x4e, 0x38, 0x4d, 0x83, 0xd2, 0x16, 0x7b, 0x3e, 0xbe, 0x93, 0x8f, - 0xa1, 0x99, 0xe4, 0x39, 0xe7, 0xa9, 0x74, 0x9a, 0x98, 0xd1, 0xaa, 0x94, 0xf4, 0x94, 0xfc, 0x19, - 0x46, 0x7e, 0x9c, 0x1f, 0x9c, 0xa4, 0x61, 0x21, 0x12, 0x75, 0x83, 0xbe, 0x11, 0x74, 0x82, 0x0e, - 0xb0, 0x06, 0xee, 0xf2, 0xc1, 0x9d, 0x57, 0x9c, 0x67, 0x9a, 0xb3, 0x98, 0xd0, 0x26, 0x89, 0xb9, - 0x11, 0xe0, 0x9d, 0x46, 0x78, 0x6e, 0xb6, 0x5a, 0x76, 0xdb, 0x1d, 0x83, 0x39, 0xcc, 0x83, 0x4c, - 0x77, 0x81, 0x17, 0xa4, 0x3a, 0x5a, 0x34, 0xfd, 0xd2, 0x85, 0xac, 0xdd, 0xea, 0x42, 0xba, 0x3d, - 0x38, 0xdc, 0x34, 0xed, 0xf2, 0x0b, 0xe7, 0xfe, 0x66, 0xc0, 0x47, 0x1b, 0x29, 0xff, 0xf7, 0x17, - 0x89, 0x3c, 0x81, 0x46, 0x65, 0xc8, 0xfa, 0x16, 0x86, 0xac, 0xb8, 0x8f, 0x7f, 0x35, 0x80, 0xfc, - 0xfb, 0x8b, 0x40, 0x9a, 0x50, 0x3f, 0x3b, 0x1e, 0xdb, 0x77, 0xc8, 0x3e, 0x58, 0x63, 0x11, 0x30, - 0x99, 0x07, 0x82, 0x32, 0x65, 0x1b, 0x64, 0x17, 0x5a, 0xdf, 0x0f, 0x4e, 0x44, 0x12, 0xc5, 0xd4, - 0xae, 0x95, 0xab, 0x71, 0xc1, 0x18, 0x4d, 0xed, 0xba, 0x8e, 0x1a, 0x9e, 0x9e, 0xdb, 0x26, 0xb1, - 0xa0, 0x39, 0x12, 0xc9, 0x34, 0x50, 0xd4, 0xde, 0xd1, 0x8b, 0x97, 0x53, 0x2a, 0xd2, 0xe0, 0xc6, - 0x6e, 0xe8, 0x80, 0x21, 0x53, 0x54, 0xb0, 0x20, 0xb5, 0x9b, 0x7a, 0xf5, 0x22, 0xd1, 0xd5, 0xd3, - 0xc8, 0x6e, 0x0d, 0xde, 0xd6, 0xe1, 0x83, 0xd5, 0x5a, 0x8e, 0xf5, 0x04, 0x48, 0x02, 0x8d, 0x21, - 0x9b, 0xf2, 0xd7, 0x94, 0x7c, 0xba, 0xe5, 0xaf, 0xa1, 0x1c, 0x40, 0xd7, 0xdb, 0x96, 0x5e, 0x0e, - 0xc3, 0xbd, 0x43, 0x7e, 0x86, 0xd6, 0xec, 0xa7, 0x41, 0xbe, 0xd8, 0x2e, 0x7a, 0xed, 0xbf, 0xd6, - 0xfd, 0xf2, 0xb6, 0x61, 0xf3, 0xe4, 0x6f, 0x0d, 0xe8, 0x3e, 0xa3, 0x6a, 0xc3, 0xc8, 0xc8, 0x46, - 0xe1, 0xff, 0xb6, 0x61, 0xf7, 0xe9, 0xad, 0xe3, 0x66, 0x15, 0x9d, 0x7c, 0xf6, 0x43, 0x3f, 0x4e, - 0xd4, 0x55, 0x71, 0xe9, 0x85, 0x3c, 0xeb, 0x67, 0x49, 0x28, 0xb8, 0xe4, 0x13, 0xd5, 0xcf, 0x78, - 0xd8, 0x17, 0x79, 0xd8, 0x5f, 0x88, 0xf6, 0x2b, 0xd1, 0xcb, 0x06, 0x1a, 0xf7, 0xf3, 0x7f, 0x02, - 0x00, 0x00, 0xff, 0xff, 0x63, 0x8c, 0x7a, 0x3d, 0x1a, 0x0a, 0x00, 0x00, ->>>>>>> Stashed changes + // 902 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x55, 0xdb, 0x6a, 0xdc, 0x46, + 0x18, 0x8e, 0x76, 0xe5, 0x3d, 0xfc, 0xb2, 0xd7, 0x62, 0xda, 0xc4, 0x62, 0x49, 0x8c, 0x51, 0x68, + 0x70, 0x03, 0xd5, 0xd2, 0xed, 0xf1, 0xa6, 0x05, 0xdb, 0x2d, 0x65, 0x43, 0xe3, 0x2c, 0xe3, 0xc5, + 0x17, 0xa5, 0x10, 0x64, 0x69, 0x56, 0x56, 0x23, 0xcd, 0xc8, 0x33, 0xa3, 0x0d, 0xa6, 0x2f, 0xd0, + 0xbe, 0x4f, 0xfb, 0x12, 0xed, 0x23, 0xf4, 0x59, 0x0a, 0x65, 0x7e, 0x69, 0x8f, 0x8d, 0x61, 0x7d, + 0x91, 0xab, 0xd5, 0xcc, 0xf7, 0xfd, 0xdf, 0x7f, 0x9e, 0x85, 0xa7, 0xb9, 0x88, 0x5e, 0x47, 0x99, + 0x28, 0xe3, 0x30, 0x61, 0x5c, 0xbf, 0x9e, 0xa5, 0x52, 0x97, 0x61, 0xc6, 0x99, 0x7e, 0x2b, 0xe4, + 0x9b, 0xa0, 0x90, 0x42, 0x0b, 0xf2, 0x28, 0x17, 0x51, 0xb0, 0x24, 0x05, 0x35, 0xda, 0x3f, 0x4c, + 0x84, 0x48, 0x32, 0x36, 0x40, 0xd6, 0x55, 0x39, 0x1d, 0xbc, 0x95, 0x61, 0x51, 0x30, 0xa9, 0x2a, + 0xbb, 0xfe, 0x01, 0x8a, 0x8b, 0x3c, 0x17, 0xbc, 0xfe, 0xa9, 0x81, 0xc3, 0x15, 0xa0, 0x16, 0x5b, + 0xc5, 0xfd, 0xbf, 0x2c, 0x78, 0x78, 0x59, 0x45, 0x72, 0x5e, 0xc1, 0x94, 0xdd, 0x94, 0x4c, 0x69, + 0x32, 0x86, 0xfd, 0x75, 0x40, 0x79, 0xd6, 0x51, 0xf3, 0xd8, 0x19, 0x3e, 0x0b, 0xde, 0x1d, 0x64, + 0xb0, 0xa1, 0xb3, 0x69, 0x4e, 0x3e, 0x87, 0xbd, 0x57, 0x05, 0x93, 0xa1, 0x4e, 0x05, 0x9f, 0xdc, + 0x16, 0xcc, 0x6b, 0x1c, 0x59, 0xc7, 0xbd, 0x61, 0x0f, 0xf5, 0x16, 0x08, 0x5d, 0x27, 0x91, 0x8f, + 0xa1, 0x3d, 0x63, 0x52, 0xa5, 0x82, 0x7b, 0xcd, 0x23, 0xeb, 0xd8, 0x19, 0xee, 0x23, 0xff, 0xa4, + 0x48, 0x2f, 0xab, 0x6b, 0x3a, 0xc7, 0xfd, 0x3f, 0x2c, 0x78, 0xb4, 0x99, 0x8c, 0x2a, 0x04, 0x57, + 0xec, 0x3d, 0x64, 0x33, 0x84, 0x16, 0x65, 0xaa, 0xcc, 0x34, 0xa6, 0xe1, 0x0c, 0xfb, 0x41, 0xd5, + 0xa3, 0x60, 0xde, 0xa3, 0xe0, 0x54, 0x88, 0xec, 0x32, 0xcc, 0x4a, 0x46, 0x6b, 0x26, 0xf9, 0x10, + 0x76, 0xbe, 0x97, 0x52, 0x48, 0xcc, 0xa4, 0x4b, 0xab, 0x83, 0x7f, 0x03, 0x4f, 0xd6, 0xc5, 0xc7, + 0x92, 0x45, 0xd7, 0x2c, 0x7a, 0x7f, 0xad, 0xf0, 0x7f, 0x81, 0xc3, 0xbb, 0x5c, 0xd6, 0x05, 0x5b, + 0xa6, 0x67, 0xdd, 0x3f, 0xbd, 0xc6, 0x6a, 0x7a, 0x7f, 0xdb, 0xd0, 0x5b, 0x77, 0x46, 0x08, 0xd8, + 0x3c, 0xcc, 0x19, 0x4a, 0x77, 0x29, 0x7e, 0x93, 0x1e, 0x34, 0xd2, 0xb8, 0xb6, 0x6c, 0xa4, 0x31, + 0xf9, 0x1a, 0xda, 0xaa, 0xbc, 0xe2, 0x4c, 0x2b, 0xaf, 0x89, 0xc9, 0x1e, 0xde, 0x95, 0xec, 0x05, + 0xd2, 0xe8, 0x9c, 0x4e, 0x8e, 0xa0, 0x19, 0x73, 0xe5, 0xd9, 0x18, 0x77, 0x07, 0xad, 0xbe, 0xe3, + 0xea, 0xd4, 0xfe, 0xed, 0x4f, 0xcf, 0xa2, 0x06, 0x22, 0xdf, 0x82, 0xad, 0xcd, 0x00, 0xee, 0xe0, + 0x00, 0x3e, 0xdf, 0xae, 0x8a, 0x66, 0x1a, 0x29, 0xda, 0x91, 0x3e, 0x74, 0xb8, 0x88, 0xd9, 0xf4, + 0x26, 0xe6, 0x5e, 0x0b, 0x23, 0x5e, 0x9c, 0xc9, 0x63, 0xe8, 0x26, 0x52, 0x94, 0xc5, 0xb9, 0x49, + 0xb0, 0x8d, 0xe0, 0xf2, 0x82, 0x3c, 0x85, 0x96, 0xd2, 0xa1, 0x2e, 0x95, 0xd7, 0xc1, 0xf0, 0x1c, + 0xf4, 0x7d, 0x81, 0x57, 0xb4, 0x86, 0x88, 0x0f, 0xbb, 0x99, 0x88, 0x70, 0x05, 0x50, 0xa5, 0x8b, + 0x2a, 0x6b, 0x77, 0xe4, 0x19, 0x38, 0x79, 0x18, 0x8d, 0x85, 0xc8, 0x90, 0x02, 0x86, 0x52, 0xa7, + 0xb8, 0x0a, 0x90, 0x27, 0x60, 0xeb, 0x30, 0x51, 0xde, 0x2e, 0xba, 0xeb, 0xa2, 0xbb, 0x49, 0x98, + 0x28, 0x8a, 0xd7, 0xe4, 0x1b, 0xe8, 0x65, 0x22, 0x49, 0xa3, 0x45, 0x96, 0xde, 0x1e, 0x12, 0x1f, + 0x22, 0x71, 0xb1, 0x45, 0x53, 0x26, 0x19, 0x8f, 0x18, 0xdd, 0x20, 0x9b, 0x46, 0x46, 0x69, 0x2c, + 0xbd, 0xde, 0x51, 0xd3, 0x34, 0xd2, 0x7c, 0x93, 0x4b, 0x38, 0xa8, 0x0b, 0x78, 0x26, 0xb8, 0x96, + 0x22, 0xcb, 0x98, 0x3c, 0x13, 0x7c, 0x9a, 0x26, 0xde, 0x3e, 0x6a, 0x3f, 0x5e, 0xd5, 0xde, 0xe4, + 0xd0, 0xbb, 0x8c, 0x5f, 0xd8, 0x1d, 0xc7, 0xdd, 0xf5, 0xff, 0x69, 0x40, 0xab, 0x6a, 0xf8, 0x56, + 0x53, 0x34, 0x0f, 0xb0, 0x5a, 0xb8, 0x2a, 0x40, 0x1f, 0x5a, 0x52, 0x94, 0x9a, 0x99, 0x11, 0x31, + 0x83, 0x05, 0x18, 0x0f, 0x35, 0x57, 0xb4, 0x46, 0xc8, 0x57, 0x00, 0x61, 0x36, 0x2f, 0x78, 0x3d, + 0x27, 0x07, 0xc8, 0x1b, 0x8d, 0x4f, 0x16, 0xc0, 0x4b, 0xa6, 0xaf, 0x45, 0x4c, 0x57, 0xa8, 0xc6, + 0xe1, 0x2c, 0x0b, 0xab, 0xb1, 0xd8, 0xa3, 0xf8, 0x4d, 0x3e, 0x82, 0x76, 0x5a, 0x14, 0x42, 0x64, + 0xca, 0x6b, 0xa3, 0x47, 0xa7, 0x56, 0x32, 0x5d, 0xa2, 0x73, 0x8c, 0xfc, 0xbc, 0x28, 0x9c, 0x62, + 0x51, 0x29, 0x53, 0x7d, 0x8b, 0x73, 0x23, 0xd9, 0x14, 0x27, 0xc0, 0x19, 0xfa, 0xab, 0x85, 0xbb, + 0xa8, 0x39, 0x3f, 0x18, 0xce, 0xb2, 0x43, 0x77, 0x49, 0x2c, 0x06, 0x01, 0xde, 0x39, 0x08, 0x2f, + 0xec, 0x4e, 0xc7, 0xed, 0xfa, 0x13, 0xb0, 0x47, 0x45, 0x98, 0x9b, 0x2c, 0x70, 0x41, 0xea, 0xd2, + 0xe2, 0xd0, 0xaf, 0x2c, 0x64, 0xe3, 0x5e, 0x0b, 0xf9, 0xfc, 0x77, 0x0b, 0xc8, 0xff, 0x77, 0x89, + 0xb4, 0xa1, 0x79, 0x7e, 0x32, 0x71, 0x1f, 0x90, 0x7d, 0x70, 0x26, 0x32, 0xe4, 0xaa, 0x08, 0x25, + 0xe3, 0xda, 0xb5, 0xc8, 0x2e, 0x74, 0x7e, 0x1c, 0x9e, 0xca, 0x34, 0x4e, 0x98, 0xdb, 0xa8, 0x4e, + 0x93, 0x92, 0x73, 0x96, 0xb9, 0x4d, 0x63, 0x35, 0x3a, 0xbb, 0x70, 0x6d, 0xe2, 0x40, 0x7b, 0x2c, + 0xd3, 0x59, 0xa8, 0x99, 0xbb, 0x63, 0x0e, 0xaf, 0x66, 0x4c, 0x66, 0xe1, 0xad, 0xdb, 0x32, 0x06, + 0x23, 0xae, 0x99, 0xe4, 0x61, 0xe6, 0xb6, 0xcd, 0xe9, 0x65, 0x6a, 0x5e, 0x22, 0x16, 0xbb, 0x9d, + 0xe1, 0xbf, 0x16, 0x7c, 0xb0, 0x1e, 0xcb, 0x89, 0x89, 0x9d, 0xa4, 0xd0, 0x1a, 0xf1, 0x99, 0x78, + 0xc3, 0xc8, 0x27, 0x5b, 0x3e, 0xaa, 0xd5, 0xe3, 0xdc, 0x0f, 0xb6, 0xa5, 0x57, 0x0f, 0xab, 0xff, + 0x80, 0xfc, 0x0a, 0x9d, 0xf9, 0x73, 0x4b, 0xbe, 0xd8, 0xce, 0x7a, 0xe3, 0x1f, 0xa1, 0xff, 0xe5, + 0x7d, 0xcd, 0xe6, 0xce, 0x4f, 0x3f, 0xfd, 0x69, 0x90, 0xa4, 0xfa, 0xba, 0xbc, 0x0a, 0x22, 0x91, + 0x0f, 0xf2, 0x34, 0x92, 0x42, 0x89, 0xa9, 0x1e, 0xe4, 0x22, 0x1a, 0xc8, 0x22, 0x1a, 0x2c, 0x35, + 0x07, 0xb5, 0xe6, 0x55, 0x0b, 0x9f, 0xfc, 0xcf, 0xfe, 0x0b, 0x00, 0x00, 0xff, 0xff, 0xd5, 0x3b, + 0x8f, 0xd4, 0xc2, 0x08, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/rpc/cloudagent/network/virtualnetwork/moc_cloudagent_virtualnetwork.proto b/rpc/cloudagent/network/virtualnetwork/moc_cloudagent_virtualnetwork.proto index faef1bc7..f80a9b88 100644 --- a/rpc/cloudagent/network/virtualnetwork/moc_cloudagent_virtualnetwork.proto +++ b/rpc/cloudagent/network/virtualnetwork/moc_cloudagent_virtualnetwork.proto @@ -81,18 +81,6 @@ message Ipam { repeated Subnet subnets = 2; } -<<<<<<< Updated upstream -======= -message NetworkControllerConfigRequest { -} - -message NetworkControllerConfigResponse { - google.protobuf.BoolValue Result = 1; - string Error = 2; - NetworkControllerConfig Config = 3; -} - ->>>>>>> Stashed changes service VirtualNetworkAgent { rpc Invoke(VirtualNetworkRequest) returns (VirtualNetworkResponse) {}