This commit is contained in:
natarajr 2020-09-22 15:00:54 -07:00
Родитель 1112721f73
Коммит 038de9bd70
6 изменённых файлов: 173 добавлений и 143 удалений

4
go.mod
Просмотреть файл

@ -4,8 +4,7 @@ go 1.14
require (
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/golang/protobuf v1.3.2
github.com/google/go-cmp v0.5.0 // indirect
github.com/golang/protobuf v1.4.1
github.com/jmespath/go-jmespath v0.3.0
github.com/kr/pretty v0.1.0 // indirect
github.com/pkg/errors v0.9.1
@ -14,6 +13,7 @@ require (
golang.org/x/sys v0.0.0-20200831180312-196b9ba8737a // indirect
golang.org/x/text v0.3.3 // indirect
google.golang.org/grpc v1.27.0
google.golang.org/protobuf v1.25.0
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
gopkg.in/yaml.v2 v2.2.8 // indirect
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c

26
go.sum
Просмотреть файл

@ -10,7 +10,17 @@ github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfb
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs=
github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
github.com/golang/protobuf v1.4.1 h1:ZFgWrT+bLgsYPirOnRfKLYJLvssAegOj/hgyMFdJZe0=
github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.0 h1:/QaMHBdZ26BB3SSst0Iwl10Epc+xhTquomWX0oZEB6w=
github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/jmespath/go-jmespath v0.3.0 h1:OS12ieG61fsCg5+qLJ+SsW9NicxNkg3b25OyT2yCeUc=
@ -34,6 +44,7 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnk
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
@ -42,6 +53,7 @@ golang.org/x/net v0.0.0-20200822124328-c89045814202 h1:VvcQYSHwXgi7W+TpUR6A9g6Up
golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@ -52,13 +64,26 @@ golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55 h1:gSJIx1SDwno+2ElGhA4+qG2zF97qiUzTM+rQ0klBOcE=
google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 h1:+kGHl1aib/qcwaRi1CbqBZ1rk19r85MNUf8HaBghugY=
google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
google.golang.org/grpc v1.26.0 h1:2dTRdpdFEEhJYQD8EMLB61nnrzSCTbG38PhqdhvOltg=
google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c=
google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
@ -68,3 +93,4 @@ gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=

Просмотреть файл

@ -6,13 +6,14 @@ package network
import (
context "context"
fmt "fmt"
math "math"
proto "github.com/golang/protobuf/proto"
wrappers "github.com/golang/protobuf/ptypes/wrappers"
common "github.com/microsoft/moc/rpc/common"
grpc "google.golang.org/grpc"
codes "google.golang.org/grpc/codes"
status "google.golang.org/grpc/status"
math "math"
wrapperspb "google.golang.org/protobuf/types/known/wrapperspb"
)
// Reference imports to suppress errors if they are not otherwise used.
@ -120,12 +121,12 @@ func (m *VirtualNetworkRequest) GetOperationType() common.Operation {
}
type VirtualNetworkResponse struct {
VirtualNetworks []*VirtualNetwork `protobuf:"bytes,1,rep,name=VirtualNetworks,proto3" json:"VirtualNetworks,omitempty"`
Result *wrappers.BoolValue `protobuf:"bytes,2,opt,name=Result,proto3" json:"Result,omitempty"`
Error string `protobuf:"bytes,3,opt,name=Error,proto3" json:"Error,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
VirtualNetworks []*VirtualNetwork `protobuf:"bytes,1,rep,name=VirtualNetworks,proto3" json:"VirtualNetworks,omitempty"`
Result *wrapperspb.BoolValue `protobuf:"bytes,2,opt,name=Result,proto3" json:"Result,omitempty"`
Error string `protobuf:"bytes,3,opt,name=Error,proto3" json:"Error,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *VirtualNetworkResponse) Reset() { *m = VirtualNetworkResponse{} }
@ -160,7 +161,7 @@ func (m *VirtualNetworkResponse) GetVirtualNetworks() []*VirtualNetwork {
return nil
}
func (m *VirtualNetworkResponse) GetResult() *wrappers.BoolValue {
func (m *VirtualNetworkResponse) GetResult() *wrapperspb.BoolValue {
if m != nil {
return m.Result
}
@ -185,7 +186,6 @@ type VirtualNetwork struct {
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"`
Vlan uint32 `protobuf:"varint,11,opt,name=vlan,proto3" json:"vlan,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
@ -286,19 +286,13 @@ func (m *VirtualNetwork) GetMacPoolName() string {
return ""
}
func (m *VirtualNetwork) GetVlan() uint32 {
if m != nil {
return m.Vlan
}
return 0
}
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"`
Cidr string `protobuf:"bytes,3,opt,name=cidr,proto3" json:"cidr,omitempty"`
Routes []*Route `protobuf:"bytes,4,rep,name=routes,proto3" json:"routes,omitempty"`
Allocation common.IPAllocationMethod `protobuf:"varint,5,opt,name=allocation,proto3,enum=moc.IPAllocationMethod" json:"allocation,omitempty"`
Vlan uint32 `protobuf:"varint,6,opt,name=vlan,proto3" json:"vlan,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
@ -364,6 +358,13 @@ func (m *Subnet) GetAllocation() common.IPAllocationMethod {
return common.IPAllocationMethod_Invalid
}
func (m *Subnet) GetVlan() uint32 {
if m != nil {
return m.Vlan
}
return 0
}
type Ipam struct {
Type string `protobuf:"bytes,1,opt,name=type,proto3" json:"type,omitempty"`
Subnets []*Subnet `protobuf:"bytes,2,rep,name=subnets,proto3" json:"subnets,omitempty"`
@ -479,52 +480,52 @@ func init() {
func init() { proto.RegisterFile("virtualnetwork.proto", fileDescriptor_4ae143cdfc584285) }
var fileDescriptor_4ae143cdfc584285 = []byte{
// 715 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x54, 0xcf, 0x4f, 0xdb, 0x48,
0x14, 0xc6, 0xf9, 0xe1, 0x24, 0x2f, 0x10, 0xbc, 0x03, 0xcb, 0x5a, 0xd1, 0x2e, 0x8a, 0xbc, 0xd2,
0x2a, 0x42, 0xbb, 0xb6, 0x36, 0x6d, 0xd5, 0x9e, 0x2a, 0x41, 0xdb, 0x43, 0xa4, 0x02, 0x91, 0x89,
0x38, 0xf4, 0x36, 0xb1, 0x27, 0xc1, 0xc2, 0x9e, 0x31, 0xe3, 0x71, 0x80, 0x5b, 0xa5, 0x9e, 0xfa,
0x57, 0xf4, 0x5f, 0xe8, 0xa1, 0x7f, 0x60, 0x35, 0xcf, 0x0e, 0x24, 0x50, 0xa4, 0xf4, 0xd0, 0x9b,
0xdf, 0x7b, 0xdf, 0xfb, 0xe6, 0x9b, 0xef, 0x8d, 0x1f, 0xec, 0xce, 0x23, 0xa9, 0x72, 0x1a, 0x73,
0xa6, 0xae, 0x85, 0xbc, 0x74, 0x53, 0x29, 0x94, 0x20, 0x7b, 0x89, 0x08, 0xdc, 0x20, 0x16, 0x79,
0x48, 0x67, 0x8c, 0x2b, 0xb7, 0xac, 0x76, 0xf7, 0x67, 0x42, 0xcc, 0x62, 0xe6, 0x21, 0x6a, 0x92,
0x4f, 0xbd, 0x6b, 0x49, 0xd3, 0x94, 0xc9, 0xac, 0xe8, 0xeb, 0x6e, 0x06, 0x22, 0x49, 0x04, 0x2f,
0xa3, 0x9d, 0xb2, 0x6d, 0x39, 0xe9, 0x7c, 0x31, 0xe0, 0xf7, 0xf3, 0xe2, 0xcc, 0x93, 0xa2, 0xec,
0xb3, 0xab, 0x9c, 0x65, 0x8a, 0x8c, 0x60, 0x7b, 0xb5, 0x90, 0xd9, 0x46, 0xaf, 0xda, 0x6f, 0x0f,
0xfe, 0x71, 0x7f, 0x2c, 0xc7, 0x7d, 0xc0, 0xf3, 0xb0, 0x9d, 0x3c, 0x87, 0xad, 0xd3, 0x94, 0x49,
0xaa, 0x22, 0xc1, 0xc7, 0xb7, 0x29, 0xb3, 0x2b, 0x3d, 0xa3, 0xdf, 0x19, 0x74, 0x90, 0xef, 0xae,
0xe2, 0xaf, 0x82, 0x9c, 0x6f, 0x06, 0xec, 0x3d, 0x54, 0x98, 0xa5, 0x82, 0x67, 0xec, 0x17, 0x48,
0x1c, 0x80, 0xe9, 0xb3, 0x2c, 0x8f, 0x15, 0x6a, 0x6b, 0x0f, 0xba, 0x6e, 0x61, 0xb1, 0xbb, 0xb0,
0xd8, 0x3d, 0x12, 0x22, 0x3e, 0xa7, 0x71, 0xce, 0xfc, 0x12, 0x49, 0x76, 0xa1, 0xfe, 0x4e, 0x4a,
0x21, 0xed, 0x6a, 0xcf, 0xe8, 0xb7, 0xfc, 0x22, 0x70, 0x3e, 0x55, 0xa1, 0xb3, 0xca, 0x4e, 0x08,
0xd4, 0x38, 0x4d, 0x98, 0x6d, 0x20, 0x0e, 0xbf, 0x49, 0x07, 0x2a, 0x51, 0x88, 0x87, 0xb5, 0xfc,
0x4a, 0x14, 0x92, 0x57, 0xd0, 0xc8, 0xf2, 0x09, 0x67, 0x2a, 0xb3, 0xab, 0x78, 0x95, 0xfd, 0xa7,
0xae, 0x72, 0x86, 0x30, 0x7f, 0x01, 0x27, 0x5d, 0xa8, 0x86, 0x3c, 0xb3, 0x6b, 0xa8, 0xbb, 0x89,
0x5d, 0x6f, 0x79, 0xe6, 0xeb, 0x24, 0x79, 0x0d, 0x35, 0xa5, 0x0d, 0xaf, 0xa3, 0xe1, 0x07, 0xeb,
0xb9, 0xa3, 0xdd, 0xf7, 0xb1, 0x8f, 0x74, 0xa1, 0xc9, 0x45, 0xc8, 0xa6, 0x57, 0x21, 0xb7, 0x4d,
0xd4, 0x7a, 0x17, 0x93, 0x3f, 0xa1, 0x35, 0x93, 0x22, 0x4f, 0x4f, 0xf4, 0xd5, 0x1a, 0x58, 0xbc,
0x4f, 0x90, 0xbf, 0xc1, 0xcc, 0x14, 0x55, 0x79, 0x66, 0x37, 0x51, 0x58, 0x1b, 0xcf, 0x3e, 0xc3,
0x94, 0x5f, 0x96, 0x88, 0x03, 0x9b, 0xb1, 0x08, 0x70, 0xe4, 0xc8, 0xd2, 0x42, 0x96, 0x95, 0x1c,
0xe9, 0x41, 0x3b, 0xa1, 0xc1, 0x48, 0x88, 0x18, 0x21, 0x80, 0x90, 0xe5, 0x94, 0xb6, 0x77, 0x1e,
0x53, 0x6e, 0xb7, 0x7b, 0x46, 0x7f, 0xcb, 0xc7, 0x6f, 0xe7, 0xab, 0x01, 0x66, 0x61, 0xd4, 0x5a,
0xee, 0x13, 0xa8, 0x05, 0x51, 0xb8, 0x98, 0x24, 0x7e, 0x93, 0x17, 0x60, 0x4a, 0x91, 0x2b, 0xa6,
0xad, 0xd5, 0x03, 0xf9, 0xeb, 0x29, 0xf7, 0x7c, 0x8d, 0xf2, 0x4b, 0x30, 0x79, 0x09, 0x40, 0xe3,
0xc5, 0x0d, 0x4a, 0xe3, 0xff, 0xc0, 0xd6, 0xe1, 0xe8, 0xf0, 0xae, 0x70, 0xcc, 0xd4, 0x85, 0x08,
0xfd, 0x25, 0xa8, 0x33, 0x86, 0xda, 0x30, 0xa5, 0x89, 0xd6, 0x82, 0x33, 0x2b, 0xf5, 0xe2, 0x1c,
0x96, 0x5e, 0x47, 0xe5, 0xa7, 0x5e, 0x87, 0x33, 0x83, 0x3a, 0xea, 0x23, 0x36, 0x34, 0x38, 0xbb,
0x51, 0x17, 0x22, 0x2d, 0x99, 0x17, 0x21, 0xf9, 0x17, 0x7e, 0x0b, 0x59, 0xa6, 0x22, 0x8e, 0x3a,
0x52, 0xc9, 0xa6, 0xd1, 0x4d, 0xe9, 0xcd, 0xe3, 0x02, 0xd9, 0x03, 0x33, 0x61, 0x4a, 0x46, 0x01,
0x9a, 0xb5, 0xe5, 0x97, 0xd1, 0xc1, 0x67, 0x03, 0xc8, 0xe3, 0x77, 0x44, 0x1a, 0x50, 0x3d, 0x39,
0x1c, 0x5b, 0x1b, 0x64, 0x1b, 0xda, 0x63, 0x49, 0x79, 0x96, 0x52, 0xc9, 0xb8, 0xb2, 0x0c, 0xb2,
0x09, 0xcd, 0xf7, 0x83, 0x23, 0x19, 0x85, 0x33, 0x66, 0x55, 0x8a, 0x68, 0x9c, 0x73, 0xce, 0x62,
0xab, 0xaa, 0xbb, 0x86, 0x6f, 0xce, 0xac, 0x1a, 0x69, 0x43, 0x63, 0x24, 0xa3, 0x39, 0x55, 0xcc,
0xaa, 0xeb, 0xe0, 0x74, 0xce, 0x64, 0x4c, 0x6f, 0x2d, 0x53, 0x37, 0x0c, 0xb9, 0x62, 0x92, 0xd3,
0xd8, 0x6a, 0xe8, 0xe8, 0x38, 0xd2, 0xff, 0x1f, 0x0b, 0xad, 0xe6, 0xe0, 0xa3, 0x01, 0x3b, 0xab,
0x5a, 0x0e, 0xb5, 0x49, 0x24, 0x02, 0x73, 0xc8, 0xe7, 0xe2, 0x92, 0x91, 0xff, 0xd6, 0x5c, 0x14,
0xc5, 0x4e, 0xec, 0xba, 0xeb, 0xc2, 0x8b, 0x05, 0xe5, 0x6c, 0x1c, 0xfd, 0xff, 0xc1, 0x9b, 0x45,
0xea, 0x22, 0x9f, 0xb8, 0x81, 0x48, 0xbc, 0x24, 0x0a, 0xa4, 0xc8, 0xc4, 0x54, 0x79, 0x89, 0x08,
0x3c, 0x99, 0x06, 0xde, 0x3d, 0x97, 0x57, 0x72, 0x4d, 0x4c, 0xdc, 0x35, 0xcf, 0xbe, 0x07, 0x00,
0x00, 0xff, 0xff, 0xce, 0x80, 0x0c, 0x96, 0x0c, 0x06, 0x00, 0x00,
// 718 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x54, 0xcd, 0x6e, 0xdb, 0x46,
0x10, 0x36, 0xf5, 0x43, 0x49, 0x23, 0x59, 0x66, 0xd7, 0xae, 0x4b, 0x08, 0xad, 0x21, 0xb0, 0x40,
0x61, 0x18, 0x2d, 0x89, 0xaa, 0x0d, 0x92, 0x53, 0x00, 0x3b, 0xc9, 0x41, 0x41, 0x6c, 0x0b, 0xb4,
0xe0, 0x43, 0x6e, 0x2b, 0x72, 0x25, 0x13, 0x26, 0x77, 0xe9, 0xe5, 0x52, 0xb6, 0x6f, 0xb9, 0xe6,
0x29, 0xf2, 0x12, 0x79, 0x84, 0xbc, 0x52, 0xee, 0xc1, 0x0e, 0x29, 0x5b, 0xb2, 0x63, 0x40, 0x39,
0xe4, 0xc6, 0x99, 0xef, 0x9b, 0xd9, 0x6f, 0xbf, 0x59, 0x0e, 0xec, 0xcc, 0x23, 0xa9, 0x72, 0x1a,
0x73, 0xa6, 0xae, 0x85, 0xbc, 0x74, 0x53, 0x29, 0x94, 0x20, 0xbb, 0x89, 0x08, 0xdc, 0x20, 0x16,
0x79, 0x48, 0x67, 0x8c, 0x2b, 0xb7, 0x44, 0x7b, 0x7b, 0x33, 0x21, 0x66, 0x31, 0xf3, 0x90, 0x35,
0xc9, 0xa7, 0xde, 0xb5, 0xa4, 0x69, 0xca, 0x64, 0x56, 0xd4, 0xf5, 0x3a, 0x81, 0x48, 0x12, 0xc1,
0xcb, 0x68, 0xbb, 0x2c, 0x5b, 0x4e, 0x3a, 0x9f, 0x0c, 0xf8, 0xf5, 0xbc, 0x38, 0xf3, 0xa4, 0x80,
0x7d, 0x76, 0x95, 0xb3, 0x4c, 0x91, 0x11, 0x6c, 0xad, 0x02, 0x99, 0x6d, 0xf4, 0xab, 0xfb, 0xed,
0xc1, 0x5f, 0xee, 0xf7, 0xe5, 0xb8, 0x0f, 0xfa, 0x3c, 0x2c, 0x27, 0xff, 0xc3, 0xe6, 0x69, 0xca,
0x24, 0x55, 0x91, 0xe0, 0xe3, 0xdb, 0x94, 0xd9, 0x95, 0xbe, 0xb1, 0xdf, 0x1d, 0x74, 0xb1, 0xdf,
0x1d, 0xe2, 0xaf, 0x92, 0x9c, 0xcf, 0x06, 0xec, 0x3e, 0x54, 0x98, 0xa5, 0x82, 0x67, 0xec, 0x27,
0x48, 0x1c, 0x80, 0xe9, 0xb3, 0x2c, 0x8f, 0x15, 0x6a, 0x6b, 0x0f, 0x7a, 0x6e, 0x61, 0xb1, 0xbb,
0xb0, 0xd8, 0x3d, 0x12, 0x22, 0x3e, 0xa7, 0x71, 0xce, 0xfc, 0x92, 0x49, 0x76, 0xa0, 0xfe, 0x46,
0x4a, 0x21, 0xed, 0x6a, 0xdf, 0xd8, 0x6f, 0xf9, 0x45, 0xe0, 0x7c, 0xad, 0x40, 0x77, 0xb5, 0x3b,
0x21, 0x50, 0xe3, 0x34, 0x61, 0xb6, 0x81, 0x3c, 0xfc, 0x26, 0x5d, 0xa8, 0x44, 0x21, 0x1e, 0xd6,
0xf2, 0x2b, 0x51, 0x48, 0x5e, 0x40, 0x23, 0xcb, 0x27, 0x9c, 0xa9, 0xcc, 0xae, 0xe2, 0x55, 0xf6,
0x9e, 0xba, 0xca, 0x19, 0xd2, 0xfc, 0x05, 0x9d, 0xf4, 0xa0, 0x1a, 0xf2, 0xcc, 0xae, 0xa1, 0xee,
0x26, 0x56, 0xbd, 0xe6, 0x99, 0xaf, 0x93, 0xe4, 0x25, 0xd4, 0x94, 0x36, 0xbc, 0x8e, 0x86, 0x1f,
0xac, 0xe7, 0x8e, 0x76, 0xdf, 0xc7, 0x3a, 0xd2, 0x83, 0x26, 0x17, 0x21, 0x9b, 0x5e, 0x85, 0xdc,
0x36, 0x51, 0xeb, 0x5d, 0x4c, 0x7e, 0x87, 0xd6, 0x4c, 0x8a, 0x3c, 0x3d, 0xd1, 0x57, 0x6b, 0x20,
0x78, 0x9f, 0x20, 0x7f, 0x82, 0x99, 0x29, 0xaa, 0xf2, 0xcc, 0x6e, 0xa2, 0xb0, 0x36, 0x9e, 0x7d,
0x86, 0x29, 0xbf, 0x84, 0x88, 0x03, 0x9d, 0x58, 0x04, 0x38, 0x72, 0xec, 0xd2, 0xc2, 0x2e, 0x2b,
0x39, 0xd2, 0x87, 0x76, 0x42, 0x83, 0x91, 0x10, 0x31, 0x52, 0x00, 0x29, 0xcb, 0xa9, 0xb7, 0xb5,
0x66, 0xdb, 0xea, 0x38, 0x5f, 0x0c, 0x30, 0x0b, 0x6b, 0xd6, 0xf2, 0x9b, 0x40, 0x2d, 0x88, 0xc2,
0xc5, 0xec, 0xf0, 0x9b, 0x3c, 0x03, 0x53, 0x8a, 0x5c, 0x31, 0x6d, 0xa6, 0x1e, 0xc1, 0x1f, 0x4f,
0xf9, 0xe5, 0x6b, 0x96, 0x5f, 0x92, 0xc9, 0x73, 0x00, 0x1a, 0x2f, 0x34, 0x97, 0x56, 0xff, 0x86,
0xa5, 0xc3, 0xd1, 0xe1, 0x1d, 0x70, 0xcc, 0xd4, 0x85, 0x08, 0xfd, 0x25, 0xaa, 0xd6, 0x30, 0x8f,
0x69, 0xe1, 0xec, 0xa6, 0x8f, 0xdf, 0xce, 0x18, 0x6a, 0xc3, 0x94, 0x26, 0x1a, 0xc3, 0xc9, 0x95,
0x77, 0xc0, 0x69, 0x2c, 0xbd, 0x91, 0xca, 0x0f, 0xbd, 0x11, 0x67, 0x06, 0x75, 0xd4, 0x4c, 0x6c,
0x68, 0x70, 0x76, 0xa3, 0x2e, 0x44, 0x5a, 0x76, 0x5e, 0x84, 0xe4, 0x6f, 0xf8, 0x25, 0x64, 0x99,
0x8a, 0x38, 0x6a, 0x4b, 0x25, 0x9b, 0x46, 0x37, 0xa5, 0x5f, 0x8f, 0x01, 0xb2, 0x0b, 0x66, 0xc2,
0x94, 0x8c, 0x02, 0x34, 0x70, 0xd3, 0x2f, 0xa3, 0x83, 0x8f, 0x06, 0x90, 0xc7, 0xaf, 0x89, 0x34,
0xa0, 0x7a, 0x72, 0x38, 0xb6, 0x36, 0xc8, 0x16, 0xb4, 0xc7, 0x92, 0xf2, 0x2c, 0xa5, 0x92, 0x71,
0x65, 0x19, 0xa4, 0x03, 0xcd, 0x77, 0x83, 0x23, 0x19, 0x85, 0x33, 0x66, 0x55, 0x8a, 0x68, 0x9c,
0x73, 0xce, 0x62, 0xab, 0xaa, 0xab, 0x86, 0xaf, 0xce, 0xac, 0x1a, 0x69, 0x43, 0x63, 0x24, 0xa3,
0x39, 0x55, 0xcc, 0xaa, 0xeb, 0xe0, 0x74, 0xce, 0x64, 0x4c, 0x6f, 0x2d, 0x53, 0x17, 0x0c, 0xb9,
0x62, 0x92, 0xd3, 0xd8, 0x6a, 0xe8, 0xe8, 0x38, 0xd2, 0x7f, 0x21, 0x0b, 0xad, 0xe6, 0xe0, 0x83,
0x01, 0xdb, 0xab, 0x5a, 0x0e, 0xb5, 0x49, 0x24, 0x02, 0x73, 0xc8, 0xe7, 0xe2, 0x92, 0x91, 0x7f,
0xd6, 0x5c, 0x17, 0xc5, 0x66, 0xec, 0xb9, 0xeb, 0xd2, 0x8b, 0x35, 0xe5, 0x6c, 0x1c, 0xfd, 0xfb,
0xde, 0x9b, 0x45, 0xea, 0x22, 0x9f, 0xb8, 0x81, 0x48, 0xbc, 0x24, 0x0a, 0xa4, 0xc8, 0xc4, 0x54,
0x79, 0x89, 0x08, 0x3c, 0x99, 0x06, 0xde, 0x7d, 0x2f, 0xaf, 0xec, 0x35, 0x31, 0x71, 0xe3, 0xfc,
0xf7, 0x2d, 0x00, 0x00, 0xff, 0xff, 0xb0, 0x15, 0xd4, 0xeb, 0x12, 0x06, 0x00, 0x00,
}
// Reference imports to suppress errors if they are not otherwise used.

Просмотреть файл

@ -33,6 +33,7 @@ message VirtualNetworkResponse {
}
message VirtualNetwork {
reserved 11;
string name = 1;
string id = 2;
repeated Subnet subnets = 3;
@ -43,7 +44,6 @@ message VirtualNetwork {
Status status = 8;
string locationName = 9;
string macPoolName = 10;
uint32 vlan = 11;
}
message Subnet {
@ -52,6 +52,7 @@ message Subnet {
string cidr = 3;
repeated Route routes = 4;
IPAllocationMethod allocation = 5;
uint32 vlan = 6;
}
message Ipam {
string type = 1;

Просмотреть файл

@ -6,14 +6,15 @@ package network
import (
context "context"
fmt "fmt"
math "math"
proto "github.com/golang/protobuf/proto"
empty "github.com/golang/protobuf/ptypes/empty"
wrappers "github.com/golang/protobuf/ptypes/wrappers"
common "github.com/microsoft/moc/rpc/common"
grpc "google.golang.org/grpc"
codes "google.golang.org/grpc/codes"
status "google.golang.org/grpc/status"
math "math"
emptypb "google.golang.org/protobuf/types/known/emptypb"
wrapperspb "google.golang.org/protobuf/types/known/wrapperspb"
)
// Reference imports to suppress errors if they are not otherwise used.
@ -121,12 +122,12 @@ func (m *VirtualNetworkRequest) GetOperationType() common.Operation {
}
type VirtualNetworkResponse struct {
VirtualNetworks []*VirtualNetwork `protobuf:"bytes,1,rep,name=VirtualNetworks,proto3" json:"VirtualNetworks,omitempty"`
Result *wrappers.BoolValue `protobuf:"bytes,2,opt,name=Result,proto3" json:"Result,omitempty"`
Error string `protobuf:"bytes,3,opt,name=Error,proto3" json:"Error,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
VirtualNetworks []*VirtualNetwork `protobuf:"bytes,1,rep,name=VirtualNetworks,proto3" json:"VirtualNetworks,omitempty"`
Result *wrapperspb.BoolValue `protobuf:"bytes,2,opt,name=Result,proto3" json:"Result,omitempty"`
Error string `protobuf:"bytes,3,opt,name=Error,proto3" json:"Error,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *VirtualNetworkResponse) Reset() { *m = VirtualNetworkResponse{} }
@ -161,7 +162,7 @@ func (m *VirtualNetworkResponse) GetVirtualNetworks() []*VirtualNetwork {
return nil
}
func (m *VirtualNetworkResponse) GetResult() *wrappers.BoolValue {
func (m *VirtualNetworkResponse) GetResult() *wrapperspb.BoolValue {
if m != nil {
return m.Result
}
@ -182,7 +183,6 @@ type VirtualNetwork struct {
Dns *common.Dns `protobuf:"bytes,4,opt,name=dns,proto3" json:"dns,omitempty"`
Type VirtualNetworkType `protobuf:"varint,5,opt,name=type,proto3,enum=moc.nodeagent.network.VirtualNetworkType" json:"type,omitempty"`
MacPool *MacPool `protobuf:"bytes,6,opt,name=macPool,proto3" json:"macPool,omitempty"`
Vlan uint32 `protobuf:"varint,7,opt,name=vlan,proto3" json:"vlan,omitempty"`
Status *common.Status `protobuf:"bytes,8,opt,name=status,proto3" json:"status,omitempty"`
Entity *common.Entity `protobuf:"bytes,9,opt,name=entity,proto3" json:"entity,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
@ -257,13 +257,6 @@ func (m *VirtualNetwork) GetMacPool() *MacPool {
return nil
}
func (m *VirtualNetwork) GetVlan() uint32 {
if m != nil {
return m.Vlan
}
return 0
}
func (m *VirtualNetwork) GetStatus() *common.Status {
if m != nil {
return m.Status
@ -370,6 +363,7 @@ type Subnet struct {
Cidr string `protobuf:"bytes,3,opt,name=cidr,proto3" json:"cidr,omitempty"`
Routes []*Route `protobuf:"bytes,4,rep,name=routes,proto3" json:"routes,omitempty"`
Allocation common.IPAllocationMethod `protobuf:"varint,5,opt,name=allocation,proto3,enum=moc.IPAllocationMethod" json:"allocation,omitempty"`
Vlan uint32 `protobuf:"varint,6,opt,name=vlan,proto3" json:"vlan,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
@ -435,6 +429,13 @@ func (m *Subnet) GetAllocation() common.IPAllocationMethod {
return common.IPAllocationMethod_Invalid
}
func (m *Subnet) GetVlan() uint32 {
if m != nil {
return m.Vlan
}
return 0
}
type Ipam struct {
Type string `protobuf:"bytes,1,opt,name=type,proto3" json:"type,omitempty"`
Subnets []*Subnet `protobuf:"bytes,2,rep,name=subnets,proto3" json:"subnets,omitempty"`
@ -552,58 +553,58 @@ func init() {
func init() { proto.RegisterFile("virtualnetwork.proto", fileDescriptor_4ae143cdfc584285) }
var fileDescriptor_4ae143cdfc584285 = []byte{
// 812 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0xdd, 0x6e, 0x1b, 0x45,
0x14, 0xee, 0xfa, 0x67, 0xed, 0x1c, 0x37, 0x89, 0x3b, 0x6d, 0xc3, 0xe2, 0x42, 0x89, 0x16, 0x90,
0x0c, 0x2a, 0x6b, 0x30, 0x95, 0xc2, 0x0d, 0x17, 0x49, 0x89, 0x84, 0x25, 0x9c, 0x44, 0x93, 0xa8,
0x17, 0xbd, 0x9b, 0xec, 0x9e, 0x38, 0xa3, 0xec, 0xce, 0x2c, 0x33, 0xb3, 0x6e, 0xf3, 0x08, 0xbc,
0x04, 0xaf, 0xc0, 0x05, 0x2f, 0xc1, 0x33, 0xf0, 0x34, 0x68, 0x66, 0xc7, 0xc1, 0x76, 0xb0, 0x94,
0x0b, 0xee, 0xf6, 0x9c, 0xf3, 0x9d, 0x6f, 0xbe, 0xf3, 0xcd, 0xf1, 0x18, 0x9e, 0xcd, 0xb9, 0x32,
0x15, 0xcb, 0x05, 0x9a, 0xf7, 0x52, 0xdd, 0x24, 0xa5, 0x92, 0x46, 0x92, 0xe7, 0x85, 0x4c, 0x13,
0x21, 0x33, 0x64, 0x33, 0x14, 0x26, 0xf1, 0xc5, 0xc1, 0xcb, 0x99, 0x94, 0xb3, 0x1c, 0x47, 0x0e,
0x74, 0x59, 0x5d, 0x8d, 0xde, 0x2b, 0x56, 0x96, 0xa8, 0x74, 0xdd, 0x36, 0x78, 0xb1, 0x5e, 0xc7,
0xa2, 0x34, 0xb7, 0xbe, 0xf8, 0x38, 0x95, 0x45, 0x21, 0x85, 0x8f, 0x9e, 0x7a, 0xce, 0x95, 0x24,
0x11, 0xd2, 0xf0, 0x2b, 0x9e, 0x32, 0xc3, 0x17, 0xb9, 0xf8, 0xf7, 0x00, 0x9e, 0xbf, 0xad, 0x35,
0x9e, 0xd4, 0x2d, 0x14, 0x7f, 0xad, 0x50, 0x1b, 0x72, 0x0a, 0xbb, 0xab, 0x05, 0x1d, 0x05, 0xfb,
0xcd, 0x61, 0x6f, 0xfc, 0x65, 0xf2, 0x9f, 0xf2, 0x93, 0x35, 0x9a, 0xf5, 0x6e, 0xf2, 0x1a, 0xb6,
0x4f, 0x4b, 0x54, 0xee, 0xf4, 0x8b, 0xdb, 0x12, 0xa3, 0xc6, 0x7e, 0x30, 0xdc, 0x19, 0xef, 0x38,
0xba, 0xbb, 0x0a, 0x5d, 0x05, 0xc5, 0x7f, 0x06, 0xb0, 0xb7, 0x2e, 0x50, 0x97, 0x52, 0x68, 0xfc,
0xff, 0x15, 0x8e, 0x21, 0xa4, 0xa8, 0xab, 0xdc, 0x38, 0x69, 0xbd, 0xf1, 0x20, 0xa9, 0x1d, 0x4f,
0x16, 0x8e, 0x27, 0x47, 0x52, 0xe6, 0x6f, 0x59, 0x5e, 0x21, 0xf5, 0x48, 0xf2, 0x0c, 0xda, 0xc7,
0x4a, 0x49, 0x15, 0x35, 0xf7, 0x83, 0xe1, 0x16, 0xad, 0x83, 0xf8, 0xef, 0x06, 0xec, 0xac, 0xb2,
0x13, 0x02, 0x2d, 0xc1, 0x0a, 0x8c, 0x02, 0x87, 0x73, 0xdf, 0x64, 0x07, 0x1a, 0x3c, 0x73, 0x87,
0x6d, 0xd1, 0x06, 0xcf, 0xc8, 0x77, 0xd0, 0xe6, 0x25, 0x2b, 0x74, 0xd4, 0x74, 0x73, 0xbc, 0xd8,
0x30, 0xc7, 0xa4, 0x64, 0x05, 0xad, 0x91, 0x64, 0x00, 0xcd, 0x4c, 0xe8, 0xa8, 0xe5, 0x04, 0x77,
0x5d, 0xc3, 0x4f, 0x42, 0x53, 0x9b, 0x24, 0x3f, 0x42, 0xcb, 0x58, 0xa3, 0xdb, 0xce, 0xe8, 0xaf,
0x1e, 0xe4, 0x8a, 0x35, 0x9d, 0xba, 0x36, 0xf2, 0x03, 0x74, 0x0a, 0x96, 0x9e, 0x49, 0x99, 0x47,
0xa1, 0xa3, 0x7f, 0xb9, 0x81, 0x61, 0x5a, 0xa3, 0xe8, 0x02, 0x6e, 0x67, 0x9d, 0xe7, 0x4c, 0x44,
0x9d, 0xfd, 0x60, 0xb8, 0x4d, 0xdd, 0x37, 0xf9, 0x1c, 0x42, 0x6d, 0x98, 0xa9, 0x74, 0xd4, 0x75,
0x64, 0x3d, 0x47, 0x76, 0xee, 0x52, 0xd4, 0x97, 0x2c, 0x08, 0x85, 0xe1, 0xe6, 0x36, 0xda, 0x5a,
0x02, 0x1d, 0xbb, 0x14, 0xf5, 0xa5, 0xf8, 0x1d, 0x74, 0xa7, 0x2c, 0xa5, 0x4c, 0xcc, 0x90, 0x0c,
0x61, 0x57, 0x1b, 0xa6, 0xcc, 0x94, 0xa5, 0x87, 0x59, 0xa6, 0x50, 0x6b, 0x6f, 0xf0, 0x7a, 0x9a,
0x7c, 0x01, 0xdb, 0x28, 0xb2, 0x25, 0x5c, 0x6d, 0xfb, 0x6a, 0x32, 0x3e, 0x82, 0x8e, 0x9f, 0x86,
0x1c, 0x40, 0xa8, 0xec, 0x19, 0x8b, 0xad, 0xfa, 0x6c, 0xf3, 0xf4, 0x4e, 0x0b, 0xf5, 0xf0, 0xf8,
0x8f, 0x00, 0xc2, 0xf3, 0xea, 0x52, 0xa0, 0x79, 0xd0, 0xa5, 0x13, 0x68, 0xa5, 0x3c, 0x5b, 0x2c,
0x90, 0xfb, 0x26, 0xaf, 0x21, 0x54, 0xb2, 0x32, 0x68, 0x2f, 0xd6, 0x9e, 0xfd, 0xc9, 0x86, 0xb3,
0xa9, 0x05, 0x51, 0x8f, 0x25, 0x07, 0x00, 0x2c, 0xcf, 0x65, 0xfd, 0x03, 0xf7, 0xb7, 0xfe, 0x91,
0xeb, 0x9c, 0x9c, 0x1d, 0xde, 0x15, 0xa6, 0x68, 0xae, 0x65, 0x46, 0x97, 0xa0, 0xf1, 0x39, 0xb4,
0xec, 0x4e, 0x59, 0x29, 0x6e, 0x61, 0xbc, 0x5c, 0xb7, 0x05, 0x07, 0xd0, 0xd1, 0x6e, 0x18, 0xeb,
0x98, 0xd5, 0xf2, 0xe9, 0x06, 0x2d, 0xf5, 0xc8, 0x74, 0x81, 0x8e, 0x67, 0xd0, 0x76, 0xf2, 0x48,
0x04, 0x1d, 0x81, 0x1f, 0xcc, 0xb5, 0x2c, 0x3d, 0xf1, 0x22, 0x24, 0xaf, 0xe0, 0x49, 0x86, 0xda,
0x70, 0xe1, 0x64, 0x94, 0x0a, 0xaf, 0xf8, 0x07, 0xef, 0xcc, 0xfd, 0x02, 0xd9, 0x83, 0xb0, 0x40,
0xa3, 0x78, 0xea, 0xac, 0xda, 0xa6, 0x3e, 0xfa, 0xfa, 0xb7, 0x00, 0xc8, 0xfd, 0x25, 0x26, 0x1d,
0x68, 0x9e, 0x1c, 0x5e, 0xf4, 0x1f, 0x91, 0x5d, 0xe8, 0x5d, 0x28, 0x26, 0x74, 0xc9, 0x14, 0x0a,
0xd3, 0x0f, 0xc8, 0x63, 0xe8, 0xfe, 0x32, 0x3e, 0x52, 0x3c, 0x9b, 0x61, 0xbf, 0x51, 0x47, 0x17,
0x95, 0x10, 0x98, 0xf7, 0x9b, 0xb6, 0x6b, 0xf2, 0xe6, 0xbc, 0xdf, 0x22, 0x3d, 0xe8, 0x9c, 0x29,
0x3e, 0x67, 0x06, 0xfb, 0x6d, 0x1b, 0x9c, 0xce, 0x51, 0xe5, 0xec, 0xb6, 0x1f, 0xda, 0x86, 0x89,
0x30, 0xa8, 0x04, 0xcb, 0xfb, 0x1d, 0x1b, 0x4d, 0xb9, 0xfd, 0xd1, 0x63, 0xd6, 0xef, 0x8e, 0xff,
0x0a, 0xe0, 0xe9, 0xaa, 0x96, 0x43, 0x6b, 0x12, 0x99, 0x41, 0x38, 0x11, 0x73, 0x79, 0x83, 0xe4,
0xd5, 0xc3, 0x1e, 0xa7, 0xfa, 0x15, 0x1e, 0x7c, 0xf3, 0x40, 0x74, 0xfd, 0x24, 0xc6, 0x8f, 0xc8,
0xcf, 0xf0, 0xe4, 0xcd, 0x35, 0xa6, 0x37, 0x27, 0x4b, 0x6f, 0x3d, 0xd9, 0xbb, 0xf7, 0x90, 0x1d,
0xdb, 0xbf, 0x8e, 0xc1, 0xc7, 0x8e, 0x7d, 0x19, 0xfa, 0x2f, 0xd3, 0xd1, 0xb7, 0xef, 0x92, 0x19,
0x37, 0xd7, 0xd5, 0x65, 0x92, 0xca, 0x62, 0x54, 0xf0, 0x54, 0x49, 0x2d, 0xaf, 0xcc, 0xa8, 0x90,
0xe9, 0x48, 0x95, 0xe9, 0xe8, 0x4e, 0xd4, 0xc8, 0x8b, 0xba, 0x0c, 0x1d, 0xfd, 0xf7, 0xff, 0x04,
0x00, 0x00, 0xff, 0xff, 0x9c, 0x24, 0x2b, 0x7d, 0xf6, 0x06, 0x00, 0x00,
// 814 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0xdd, 0x72, 0x1b, 0x35,
0x14, 0xee, 0xfa, 0x67, 0xed, 0x1c, 0x37, 0xc9, 0x56, 0x6d, 0xc3, 0xe2, 0x42, 0xc9, 0x18, 0x98,
0x09, 0x4c, 0x59, 0x83, 0xe9, 0x4c, 0xb8, 0xe1, 0x22, 0x29, 0x99, 0xc1, 0x0c, 0x4e, 0x32, 0x4a,
0xa6, 0x17, 0xbd, 0x53, 0x76, 0x4f, 0x1c, 0x4d, 0x76, 0xa5, 0x45, 0xd2, 0xba, 0xc9, 0x23, 0xf0,
0x12, 0xbc, 0x04, 0x8f, 0xc0, 0x0d, 0x17, 0x3c, 0x14, 0x23, 0xad, 0x1c, 0x6c, 0x07, 0xcf, 0xe4,
0xa2, 0x77, 0x3a, 0xe7, 0x7c, 0xe7, 0xd3, 0xa7, 0x4f, 0x67, 0xb5, 0xf0, 0x6c, 0xc6, 0x95, 0xa9,
0x58, 0x2e, 0xd0, 0xbc, 0x97, 0xea, 0x3a, 0x29, 0x95, 0x34, 0x92, 0x3c, 0x2f, 0x64, 0x9a, 0x08,
0x99, 0x21, 0x9b, 0xa2, 0x30, 0x89, 0x2f, 0xf6, 0x5f, 0x4e, 0xa5, 0x9c, 0xe6, 0x38, 0x74, 0xa0,
0x8b, 0xea, 0x72, 0xf8, 0x5e, 0xb1, 0xb2, 0x44, 0xa5, 0xeb, 0xb6, 0xfe, 0x8b, 0xd5, 0x3a, 0x16,
0xa5, 0xb9, 0xf5, 0xc5, 0xc7, 0xa9, 0x2c, 0x0a, 0x29, 0x7c, 0xf4, 0xd4, 0x73, 0x2e, 0x25, 0x89,
0x90, 0x86, 0x5f, 0xf2, 0x94, 0x19, 0x3e, 0xcf, 0x0d, 0xfe, 0x08, 0xe0, 0xf9, 0xdb, 0x5a, 0xe3,
0x71, 0xdd, 0x42, 0xf1, 0xb7, 0x0a, 0xb5, 0x21, 0x27, 0xb0, 0xbd, 0x5c, 0xd0, 0x71, 0xb0, 0xdb,
0xdc, 0xeb, 0x8d, 0xbe, 0x4c, 0xfe, 0x57, 0x7e, 0xb2, 0x42, 0xb3, 0xda, 0x4d, 0x5e, 0xc3, 0xe6,
0x49, 0x89, 0xca, 0xed, 0x7e, 0x7e, 0x5b, 0x62, 0xdc, 0xd8, 0x0d, 0xf6, 0xb6, 0x46, 0x5b, 0x8e,
0xee, 0xae, 0x42, 0x97, 0x41, 0x83, 0x3f, 0x03, 0xd8, 0x59, 0x15, 0xa8, 0x4b, 0x29, 0x34, 0x7e,
0x78, 0x85, 0x23, 0x08, 0x29, 0xea, 0x2a, 0x37, 0x4e, 0x5a, 0x6f, 0xd4, 0x4f, 0x6a, 0xc7, 0x93,
0xb9, 0xe3, 0xc9, 0xa1, 0x94, 0xf9, 0x5b, 0x96, 0x57, 0x48, 0x3d, 0x92, 0x3c, 0x83, 0xf6, 0x91,
0x52, 0x52, 0xc5, 0xcd, 0xdd, 0x60, 0x6f, 0x83, 0xd6, 0xc1, 0xe0, 0x9f, 0x06, 0x6c, 0x2d, 0xb3,
0x13, 0x02, 0x2d, 0xc1, 0x0a, 0x8c, 0x03, 0x87, 0x73, 0x6b, 0xb2, 0x05, 0x0d, 0x9e, 0xb9, 0xcd,
0x36, 0x68, 0x83, 0x67, 0xe4, 0x3b, 0x68, 0xf3, 0x92, 0x15, 0x3a, 0x6e, 0xba, 0x73, 0xbc, 0x58,
0x73, 0x8e, 0x71, 0xc9, 0x0a, 0x5a, 0x23, 0x49, 0x1f, 0x9a, 0x99, 0xd0, 0x71, 0xcb, 0x09, 0xee,
0xba, 0x86, 0x9f, 0x84, 0xa6, 0x36, 0x49, 0x7e, 0x84, 0x96, 0xb1, 0x46, 0xb7, 0x9d, 0xd1, 0x5f,
0x3d, 0xc8, 0x15, 0x6b, 0x3a, 0x75, 0x6d, 0xe4, 0x07, 0xe8, 0x14, 0x2c, 0x3d, 0x95, 0x32, 0x8f,
0x43, 0x47, 0xff, 0x72, 0x0d, 0xc3, 0xa4, 0x46, 0xd1, 0x39, 0x9c, 0x7c, 0x0e, 0xa1, 0x36, 0xcc,
0x54, 0x3a, 0xee, 0xba, 0xc6, 0x9e, 0x6b, 0x3c, 0x73, 0x29, 0xea, 0x4b, 0x16, 0x84, 0xc2, 0x70,
0x73, 0x1b, 0x6f, 0x2c, 0x80, 0x8e, 0x5c, 0x8a, 0xfa, 0xd2, 0x2f, 0xad, 0x6e, 0x27, 0xea, 0x0e,
0xde, 0x41, 0x77, 0xc2, 0x52, 0xca, 0xc4, 0x14, 0xc9, 0x1e, 0x6c, 0x6b, 0xc3, 0x94, 0x99, 0xb0,
0xf4, 0x20, 0xcb, 0x14, 0x6a, 0xed, 0x2d, 0x5d, 0x4d, 0x93, 0x2f, 0x60, 0x13, 0x45, 0xb6, 0x80,
0xab, 0x8d, 0x5e, 0x4e, 0x0e, 0x0e, 0xa1, 0xe3, 0xf5, 0x93, 0x7d, 0x08, 0x95, 0xdd, 0x63, 0x3e,
0x47, 0x9f, 0xad, 0x3f, 0xaf, 0xd3, 0x42, 0x3d, 0x7c, 0xf0, 0x57, 0x00, 0xe1, 0x59, 0x75, 0x21,
0xd0, 0x3c, 0xe8, 0x9a, 0x09, 0xb4, 0x52, 0x9e, 0xcd, 0x47, 0xc6, 0xad, 0xc9, 0x6b, 0x08, 0x95,
0xac, 0x0c, 0xda, 0xab, 0xb4, 0x7b, 0x7f, 0xb2, 0x66, 0x6f, 0x6a, 0x41, 0xd4, 0x63, 0xc9, 0x3e,
0x00, 0xcb, 0x73, 0x59, 0x7f, 0xd2, 0xfe, 0x9e, 0x3f, 0x72, 0x9d, 0xe3, 0xd3, 0x83, 0xbb, 0xc2,
0x04, 0xcd, 0x95, 0xcc, 0xe8, 0x02, 0xd4, 0x4a, 0x98, 0xe5, 0x4c, 0xb8, 0x8b, 0xdd, 0xa4, 0x6e,
0x3d, 0x38, 0x83, 0x96, 0x9d, 0x2c, 0x5b, 0x73, 0x63, 0xe3, 0x8f, 0xe0, 0x66, 0x61, 0x1f, 0x3a,
0xda, 0x1d, 0xd0, 0xba, 0x68, 0xf5, 0x7d, 0xba, 0x46, 0x5f, 0x6d, 0x03, 0x9d, 0xa3, 0x07, 0x53,
0x68, 0x3b, 0xc9, 0x24, 0x86, 0x8e, 0xc0, 0x1b, 0x73, 0x25, 0x4b, 0x4f, 0x3c, 0x0f, 0xc9, 0x2b,
0x78, 0x92, 0xa1, 0x36, 0x5c, 0x38, 0x69, 0xa5, 0xc2, 0x4b, 0x7e, 0xe3, 0xdd, 0xba, 0x5f, 0x20,
0x3b, 0x10, 0x16, 0x68, 0x14, 0x4f, 0x9d, 0x7d, 0x9b, 0xd4, 0x47, 0x5f, 0xff, 0x1e, 0x00, 0xb9,
0x3f, 0xca, 0xa4, 0x03, 0xcd, 0xe3, 0x83, 0xf3, 0xe8, 0x11, 0xd9, 0x86, 0xde, 0xb9, 0x62, 0x42,
0x97, 0x4c, 0xa1, 0x30, 0x51, 0x40, 0x1e, 0x43, 0xf7, 0xd7, 0xd1, 0xa1, 0xe2, 0xd9, 0x14, 0xa3,
0x46, 0x1d, 0x9d, 0x57, 0x42, 0x60, 0x1e, 0x35, 0x6d, 0xd7, 0xf8, 0xcd, 0x59, 0xd4, 0x22, 0x3d,
0xe8, 0x9c, 0x2a, 0x3e, 0x63, 0x06, 0xa3, 0xb6, 0x0d, 0x4e, 0x66, 0xa8, 0x72, 0x76, 0x1b, 0x85,
0xb6, 0x61, 0x2c, 0x0c, 0x2a, 0xc1, 0xf2, 0xa8, 0x63, 0xa3, 0x09, 0xb7, 0x9f, 0x3e, 0x66, 0x51,
0x77, 0xf4, 0x77, 0x00, 0x4f, 0x97, 0xb5, 0x1c, 0x58, 0x93, 0xc8, 0x14, 0xc2, 0xb1, 0x98, 0xc9,
0x6b, 0x24, 0xaf, 0x1e, 0xf6, 0x44, 0xd5, 0x6f, 0x71, 0xff, 0x9b, 0x07, 0xa2, 0xeb, 0x87, 0x71,
0xf0, 0x88, 0xfc, 0x0c, 0x4f, 0xde, 0x5c, 0x61, 0x7a, 0x7d, 0xbc, 0xf0, 0xe2, 0x93, 0x9d, 0x7b,
0xcf, 0xd9, 0x91, 0xfd, 0x81, 0xf4, 0x3f, 0x76, 0xec, 0x8b, 0xd0, 0xff, 0x98, 0x0e, 0xbf, 0x7d,
0x97, 0x4c, 0xb9, 0xb9, 0xaa, 0x2e, 0x92, 0x54, 0x16, 0xc3, 0x82, 0xa7, 0x4a, 0x6a, 0x79, 0x69,
0x86, 0x85, 0x4c, 0x87, 0xaa, 0x4c, 0x87, 0x77, 0xa2, 0x86, 0x5e, 0xd4, 0x45, 0xe8, 0xe8, 0xbf,
0xff, 0x37, 0x00, 0x00, 0xff, 0xff, 0xb2, 0x19, 0xc6, 0x28, 0xfc, 0x06, 0x00, 0x00,
}
// Reference imports to suppress errors if they are not otherwise used.
@ -619,7 +620,7 @@ const _ = grpc.SupportPackageIsVersion4
// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
type VirtualNetworkAgentClient interface {
Invoke(ctx context.Context, in *VirtualNetworkRequest, opts ...grpc.CallOption) (*VirtualNetworkResponse, error)
CheckNotification(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*common.NotificationResponse, error)
CheckNotification(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*common.NotificationResponse, error)
}
type virtualNetworkAgentClient struct {
@ -639,7 +640,7 @@ func (c *virtualNetworkAgentClient) Invoke(ctx context.Context, in *VirtualNetwo
return out, nil
}
func (c *virtualNetworkAgentClient) CheckNotification(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*common.NotificationResponse, error) {
func (c *virtualNetworkAgentClient) CheckNotification(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*common.NotificationResponse, error) {
out := new(common.NotificationResponse)
err := c.cc.Invoke(ctx, "/moc.nodeagent.network.VirtualNetworkAgent/CheckNotification", in, out, opts...)
if err != nil {
@ -651,7 +652,7 @@ func (c *virtualNetworkAgentClient) CheckNotification(ctx context.Context, in *e
// VirtualNetworkAgentServer is the server API for VirtualNetworkAgent service.
type VirtualNetworkAgentServer interface {
Invoke(context.Context, *VirtualNetworkRequest) (*VirtualNetworkResponse, error)
CheckNotification(context.Context, *empty.Empty) (*common.NotificationResponse, error)
CheckNotification(context.Context, *emptypb.Empty) (*common.NotificationResponse, error)
}
// UnimplementedVirtualNetworkAgentServer can be embedded to have forward compatible implementations.
@ -661,7 +662,7 @@ type UnimplementedVirtualNetworkAgentServer struct {
func (*UnimplementedVirtualNetworkAgentServer) Invoke(ctx context.Context, req *VirtualNetworkRequest) (*VirtualNetworkResponse, error) {
return nil, status.Errorf(codes.Unimplemented, "method Invoke not implemented")
}
func (*UnimplementedVirtualNetworkAgentServer) CheckNotification(ctx context.Context, req *empty.Empty) (*common.NotificationResponse, error) {
func (*UnimplementedVirtualNetworkAgentServer) CheckNotification(ctx context.Context, req *emptypb.Empty) (*common.NotificationResponse, error) {
return nil, status.Errorf(codes.Unimplemented, "method CheckNotification not implemented")
}
@ -688,7 +689,7 @@ func _VirtualNetworkAgent_Invoke_Handler(srv interface{}, ctx context.Context, d
}
func _VirtualNetworkAgent_CheckNotification_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
in := new(empty.Empty)
in := new(emptypb.Empty)
if err := dec(in); err != nil {
return nil, err
}
@ -700,7 +701,7 @@ func _VirtualNetworkAgent_CheckNotification_Handler(srv interface{}, ctx context
FullMethod: "/moc.nodeagent.network.VirtualNetworkAgent/CheckNotification",
}
handler := func(ctx context.Context, req interface{}) (interface{}, error) {
return srv.(VirtualNetworkAgentServer).CheckNotification(ctx, req.(*empty.Empty))
return srv.(VirtualNetworkAgentServer).CheckNotification(ctx, req.(*emptypb.Empty))
}
return interceptor(ctx, in, info, handler)
}

Просмотреть файл

@ -35,13 +35,13 @@ message VirtualNetworkResponse {
}
message VirtualNetwork {
reserved 7;
string name = 1;
string id = 2;
repeated Ipam ipams = 3;
Dns dns = 4;
VirtualNetworkType type = 5;
MacPool macPool = 6;
uint32 vlan = 7;
Status status = 8;
Entity entity = 9;
}
@ -60,6 +60,7 @@ message Subnet {
string cidr = 3;
repeated Route routes = 4;
IPAllocationMethod allocation = 5;
uint32 vlan = 6;
}
message Ipam {
string type = 1;