From c793ff47ab49bc5fc2aa2b95d9e6c2ce5e3d20e8 Mon Sep 17 00:00:00 2001 From: Daniel Canter Date: Thu, 13 May 2021 10:27:58 -0700 Subject: [PATCH] Add DnsSettings to CreateEndpointRequest To be able to set DNS configurations on the endpoint add a new DnsSettings message to be used on the hcn endpoint. This PR also fixes up a spelling mistake in subnet_ipadress_prefix -> subnet_ipaddress_prefix, and a couple casing changes on the proto file. Signed-off-by: Daniel Canter --- cmd/ncproxy/main.go | 9 +- cmd/ncproxy/ncproxy.go | 25 +- .../ncproxygrpc/networkconfigproxy.pb.go | 634 ++++++++++++++---- .../ncproxygrpc/networkconfigproxy.proto | 24 +- 4 files changed, 563 insertions(+), 129 deletions(-) diff --git a/cmd/ncproxy/main.go b/cmd/ncproxy/main.go index 46874b448b..dacb3bd916 100644 --- a/cmd/ncproxy/main.go +++ b/cmd/ncproxy/main.go @@ -64,21 +64,22 @@ func main() { // If there's a node network service in the config, assign this to our global client. if conf.NodeNetSvcAddr != "" { - log.G(ctx).Debugf("connecting to NodeNetworkService at address %s", conf.NodeNetSvcAddr) + log.G(ctx).Infof("connecting to NodeNetworkService at address %s", conf.NodeNetSvcAddr) + dialCtx := ctx opts := []grpc.DialOption{grpc.WithInsecure(), grpc.WithStatsHandler(&ocgrpc.ClientHandler{})} if conf.Timeout > 0 { var cancel context.CancelFunc - ctx, cancel = context.WithTimeout(ctx, time.Duration(conf.Timeout)*time.Second) + dialCtx, cancel = context.WithTimeout(ctx, time.Duration(conf.Timeout)*time.Second) defer cancel() opts = append(opts, grpc.WithBlock()) } - client, err := grpc.DialContext(ctx, conf.NodeNetSvcAddr, opts...) + client, err := grpc.DialContext(dialCtx, conf.NodeNetSvcAddr, opts...) if err != nil { log.G(ctx).Fatalf("failed to connect to NodeNetworkService at address %s", conf.NodeNetSvcAddr) } - log.G(ctx).Debugf("successfully connected to NodeNetworkService at address %s", conf.NodeNetSvcAddr) + log.G(ctx).Infof("successfully connected to NodeNetworkService at address %s", conf.NodeNetSvcAddr) netSvcClient := nodenetsvc.NewNodeNetworkServiceClient(client) nodeNetSvcClient = &nodeNetSvcConn{ diff --git a/cmd/ncproxy/ncproxy.go b/cmd/ncproxy/ncproxy.go index dd28a50cb7..3ba1cac281 100644 --- a/cmd/ncproxy/ncproxy.go +++ b/cmd/ncproxy/ncproxy.go @@ -5,6 +5,7 @@ import ( "encoding/json" "strconv" "sync" + "time" "github.com/Microsoft/go-winio" "github.com/Microsoft/hcsshim/cmd/ncproxy/ncproxygrpc" @@ -214,8 +215,8 @@ func (s *grpcService) CreateNetwork(ctx context.Context, req *ncproxygrpc.Create Settings: data, } - subnets := make([]hcn.Subnet, len(req.SubnetIpadressPrefix)) - for i, addrPrefix := range req.SubnetIpadressPrefix { + subnets := make([]hcn.Subnet, len(req.SubnetIpaddressPrefix)) + for i, addrPrefix := range req.SubnetIpaddressPrefix { subnet := hcn.Subnet{ IpAddressPrefix: addrPrefix, Routes: []hcn.Route{ @@ -342,6 +343,14 @@ func (s *grpcService) CreateEndpoint(ctx context.Context, req *ncproxygrpc.Creat }, } + if req.DnsSetting != nil { + endpoint.Dns = hcn.Dns{ + ServerList: req.DnsSetting.ServerIpAddrs, + Domain: req.DnsSetting.Domain, + Search: req.DnsSetting.Search, + } + } + endpoint, err = endpoint.Create() if err != nil { return nil, errors.Wrap(err, "failed to create HNS endpoint") @@ -456,6 +465,11 @@ func (s *grpcService) GetEndpoint(ctx context.Context, req *ncproxygrpc.GetEndpo Name: ep.Name, Network: ep.HostComputeNetwork, Namespace: ep.HostComputeNamespace, + DnsSetting: &ncproxygrpc.DnsSetting{ + ServerIpAddrs: ep.Dns.ServerList, + Domain: ep.Dns.Domain, + Search: ep.Dns.Search, + }, }, nil } @@ -476,6 +490,11 @@ func (s *grpcService) GetEndpoints(ctx context.Context, req *ncproxygrpc.GetEndp Name: endpoint.Name, Network: endpoint.HostComputeNetwork, Namespace: endpoint.HostComputeNamespace, + DnsSetting: &ncproxygrpc.DnsSetting{ + ServerIpAddrs: endpoint.Dns.ServerList, + Domain: endpoint.Dns.Domain, + Search: endpoint.Dns.Search, + }, } endpoints[i] = resp } @@ -595,6 +614,8 @@ func (s *ttrpcService) ConfigureNetworking(ctx context.Context, req *ncproxyttrp RequestType: nodenetsvc.RequestType(req.RequestType), } + ctx, cancel := context.WithTimeout(ctx, 5*time.Minute) + defer cancel() if _, err := nodeNetSvcClient.client.ConfigureNetworking(ctx, netsvcReq); err != nil { return nil, err } diff --git a/cmd/ncproxy/ncproxygrpc/networkconfigproxy.pb.go b/cmd/ncproxy/ncproxygrpc/networkconfigproxy.pb.go index 5666c7b62c..2e669ca01f 100644 --- a/cmd/ncproxy/ncproxygrpc/networkconfigproxy.pb.go +++ b/cmd/ncproxy/ncproxygrpc/networkconfigproxy.pb.go @@ -311,15 +311,15 @@ func (m *DeleteNICResponse) XXX_DiscardUnknown() { var xxx_messageInfo_DeleteNICResponse proto.InternalMessageInfo type CreateNetworkRequest struct { - Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` - Mode CreateNetworkRequest_NetworkMode `protobuf:"varint,2,opt,name=mode,proto3,enum=ncproxygrpc.CreateNetworkRequest_NetworkMode" json:"mode,omitempty"` - SwitchName string `protobuf:"bytes,3,opt,name=switch_name,json=switchName,proto3" json:"switch_name,omitempty"` - IpamType CreateNetworkRequest_IpamType `protobuf:"varint,4,opt,name=ipam_type,json=ipamType,proto3,enum=ncproxygrpc.CreateNetworkRequest_IpamType" json:"ipam_type,omitempty"` - SubnetIpadressPrefix []string `protobuf:"bytes,5,rep,name=subnet_ipadress_prefix,json=subnetIpadressPrefix,proto3" json:"subnet_ipadress_prefix,omitempty"` - DefaultGateway string `protobuf:"bytes,6,opt,name=default_gateway,json=defaultGateway,proto3" json:"default_gateway,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"` + Mode CreateNetworkRequest_NetworkMode `protobuf:"varint,2,opt,name=mode,proto3,enum=ncproxygrpc.CreateNetworkRequest_NetworkMode" json:"mode,omitempty"` + SwitchName string `protobuf:"bytes,3,opt,name=switch_name,json=switchName,proto3" json:"switch_name,omitempty"` + IpamType CreateNetworkRequest_IpamType `protobuf:"varint,4,opt,name=ipam_type,json=ipamType,proto3,enum=ncproxygrpc.CreateNetworkRequest_IpamType" json:"ipam_type,omitempty"` + SubnetIpaddressPrefix []string `protobuf:"bytes,5,rep,name=subnet_ipaddress_prefix,json=subnetIpaddressPrefix,proto3" json:"subnet_ipaddress_prefix,omitempty"` + DefaultGateway string `protobuf:"bytes,6,opt,name=default_gateway,json=defaultGateway,proto3" json:"default_gateway,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *CreateNetworkRequest) Reset() { *m = CreateNetworkRequest{} } @@ -433,9 +433,9 @@ func (m *PortNameEndpointPolicySetting) XXX_DiscardUnknown() { var xxx_messageInfo_PortNameEndpointPolicySetting proto.InternalMessageInfo type IovEndpointPolicySetting struct { - IovOffloadWeight uint32 `protobuf:"varint,1,opt,name=IovOffloadWeight,proto3" json:"IovOffloadWeight,omitempty"` - QueuePairsRequested uint32 `protobuf:"varint,2,opt,name=QueuePairsRequested,proto3" json:"QueuePairsRequested,omitempty"` - InterruptModeration uint32 `protobuf:"varint,3,opt,name=InterruptModeration,proto3" json:"InterruptModeration,omitempty"` + IovOffloadWeight uint32 `protobuf:"varint,1,opt,name=iov_offload_weight,json=iovOffloadWeight,proto3" json:"iov_offload_weight,omitempty"` + QueuePairsRequested uint32 `protobuf:"varint,2,opt,name=queue_pairs_requested,json=queuePairsRequested,proto3" json:"queue_pairs_requested,omitempty"` + InterruptModeration uint32 `protobuf:"varint,3,opt,name=interrupt_moderation,json=interruptModeration,proto3" json:"interrupt_moderation,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -473,6 +473,47 @@ func (m *IovEndpointPolicySetting) XXX_DiscardUnknown() { var xxx_messageInfo_IovEndpointPolicySetting proto.InternalMessageInfo +type DnsSetting struct { + ServerIpAddrs []string `protobuf:"bytes,1,rep,name=server_ip_addrs,json=serverIpAddrs,proto3" json:"server_ip_addrs,omitempty"` + Domain string `protobuf:"bytes,2,opt,name=domain,proto3" json:"domain,omitempty"` + Search []string `protobuf:"bytes,3,rep,name=search,proto3" json:"search,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *DnsSetting) Reset() { *m = DnsSetting{} } +func (*DnsSetting) ProtoMessage() {} +func (*DnsSetting) Descriptor() ([]byte, []int) { + return fileDescriptor_b4dbe7e533383a60, []int{10} +} +func (m *DnsSetting) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *DnsSetting) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_DnsSetting.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *DnsSetting) XXX_Merge(src proto.Message) { + xxx_messageInfo_DnsSetting.Merge(m, src) +} +func (m *DnsSetting) XXX_Size() int { + return m.Size() +} +func (m *DnsSetting) XXX_DiscardUnknown() { + xxx_messageInfo_DnsSetting.DiscardUnknown(m) +} + +var xxx_messageInfo_DnsSetting proto.InternalMessageInfo + type CreateEndpointRequest struct { Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` Macaddress string `protobuf:"bytes,2,opt,name=macaddress,proto3" json:"macaddress,omitempty"` @@ -481,6 +522,7 @@ type CreateEndpointRequest struct { NetworkName string `protobuf:"bytes,5,opt,name=network_name,json=networkName,proto3" json:"network_name,omitempty"` PortnamePolicySetting *PortNameEndpointPolicySetting `protobuf:"bytes,6,opt,name=portname_policy_setting,json=portnamePolicySetting,proto3" json:"portname_policy_setting,omitempty"` IovPolicySettings *IovEndpointPolicySetting `protobuf:"bytes,7,opt,name=iov_policy_settings,json=iovPolicySettings,proto3" json:"iov_policy_settings,omitempty"` + DnsSetting *DnsSetting `protobuf:"bytes,16,opt,name=dns_setting,json=dnsSetting,proto3" json:"dns_setting,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -489,7 +531,7 @@ type CreateEndpointRequest struct { func (m *CreateEndpointRequest) Reset() { *m = CreateEndpointRequest{} } func (*CreateEndpointRequest) ProtoMessage() {} func (*CreateEndpointRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_b4dbe7e533383a60, []int{10} + return fileDescriptor_b4dbe7e533383a60, []int{11} } func (m *CreateEndpointRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -528,7 +570,7 @@ type CreateEndpointResponse struct { func (m *CreateEndpointResponse) Reset() { *m = CreateEndpointResponse{} } func (*CreateEndpointResponse) ProtoMessage() {} func (*CreateEndpointResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_b4dbe7e533383a60, []int{11} + return fileDescriptor_b4dbe7e533383a60, []int{12} } func (m *CreateEndpointResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -568,7 +610,7 @@ type AddEndpointRequest struct { func (m *AddEndpointRequest) Reset() { *m = AddEndpointRequest{} } func (*AddEndpointRequest) ProtoMessage() {} func (*AddEndpointRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_b4dbe7e533383a60, []int{12} + return fileDescriptor_b4dbe7e533383a60, []int{13} } func (m *AddEndpointRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -606,7 +648,7 @@ type AddEndpointResponse struct { func (m *AddEndpointResponse) Reset() { *m = AddEndpointResponse{} } func (*AddEndpointResponse) ProtoMessage() {} func (*AddEndpointResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_b4dbe7e533383a60, []int{13} + return fileDescriptor_b4dbe7e533383a60, []int{14} } func (m *AddEndpointResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -645,7 +687,7 @@ type DeleteEndpointRequest struct { func (m *DeleteEndpointRequest) Reset() { *m = DeleteEndpointRequest{} } func (*DeleteEndpointRequest) ProtoMessage() {} func (*DeleteEndpointRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_b4dbe7e533383a60, []int{14} + return fileDescriptor_b4dbe7e533383a60, []int{15} } func (m *DeleteEndpointRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -683,7 +725,7 @@ type DeleteEndpointResponse struct { func (m *DeleteEndpointResponse) Reset() { *m = DeleteEndpointResponse{} } func (*DeleteEndpointResponse) ProtoMessage() {} func (*DeleteEndpointResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_b4dbe7e533383a60, []int{15} + return fileDescriptor_b4dbe7e533383a60, []int{16} } func (m *DeleteEndpointResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -722,7 +764,7 @@ type DeleteNetworkRequest struct { func (m *DeleteNetworkRequest) Reset() { *m = DeleteNetworkRequest{} } func (*DeleteNetworkRequest) ProtoMessage() {} func (*DeleteNetworkRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_b4dbe7e533383a60, []int{16} + return fileDescriptor_b4dbe7e533383a60, []int{17} } func (m *DeleteNetworkRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -760,7 +802,7 @@ type DeleteNetworkResponse struct { func (m *DeleteNetworkResponse) Reset() { *m = DeleteNetworkResponse{} } func (*DeleteNetworkResponse) ProtoMessage() {} func (*DeleteNetworkResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_b4dbe7e533383a60, []int{17} + return fileDescriptor_b4dbe7e533383a60, []int{18} } func (m *DeleteNetworkResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -799,7 +841,7 @@ type GetEndpointRequest struct { func (m *GetEndpointRequest) Reset() { *m = GetEndpointRequest{} } func (*GetEndpointRequest) ProtoMessage() {} func (*GetEndpointRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_b4dbe7e533383a60, []int{18} + return fileDescriptor_b4dbe7e533383a60, []int{19} } func (m *GetEndpointRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -829,19 +871,20 @@ func (m *GetEndpointRequest) XXX_DiscardUnknown() { var xxx_messageInfo_GetEndpointRequest proto.InternalMessageInfo type GetEndpointResponse struct { - ID string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` - Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"` - Network string `protobuf:"bytes,3,opt,name=network,proto3" json:"network,omitempty"` - Namespace string `protobuf:"bytes,4,opt,name=namespace,proto3" json:"namespace,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + ID string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` + Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"` + Network string `protobuf:"bytes,3,opt,name=network,proto3" json:"network,omitempty"` + Namespace string `protobuf:"bytes,4,opt,name=namespace,proto3" json:"namespace,omitempty"` + DnsSetting *DnsSetting `protobuf:"bytes,5,opt,name=dns_setting,json=dnsSetting,proto3" json:"dns_setting,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *GetEndpointResponse) Reset() { *m = GetEndpointResponse{} } func (*GetEndpointResponse) ProtoMessage() {} func (*GetEndpointResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_b4dbe7e533383a60, []int{19} + return fileDescriptor_b4dbe7e533383a60, []int{20} } func (m *GetEndpointResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -880,7 +923,7 @@ type GetNetworkRequest struct { func (m *GetNetworkRequest) Reset() { *m = GetNetworkRequest{} } func (*GetNetworkRequest) ProtoMessage() {} func (*GetNetworkRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_b4dbe7e533383a60, []int{20} + return fileDescriptor_b4dbe7e533383a60, []int{21} } func (m *GetNetworkRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -920,7 +963,7 @@ type GetNetworkResponse struct { func (m *GetNetworkResponse) Reset() { *m = GetNetworkResponse{} } func (*GetNetworkResponse) ProtoMessage() {} func (*GetNetworkResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_b4dbe7e533383a60, []int{21} + return fileDescriptor_b4dbe7e533383a60, []int{22} } func (m *GetNetworkResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -958,7 +1001,7 @@ type GetEndpointsRequest struct { func (m *GetEndpointsRequest) Reset() { *m = GetEndpointsRequest{} } func (*GetEndpointsRequest) ProtoMessage() {} func (*GetEndpointsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_b4dbe7e533383a60, []int{22} + return fileDescriptor_b4dbe7e533383a60, []int{23} } func (m *GetEndpointsRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -997,7 +1040,7 @@ type GetEndpointsResponse struct { func (m *GetEndpointsResponse) Reset() { *m = GetEndpointsResponse{} } func (*GetEndpointsResponse) ProtoMessage() {} func (*GetEndpointsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_b4dbe7e533383a60, []int{23} + return fileDescriptor_b4dbe7e533383a60, []int{24} } func (m *GetEndpointsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1035,7 +1078,7 @@ type GetNetworksRequest struct { func (m *GetNetworksRequest) Reset() { *m = GetNetworksRequest{} } func (*GetNetworksRequest) ProtoMessage() {} func (*GetNetworksRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_b4dbe7e533383a60, []int{24} + return fileDescriptor_b4dbe7e533383a60, []int{25} } func (m *GetNetworksRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1074,7 +1117,7 @@ type GetNetworksResponse struct { func (m *GetNetworksResponse) Reset() { *m = GetNetworksResponse{} } func (*GetNetworksResponse) ProtoMessage() {} func (*GetNetworksResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_b4dbe7e533383a60, []int{25} + return fileDescriptor_b4dbe7e533383a60, []int{26} } func (m *GetNetworksResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1116,6 +1159,7 @@ func init() { proto.RegisterType((*CreateNetworkResponse)(nil), "ncproxygrpc.CreateNetworkResponse") proto.RegisterType((*PortNameEndpointPolicySetting)(nil), "ncproxygrpc.PortNameEndpointPolicySetting") proto.RegisterType((*IovEndpointPolicySetting)(nil), "ncproxygrpc.IovEndpointPolicySetting") + proto.RegisterType((*DnsSetting)(nil), "ncproxygrpc.DnsSetting") proto.RegisterType((*CreateEndpointRequest)(nil), "ncproxygrpc.CreateEndpointRequest") proto.RegisterType((*CreateEndpointResponse)(nil), "ncproxygrpc.CreateEndpointResponse") proto.RegisterType((*AddEndpointRequest)(nil), "ncproxygrpc.AddEndpointRequest") @@ -1139,80 +1183,86 @@ func init() { } var fileDescriptor_b4dbe7e533383a60 = []byte{ - // 1153 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x57, 0x41, 0x6f, 0xe3, 0xc4, - 0x17, 0x8f, 0xd3, 0x36, 0x9b, 0x3c, 0x37, 0x6d, 0x3a, 0x69, 0xbb, 0x51, 0xf6, 0xbf, 0x49, 0x3a, - 0xab, 0xbf, 0xb6, 0x2a, 0xa2, 0x59, 0x05, 0x38, 0x81, 0x10, 0xdd, 0x14, 0x15, 0x4b, 0xb4, 0x1b, - 0xbc, 0xbb, 0x80, 0x04, 0x52, 0xe4, 0xda, 0x93, 0x64, 0x44, 0xe3, 0x31, 0xf6, 0xa4, 0xdd, 0xdc, - 0xb8, 0x21, 0x21, 0xf1, 0x45, 0xf8, 0x24, 0x7b, 0xe4, 0xc8, 0xa9, 0x62, 0x23, 0x3e, 0x04, 0x27, - 0x84, 0x3c, 0x1e, 0x3b, 0xb6, 0xd7, 0x49, 0x23, 0x71, 0xd9, 0x53, 0xec, 0xf7, 0xde, 0xbc, 0xf9, - 0xcd, 0x7b, 0xbf, 0xf7, 0xf3, 0x04, 0xce, 0x87, 0x94, 0x8f, 0x26, 0x97, 0xc7, 0x26, 0x1b, 0xb7, - 0xcf, 0xa9, 0xe9, 0x32, 0x8f, 0x0d, 0x78, 0x7b, 0x64, 0x7a, 0xde, 0x88, 0x8e, 0xdb, 0xe6, 0xd8, - 0x6a, 0xdb, 0xa6, 0xe3, 0xb2, 0x57, 0xd3, 0xf0, 0x77, 0xe8, 0x3a, 0x66, 0xdb, 0x26, 0xfc, 0x86, - 0xb9, 0x3f, 0x98, 0xcc, 0x1e, 0xd0, 0xa1, 0x30, 0x1f, 0x3b, 0x2e, 0xe3, 0x0c, 0xa9, 0xb1, 0x28, - 0xfc, 0x8b, 0x02, 0xe5, 0x13, 0xcb, 0xba, 0xd0, 0xba, 0x3a, 0xf9, 0x71, 0x42, 0x3c, 0x8e, 0x3a, - 0xb0, 0x69, 0x32, 0x9b, 0x1b, 0xd4, 0x26, 0x6e, 0x9f, 0x5a, 0x35, 0xa5, 0xa5, 0x1c, 0x96, 0x9e, - 0x6e, 0xcf, 0x6e, 0x9b, 0x6a, 0x37, 0xb4, 0x6b, 0xa7, 0xba, 0x1a, 0x05, 0x69, 0x16, 0x6a, 0x41, - 0xc1, 0xa6, 0xa6, 0x1f, 0x9d, 0x17, 0xd1, 0xa5, 0xd9, 0x6d, 0x73, 0xe3, 0x82, 0x9a, 0xda, 0xa9, - 0xbe, 0x61, 0x53, 0x53, 0xb3, 0xd0, 0x23, 0x28, 0x13, 0xdb, 0x72, 0x18, 0xb5, 0x79, 0xdf, 0x36, - 0xc6, 0xa4, 0xb6, 0xe6, 0x07, 0xea, 0x9b, 0xa1, 0xf1, 0xc2, 0x18, 0x13, 0x5c, 0x81, 0xad, 0x10, - 0x8b, 0xe7, 0x30, 0xdb, 0x23, 0xf8, 0x2f, 0x05, 0x2a, 0xe7, 0xcc, 0xa2, 0x83, 0xe9, 0x3b, 0x81, - 0x10, 0xbd, 0x84, 0x2a, 0x65, 0xd7, 0x7d, 0x87, 0x5d, 0x51, 0x73, 0xda, 0xf7, 0x08, 0xe7, 0xd4, - 0x1e, 0x7a, 0xb5, 0xf5, 0x96, 0x72, 0xa8, 0x76, 0xfe, 0x7f, 0x1c, 0xab, 0xec, 0xb1, 0xc6, 0xae, - 0x3f, 0x97, 0x4b, 0x7b, 0x22, 0xfc, 0x79, 0x10, 0xad, 0xef, 0x50, 0x76, 0x9d, 0xb0, 0x78, 0xb8, - 0x0a, 0x3b, 0xb1, 0x53, 0xca, 0xb3, 0xff, 0xaa, 0x40, 0xe5, 0x94, 0x5c, 0x11, 0x4e, 0xde, 0x8d, - 0xee, 0x54, 0x61, 0x27, 0x06, 0x47, 0x82, 0xfc, 0x3b, 0x0f, 0xbb, 0x5d, 0x97, 0x18, 0x9c, 0x5c, - 0x04, 0x7c, 0x0b, 0x81, 0x22, 0x58, 0x17, 0x99, 0x04, 0x40, 0x5d, 0x3c, 0xa3, 0x13, 0x58, 0x1f, - 0x33, 0x8b, 0x08, 0x18, 0x5b, 0x9d, 0xf7, 0x13, 0xe5, 0xca, 0x4a, 0x72, 0x2c, 0x5f, 0xcf, 0x99, - 0x45, 0x74, 0xb1, 0x14, 0x35, 0x41, 0xf5, 0x6e, 0x28, 0x37, 0x47, 0x71, 0x9c, 0x10, 0x98, 0x44, - 0x87, 0xce, 0xa0, 0x44, 0x1d, 0x63, 0xdc, 0xe7, 0x53, 0x87, 0x88, 0xbe, 0x6c, 0x75, 0x8e, 0xee, - 0xde, 0x48, 0x73, 0x8c, 0xf1, 0x8b, 0xa9, 0x43, 0xf4, 0x22, 0x95, 0x4f, 0xe8, 0x43, 0xd8, 0xf7, - 0x26, 0x97, 0x36, 0xe1, 0x7d, 0xea, 0x18, 0x96, 0x4b, 0x3c, 0xaf, 0xef, 0xb8, 0x64, 0x40, 0x5f, - 0xd5, 0x36, 0x5a, 0x6b, 0x87, 0x25, 0x7d, 0x37, 0xf0, 0x6a, 0xd2, 0xd9, 0x13, 0x3e, 0xf4, 0x18, - 0xb6, 0x2d, 0x32, 0x30, 0x26, 0x57, 0xbc, 0x3f, 0x34, 0x38, 0xb9, 0x31, 0xa6, 0xb5, 0x82, 0xc0, - 0xb8, 0x25, 0xcd, 0x67, 0x81, 0x15, 0x37, 0x40, 0x8d, 0x9d, 0x0e, 0x6d, 0x83, 0xfa, 0xc2, 0x35, - 0x6c, 0xcf, 0x31, 0x5c, 0x62, 0xf3, 0x4a, 0x0e, 0xb7, 0xa0, 0x18, 0x82, 0x42, 0x00, 0x85, 0xe7, - 0xdc, 0xe0, 0xd4, 0xac, 0xe4, 0x50, 0x11, 0xd6, 0x4f, 0xbf, 0xe8, 0xf6, 0x2a, 0x0a, 0x6e, 0xc3, - 0x5e, 0xea, 0x2c, 0x41, 0x4f, 0xd0, 0x3e, 0xe4, 0x23, 0x66, 0x14, 0x66, 0xb7, 0xcd, 0xbc, 0x76, - 0xaa, 0xe7, 0xa9, 0x85, 0x3f, 0x81, 0x87, 0x3d, 0xe6, 0x8a, 0x66, 0x66, 0x32, 0x13, 0x3d, 0x80, - 0x92, 0xc3, 0x5c, 0x49, 0x81, 0xa0, 0x71, 0x45, 0x47, 0xae, 0xc0, 0xbf, 0x29, 0x50, 0x5b, 0xc4, - 0x69, 0x74, 0x04, 0x15, 0x8d, 0x5d, 0x3f, 0x1b, 0x0c, 0xae, 0x98, 0x61, 0x7d, 0x43, 0xe8, 0x70, - 0xc4, 0x45, 0x82, 0xb2, 0xfe, 0x96, 0x1d, 0x3d, 0x81, 0xea, 0x57, 0x13, 0x32, 0x21, 0x3d, 0x83, - 0xba, 0x9e, 0x6c, 0x00, 0x09, 0xb8, 0x59, 0xd6, 0xb3, 0x5c, 0xfe, 0x0a, 0xcd, 0xe6, 0xc4, 0x75, - 0x27, 0x0e, 0xf7, 0xab, 0xe5, 0x1a, 0x9c, 0x32, 0x5b, 0x34, 0xbf, 0xac, 0x67, 0xb9, 0xf0, 0x3f, - 0xf9, 0xb0, 0x38, 0x21, 0xde, 0x65, 0xbc, 0x6c, 0x00, 0x8c, 0x0d, 0xd3, 0xb0, 0x44, 0x23, 0x83, - 0x21, 0xd1, 0x63, 0x16, 0xf4, 0x3f, 0xc1, 0x29, 0xe9, 0x0e, 0x28, 0x37, 0x37, 0xa0, 0x8f, 0x60, - 0x3f, 0x7a, 0x91, 0x14, 0xb9, 0x22, 0xf6, 0x90, 0x8f, 0x04, 0xfd, 0x4a, 0xfa, 0x5e, 0xe4, 0xed, - 0xc5, 0x9c, 0xe8, 0x00, 0x36, 0xa5, 0x44, 0x07, 0xf5, 0xde, 0x10, 0xc1, 0xaa, 0xb4, 0x09, 0x2e, - 0x5f, 0xc2, 0x7d, 0xbf, 0xfc, 0xbe, 0x3b, 0x25, 0x39, 0x82, 0x54, 0x6a, 0x8a, 0xd9, 0x4b, 0x9b, - 0xab, 0xef, 0x85, 0xa9, 0x92, 0x9d, 0x5b, 0xa0, 0x68, 0xf7, 0xfe, 0xa3, 0xa2, 0x3d, 0x81, 0xfd, - 0x74, 0xfd, 0xef, 0x60, 0xe7, 0xf7, 0x80, 0x4e, 0x2c, 0x6b, 0x95, 0x76, 0x75, 0x60, 0xd3, 0xff, - 0xf5, 0x1c, 0xc3, 0x24, 0x73, 0x55, 0x13, 0x1a, 0x78, 0x11, 0xda, 0x7d, 0x0d, 0x8c, 0x82, 0x34, - 0x0b, 0xef, 0x41, 0x35, 0x91, 0x5d, 0xca, 0xd7, 0x7b, 0xb0, 0x17, 0x68, 0xda, 0x0a, 0xfb, 0xe2, - 0x1a, 0xec, 0xa7, 0x83, 0x65, 0x9a, 0x23, 0xd8, 0x95, 0xd2, 0x78, 0xa7, 0x08, 0xe2, 0xfb, 0xe1, - 0x96, 0xa9, 0xb1, 0xc5, 0x87, 0x80, 0xce, 0x08, 0x5f, 0x05, 0xc8, 0x14, 0xaa, 0x89, 0xc8, 0xe5, - 0x95, 0x8d, 0x52, 0xe4, 0x63, 0x35, 0xac, 0xc1, 0x3d, 0xc9, 0x34, 0x49, 0xe8, 0xf0, 0xd5, 0x27, - 0x7b, 0x54, 0x38, 0xc9, 0xe0, 0xb9, 0x01, 0x3f, 0x86, 0x9d, 0x33, 0xc2, 0x57, 0x38, 0xe6, 0x67, - 0xe2, 0x34, 0x2b, 0x4a, 0x53, 0x16, 0x44, 0xbf, 0x65, 0xb1, 0x53, 0x86, 0x72, 0x80, 0xbf, 0x86, - 0xdd, 0xa4, 0x59, 0xa6, 0xfe, 0x14, 0x4a, 0xe1, 0xe7, 0xca, 0xab, 0x29, 0xad, 0xb5, 0x43, 0xb5, - 0xd3, 0x4a, 0xd0, 0x37, 0xa3, 0x64, 0xfa, 0x7c, 0x09, 0xde, 0x8d, 0x03, 0x8e, 0x76, 0xd3, 0x05, - 0x88, 0xb9, 0x55, 0x6e, 0xf6, 0x31, 0x14, 0x65, 0xbd, 0xc2, 0xbd, 0x9a, 0xe9, 0xbd, 0x52, 0x47, - 0xd7, 0xa3, 0x05, 0x9d, 0x9f, 0x8b, 0x80, 0xa4, 0xb7, 0x2b, 0x6e, 0x67, 0x3d, 0x7f, 0x1d, 0xea, - 0x42, 0x21, 0xb8, 0xfd, 0xa0, 0x7a, 0x22, 0x57, 0xe2, 0x7a, 0x56, 0x7f, 0x90, 0xe9, 0x93, 0x14, - 0xca, 0xa1, 0x2f, 0xa1, 0x14, 0xdd, 0x24, 0xd0, 0xc3, 0x44, 0x6c, 0xfa, 0x1e, 0x55, 0x6f, 0x2c, - 0x72, 0xc7, 0xb3, 0x45, 0x9f, 0xfc, 0x54, 0xb6, 0xf4, 0xcd, 0x24, 0x95, 0xed, 0xed, 0x9b, 0x42, - 0x0e, 0x7d, 0x0b, 0xe5, 0xc4, 0x07, 0x0b, 0x1d, 0xdc, 0xf9, 0x61, 0xae, 0xe3, 0x65, 0x21, 0x51, - 0xe6, 0xef, 0x60, 0x2b, 0xa9, 0x36, 0x28, 0x6b, 0x5d, 0x6a, 0xb4, 0xea, 0x8f, 0x96, 0xc6, 0x44, - 0xc9, 0x75, 0x50, 0x63, 0xd2, 0x81, 0x9a, 0xe9, 0x06, 0xa4, 0xd3, 0xb6, 0x16, 0x07, 0xc4, 0x01, - 0x27, 0xa5, 0x24, 0x05, 0x38, 0x53, 0x94, 0x52, 0x80, 0x17, 0x68, 0x91, 0xa8, 0x73, 0x42, 0x61, - 0x52, 0x75, 0xce, 0x52, 0xaa, 0x3a, 0x5e, 0x16, 0x12, 0x2f, 0x45, 0x6c, 0x8a, 0x50, 0x73, 0xf1, - 0x7c, 0x65, 0x95, 0x22, 0x63, 0x00, 0x71, 0x0e, 0x3d, 0x03, 0x98, 0x4f, 0x0b, 0x6a, 0x2c, 0x1c, - 0xa3, 0x20, 0xe3, 0x5d, 0x63, 0x86, 0x73, 0xe8, 0x25, 0x6c, 0xc6, 0x05, 0x02, 0x2d, 0x04, 0x11, - 0x0e, 0x79, 0xfd, 0x60, 0x49, 0x44, 0xea, 0xec, 0xa1, 0x12, 0xa0, 0x45, 0x40, 0xbc, 0x85, 0x67, - 0x4f, 0x8b, 0x08, 0xce, 0x3d, 0xad, 0xbd, 0x7e, 0xd3, 0xc8, 0xfd, 0xf1, 0xa6, 0x91, 0xfb, 0x69, - 0xd6, 0x50, 0x5e, 0xcf, 0x1a, 0xca, 0xef, 0xb3, 0x86, 0xf2, 0xe7, 0xac, 0xa1, 0x5c, 0x16, 0xc4, - 0x7f, 0xb5, 0x0f, 0xfe, 0x0d, 0x00, 0x00, 0xff, 0xff, 0x7a, 0x63, 0xb5, 0xba, 0xfc, 0x0d, 0x00, - 0x00, + // 1255 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x57, 0xc1, 0x6f, 0xe3, 0xc4, + 0x17, 0x8e, 0xd3, 0x36, 0x9b, 0x3c, 0x37, 0x6d, 0x3a, 0x69, 0xda, 0x28, 0xfb, 0xdb, 0x24, 0x3b, + 0xab, 0x1f, 0x5b, 0x2d, 0xd0, 0x40, 0x10, 0x08, 0x09, 0x84, 0xe8, 0x26, 0xa8, 0x04, 0xd1, 0x6e, + 0xe4, 0xdd, 0x05, 0x24, 0x90, 0x2c, 0xd7, 0x9e, 0x24, 0x23, 0x1a, 0x8f, 0xd7, 0x9e, 0xb4, 0x9b, + 0x1b, 0x37, 0x24, 0x24, 0xfe, 0x16, 0x0e, 0xdc, 0x39, 0xef, 0x91, 0x23, 0xa7, 0x15, 0x1b, 0xf1, + 0x57, 0x70, 0x42, 0x1e, 0x8f, 0x1d, 0xdb, 0x24, 0x69, 0x24, 0x2e, 0x7b, 0x8a, 0xfd, 0xde, 0x9b, + 0x37, 0xdf, 0xbc, 0xf7, 0xbd, 0xcf, 0x13, 0x38, 0x1b, 0x52, 0x3e, 0x9a, 0x5c, 0x1c, 0x9b, 0x6c, + 0xdc, 0x3a, 0xa3, 0xa6, 0xcb, 0x3c, 0x36, 0xe0, 0xad, 0x91, 0xe9, 0x79, 0x23, 0x3a, 0x6e, 0x99, + 0x63, 0xab, 0x65, 0x9b, 0x8e, 0xcb, 0x9e, 0x4f, 0xc3, 0xdf, 0xa1, 0xeb, 0x98, 0x2d, 0x9b, 0xf0, + 0x6b, 0xe6, 0x7e, 0x6f, 0x32, 0x7b, 0x40, 0x87, 0xc2, 0x7c, 0xec, 0xb8, 0x8c, 0x33, 0xa4, 0xc6, + 0xa2, 0xf0, 0x4f, 0x0a, 0x14, 0x4f, 0x2c, 0xeb, 0xbc, 0xd7, 0xd1, 0xc8, 0xb3, 0x09, 0xf1, 0x38, + 0x6a, 0xc3, 0xb6, 0xc9, 0x6c, 0x6e, 0x50, 0x9b, 0xb8, 0x3a, 0xb5, 0xaa, 0x4a, 0x53, 0x39, 0x2a, + 0x3c, 0xdc, 0x9d, 0xbd, 0x6c, 0xa8, 0x9d, 0xd0, 0xde, 0xeb, 0x6a, 0x6a, 0x14, 0xd4, 0xb3, 0x50, + 0x13, 0x72, 0x36, 0x35, 0xfd, 0xe8, 0xac, 0x88, 0x2e, 0xcc, 0x5e, 0x36, 0xb6, 0xce, 0xa9, 0xd9, + 0xeb, 0x6a, 0x5b, 0x36, 0x35, 0x7b, 0x16, 0xba, 0x07, 0x45, 0x62, 0x5b, 0x0e, 0xa3, 0x36, 0xd7, + 0x6d, 0x63, 0x4c, 0xaa, 0x1b, 0x7e, 0xa0, 0xb6, 0x1d, 0x1a, 0xcf, 0x8d, 0x31, 0xc1, 0x25, 0xd8, + 0x09, 0xb1, 0x78, 0x0e, 0xb3, 0x3d, 0x82, 0xff, 0x52, 0xa0, 0x74, 0xc6, 0x2c, 0x3a, 0x98, 0xbe, + 0x16, 0x08, 0xd1, 0x53, 0x28, 0x53, 0x76, 0xa5, 0x3b, 0xec, 0x92, 0x9a, 0x53, 0xdd, 0x23, 0x9c, + 0x53, 0x7b, 0xe8, 0x55, 0x37, 0x9b, 0xca, 0x91, 0xda, 0xfe, 0xff, 0x71, 0xac, 0xb2, 0xc7, 0x3d, + 0x76, 0xf5, 0x99, 0x5c, 0xda, 0x17, 0xe1, 0x8f, 0x83, 0x68, 0x6d, 0x8f, 0xb2, 0xab, 0x84, 0xc5, + 0xc3, 0x65, 0xd8, 0x8b, 0x9d, 0x52, 0x9e, 0xfd, 0x67, 0x05, 0x4a, 0x5d, 0x72, 0x49, 0x38, 0x79, + 0x3d, 0xba, 0x53, 0x86, 0xbd, 0x18, 0x1c, 0x09, 0xf2, 0xef, 0x2c, 0xec, 0x77, 0x5c, 0x62, 0x70, + 0x72, 0x1e, 0xf0, 0x2d, 0x04, 0x8a, 0x60, 0x53, 0x64, 0x12, 0x00, 0x35, 0xf1, 0x8c, 0x4e, 0x60, + 0x73, 0xcc, 0x2c, 0x22, 0x60, 0xec, 0xb4, 0xdf, 0x4e, 0x94, 0x6b, 0x51, 0x92, 0x63, 0xf9, 0x7a, + 0xc6, 0x2c, 0xa2, 0x89, 0xa5, 0xa8, 0x01, 0xaa, 0x77, 0x4d, 0xb9, 0x39, 0x8a, 0xe3, 0x84, 0xc0, + 0x24, 0x3a, 0x74, 0x0a, 0x05, 0xea, 0x18, 0x63, 0x9d, 0x4f, 0x1d, 0x22, 0xfa, 0xb2, 0xd3, 0x7e, + 0x70, 0xf3, 0x46, 0x3d, 0xc7, 0x18, 0x3f, 0x99, 0x3a, 0x44, 0xcb, 0x53, 0xf9, 0x84, 0x3e, 0x80, + 0x43, 0x6f, 0x72, 0x61, 0x13, 0xae, 0x53, 0xc7, 0xb0, 0x2c, 0x97, 0x78, 0x9e, 0xee, 0xb8, 0x64, + 0x40, 0x9f, 0x57, 0xb7, 0x9a, 0x1b, 0x47, 0x05, 0xad, 0x12, 0xb8, 0x7b, 0xa1, 0xb7, 0x2f, 0x9c, + 0xe8, 0x3e, 0xec, 0x5a, 0x64, 0x60, 0x4c, 0x2e, 0xb9, 0x3e, 0x34, 0x38, 0xb9, 0x36, 0xa6, 0xd5, + 0x9c, 0x40, 0xb9, 0x23, 0xcd, 0xa7, 0x81, 0x15, 0xd7, 0x41, 0x8d, 0x9d, 0x0f, 0xed, 0x82, 0xfa, + 0xc4, 0x35, 0x6c, 0xcf, 0x31, 0x5c, 0x62, 0xf3, 0x52, 0x06, 0x37, 0x21, 0x1f, 0xc2, 0x42, 0x00, + 0xb9, 0xc7, 0xdc, 0xe0, 0xd4, 0x2c, 0x65, 0x50, 0x1e, 0x36, 0xbb, 0x9f, 0x77, 0xfa, 0x25, 0x05, + 0xb7, 0xa0, 0x92, 0x3a, 0x4d, 0xd0, 0x15, 0x74, 0x00, 0xd9, 0x88, 0x1b, 0xb9, 0xd9, 0xcb, 0x46, + 0xb6, 0xd7, 0xd5, 0xb2, 0xd4, 0xc2, 0x1f, 0xc3, 0x9d, 0x3e, 0x73, 0x45, 0x3b, 0x17, 0x72, 0x13, + 0xdd, 0x86, 0x82, 0xc3, 0x5c, 0x49, 0x82, 0xa0, 0x75, 0x79, 0x47, 0xae, 0xc0, 0xbf, 0x28, 0x50, + 0x5d, 0xc6, 0x6a, 0xf4, 0x16, 0x20, 0x7f, 0x32, 0xd8, 0x60, 0x70, 0xc9, 0x0c, 0x4b, 0xbf, 0x26, + 0x74, 0x38, 0xe2, 0x22, 0x45, 0x51, 0x2b, 0x51, 0x76, 0xf5, 0x28, 0x70, 0x7c, 0x2d, 0xec, 0xa8, + 0x0d, 0x95, 0x67, 0x13, 0x32, 0x21, 0xba, 0x63, 0x50, 0xd7, 0xd3, 0xdd, 0xa0, 0x0d, 0x24, 0x60, + 0x68, 0x51, 0x2b, 0x0b, 0x67, 0xdf, 0xf7, 0x69, 0xa1, 0x0b, 0xbd, 0x0b, 0xfb, 0xd4, 0xe6, 0xc4, + 0x75, 0x27, 0x0e, 0xd7, 0x7d, 0x32, 0xb8, 0x06, 0xa7, 0xcc, 0x16, 0x1c, 0x28, 0x6a, 0xe5, 0xc8, + 0x77, 0x16, 0xb9, 0xb0, 0x05, 0xd0, 0xb5, 0xbd, 0x10, 0xe2, 0x1b, 0xb0, 0xeb, 0x11, 0xf7, 0xca, + 0x1f, 0x1c, 0x47, 0xf7, 0x9b, 0xe6, 0x55, 0x15, 0xd1, 0xc9, 0x62, 0x60, 0xee, 0x39, 0x27, 0xbe, + 0x11, 0x1d, 0x40, 0xce, 0x62, 0x63, 0x83, 0xda, 0xc1, 0xbc, 0x68, 0xf2, 0xcd, 0xb7, 0x7b, 0xc4, + 0x70, 0xcd, 0x51, 0x75, 0x43, 0x2c, 0x93, 0x6f, 0xf8, 0xb7, 0x8d, 0xb0, 0x0f, 0x61, 0x69, 0x56, + 0x0d, 0x41, 0x1d, 0x60, 0x6c, 0x98, 0x92, 0x33, 0x72, 0x87, 0x98, 0x05, 0xfd, 0x4f, 0x10, 0x58, + 0xba, 0x03, 0x7e, 0xcf, 0x0d, 0xe8, 0x7d, 0x38, 0x48, 0xd3, 0xf1, 0x92, 0xd8, 0x43, 0x3e, 0x12, + 0x5c, 0x2f, 0x68, 0x15, 0x9a, 0xa4, 0x63, 0xe0, 0x44, 0x77, 0x61, 0x5b, 0x7e, 0x0f, 0x82, 0xd6, + 0x6e, 0x89, 0x60, 0x55, 0xda, 0xc4, 0xe0, 0x5c, 0xc0, 0xa1, 0xdf, 0x69, 0xdf, 0x9d, 0xd2, 0x37, + 0xc1, 0x5f, 0x35, 0x35, 0x46, 0x2b, 0x79, 0xa4, 0x55, 0xc2, 0x54, 0x49, 0x92, 0x2c, 0x91, 0xcf, + 0x5b, 0xff, 0x4d, 0x3e, 0xd1, 0x87, 0xa0, 0x5a, 0xb6, 0x17, 0xc1, 0x2d, 0x89, 0x74, 0x87, 0x89, + 0x74, 0x73, 0x1a, 0x68, 0x60, 0x45, 0xcf, 0x5f, 0x6c, 0xe6, 0xf3, 0xa5, 0x12, 0x7e, 0x07, 0x0e, + 0xd2, 0xfd, 0xbb, 0x61, 0x90, 0xbe, 0x03, 0x74, 0x62, 0x59, 0xeb, 0xb4, 0xbb, 0x0d, 0xdb, 0xfe, + 0xaf, 0xe7, 0x18, 0x26, 0x99, 0x4b, 0xb0, 0x10, 0xec, 0xf3, 0xd0, 0xee, 0x0b, 0x76, 0x14, 0xd4, + 0xb3, 0x70, 0x05, 0xca, 0x89, 0xec, 0x52, 0x6b, 0xdf, 0x84, 0x4a, 0x20, 0xc0, 0x6b, 0xec, 0x8b, + 0xab, 0x70, 0x90, 0x0e, 0x96, 0x69, 0x1e, 0xc0, 0xbe, 0xd4, 0xf1, 0x1b, 0x15, 0x1b, 0x1f, 0x86, + 0x5b, 0xa6, 0x14, 0x06, 0x1f, 0x01, 0x3a, 0x25, 0x7c, 0x1d, 0x20, 0xbf, 0x2a, 0x50, 0x4e, 0x84, + 0xae, 0x2e, 0x6d, 0x94, 0x23, 0x1b, 0x2b, 0x62, 0x15, 0x6e, 0x49, 0xaa, 0xca, 0x89, 0x08, 0x5f, + 0xfd, 0x69, 0x89, 0x2a, 0x27, 0x47, 0x60, 0x6e, 0x48, 0x13, 0x63, 0x6b, 0x6d, 0x62, 0xe0, 0xfb, + 0xb0, 0x77, 0x4a, 0xf8, 0x1a, 0x15, 0xfa, 0x54, 0x14, 0x62, 0x4d, 0x01, 0x5e, 0x74, 0x38, 0xbf, + 0xdb, 0xb1, 0xfa, 0x84, 0x82, 0x87, 0xbf, 0x82, 0xfd, 0xa4, 0x59, 0xa6, 0xfe, 0x04, 0x0a, 0xe1, + 0x67, 0x39, 0xd0, 0x2f, 0xb5, 0xdd, 0x4c, 0x9c, 0x68, 0x41, 0xb1, 0xb5, 0xf9, 0x12, 0xbc, 0x1f, + 0x07, 0x1c, 0xed, 0xa6, 0x09, 0x10, 0x73, 0xab, 0xdc, 0xec, 0x23, 0xc8, 0xcb, 0x4a, 0x87, 0x7b, + 0x35, 0xd2, 0x7b, 0xa5, 0x8e, 0xae, 0x45, 0x0b, 0xda, 0x3f, 0xe6, 0x01, 0x49, 0x6f, 0x47, 0xdc, + 0x42, 0xfb, 0xfe, 0x3a, 0xd4, 0x81, 0x5c, 0x70, 0xcb, 0x43, 0xb5, 0x44, 0xae, 0xc4, 0x35, 0xb4, + 0x76, 0x7b, 0xa1, 0x4f, 0xb2, 0x2f, 0x83, 0xbe, 0x84, 0x42, 0x74, 0x63, 0x42, 0x77, 0x12, 0xb1, + 0xe9, 0xfb, 0x62, 0xad, 0xbe, 0xcc, 0x1d, 0xcf, 0x16, 0x5d, 0x6d, 0x52, 0xd9, 0xd2, 0x37, 0xb0, + 0x54, 0xb6, 0x7f, 0xdf, 0x88, 0x32, 0xe8, 0x1b, 0x28, 0x26, 0x3e, 0xcb, 0xe8, 0xee, 0x8d, 0x17, + 0x90, 0x1a, 0x5e, 0x15, 0x12, 0x65, 0xfe, 0x16, 0x76, 0x92, 0x42, 0x85, 0x16, 0xad, 0x4b, 0x4d, + 0x65, 0xed, 0xde, 0xca, 0x98, 0x28, 0xb9, 0x06, 0x6a, 0x4c, 0x75, 0x50, 0x23, 0xdd, 0x80, 0x74, + 0xda, 0xe6, 0xf2, 0x80, 0x38, 0xe0, 0xa4, 0x0a, 0xa5, 0x00, 0x2f, 0xd4, 0xb3, 0x14, 0xe0, 0x25, + 0x32, 0x26, 0xea, 0x9c, 0x10, 0xa7, 0x54, 0x9d, 0x17, 0x89, 0x5c, 0x0d, 0xaf, 0x0a, 0x89, 0x97, + 0x22, 0x36, 0x45, 0xa8, 0xb1, 0x7c, 0xbe, 0x16, 0x95, 0x62, 0xc1, 0x00, 0xe2, 0x0c, 0x7a, 0x04, + 0x30, 0x9f, 0x16, 0x54, 0x5f, 0x3a, 0x46, 0x41, 0xc6, 0x9b, 0xc6, 0x0c, 0x67, 0xd0, 0x53, 0xd8, + 0x8e, 0x0b, 0x04, 0x5a, 0x0a, 0x22, 0x1c, 0xf2, 0xda, 0xdd, 0x15, 0x11, 0xa9, 0xb3, 0x87, 0x4a, + 0x80, 0x96, 0x01, 0xf1, 0x96, 0x9e, 0x3d, 0x2d, 0x22, 0x38, 0xf3, 0xb0, 0xfa, 0xe2, 0x55, 0x3d, + 0xf3, 0xc7, 0xab, 0x7a, 0xe6, 0x87, 0x59, 0x5d, 0x79, 0x31, 0xab, 0x2b, 0xbf, 0xcf, 0xea, 0xca, + 0x9f, 0xb3, 0xba, 0x72, 0x91, 0x13, 0xff, 0x49, 0xdf, 0xfb, 0x27, 0x00, 0x00, 0xff, 0xff, 0x43, + 0x10, 0xe4, 0xd5, 0xe4, 0x0e, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1877,8 +1927,8 @@ func (m *CreateNetworkRequest) MarshalTo(dAtA []byte) (int, error) { i++ i = encodeVarintNetworkconfigproxy(dAtA, i, uint64(m.IpamType)) } - if len(m.SubnetIpadressPrefix) > 0 { - for _, s := range m.SubnetIpadressPrefix { + if len(m.SubnetIpaddressPrefix) > 0 { + for _, s := range m.SubnetIpaddressPrefix { dAtA[i] = 0x2a i++ l = len(s) @@ -1994,6 +2044,63 @@ func (m *IovEndpointPolicySetting) MarshalTo(dAtA []byte) (int, error) { return i, nil } +func (m *DnsSetting) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalTo(dAtA) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *DnsSetting) MarshalTo(dAtA []byte) (int, error) { + var i int + _ = i + var l int + _ = l + if len(m.ServerIpAddrs) > 0 { + for _, s := range m.ServerIpAddrs { + dAtA[i] = 0xa + i++ + l = len(s) + for l >= 1<<7 { + dAtA[i] = uint8(uint64(l)&0x7f | 0x80) + l >>= 7 + i++ + } + dAtA[i] = uint8(l) + i++ + i += copy(dAtA[i:], s) + } + } + if len(m.Domain) > 0 { + dAtA[i] = 0x12 + i++ + i = encodeVarintNetworkconfigproxy(dAtA, i, uint64(len(m.Domain))) + i += copy(dAtA[i:], m.Domain) + } + if len(m.Search) > 0 { + for _, s := range m.Search { + dAtA[i] = 0x1a + i++ + l = len(s) + for l >= 1<<7 { + dAtA[i] = uint8(uint64(l)&0x7f | 0x80) + l >>= 7 + i++ + } + dAtA[i] = uint8(l) + i++ + i += copy(dAtA[i:], s) + } + } + if m.XXX_unrecognized != nil { + i += copy(dAtA[i:], m.XXX_unrecognized) + } + return i, nil +} + func (m *CreateEndpointRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -2059,6 +2166,18 @@ func (m *CreateEndpointRequest) MarshalTo(dAtA []byte) (int, error) { } i += n3 } + if m.DnsSetting != nil { + dAtA[i] = 0x82 + i++ + dAtA[i] = 0x1 + i++ + i = encodeVarintNetworkconfigproxy(dAtA, i, uint64(m.DnsSetting.Size())) + n4, err := m.DnsSetting.MarshalTo(dAtA[i:]) + if err != nil { + return 0, err + } + i += n4 + } if m.XXX_unrecognized != nil { i += copy(dAtA[i:], m.XXX_unrecognized) } @@ -2308,6 +2427,16 @@ func (m *GetEndpointResponse) MarshalTo(dAtA []byte) (int, error) { i = encodeVarintNetworkconfigproxy(dAtA, i, uint64(len(m.Namespace))) i += copy(dAtA[i:], m.Namespace) } + if m.DnsSetting != nil { + dAtA[i] = 0x2a + i++ + i = encodeVarintNetworkconfigproxy(dAtA, i, uint64(m.DnsSetting.Size())) + n5, err := m.DnsSetting.MarshalTo(dAtA[i:]) + if err != nil { + return 0, err + } + i += n5 + } if m.XXX_unrecognized != nil { i += copy(dAtA[i:], m.XXX_unrecognized) } @@ -2623,8 +2752,8 @@ func (m *CreateNetworkRequest) Size() (n int) { if m.IpamType != 0 { n += 1 + sovNetworkconfigproxy(uint64(m.IpamType)) } - if len(m.SubnetIpadressPrefix) > 0 { - for _, s := range m.SubnetIpadressPrefix { + if len(m.SubnetIpaddressPrefix) > 0 { + for _, s := range m.SubnetIpaddressPrefix { l = len(s) n += 1 + l + sovNetworkconfigproxy(uint64(l)) } @@ -2692,6 +2821,34 @@ func (m *IovEndpointPolicySetting) Size() (n int) { return n } +func (m *DnsSetting) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if len(m.ServerIpAddrs) > 0 { + for _, s := range m.ServerIpAddrs { + l = len(s) + n += 1 + l + sovNetworkconfigproxy(uint64(l)) + } + } + l = len(m.Domain) + if l > 0 { + n += 1 + l + sovNetworkconfigproxy(uint64(l)) + } + if len(m.Search) > 0 { + for _, s := range m.Search { + l = len(s) + n += 1 + l + sovNetworkconfigproxy(uint64(l)) + } + } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } + return n +} + func (m *CreateEndpointRequest) Size() (n int) { if m == nil { return 0 @@ -2726,6 +2883,10 @@ func (m *CreateEndpointRequest) Size() (n int) { l = m.IovPolicySettings.Size() n += 1 + l + sovNetworkconfigproxy(uint64(l)) } + if m.DnsSetting != nil { + l = m.DnsSetting.Size() + n += 2 + l + sovNetworkconfigproxy(uint64(l)) + } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -2874,6 +3035,10 @@ func (m *GetEndpointResponse) Size() (n int) { if l > 0 { n += 1 + l + sovNetworkconfigproxy(uint64(l)) } + if m.DnsSetting != nil { + l = m.DnsSetting.Size() + n += 1 + l + sovNetworkconfigproxy(uint64(l)) + } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -3068,7 +3233,7 @@ func (this *CreateNetworkRequest) String() string { `Mode:` + fmt.Sprintf("%v", this.Mode) + `,`, `SwitchName:` + fmt.Sprintf("%v", this.SwitchName) + `,`, `IpamType:` + fmt.Sprintf("%v", this.IpamType) + `,`, - `SubnetIpadressPrefix:` + fmt.Sprintf("%v", this.SubnetIpadressPrefix) + `,`, + `SubnetIpaddressPrefix:` + fmt.Sprintf("%v", this.SubnetIpaddressPrefix) + `,`, `DefaultGateway:` + fmt.Sprintf("%v", this.DefaultGateway) + `,`, `XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`, `}`, @@ -3110,6 +3275,19 @@ func (this *IovEndpointPolicySetting) String() string { }, "") return s } +func (this *DnsSetting) String() string { + if this == nil { + return "nil" + } + s := strings.Join([]string{`&DnsSetting{`, + `ServerIpAddrs:` + fmt.Sprintf("%v", this.ServerIpAddrs) + `,`, + `Domain:` + fmt.Sprintf("%v", this.Domain) + `,`, + `Search:` + fmt.Sprintf("%v", this.Search) + `,`, + `XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`, + `}`, + }, "") + return s +} func (this *CreateEndpointRequest) String() string { if this == nil { return "nil" @@ -3122,6 +3300,7 @@ func (this *CreateEndpointRequest) String() string { `NetworkName:` + fmt.Sprintf("%v", this.NetworkName) + `,`, `PortnamePolicySetting:` + strings.Replace(fmt.Sprintf("%v", this.PortnamePolicySetting), "PortNameEndpointPolicySetting", "PortNameEndpointPolicySetting", 1) + `,`, `IovPolicySettings:` + strings.Replace(fmt.Sprintf("%v", this.IovPolicySettings), "IovEndpointPolicySetting", "IovEndpointPolicySetting", 1) + `,`, + `DnsSetting:` + strings.Replace(fmt.Sprintf("%v", this.DnsSetting), "DnsSetting", "DnsSetting", 1) + `,`, `XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`, `}`, }, "") @@ -3222,6 +3401,7 @@ func (this *GetEndpointResponse) String() string { `Name:` + fmt.Sprintf("%v", this.Name) + `,`, `Network:` + fmt.Sprintf("%v", this.Network) + `,`, `Namespace:` + fmt.Sprintf("%v", this.Namespace) + `,`, + `DnsSetting:` + strings.Replace(fmt.Sprintf("%v", this.DnsSetting), "DnsSetting", "DnsSetting", 1) + `,`, `XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`, `}`, }, "") @@ -4081,7 +4261,7 @@ func (m *CreateNetworkRequest) Unmarshal(dAtA []byte) error { } case 5: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field SubnetIpadressPrefix", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field SubnetIpaddressPrefix", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -4109,7 +4289,7 @@ func (m *CreateNetworkRequest) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.SubnetIpadressPrefix = append(m.SubnetIpadressPrefix, string(dAtA[iNdEx:postIndex])) + m.SubnetIpaddressPrefix = append(m.SubnetIpaddressPrefix, string(dAtA[iNdEx:postIndex])) iNdEx = postIndex case 6: if wireType != 2 { @@ -4451,6 +4631,156 @@ func (m *IovEndpointPolicySetting) Unmarshal(dAtA []byte) error { } return nil } +func (m *DnsSetting) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowNetworkconfigproxy + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: DnsSetting: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: DnsSetting: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ServerIpAddrs", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowNetworkconfigproxy + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthNetworkconfigproxy + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthNetworkconfigproxy + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.ServerIpAddrs = append(m.ServerIpAddrs, string(dAtA[iNdEx:postIndex])) + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Domain", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowNetworkconfigproxy + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthNetworkconfigproxy + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthNetworkconfigproxy + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Domain = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Search", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowNetworkconfigproxy + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthNetworkconfigproxy + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthNetworkconfigproxy + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Search = append(m.Search, string(dAtA[iNdEx:postIndex])) + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipNetworkconfigproxy(dAtA[iNdEx:]) + if err != nil { + return err + } + if skippy < 0 { + return ErrInvalidLengthNetworkconfigproxy + } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthNetworkconfigproxy + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} func (m *CreateEndpointRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -4712,6 +5042,42 @@ func (m *CreateEndpointRequest) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 16: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field DnsSetting", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowNetworkconfigproxy + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthNetworkconfigproxy + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthNetworkconfigproxy + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.DnsSetting == nil { + m.DnsSetting = &DnsSetting{} + } + if err := m.DnsSetting.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipNetworkconfigproxy(dAtA[iNdEx:]) @@ -5518,6 +5884,42 @@ func (m *GetEndpointResponse) Unmarshal(dAtA []byte) error { } m.Namespace = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex + case 5: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field DnsSetting", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowNetworkconfigproxy + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthNetworkconfigproxy + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthNetworkconfigproxy + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.DnsSetting == nil { + m.DnsSetting = &DnsSetting{} + } + if err := m.DnsSetting.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipNetworkconfigproxy(dAtA[iNdEx:]) diff --git a/cmd/ncproxy/ncproxygrpc/networkconfigproxy.proto b/cmd/ncproxy/ncproxygrpc/networkconfigproxy.proto index c63483671c..d670f0b2db 100644 --- a/cmd/ncproxy/ncproxygrpc/networkconfigproxy.proto +++ b/cmd/ncproxy/ncproxygrpc/networkconfigproxy.proto @@ -6,6 +6,7 @@ service NetworkConfigProxy { rpc AddNIC(AddNICRequest) returns (AddNICResponse) {} rpc ModifyNIC(ModifyNICRequest) returns (ModifyNICResponse) {} rpc DeleteNIC(DeleteNICRequest) returns (DeleteNICResponse) {} + rpc CreateNetwork(CreateNetworkRequest) returns (CreateNetworkResponse) {} rpc CreateEndpoint(CreateEndpointRequest) returns (CreateEndpointResponse) {} rpc AddEndpoint(AddEndpointRequest) returns (AddEndpointResponse) {} @@ -29,7 +30,7 @@ message ModifyNICRequest { string container_id = 1; string nic_id = 2; string endpoint_name = 3; - IovEndpointPolicySetting iov_policy_settings = 4; + IovEndpointPolicySetting iov_policy_settings = 4; } message ModifyNICResponse {} @@ -48,17 +49,17 @@ message CreateNetworkRequest { Transparent = 0; } - enum IpamType + enum IpamType { Static = 0; DHCP = 1; } - string name = 1; + string name = 1; NetworkMode mode = 2; string switch_name = 3; IpamType ipam_type = 4; - repeated string subnet_ipadress_prefix = 5; + repeated string subnet_ipaddress_prefix = 5; string default_gateway = 6; } @@ -71,12 +72,19 @@ message PortNameEndpointPolicySetting { } message IovEndpointPolicySetting { - uint32 IovOffloadWeight = 1; - uint32 QueuePairsRequested = 2; - uint32 InterruptModeration = 3; + uint32 iov_offload_weight = 1; + uint32 queue_pairs_requested = 2; + uint32 interrupt_moderation = 3; +} + +message DnsSetting { + repeated string server_ip_addrs = 1; + string domain = 2; + repeated string search = 3; } message CreateEndpointRequest { + reserved 8 to 15; string name = 1; string macaddress = 2; string ipaddress = 3; @@ -84,6 +92,7 @@ message CreateEndpointRequest { string network_name = 5; PortNameEndpointPolicySetting portname_policy_setting = 6; IovEndpointPolicySetting iov_policy_settings = 7; + DnsSetting dns_setting = 16; } message CreateEndpointResponse{ @@ -118,6 +127,7 @@ message GetEndpointResponse{ string name = 2; string network = 3; // GUID string namespace = 4; // GUID + DnsSetting dns_setting = 5; } message GetNetworkRequest{