diff --git a/pkg/hostman/guestfs/core.go b/pkg/hostman/guestfs/core.go index 50db6effd6..0a2882f37a 100644 --- a/pkg/hostman/guestfs/core.go +++ b/pkg/hostman/guestfs/core.go @@ -18,10 +18,9 @@ import ( "fmt" "math/rand" - "github.com/pkg/errors" - "yunion.io/x/jsonutils" "yunion.io/x/log" + "yunion.io/x/pkg/errors" "yunion.io/x/pkg/util/netutils" "yunion.io/x/onecloud/pkg/hostman/guestfs/fsdriver" @@ -69,6 +68,9 @@ func DoDeployGuestFs(rootfs fsdriver.IRootFsDriver, guestDesc *deployapi.GuestDe partition = rootfs.GetPartition() releaseInfo = rootfs.GetReleaseInfo(partition) ) + if len(guestDesc.Hostname) > 0 { + hn = guestDesc.Hostname + } for _, n := range nics { var addr netutils.IPV4Addr if addr, err = netutils.NewIPV4Addr(n.Ip); err != nil { diff --git a/pkg/hostman/hostdeployer/apis/deploy.pb.go b/pkg/hostman/hostdeployer/apis/deploy.pb.go index da0edfc6f8..6637c473d5 100644 --- a/pkg/hostman/hostdeployer/apis/deploy.pb.go +++ b/pkg/hostman/hostdeployer/apis/deploy.pb.go @@ -1,31 +1,20 @@ -// Copyright 2019 Yunion -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - // Code generated by protoc-gen-go. DO NOT EDIT. -// source: deploy.proto +// source: pkg/hostman/hostdeployer/apis/deploy.proto + +// protoc --version=libprotoc 3.11.3 +// protoc-gen-go --version=v1.3.5 +// protoc --go_out=plugins=grpc:. pkg/hostman/hostdeployer/apis/deploy.proto package apis import ( context "context" fmt "fmt" - math "math" - proto "github.com/golang/protobuf/proto" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" + math "math" ) // Reference imports to suppress errors if they are not otherwise used. @@ -47,6 +36,7 @@ type GuestDesc struct { NicsStandby []*Nic `protobuf:"bytes,5,rep,name=nics_standby,json=nicsStandby,proto3" json:"nics_standby,omitempty"` Disks []*Disk `protobuf:"bytes,6,rep,name=disks,proto3" json:"disks,omitempty"` Hypervisor string `protobuf:"bytes,7,opt,name=Hypervisor,proto3" json:"Hypervisor,omitempty"` + Hostname string `protobuf:"bytes,8,opt,name=hostname,proto3" json:"hostname,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -56,7 +46,7 @@ func (m *GuestDesc) Reset() { *m = GuestDesc{} } func (m *GuestDesc) String() string { return proto.CompactTextString(m) } func (*GuestDesc) ProtoMessage() {} func (*GuestDesc) Descriptor() ([]byte, []int) { - return fileDescriptor_05f09e103004e384, []int{0} + return fileDescriptor_dd896c9c60108af6, []int{0} } func (m *GuestDesc) XXX_Unmarshal(b []byte) error { @@ -126,6 +116,13 @@ func (m *GuestDesc) GetHypervisor() string { return "" } +func (m *GuestDesc) GetHostname() string { + if m != nil { + return m.Hostname + } + return "" +} + type Disk struct { DiskId string `protobuf:"bytes,1,opt,name=disk_id,json=diskId,proto3" json:"disk_id,omitempty"` Driver string `protobuf:"bytes,2,opt,name=driver,proto3" json:"driver,omitempty"` @@ -153,7 +150,7 @@ func (m *Disk) Reset() { *m = Disk{} } func (m *Disk) String() string { return proto.CompactTextString(m) } func (*Disk) ProtoMessage() {} func (*Disk) Descriptor() ([]byte, []int) { - return fileDescriptor_05f09e103004e384, []int{1} + return fileDescriptor_dd896c9c60108af6, []int{1} } func (m *Disk) XXX_Unmarshal(b []byte) error { @@ -329,7 +326,7 @@ func (m *Nic) Reset() { *m = Nic{} } func (m *Nic) String() string { return proto.CompactTextString(m) } func (*Nic) ProtoMessage() {} func (*Nic) Descriptor() ([]byte, []int) { - return fileDescriptor_05f09e103004e384, []int{2} + return fileDescriptor_dd896c9c60108af6, []int{2} } func (m *Nic) XXX_Unmarshal(b []byte) error { @@ -547,7 +544,7 @@ func (m *VDDKConInfo) Reset() { *m = VDDKConInfo{} } func (m *VDDKConInfo) String() string { return proto.CompactTextString(m) } func (*VDDKConInfo) ProtoMessage() {} func (*VDDKConInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_05f09e103004e384, []int{3} + return fileDescriptor_dd896c9c60108af6, []int{3} } func (m *VDDKConInfo) XXX_Unmarshal(b []byte) error { @@ -622,7 +619,7 @@ func (m *DeployInfo) Reset() { *m = DeployInfo{} } func (m *DeployInfo) String() string { return proto.CompactTextString(m) } func (*DeployInfo) ProtoMessage() {} func (*DeployInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_05f09e103004e384, []int{4} + return fileDescriptor_dd896c9c60108af6, []int{4} } func (m *DeployInfo) XXX_Unmarshal(b []byte) error { @@ -720,7 +717,7 @@ func (m *SSHKeys) Reset() { *m = SSHKeys{} } func (m *SSHKeys) String() string { return proto.CompactTextString(m) } func (*SSHKeys) ProtoMessage() {} func (*SSHKeys) Descriptor() ([]byte, []int) { - return fileDescriptor_05f09e103004e384, []int{5} + return fileDescriptor_dd896c9c60108af6, []int{5} } func (m *SSHKeys) XXX_Unmarshal(b []byte) error { @@ -782,7 +779,7 @@ func (m *DeployContent) Reset() { *m = DeployContent{} } func (m *DeployContent) String() string { return proto.CompactTextString(m) } func (*DeployContent) ProtoMessage() {} func (*DeployContent) Descriptor() ([]byte, []int) { - return fileDescriptor_05f09e103004e384, []int{6} + return fileDescriptor_dd896c9c60108af6, []int{6} } func (m *DeployContent) XXX_Unmarshal(b []byte) error { @@ -834,7 +831,7 @@ func (m *Empty) Reset() { *m = Empty{} } func (m *Empty) String() string { return proto.CompactTextString(m) } func (*Empty) ProtoMessage() {} func (*Empty) Descriptor() ([]byte, []int) { - return fileDescriptor_05f09e103004e384, []int{7} + return fileDescriptor_dd896c9c60108af6, []int{7} } func (m *Empty) XXX_Unmarshal(b []byte) error { @@ -872,7 +869,7 @@ func (m *DeployGuestFsResponse) Reset() { *m = DeployGuestFsResponse{} } func (m *DeployGuestFsResponse) String() string { return proto.CompactTextString(m) } func (*DeployGuestFsResponse) ProtoMessage() {} func (*DeployGuestFsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_05f09e103004e384, []int{8} + return fileDescriptor_dd896c9c60108af6, []int{8} } func (m *DeployGuestFsResponse) XXX_Unmarshal(b []byte) error { @@ -956,7 +953,7 @@ func (m *DeployParams) Reset() { *m = DeployParams{} } func (m *DeployParams) String() string { return proto.CompactTextString(m) } func (*DeployParams) ProtoMessage() {} func (*DeployParams) Descriptor() ([]byte, []int) { - return fileDescriptor_05f09e103004e384, []int{9} + return fileDescriptor_dd896c9c60108af6, []int{9} } func (m *DeployParams) XXX_Unmarshal(b []byte) error { @@ -1018,7 +1015,7 @@ func (m *ResizeFsParams) Reset() { *m = ResizeFsParams{} } func (m *ResizeFsParams) String() string { return proto.CompactTextString(m) } func (*ResizeFsParams) ProtoMessage() {} func (*ResizeFsParams) Descriptor() ([]byte, []int) { - return fileDescriptor_05f09e103004e384, []int{10} + return fileDescriptor_dd896c9c60108af6, []int{10} } func (m *ResizeFsParams) XXX_Unmarshal(b []byte) error { @@ -1073,7 +1070,7 @@ func (m *FormatFsParams) Reset() { *m = FormatFsParams{} } func (m *FormatFsParams) String() string { return proto.CompactTextString(m) } func (*FormatFsParams) ProtoMessage() {} func (*FormatFsParams) Descriptor() ([]byte, []int) { - return fileDescriptor_05f09e103004e384, []int{11} + return fileDescriptor_dd896c9c60108af6, []int{11} } func (m *FormatFsParams) XXX_Unmarshal(b []byte) error { @@ -1129,7 +1126,7 @@ func (m *ReleaseInfo) Reset() { *m = ReleaseInfo{} } func (m *ReleaseInfo) String() string { return proto.CompactTextString(m) } func (*ReleaseInfo) ProtoMessage() {} func (*ReleaseInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_05f09e103004e384, []int{12} + return fileDescriptor_dd896c9c60108af6, []int{12} } func (m *ReleaseInfo) XXX_Unmarshal(b []byte) error { @@ -1190,7 +1187,7 @@ func (m *SaveToGlanceParams) Reset() { *m = SaveToGlanceParams{} } func (m *SaveToGlanceParams) String() string { return proto.CompactTextString(m) } func (*SaveToGlanceParams) ProtoMessage() {} func (*SaveToGlanceParams) Descriptor() ([]byte, []int) { - return fileDescriptor_05f09e103004e384, []int{13} + return fileDescriptor_dd896c9c60108af6, []int{13} } func (m *SaveToGlanceParams) XXX_Unmarshal(b []byte) error { @@ -1237,7 +1234,7 @@ func (m *SaveToGlanceResponse) Reset() { *m = SaveToGlanceResponse{} } func (m *SaveToGlanceResponse) String() string { return proto.CompactTextString(m) } func (*SaveToGlanceResponse) ProtoMessage() {} func (*SaveToGlanceResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_05f09e103004e384, []int{14} + return fileDescriptor_dd896c9c60108af6, []int{14} } func (m *SaveToGlanceResponse) XXX_Unmarshal(b []byte) error { @@ -1283,7 +1280,7 @@ func (m *ProbeImageInfoPramas) Reset() { *m = ProbeImageInfoPramas{} } func (m *ProbeImageInfoPramas) String() string { return proto.CompactTextString(m) } func (*ProbeImageInfoPramas) ProtoMessage() {} func (*ProbeImageInfoPramas) Descriptor() ([]byte, []int) { - return fileDescriptor_05f09e103004e384, []int{15} + return fileDescriptor_dd896c9c60108af6, []int{15} } func (m *ProbeImageInfoPramas) XXX_Unmarshal(b []byte) error { @@ -1328,7 +1325,7 @@ func (m *ImageInfo) Reset() { *m = ImageInfo{} } func (m *ImageInfo) String() string { return proto.CompactTextString(m) } func (*ImageInfo) ProtoMessage() {} func (*ImageInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_05f09e103004e384, []int{16} + return fileDescriptor_dd896c9c60108af6, []int{16} } func (m *ImageInfo) XXX_Unmarshal(b []byte) error { @@ -1409,7 +1406,7 @@ func (m *EsxiDiskInfo) Reset() { *m = EsxiDiskInfo{} } func (m *EsxiDiskInfo) String() string { return proto.CompactTextString(m) } func (*EsxiDiskInfo) ProtoMessage() {} func (*EsxiDiskInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_05f09e103004e384, []int{17} + return fileDescriptor_dd896c9c60108af6, []int{17} } func (m *EsxiDiskInfo) XXX_Unmarshal(b []byte) error { @@ -1449,7 +1446,7 @@ func (m *ConnectEsxiDisksParams) Reset() { *m = ConnectEsxiDisksParams{} func (m *ConnectEsxiDisksParams) String() string { return proto.CompactTextString(m) } func (*ConnectEsxiDisksParams) ProtoMessage() {} func (*ConnectEsxiDisksParams) Descriptor() ([]byte, []int) { - return fileDescriptor_05f09e103004e384, []int{18} + return fileDescriptor_dd896c9c60108af6, []int{18} } func (m *ConnectEsxiDisksParams) XXX_Unmarshal(b []byte) error { @@ -1495,7 +1492,7 @@ func (m *EsxiDisksConnectionInfo) Reset() { *m = EsxiDisksConnectionInfo func (m *EsxiDisksConnectionInfo) String() string { return proto.CompactTextString(m) } func (*EsxiDisksConnectionInfo) ProtoMessage() {} func (*EsxiDisksConnectionInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_05f09e103004e384, []int{19} + return fileDescriptor_dd896c9c60108af6, []int{19} } func (m *EsxiDisksConnectionInfo) XXX_Unmarshal(b []byte) error { @@ -1546,128 +1543,131 @@ func init() { proto.RegisterType((*EsxiDisksConnectionInfo)(nil), "apis.EsxiDisksConnectionInfo") } -func init() { proto.RegisterFile("deploy.proto", fileDescriptor_05f09e103004e384) } +func init() { + proto.RegisterFile("pkg/hostman/hostdeployer/apis/deploy.proto", fileDescriptor_dd896c9c60108af6) +} -var fileDescriptor_05f09e103004e384 = []byte{ - // 1735 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x57, 0x4f, 0x6f, 0x1c, 0x49, - 0x15, 0xd7, 0xfc, 0x9f, 0x7e, 0xe3, 0xd8, 0x4e, 0xc5, 0xb1, 0x7b, 0x27, 0x9b, 0x5d, 0x6b, 0x10, - 0xc8, 0x0a, 0x59, 0x4b, 0x38, 0xc0, 0x05, 0x21, 0x11, 0xd9, 0x9b, 0xdd, 0x51, 0xd8, 0xc5, 0x6a, - 0x27, 0x70, 0xa3, 0x55, 0xee, 0xae, 0x99, 0x29, 0xdc, 0x5d, 0xd5, 0xea, 0xaa, 0x99, 0xc9, 0x20, - 0xed, 0x37, 0xe2, 0x84, 0xc4, 0x95, 0x23, 0xdf, 0x01, 0x3e, 0x02, 0x5f, 0x80, 0x2b, 0x7a, 0xaf, - 0xaa, 0x7b, 0x7a, 0xbc, 0x21, 0x9b, 0x0b, 0xa7, 0xae, 0xf7, 0xa7, 0xaa, 0xde, 0xdf, 0xdf, 0xab, - 0x86, 0xbd, 0x54, 0x14, 0x99, 0xde, 0x9c, 0x17, 0xa5, 0xb6, 0x9a, 0x75, 0x79, 0x21, 0xcd, 0xe4, - 0x5f, 0x2d, 0x08, 0xbe, 0x5a, 0x0a, 0x63, 0xaf, 0x84, 0x49, 0x18, 0x83, 0xae, 0xe2, 0xb9, 0x08, - 0x5b, 0xa7, 0xad, 0xb3, 0x20, 0xa2, 0x35, 0xf2, 0x96, 0x4b, 0x99, 0x86, 0x6d, 0xc7, 0xc3, 0x35, - 0x3b, 0x86, 0x7e, 0xaa, 0x73, 0x2e, 0x55, 0xd8, 0x21, 0xae, 0xa7, 0xd8, 0x53, 0xe8, 0x2a, 0x99, - 0x98, 0xb0, 0x7b, 0xda, 0x39, 0x1b, 0x5d, 0x04, 0xe7, 0x78, 0xc5, 0xf9, 0xb7, 0x32, 0x89, 0x88, - 0xcd, 0x9e, 0xc3, 0x1e, 0x7e, 0x63, 0x63, 0xb9, 0x4a, 0x6f, 0x37, 0x61, 0xef, 0xbe, 0xda, 0x08, - 0xc5, 0x37, 0x4e, 0xca, 0x4e, 0xa1, 0x97, 0x4a, 0x73, 0x67, 0xc2, 0x3e, 0xa9, 0x81, 0x53, 0xbb, - 0x92, 0xe6, 0x2e, 0x72, 0x02, 0xf6, 0x19, 0xc0, 0xd7, 0x9b, 0x42, 0x94, 0x2b, 0x69, 0x74, 0x19, - 0x0e, 0xc8, 0x94, 0x06, 0x67, 0xf2, 0xcf, 0x0e, 0x74, 0x51, 0x9f, 0x9d, 0xc0, 0x00, 0x77, 0xc4, - 0x32, 0xf5, 0xae, 0xf5, 0x91, 0x9c, 0x3a, 0x47, 0x4a, 0xb9, 0x12, 0xa5, 0x77, 0xcf, 0x53, 0xec, - 0x29, 0x40, 0xc2, 0x93, 0x85, 0x88, 0x73, 0x9d, 0x0a, 0xef, 0x64, 0x40, 0x9c, 0x6f, 0x74, 0x2a, - 0xd8, 0x27, 0x30, 0xe4, 0x52, 0x3b, 0x61, 0x97, 0x84, 0x03, 0x2e, 0x35, 0x89, 0x18, 0x74, 0x8d, - 0xfc, 0xb3, 0x08, 0x7b, 0xa7, 0xad, 0xb3, 0x4e, 0x44, 0x6b, 0xf6, 0x39, 0x8c, 0xac, 0xc8, 0x8b, - 0x8c, 0x5b, 0x81, 0x26, 0xf4, 0x9d, 0xa1, 0x15, 0x6b, 0x9a, 0xe2, 0x75, 0x32, 0xe7, 0x73, 0x11, - 0x17, 0xdc, 0x2e, 0xbc, 0x23, 0x01, 0x71, 0xae, 0xb9, 0x5d, 0xa0, 0xd8, 0x58, 0x5d, 0xa2, 0x82, - 0x4c, 0xc3, 0xa1, 0x13, 0x7b, 0xce, 0x34, 0x65, 0x9f, 0x42, 0x90, 0xcb, 0x79, 0xc9, 0xad, 0x54, - 0xf3, 0x30, 0x38, 0x6d, 0x9d, 0x0d, 0xa3, 0x2d, 0x83, 0x3d, 0x83, 0x87, 0x96, 0x97, 0x73, 0x61, - 0xe3, 0xc6, 0x19, 0x40, 0x67, 0x1c, 0x38, 0xc1, 0x4d, 0x7d, 0x12, 0x83, 0x2e, 0x59, 0x30, 0x72, - 0xb9, 0xc6, 0x35, 0x86, 0x68, 0xa6, 0xcb, 0x9c, 0xdb, 0x70, 0xcf, 0x85, 0xc8, 0x51, 0xec, 0x08, - 0x7a, 0x52, 0xa5, 0xe2, 0x5d, 0xf8, 0xe0, 0xb4, 0x75, 0xd6, 0x8b, 0x1c, 0xc1, 0x7e, 0x0c, 0xfb, - 0xb9, 0x28, 0xe7, 0x22, 0x36, 0x8a, 0x17, 0x66, 0xa1, 0x6d, 0xb8, 0x4f, 0x06, 0x3d, 0x20, 0xee, - 0x8d, 0x67, 0xb2, 0x7d, 0x68, 0xcf, 0x4c, 0x78, 0x40, 0x07, 0xb6, 0x67, 0x94, 0xc9, 0x5c, 0x2f, - 0x95, 0x2d, 0xb4, 0x54, 0x36, 0x3c, 0x74, 0x01, 0xda, 0x72, 0xd8, 0x21, 0x74, 0x52, 0xb1, 0x0a, - 0x1f, 0x92, 0x00, 0x97, 0x93, 0x7f, 0x77, 0xa1, 0xf3, 0xad, 0x4c, 0x50, 0x92, 0xf3, 0xc4, 0xa7, - 0x15, 0x97, 0x78, 0xb6, 0x2c, 0x7c, 0x3e, 0xdb, 0xb2, 0x40, 0x0d, 0x25, 0xac, 0x4f, 0x22, 0x2e, - 0xd9, 0x63, 0xe8, 0x2b, 0x61, 0x31, 0x0e, 0x2e, 0x79, 0x3d, 0x25, 0xec, 0x34, 0x65, 0x21, 0x0c, - 0x56, 0xb2, 0xb4, 0x4b, 0x9e, 0x51, 0xf6, 0x86, 0x51, 0x45, 0xa2, 0x64, 0xce, 0xad, 0x58, 0xf3, - 0x8d, 0x4f, 0x5e, 0x45, 0x92, 0x61, 0xca, 0xf8, 0x94, 0xe1, 0xb2, 0xd1, 0x1b, 0xc3, 0x9d, 0xde, - 0x38, 0x86, 0x7e, 0xa9, 0x97, 0x56, 0x18, 0x4a, 0x51, 0x10, 0x79, 0x0a, 0xf9, 0x72, 0x46, 0x5d, - 0xe7, 0x92, 0xe2, 0x29, 0xbc, 0x33, 0xe7, 0xe6, 0x2e, 0x13, 0x8a, 0xd2, 0xd1, 0x8b, 0x2a, 0xb2, - 0x51, 0xb4, 0x7b, 0x3b, 0x45, 0x7b, 0x0c, 0xfd, 0xdb, 0x52, 0xa6, 0x73, 0x41, 0x29, 0x09, 0x22, - 0x4f, 0x61, 0xf5, 0xaf, 0x65, 0x49, 0x79, 0xdf, 0x77, 0x02, 0x24, 0x5d, 0xba, 0x57, 0x19, 0x57, - 0x94, 0x87, 0x5e, 0x44, 0x6b, 0x2c, 0x26, 0xa9, 0xac, 0x28, 0x67, 0x3c, 0x11, 0x3e, 0x11, 0x5b, - 0x06, 0xc6, 0xf6, 0x76, 0x4d, 0x69, 0xe8, 0x45, 0xed, 0xdb, 0xf5, 0xb6, 0x08, 0x58, 0xb3, 0x08, - 0x3e, 0x87, 0x91, 0x8f, 0x5c, 0x2c, 0x0b, 0x13, 0x3e, 0x3a, 0xed, 0x60, 0x3a, 0x3d, 0x6b, 0x5a, - 0x18, 0x54, 0x10, 0xef, 0xac, 0x28, 0x95, 0xc8, 0xd0, 0xaa, 0x23, 0x97, 0xef, 0x8a, 0x35, 0x4d, - 0xd9, 0x13, 0x08, 0xac, 0xe0, 0x79, 0xbc, 0x96, 0x76, 0x11, 0x3e, 0x26, 0xf1, 0x10, 0x19, 0x7f, - 0x90, 0xae, 0x22, 0x73, 0xae, 0x30, 0x4d, 0xc7, 0x94, 0x26, 0x4f, 0x61, 0x57, 0x2a, 0x99, 0xc4, - 0x76, 0x53, 0x88, 0xf0, 0xc4, 0xa5, 0x49, 0xc9, 0xe4, 0xcd, 0xa6, 0xa0, 0x10, 0x64, 0x52, 0xdd, - 0xc5, 0xcb, 0x22, 0x0c, 0xdd, 0x1e, 0x24, 0xdf, 0x52, 0x71, 0xe4, 0x76, 0x19, 0x7e, 0x42, 0xdd, - 0x8a, 0xcb, 0x1a, 0x03, 0xc7, 0x5b, 0x0c, 0x9c, 0xac, 0x61, 0xf4, 0xfb, 0xab, 0xab, 0xd7, 0x97, - 0x5a, 0x4d, 0xd5, 0x4c, 0xa3, 0xca, 0x42, 0x1b, 0x5b, 0xc1, 0x24, 0xae, 0xa9, 0x75, 0x74, 0x69, - 0xa9, 0xee, 0x7a, 0x11, 0xad, 0x09, 0x3a, 0x8d, 0x28, 0x7d, 0xe9, 0xd1, 0x1a, 0x8d, 0x2f, 0xb8, - 0x31, 0xeb, 0xaa, 0xf6, 0x3c, 0x85, 0x91, 0x5c, 0xe5, 0xa5, 0x98, 0x51, 0xe9, 0x05, 0x91, 0x23, - 0x26, 0xff, 0x69, 0x03, 0x5c, 0x11, 0x6a, 0xd3, 0xc5, 0xcf, 0x01, 0x8a, 0xe5, 0x6d, 0x26, 0x93, - 0xf8, 0x4e, 0x6c, 0xe8, 0xfa, 0xd1, 0xc5, 0x03, 0x87, 0x8b, 0x37, 0x37, 0x5f, 0xbf, 0x16, 0x1b, - 0x13, 0x05, 0x4e, 0xe1, 0xb5, 0xd8, 0xb0, 0x2f, 0x60, 0xe0, 0x10, 0xdf, 0x84, 0x6d, 0x82, 0xd0, - 0x47, 0x1e, 0x42, 0x89, 0x79, 0xa9, 0x95, 0x15, 0xca, 0x46, 0x95, 0x0e, 0x1b, 0xc3, 0x90, 0x6c, - 0xd1, 0x65, 0xea, 0x2d, 0xae, 0x69, 0x8c, 0x9f, 0x34, 0xb1, 0x54, 0xd2, 0x92, 0xd9, 0xc3, 0xa8, - 0x2f, 0xcd, 0x54, 0x49, 0x8b, 0xd0, 0x24, 0x14, 0xbf, 0xcd, 0x44, 0x6c, 0xed, 0xc6, 0xb7, 0x4d, - 0xe0, 0x38, 0x6f, 0xec, 0x06, 0xc1, 0x27, 0x15, 0x33, 0xbe, 0xcc, 0x6c, 0x5c, 0x6a, 0x6d, 0x63, - 0x0a, 0x47, 0x9f, 0xb4, 0x0e, 0xbc, 0x20, 0xd2, 0xda, 0xbe, 0xc5, 0xc8, 0xfc, 0x0a, 0xc6, 0x6b, - 0xa9, 0x52, 0xbd, 0x36, 0x71, 0xb5, 0x87, 0xa7, 0xb9, 0x54, 0x6e, 0xd3, 0x80, 0x36, 0x9d, 0x78, - 0x8d, 0x2b, 0xa7, 0xf0, 0x12, 0xe5, 0xb4, 0xf9, 0x19, 0x3c, 0xf4, 0x76, 0x24, 0x99, 0x5e, 0xa6, - 0xce, 0xd4, 0xa1, 0xbb, 0xc8, 0x09, 0x2e, 0x91, 0x4f, 0x36, 0xff, 0x08, 0x1e, 0x64, 0x7a, 0x2e, - 0x55, 0xcc, 0x93, 0x04, 0x21, 0xc6, 0x37, 0xe4, 0x1e, 0x31, 0x5f, 0x3a, 0xde, 0xe4, 0x2f, 0x2d, - 0x18, 0xf8, 0x98, 0xa2, 0x93, 0xf7, 0xc2, 0x1e, 0x34, 0xe3, 0x4c, 0x4e, 0x66, 0xc2, 0x8a, 0xb8, - 0xa1, 0xe5, 0xf0, 0xe7, 0xc0, 0x09, 0xae, 0x6b, 0xdd, 0x33, 0x38, 0x74, 0x4e, 0x35, 0x54, 0x5d, - 0xb0, 0xf7, 0x89, 0xbf, 0xd5, 0x7c, 0x0e, 0xac, 0x28, 0xf5, 0x9f, 0x44, 0x62, 0x9b, 0xba, 0xae, - 0x68, 0x0e, 0xbd, 0xa4, 0xd6, 0x9e, 0xbc, 0x85, 0x07, 0x3b, 0x69, 0xad, 0xa1, 0xbc, 0xd5, 0x80, - 0xf2, 0x10, 0x06, 0x89, 0x13, 0x7b, 0xf3, 0x2a, 0x12, 0xab, 0x92, 0x27, 0x56, 0xea, 0x7a, 0xa0, - 0x3b, 0x6a, 0x32, 0x80, 0xde, 0x97, 0x79, 0x61, 0x37, 0x93, 0xbf, 0xb5, 0xe0, 0xb1, 0xbb, 0x80, - 0x5e, 0x0b, 0xaf, 0x4c, 0x24, 0x4c, 0xa1, 0x95, 0x11, 0x84, 0x46, 0xd2, 0xd8, 0x52, 0x37, 0x46, - 0xab, 0x2d, 0x35, 0xa1, 0xa9, 0x28, 0x0d, 0x9e, 0xe9, 0x2f, 0xf3, 0x24, 0x9a, 0xc6, 0xcb, 0x64, - 0x51, 0xb5, 0x05, 0xae, 0xb1, 0xf8, 0x32, 0xae, 0xe6, 0x4b, 0x3e, 0xaf, 0x26, 0x6a, 0x4d, 0x23, - 0xe8, 0x68, 0xe3, 0xfb, 0xa2, 0xad, 0x0d, 0x9e, 0x5c, 0x65, 0xce, 0xa3, 0xb1, 0x27, 0xb1, 0x9b, - 0x31, 0x48, 0x1e, 0x8d, 0xef, 0xc4, 0x66, 0xf2, 0xf7, 0x16, 0xec, 0x39, 0xbb, 0xaf, 0x79, 0xc9, - 0x73, 0x83, 0xc8, 0x42, 0x4f, 0x81, 0x46, 0x70, 0x86, 0xc8, 0xa0, 0x41, 0x7b, 0x0e, 0x30, 0x47, - 0xf7, 0xe2, 0x54, 0x98, 0x84, 0xcc, 0x1e, 0x5d, 0x1c, 0xb8, 0xa6, 0xa9, 0x1f, 0x49, 0x51, 0x30, - 0xaf, 0xdf, 0x4b, 0x3f, 0x83, 0x91, 0xeb, 0x9e, 0x58, 0xaa, 0x99, 0x26, 0x87, 0x46, 0x17, 0x87, - 0xcd, 0x2e, 0xc3, 0xb6, 0x8d, 0x20, 0xdd, 0xb6, 0xf0, 0x39, 0x04, 0xab, 0x34, 0xbd, 0x73, 0x1b, - 0xba, 0xb4, 0xe1, 0xa1, 0xdb, 0xd0, 0x40, 0x98, 0x68, 0x88, 0x3a, 0xb8, 0x9a, 0x7c, 0x07, 0xfb, - 0x91, 0xc0, 0x57, 0xc4, 0x2b, 0xf3, 0x31, 0x1e, 0x7c, 0x06, 0xb0, 0xd8, 0x3e, 0x89, 0x5c, 0xe0, - 0x1b, 0x9c, 0xdd, 0xeb, 0x3b, 0x3f, 0x7c, 0xfd, 0x1f, 0x61, 0xff, 0x15, 0xcd, 0xfb, 0x8f, 0xbb, - 0xfe, 0x09, 0x04, 0x33, 0x13, 0xfb, 0xf7, 0x82, 0xbb, 0x7d, 0x38, 0x33, 0xee, 0x84, 0xfa, 0x25, - 0xd9, 0xd9, 0xbe, 0x24, 0x27, 0x1a, 0x46, 0x91, 0xc8, 0x04, 0x37, 0x82, 0xa2, 0xf3, 0x7f, 0x2f, - 0xa6, 0xc9, 0x37, 0xc0, 0x6e, 0xf8, 0x4a, 0xbc, 0xd1, 0x5f, 0x65, 0x5c, 0x25, 0xe2, 0x63, 0x9c, - 0x1a, 0xc3, 0x30, 0xd1, 0x79, 0x51, 0x0a, 0x63, 0xe8, 0xf6, 0x61, 0x54, 0xd3, 0x13, 0x01, 0x47, - 0xcd, 0xe3, 0xea, 0xae, 0x38, 0x81, 0x81, 0x36, 0x2e, 0xca, 0xde, 0x13, 0x6d, 0xc8, 0xc3, 0x9f, - 0xc3, 0x5e, 0xe9, 0x1c, 0x76, 0xd2, 0x76, 0x33, 0x07, 0x8d, 0x50, 0x44, 0xa3, 0x72, 0x4b, 0x4c, - 0x5e, 0xc0, 0xd1, 0x75, 0xa9, 0x6f, 0xc5, 0x14, 0xdf, 0x84, 0xc8, 0xb9, 0x2e, 0x79, 0xce, 0x3f, - 0x6c, 0xf7, 0xe4, 0xaf, 0x6d, 0x08, 0xea, 0x0d, 0xec, 0xd9, 0xae, 0x45, 0xef, 0xbd, 0xb3, 0x32, - 0xd2, 0x59, 0x4f, 0x83, 0xb4, 0x5d, 0x59, 0x4f, 0x73, 0xf4, 0x27, 0x70, 0x20, 0x4d, 0xbc, 0x14, - 0x33, 0x19, 0x9b, 0x65, 0x41, 0x03, 0xaf, 0xe3, 0xde, 0x77, 0xd2, 0xbc, 0x15, 0x33, 0x79, 0xe3, - 0x98, 0x08, 0x73, 0xd2, 0xc4, 0xd9, 0x2a, 0x8f, 0x0b, 0x5e, 0x5a, 0x49, 0xc8, 0xe2, 0x06, 0xc7, - 0xbe, 0x34, 0xbf, 0x5d, 0xe5, 0xd7, 0x15, 0x17, 0x9f, 0x02, 0xd2, 0xc4, 0xa5, 0xe0, 0xa9, 0x56, - 0x59, 0x35, 0x41, 0x40, 0x9a, 0xc8, 0x73, 0xd8, 0x2f, 0xe1, 0xa4, 0x58, 0x6c, 0x8c, 0x4c, 0x78, - 0xb6, 0x3d, 0xcc, 0xd9, 0xe6, 0xba, 0xff, 0x71, 0x25, 0xae, 0x0f, 0x25, 0x53, 0x7f, 0x01, 0x27, - 0x34, 0xb2, 0x8c, 0xe5, 0x59, 0x26, 0xd2, 0xe6, 0x5c, 0x70, 0xb3, 0xe4, 0x08, 0x47, 0x98, 0x97, - 0xd6, 0xc3, 0x61, 0xf2, 0x53, 0xd8, 0xfb, 0xd2, 0xbc, 0x93, 0xf8, 0xdb, 0x40, 0xa1, 0xf8, 0x60, - 0x84, 0xbf, 0x83, 0xe3, 0x4b, 0xad, 0x94, 0x48, 0x6c, 0xb5, 0xa7, 0xea, 0x92, 0x9d, 0x3e, 0x6b, - 0xfd, 0x60, 0x9f, 0xb1, 0x17, 0x30, 0xe2, 0x49, 0x22, 0x8c, 0xa9, 0xaa, 0x02, 0xe7, 0x35, 0x73, - 0x3b, 0x9a, 0xf6, 0x44, 0xe0, 0xd4, 0xa8, 0x2a, 0x2e, 0xe1, 0xa4, 0xbe, 0xd7, 0xdb, 0x21, 0xfd, - 0x13, 0xe5, 0xac, 0xfa, 0x79, 0x6a, 0xfd, 0xcf, 0x93, 0x9c, 0xc2, 0xc5, 0x3f, 0x3a, 0x30, 0x72, - 0x58, 0xf5, 0x72, 0x8e, 0xa3, 0xe0, 0x37, 0xd5, 0x24, 0xf1, 0x40, 0xcf, 0x58, 0x13, 0xcf, 0x9c, - 0x7b, 0xe3, 0x27, 0x4d, 0xde, 0xfd, 0x89, 0xf0, 0x05, 0x0c, 0x2b, 0xc8, 0x62, 0x47, 0x55, 0x91, - 0x35, 0x21, 0x6c, 0x3c, 0xf2, 0xe6, 0xe0, 0x68, 0x41, 0xf5, 0x0a, 0x62, 0x2a, 0xf5, 0x5d, 0xc8, - 0xd9, 0x55, 0xbf, 0x82, 0xbd, 0x66, 0xc7, 0xb1, 0xd0, 0xbf, 0x7f, 0xbe, 0xd7, 0xd4, 0xe3, 0xf1, - 0xf7, 0x25, 0xb5, 0x8d, 0xbf, 0x86, 0xfd, 0xdd, 0x86, 0x62, 0x5e, 0xfb, 0x7d, 0x6d, 0x36, 0xf6, - 0x33, 0x60, 0xab, 0xfc, 0x3b, 0x38, 0xbc, 0x9f, 0x78, 0xf6, 0xa9, 0x53, 0x7a, 0x7f, 0x41, 0x8c, - 0x9f, 0xee, 0x66, 0xe0, 0x7e, 0xbe, 0x5e, 0xc2, 0xa3, 0x2b, 0x69, 0x92, 0xfb, 0x67, 0x7e, 0x78, - 0xd7, 0x4e, 0x60, 0x6e, 0xfb, 0xf4, 0x5f, 0xff, 0xe2, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x30, - 0xc4, 0xb6, 0xf0, 0xe7, 0x0f, 0x00, 0x00, +var fileDescriptor_dd896c9c60108af6 = []byte{ + // 1760 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x57, 0xdd, 0x6e, 0x1c, 0x49, + 0x15, 0xd6, 0xfc, 0x4f, 0x9f, 0xf1, 0x5f, 0x2a, 0x8e, 0xdd, 0x3b, 0xd9, 0xec, 0x5a, 0x83, 0x40, + 0x56, 0xc8, 0x3a, 0xc2, 0x01, 0x6e, 0x10, 0x12, 0x91, 0xbd, 0xd9, 0xb5, 0xc2, 0x2e, 0x56, 0x3b, + 0x81, 0x3b, 0x5a, 0xe5, 0xee, 0x9a, 0x99, 0xc2, 0xdd, 0x55, 0xad, 0xae, 0x9a, 0x99, 0x0c, 0xd2, + 0xbe, 0x11, 0x57, 0x48, 0xdc, 0x72, 0xc9, 0x3b, 0xf0, 0x0a, 0x3c, 0x00, 0xdc, 0xa2, 0x73, 0xaa, + 0xba, 0xa7, 0xc7, 0x1b, 0xb2, 0xb9, 0xe1, 0xaa, 0xeb, 0xfc, 0x54, 0xd5, 0xf9, 0xfd, 0x4e, 0x35, + 0x3c, 0x2d, 0xee, 0x66, 0xcf, 0xe7, 0xda, 0xd8, 0x9c, 0x2b, 0xfa, 0xa6, 0xa2, 0xc8, 0xf4, 0x5a, + 0x94, 0xcf, 0x79, 0x21, 0xcd, 0x73, 0x47, 0x9d, 0x15, 0xa5, 0xb6, 0x9a, 0x75, 0x91, 0x35, 0xf9, + 0x77, 0x0b, 0x82, 0xaf, 0x16, 0xc2, 0xd8, 0x4b, 0x61, 0x12, 0xc6, 0xa0, 0xab, 0x78, 0x2e, 0xc2, + 0xd6, 0x49, 0xeb, 0x34, 0x88, 0x68, 0x8d, 0xbc, 0xc5, 0x42, 0xa6, 0x61, 0xdb, 0xf1, 0x70, 0xcd, + 0x8e, 0xa0, 0x9f, 0xea, 0x9c, 0x4b, 0x15, 0x76, 0x88, 0xeb, 0x29, 0xf6, 0x04, 0xba, 0x4a, 0x26, + 0x26, 0xec, 0x9e, 0x74, 0x4e, 0x47, 0xe7, 0xc1, 0x19, 0x5e, 0x71, 0xf6, 0xad, 0x4c, 0x22, 0x62, + 0xb3, 0x67, 0xb0, 0x83, 0xdf, 0xd8, 0x58, 0xae, 0xd2, 0xdb, 0x75, 0xd8, 0xbb, 0xaf, 0x36, 0x42, + 0xf1, 0x8d, 0x93, 0xb2, 0x13, 0xe8, 0xa5, 0xd2, 0xdc, 0x99, 0xb0, 0x4f, 0x6a, 0xe0, 0xd4, 0x2e, + 0xa5, 0xb9, 0x8b, 0x9c, 0x80, 0x7d, 0x06, 0xf0, 0xf5, 0xba, 0x10, 0xe5, 0x52, 0x1a, 0x5d, 0x86, + 0x03, 0x32, 0xa5, 0xc1, 0x61, 0x63, 0x18, 0x62, 0x10, 0xc8, 0xa5, 0x21, 0x49, 0x6b, 0x7a, 0xf2, + 0xcf, 0x0e, 0x74, 0xf1, 0x2c, 0x76, 0x0c, 0x03, 0x3c, 0x2d, 0x96, 0xa9, 0x77, 0xbb, 0x8f, 0xe4, + 0x95, 0x73, 0xb2, 0x94, 0x4b, 0x51, 0x7a, 0xd7, 0x3d, 0xc5, 0x9e, 0x00, 0x24, 0x3c, 0x99, 0x8b, + 0x38, 0xd7, 0xa9, 0xf0, 0x01, 0x08, 0x88, 0xf3, 0x8d, 0x4e, 0x05, 0xfb, 0x04, 0x86, 0x5c, 0x6a, + 0x27, 0xec, 0x92, 0x70, 0xc0, 0xa5, 0x26, 0x11, 0x83, 0xae, 0x91, 0x7f, 0x16, 0x61, 0xef, 0xa4, + 0x75, 0xda, 0x89, 0x68, 0xcd, 0x3e, 0x87, 0x91, 0x15, 0x79, 0x91, 0x71, 0x2b, 0xd0, 0x84, 0xbe, + 0x73, 0xa2, 0x62, 0x5d, 0xa5, 0x78, 0x9d, 0xcc, 0xf9, 0x4c, 0xc4, 0x05, 0xb7, 0x73, 0xef, 0x64, + 0x40, 0x9c, 0x6b, 0x6e, 0xe7, 0x28, 0x36, 0x56, 0x97, 0xa8, 0x20, 0x53, 0xef, 0x65, 0xe0, 0x39, + 0x57, 0x29, 0xfb, 0x14, 0x82, 0x5c, 0xce, 0x4a, 0x6e, 0xa5, 0x9a, 0x85, 0xc1, 0x49, 0xeb, 0x74, + 0x18, 0x6d, 0x18, 0xec, 0x29, 0x3c, 0xb0, 0xbc, 0x9c, 0x09, 0x1b, 0x37, 0xce, 0x00, 0x3a, 0x63, + 0xdf, 0x09, 0x6e, 0xea, 0x93, 0x18, 0x74, 0xc9, 0x82, 0x91, 0xab, 0x03, 0x5c, 0x63, 0x88, 0xa6, + 0xba, 0xcc, 0xb9, 0x0d, 0x77, 0x5c, 0x88, 0x1c, 0xc5, 0x0e, 0xa1, 0x27, 0x55, 0x2a, 0xde, 0x85, + 0xbb, 0x27, 0xad, 0xd3, 0x5e, 0xe4, 0x08, 0xf6, 0x63, 0xd8, 0xcb, 0x45, 0x39, 0x13, 0xb1, 0x51, + 0xbc, 0x30, 0x73, 0x6d, 0xc3, 0x3d, 0x32, 0x68, 0x97, 0xb8, 0x37, 0x9e, 0xc9, 0xf6, 0xa0, 0x3d, + 0x35, 0xe1, 0x3e, 0x1d, 0xd8, 0x9e, 0x52, 0x96, 0x73, 0xbd, 0x50, 0xb6, 0xd0, 0x52, 0xd9, 0xf0, + 0xc0, 0x05, 0x68, 0xc3, 0x61, 0x07, 0xd0, 0x49, 0xc5, 0x32, 0x7c, 0x40, 0x02, 0x5c, 0x4e, 0xfe, + 0xd5, 0x85, 0xce, 0xb7, 0x32, 0x41, 0x49, 0xce, 0x13, 0x9f, 0x56, 0x5c, 0xe2, 0xd9, 0xb2, 0xf0, + 0xf9, 0x6c, 0xcb, 0x02, 0x35, 0x94, 0xb0, 0x3e, 0x89, 0xb8, 0x64, 0x8f, 0xa0, 0xaf, 0x84, 0xc5, + 0x38, 0xb8, 0xe4, 0xf5, 0x94, 0xb0, 0x57, 0x29, 0x0b, 0x61, 0xb0, 0x94, 0xa5, 0x5d, 0xf0, 0x8c, + 0xb2, 0x37, 0x8c, 0x2a, 0x12, 0x25, 0x33, 0x6e, 0xc5, 0x8a, 0xaf, 0x7d, 0xf2, 0x2a, 0x92, 0x0c, + 0x53, 0xc6, 0xa7, 0x0c, 0x97, 0x8d, 0xbe, 0x19, 0x6e, 0xf5, 0xcd, 0x11, 0xf4, 0x4b, 0xbd, 0xb0, + 0xc2, 0x50, 0x8a, 0x82, 0xc8, 0x53, 0xc8, 0x97, 0x53, 0x2a, 0x5f, 0x97, 0x14, 0x4f, 0xe1, 0x9d, + 0x39, 0x37, 0x77, 0x99, 0x50, 0x94, 0x8e, 0x5e, 0x54, 0x91, 0x8d, 0xa2, 0xdd, 0xd9, 0x2a, 0xda, + 0x23, 0xe8, 0xdf, 0x96, 0x32, 0x9d, 0x09, 0x4a, 0x49, 0x10, 0x79, 0x0a, 0xab, 0x7f, 0x25, 0x4b, + 0xca, 0xfb, 0x9e, 0x13, 0x20, 0xe9, 0xd2, 0xbd, 0xcc, 0xb8, 0xa2, 0x3c, 0xf4, 0x22, 0x5a, 0x63, + 0x31, 0x49, 0x65, 0x45, 0x39, 0xe5, 0x89, 0xf0, 0x89, 0xd8, 0x30, 0x30, 0xb6, 0xb7, 0x2b, 0x4a, + 0x43, 0x2f, 0x6a, 0xdf, 0xae, 0x36, 0x45, 0xc0, 0x9a, 0x45, 0xf0, 0x39, 0x8c, 0x7c, 0xe4, 0x62, + 0x59, 0x98, 0xf0, 0xe1, 0x49, 0x07, 0xd3, 0xe9, 0x59, 0x57, 0x85, 0x41, 0x05, 0xf1, 0xce, 0x8a, + 0x52, 0x89, 0x0c, 0xad, 0x3a, 0x74, 0xf9, 0xae, 0x58, 0x57, 0x29, 0x7b, 0x0c, 0x81, 0x15, 0x3c, + 0x8f, 0x57, 0xd2, 0xce, 0xc3, 0x47, 0xae, 0xad, 0x91, 0xf1, 0x07, 0xe9, 0x2a, 0x32, 0xe7, 0x0a, + 0xd3, 0x74, 0x44, 0x69, 0xf2, 0x14, 0x76, 0xa5, 0x92, 0x49, 0x6c, 0xd7, 0x85, 0x08, 0x8f, 0x5d, + 0x9a, 0x94, 0x4c, 0xde, 0xac, 0x0b, 0x0a, 0x41, 0x26, 0xd5, 0x5d, 0xbc, 0x28, 0xc2, 0xd0, 0xed, + 0x41, 0xf2, 0x2d, 0x15, 0x47, 0x6e, 0x17, 0xe1, 0x27, 0xd4, 0xad, 0xb8, 0xac, 0xf1, 0x71, 0xbc, + 0xc1, 0xc7, 0xc9, 0x0a, 0x46, 0xbf, 0xbf, 0xbc, 0x7c, 0x7d, 0xa1, 0xd5, 0x95, 0x9a, 0x6a, 0x54, + 0x41, 0x8c, 0xa9, 0x20, 0x14, 0xd7, 0xd4, 0x3a, 0xba, 0xb4, 0x54, 0x77, 0xbd, 0x88, 0xd6, 0x04, + 0xab, 0x46, 0x94, 0xbe, 0xf4, 0x68, 0x8d, 0xc6, 0x17, 0xdc, 0x98, 0x55, 0x55, 0x7b, 0x9e, 0xc2, + 0x48, 0x2e, 0xf3, 0x52, 0x4c, 0xa9, 0xf4, 0x82, 0xc8, 0x11, 0x93, 0xff, 0xb4, 0x01, 0x2e, 0x09, + 0xd1, 0xe9, 0xe2, 0x67, 0x00, 0xc5, 0xe2, 0x36, 0x93, 0x49, 0x7c, 0x27, 0xd6, 0x74, 0xfd, 0xe8, + 0x7c, 0xd7, 0x61, 0xe6, 0xcd, 0xcd, 0xd7, 0xaf, 0xc5, 0xda, 0x44, 0x81, 0x53, 0x78, 0x2d, 0xd6, + 0xec, 0x0b, 0x18, 0xb8, 0x69, 0x60, 0xc2, 0x36, 0xc1, 0xeb, 0x43, 0x0f, 0xaf, 0xc4, 0xbc, 0xd0, + 0xca, 0x0a, 0x65, 0xa3, 0x4a, 0x07, 0x91, 0x94, 0x6c, 0xd1, 0x65, 0xea, 0x2d, 0xae, 0x69, 0x8c, + 0x9f, 0x34, 0xb1, 0x54, 0xd2, 0x92, 0xd9, 0xc3, 0xa8, 0x2f, 0xcd, 0x95, 0x92, 0x16, 0xa1, 0x49, + 0x28, 0x7e, 0x9b, 0x89, 0xd8, 0xda, 0xb5, 0x6f, 0x9b, 0xc0, 0x71, 0xde, 0xd8, 0x35, 0x82, 0x4f, + 0x2a, 0xa6, 0x7c, 0x91, 0xd9, 0xb8, 0xd4, 0xda, 0xc6, 0x14, 0x8e, 0x3e, 0x69, 0xed, 0x7b, 0x41, + 0xa4, 0xb5, 0x7d, 0x8b, 0x91, 0xf9, 0x15, 0x8c, 0x57, 0x52, 0xa5, 0x7a, 0x65, 0xe2, 0x6a, 0x0f, + 0x4f, 0x73, 0xa9, 0xdc, 0xa6, 0x01, 0x6d, 0x3a, 0xf6, 0x1a, 0x97, 0x4e, 0xe1, 0x25, 0xca, 0x69, + 0xf3, 0x53, 0x78, 0xe0, 0xed, 0x48, 0x32, 0xbd, 0x48, 0x9d, 0xa9, 0x43, 0x77, 0x91, 0x13, 0x5c, + 0x20, 0x9f, 0x6c, 0xfe, 0x11, 0xec, 0x66, 0x7a, 0x26, 0x55, 0xcc, 0x93, 0x04, 0x21, 0xc6, 0x37, + 0xe4, 0x0e, 0x31, 0x5f, 0x3a, 0xde, 0xe4, 0x2f, 0x2d, 0x18, 0xf8, 0x98, 0xa2, 0x93, 0xf7, 0xc2, + 0x1e, 0x34, 0xe3, 0x4c, 0x4e, 0x66, 0xc2, 0x8a, 0xb8, 0xa1, 0xe5, 0xf0, 0x67, 0xdf, 0x09, 0xae, + 0x6b, 0xdd, 0x53, 0x38, 0x70, 0x4e, 0x35, 0x54, 0x5d, 0xb0, 0xf7, 0x88, 0xbf, 0xd1, 0x7c, 0x06, + 0xac, 0x28, 0xf5, 0x9f, 0x44, 0x62, 0x9b, 0xba, 0xae, 0x68, 0x0e, 0xbc, 0xa4, 0xd6, 0x9e, 0xbc, + 0x85, 0xdd, 0xad, 0xb4, 0xd6, 0x50, 0xde, 0x6a, 0x40, 0x79, 0x08, 0x83, 0xc4, 0x89, 0xbd, 0x79, + 0x15, 0x89, 0x55, 0xc9, 0x13, 0x2b, 0x75, 0x3d, 0xec, 0x1d, 0x35, 0x19, 0x40, 0xef, 0xcb, 0xbc, + 0xb0, 0xeb, 0xc9, 0xdf, 0x5a, 0xf0, 0xc8, 0x5d, 0x40, 0x2f, 0x89, 0x57, 0x26, 0x12, 0xa6, 0xd0, + 0xca, 0x08, 0x42, 0x23, 0x69, 0x6c, 0xa9, 0x1b, 0xa3, 0xd5, 0x96, 0x9a, 0xd0, 0x54, 0x94, 0x06, + 0xcf, 0xf4, 0x97, 0x79, 0x12, 0x4d, 0xe3, 0x65, 0x32, 0xaf, 0xda, 0x02, 0xd7, 0x58, 0x7c, 0x19, + 0x57, 0xb3, 0x05, 0x9f, 0x55, 0x13, 0xb5, 0xa6, 0x11, 0x74, 0xb4, 0xf1, 0x7d, 0xd1, 0xd6, 0x06, + 0x4f, 0xae, 0x32, 0xe7, 0xd1, 0xd8, 0x93, 0xd8, 0xcd, 0x18, 0x24, 0x8f, 0xc6, 0x77, 0x62, 0x3d, + 0xf9, 0x7b, 0x0b, 0x76, 0x9c, 0xdd, 0xd7, 0xbc, 0xe4, 0xb9, 0x41, 0x64, 0xa1, 0xa7, 0x40, 0x23, + 0x38, 0x43, 0x64, 0xd0, 0xa0, 0x3d, 0x03, 0x98, 0xa1, 0x7b, 0x71, 0x2a, 0x4c, 0x42, 0x66, 0x8f, + 0xce, 0xf7, 0x5d, 0xd3, 0xd4, 0x0f, 0xa8, 0x28, 0x98, 0xd5, 0x6f, 0xa9, 0x9f, 0xc1, 0xc8, 0x75, + 0x4f, 0x2c, 0xd5, 0x54, 0x93, 0x43, 0xa3, 0xf3, 0x83, 0x66, 0x97, 0x61, 0xdb, 0x46, 0x90, 0x6e, + 0x5a, 0xf8, 0x0c, 0x82, 0x65, 0x9a, 0xde, 0xb9, 0x0d, 0x5d, 0xda, 0xf0, 0xc0, 0x6d, 0x68, 0x20, + 0x4c, 0x34, 0x44, 0x1d, 0x5c, 0x4d, 0xbe, 0x83, 0xbd, 0x48, 0xe0, 0x2b, 0xe2, 0x95, 0xf9, 0x18, + 0x0f, 0x3e, 0x03, 0x98, 0x6f, 0x9e, 0x4b, 0x2e, 0xf0, 0x0d, 0xce, 0xf6, 0xf5, 0x9d, 0x1f, 0xbe, + 0xfe, 0x8f, 0xb0, 0xf7, 0x8a, 0xe6, 0xfd, 0xc7, 0x5d, 0xff, 0x18, 0x82, 0xa9, 0x89, 0xfd, 0x7b, + 0xc1, 0xdd, 0x3e, 0x9c, 0x1a, 0x77, 0x42, 0xfd, 0xca, 0xec, 0x6c, 0x5e, 0x99, 0x13, 0x0d, 0xa3, + 0x48, 0x64, 0x82, 0x1b, 0x41, 0xd1, 0xf9, 0xbf, 0x17, 0xd3, 0xe4, 0x1b, 0x60, 0x37, 0x7c, 0x29, + 0xde, 0xe8, 0xaf, 0x32, 0xae, 0x12, 0xf1, 0x31, 0x4e, 0x8d, 0x61, 0x98, 0xe8, 0xbc, 0x28, 0x85, + 0x31, 0x74, 0xfb, 0x30, 0xaa, 0xe9, 0x89, 0x80, 0xc3, 0xe6, 0x71, 0x75, 0x57, 0x1c, 0xc3, 0x40, + 0x1b, 0x17, 0x65, 0xef, 0x89, 0x36, 0xe4, 0xe1, 0xcf, 0x61, 0xa7, 0x74, 0x0e, 0x3b, 0x69, 0xbb, + 0x99, 0x83, 0x46, 0x28, 0xa2, 0x51, 0xb9, 0x21, 0x26, 0x2f, 0xe0, 0xf0, 0xba, 0xd4, 0xb7, 0xe2, + 0x0a, 0xdf, 0x84, 0xc8, 0xb9, 0x2e, 0x79, 0xce, 0x3f, 0x6c, 0xf7, 0xe4, 0xaf, 0x6d, 0x08, 0xea, + 0x0d, 0xec, 0xe9, 0xb6, 0x45, 0xef, 0xbd, 0xb3, 0x32, 0xd2, 0x59, 0x4f, 0x83, 0xb4, 0x5d, 0x59, + 0x4f, 0x73, 0xf4, 0x27, 0xb0, 0x2f, 0x4d, 0xbc, 0x10, 0x53, 0x19, 0x9b, 0x45, 0x41, 0x03, 0xaf, + 0xe3, 0xde, 0x77, 0xd2, 0xbc, 0x15, 0x53, 0x79, 0xe3, 0x98, 0x08, 0x73, 0xd2, 0xc4, 0xd9, 0x32, + 0x8f, 0x0b, 0x5e, 0x5a, 0x49, 0xc8, 0xe2, 0x06, 0xc7, 0x9e, 0x34, 0xbf, 0x5d, 0xe6, 0xd7, 0x15, + 0x17, 0x9f, 0x02, 0xd2, 0xc4, 0xa5, 0xe0, 0xa9, 0x56, 0x59, 0x35, 0x41, 0x40, 0x9a, 0xc8, 0x73, + 0xd8, 0x2f, 0xe1, 0xb8, 0x98, 0xaf, 0x8d, 0x4c, 0x78, 0xb6, 0x39, 0xcc, 0xd9, 0xe6, 0xba, 0xff, + 0x51, 0x25, 0xae, 0x0f, 0x25, 0x53, 0x7f, 0x01, 0xc7, 0x34, 0xb2, 0x8c, 0xe5, 0x59, 0x26, 0xd2, + 0xe6, 0x5c, 0x70, 0xb3, 0xe4, 0x10, 0x47, 0x98, 0x97, 0xd6, 0xc3, 0x61, 0xf2, 0x53, 0xd8, 0xf9, + 0xd2, 0xbc, 0x93, 0xf8, 0xdb, 0x40, 0xa1, 0xf8, 0x60, 0x84, 0xbf, 0x83, 0xa3, 0x0b, 0xad, 0x94, + 0x48, 0x6c, 0xb5, 0xa7, 0xea, 0x92, 0xad, 0x3e, 0x6b, 0xfd, 0x60, 0x9f, 0xb1, 0x17, 0x30, 0xe2, + 0x49, 0x22, 0x8c, 0xa9, 0xaa, 0x02, 0xe7, 0x35, 0x73, 0x3b, 0x9a, 0xf6, 0x44, 0xe0, 0xd4, 0xa8, + 0x2a, 0x2e, 0xe0, 0xb8, 0xbe, 0xd7, 0xdb, 0x21, 0xfd, 0x13, 0xe5, 0xb4, 0xfa, 0xb1, 0x6a, 0xfd, + 0xcf, 0x93, 0x9c, 0xc2, 0xf9, 0x3f, 0x3a, 0x30, 0x72, 0x58, 0xf5, 0x72, 0x86, 0xa3, 0xe0, 0x37, + 0xd5, 0x24, 0xf1, 0x40, 0xcf, 0x58, 0x13, 0xcf, 0x9c, 0x7b, 0xe3, 0xc7, 0x4d, 0xde, 0xfd, 0x89, + 0xf0, 0x05, 0x0c, 0x2b, 0xc8, 0x62, 0x87, 0x55, 0x91, 0x35, 0x21, 0x6c, 0x3c, 0xf2, 0xe6, 0xe0, + 0x68, 0x41, 0xf5, 0x0a, 0x62, 0x2a, 0xf5, 0x6d, 0xc8, 0xd9, 0x56, 0xbf, 0x84, 0x9d, 0x66, 0xc7, + 0xb1, 0xd0, 0xbf, 0x7f, 0xbe, 0xd7, 0xd4, 0xe3, 0xf1, 0xf7, 0x25, 0xb5, 0x8d, 0xbf, 0x86, 0xbd, + 0xed, 0x86, 0x62, 0x5e, 0xfb, 0x7d, 0x6d, 0x36, 0xf6, 0x33, 0x60, 0xa3, 0xfc, 0x3b, 0x38, 0xb8, + 0x9f, 0x78, 0xf6, 0xa9, 0x53, 0x7a, 0x7f, 0x41, 0x8c, 0x9f, 0x6c, 0x67, 0xe0, 0x7e, 0xbe, 0x5e, + 0xc2, 0xc3, 0x4b, 0x69, 0x92, 0xfb, 0x67, 0x7e, 0x78, 0xd7, 0x56, 0x60, 0x6e, 0xfb, 0xf4, 0xcf, + 0xff, 0xe2, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x05, 0x65, 0xaf, 0xd2, 0x21, 0x10, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. var _ context.Context -var _ grpc.ClientConn +var _ grpc.ClientConnInterface // This is a compile-time assertion to ensure that this generated file // is compatible with the grpc package it is being compiled against. -const _ = grpc.SupportPackageIsVersion4 +const _ = grpc.SupportPackageIsVersion6 // DeployAgentClient is the client API for DeployAgent service. // @@ -1683,10 +1683,10 @@ type DeployAgentClient interface { } type deployAgentClient struct { - cc *grpc.ClientConn + cc grpc.ClientConnInterface } -func NewDeployAgentClient(cc *grpc.ClientConn) DeployAgentClient { +func NewDeployAgentClient(cc grpc.ClientConnInterface) DeployAgentClient { return &deployAgentClient{cc} } @@ -1954,5 +1954,5 @@ var _DeployAgent_serviceDesc = grpc.ServiceDesc{ }, }, Streams: []grpc.StreamDesc{}, - Metadata: "deploy.proto", + Metadata: "pkg/hostman/hostdeployer/apis/deploy.proto", } diff --git a/pkg/hostman/hostdeployer/apis/deploy.proto b/pkg/hostman/hostdeployer/apis/deploy.proto index c8ede7b531..fe68e30bc1 100644 --- a/pkg/hostman/hostdeployer/apis/deploy.proto +++ b/pkg/hostman/hostdeployer/apis/deploy.proto @@ -1,5 +1,8 @@ syntax = "proto3"; +// protoc --version=libprotoc 3.11.3 +// protoc-gen-go --version=v1.3.5 +// protoc --go_out=plugins=grpc:. pkg/hostman/hostdeployer/apis/deploy.proto package apis; message GuestDesc { @@ -12,6 +15,7 @@ message GuestDesc { repeated Disk disks = 6; string Hypervisor = 7; + string hostname = 8; } message Disk { diff --git a/pkg/hostman/hostdeployer/apis/utils.go b/pkg/hostman/hostdeployer/apis/utils.go index ad0a8ddeff..7f347b3a87 100644 --- a/pkg/hostman/hostdeployer/apis/utils.go +++ b/pkg/hostman/hostdeployer/apis/utils.go @@ -91,6 +91,7 @@ func GuestDescToDeployDesc(guestDesc *jsonutils.JSONDict) (*GuestDesc, error) { ret.Name, _ = guestDesc.GetString("name") ret.Domain, _ = guestDesc.GetString("domain") ret.Uuid, _ = guestDesc.GetString("uuid") + ret.Hostname, _ = guestDesc.GetString("hostname") jnics, _ := guestDesc.Get("nics") jdisks, _ := guestDesc.Get("disks") jnicsStandby, _ := guestDesc.Get("nics_standby") diff --git a/pkg/hostman/hostinfo/hostdhcp/dhcpserver.go b/pkg/hostman/hostinfo/hostdhcp/dhcpserver.go index f7581b8262..80650ddebb 100644 --- a/pkg/hostman/hostinfo/hostdhcp/dhcpserver.go +++ b/pkg/hostman/hostinfo/hostdhcp/dhcpserver.go @@ -105,7 +105,10 @@ func (s *SGuestDHCPServer) getGuestConfig(guestDesc, guestNic jsonutils.JSONObje conf.ServerIP = net.ParseIP(v4Ip.NetAddr(int8(masklen)).String()) conf.SubnetMask = net.ParseIP(netutils2.Netlen2Mask(int(masklen))) conf.BroadcastAddr = v4Ip.BroadcastAddr(int8(masklen)).ToBytes() - conf.Hostname, _ = guestDesc.GetString("hostname") + conf.Hostname, _ = guestDesc.GetString("name") + if hostname, _ := guestDesc.GetString("hostname"); len(hostname) > 0 { + conf.Hostname = hostname + } conf.Domain = nicdesc.Domain // get main ip