diff --git a/iri/apis/machine/v1alpha1/api.pb.go b/iri/apis/machine/v1alpha1/api.pb.go index 4507f5bab..c69a5784b 100644 --- a/iri/apis/machine/v1alpha1/api.pb.go +++ b/iri/apis/machine/v1alpha1/api.pb.go @@ -906,6 +906,7 @@ type NetworkInterfaceStatus struct { Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` Handle string `protobuf:"bytes,2,opt,name=handle,proto3" json:"handle,omitempty"` State NetworkInterfaceState `protobuf:"varint,3,opt,name=state,proto3,enum=machine.v1alpha1.NetworkInterfaceState" json:"state,omitempty"` + Ips []string `protobuf:"bytes,4,rep,name=ips,proto3" json:"ips,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_sizecache int32 `json:"-"` } @@ -963,6 +964,13 @@ func (m *NetworkInterfaceStatus) GetState() NetworkInterfaceState { return NetworkInterfaceState_NETWORK_INTERFACE_PENDING } +func (m *NetworkInterfaceStatus) GetIps() []string { + if m != nil { + return m.Ips + } + return nil +} + type MachineClass struct { Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` Capabilities *MachineClassCapabilities `protobuf:"bytes,2,opt,name=capabilities,proto3" json:"capabilities,omitempty"` @@ -2201,122 +2209,122 @@ func init() { func init() { proto.RegisterFile("api.proto", fileDescriptor_00212fb1f9d3bf1c) } var fileDescriptor_00212fb1f9d3bf1c = []byte{ - // 1832 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x59, 0xdd, 0x73, 0xdb, 0x58, + // 1840 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x59, 0x5f, 0x73, 0xdb, 0x58, 0x15, 0x8f, 0x9c, 0xc4, 0x89, 0x8f, 0x1d, 0xc7, 0xbd, 0x49, 0xb3, 0xae, 0x16, 0xbb, 0xae, 0x58, - 0xb6, 0x9d, 0xd0, 0xda, 0x1b, 0x97, 0xfd, 0xa0, 0x33, 0xcb, 0xe0, 0xda, 0xee, 0xd6, 0xd3, 0xd8, - 0x29, 0x4a, 0x9a, 0x02, 0x03, 0xa3, 0x91, 0xe5, 0x9b, 0x44, 0x54, 0x96, 0xbc, 0x92, 0xec, 0x25, - 0xec, 0x0b, 0x0c, 0xcf, 0x0c, 0xfc, 0x15, 0x3c, 0xc3, 0x0c, 0x8f, 0xfc, 0x01, 0xfb, 0xb8, 0x6f, - 0xf0, 0xc8, 0x86, 0x19, 0x1e, 0xf8, 0x2b, 0x98, 0xfb, 0x21, 0x59, 0xb6, 0xaf, 0xfc, 0x51, 0x1e, - 0xf6, 0xcd, 0xf7, 0xe8, 0x9c, 0xdf, 0xf9, 0xd0, 0x39, 0xe7, 0x77, 0x35, 0x86, 0x94, 0x3e, 0x30, - 0xcb, 0x03, 0xd7, 0xf1, 0x1d, 0x94, 0xeb, 0xeb, 0xc6, 0x95, 0x69, 0xe3, 0xf2, 0xe8, 0x48, 0xb7, - 0x06, 0x57, 0xfa, 0x91, 0xfc, 0xe8, 0xd2, 0xf4, 0xaf, 0x86, 0xdd, 0xb2, 0xe1, 0xf4, 0x2b, 0x97, - 0xce, 0xa5, 0x53, 0xa1, 0x8a, 0xdd, 0xe1, 0x05, 0x3d, 0xd1, 0x03, 0xfd, 0xc5, 0x00, 0xe4, 0x5a, - 0x44, 0xdd, 0x74, 0x1d, 0xdb, 0x70, 0x5c, 0xfc, 0xa8, 0x87, 0x47, 0xe1, 0xa1, 0x62, 0xba, 0x66, - 0x45, 0x1f, 0x98, 0x5e, 0xa5, 0x8f, 0x7d, 0xbd, 0x12, 0xf8, 0xa9, 0x84, 0x31, 0x28, 0xff, 0x48, - 0x00, 0x9c, 0x3b, 0xd6, 0xb0, 0x8f, 0x4f, 0x07, 0xd8, 0x40, 0x07, 0x90, 0xec, 0xb9, 0xe6, 0x08, - 0xbb, 0x79, 0xa9, 0x24, 0x3d, 0x48, 0xa9, 0xfc, 0x44, 0xe4, 0x57, 0xba, 0xdd, 0xb3, 0x70, 0x3e, - 0xc1, 0xe4, 0xec, 0x84, 0x8e, 0x01, 0x74, 0xdf, 0x77, 0xcd, 0xee, 0xd0, 0xc7, 0x5e, 0x7e, 0xbd, - 0xb4, 0xfe, 0x20, 0x5d, 0x7d, 0x58, 0x9e, 0xce, 0xab, 0x3c, 0xf6, 0x50, 0xae, 0x85, 0xea, 0x4d, - 0xdb, 0x77, 0xaf, 0xd5, 0x88, 0x3d, 0x6a, 0x43, 0xda, 0xc3, 0x86, 0x8b, 0x7d, 0xad, 0xa7, 0xfb, - 0x7a, 0x7e, 0x63, 0x09, 0xb8, 0x53, 0xaa, 0xdf, 0xd0, 0x7d, 0x9d, 0xc3, 0x79, 0xa1, 0x40, 0xfe, - 0x14, 0x76, 0xa7, 0xbc, 0xa1, 0x1c, 0xac, 0xbf, 0xc1, 0xd7, 0x3c, 0x39, 0xf2, 0x13, 0xed, 0xc3, - 0xe6, 0x48, 0xb7, 0x86, 0x41, 0x62, 0xec, 0xf0, 0x24, 0xf1, 0x89, 0x44, 0xcc, 0xa7, 0xd0, 0x17, - 0x99, 0x67, 0x22, 0xe6, 0xca, 0xdf, 0x25, 0xd8, 0x69, 0xb3, 0xc8, 0x9f, 0x99, 0x96, 0x8f, 0x5d, - 0x94, 0x85, 0x84, 0xd9, 0xe3, 0xc6, 0x09, 0xb3, 0x87, 0x7e, 0x06, 0x59, 0x4b, 0xef, 0x62, 0x4b, - 0xf3, 0xb0, 0x85, 0x0d, 0xdf, 0x71, 0xf3, 0x09, 0x9a, 0x71, 0x75, 0x36, 0xe3, 0x09, 0xa0, 0xf2, - 0x31, 0xb1, 0x3a, 0xe5, 0x46, 0x2c, 0xef, 0x1d, 0x2b, 0x2a, 0x93, 0x7f, 0x0c, 0x68, 0x56, 0x69, - 0x95, 0xec, 0x95, 0x5f, 0x40, 0x9e, 0x3b, 0xad, 0x5b, 0xba, 0xe7, 0xd5, 0xf5, 0x81, 0xde, 0x35, - 0x2d, 0xd3, 0x37, 0xb1, 0x87, 0x0a, 0x00, 0xc6, 0x60, 0xa8, 0xf5, 0x4d, 0xcb, 0x32, 0x3d, 0x0a, - 0xb7, 0xae, 0xa6, 0x8c, 0xc1, 0xb0, 0x4d, 0x05, 0xe8, 0x1e, 0x64, 0xfa, 0xb8, 0xef, 0xb8, 0xd7, - 0x5a, 0xf7, 0x9a, 0xb4, 0x45, 0x82, 0x2a, 0xa4, 0x99, 0xec, 0x29, 0x11, 0x29, 0x7f, 0x91, 0x60, - 0x8b, 0xc3, 0xa3, 0x1f, 0xc2, 0x36, 0xe9, 0x4e, 0xfa, 0xca, 0x09, 0x56, 0xba, 0x5a, 0x28, 0x13, - 0xc1, 0x38, 0xfb, 0x93, 0xee, 0xaf, 0xb0, 0xe1, 0xb7, 0xb9, 0x92, 0x1a, 0xaa, 0xa3, 0x23, 0xd8, - 0xf0, 0x06, 0xd8, 0xa0, 0x1e, 0xa8, 0x59, 0x4c, 0xdd, 0x48, 0xab, 0xa8, 0x54, 0x15, 0x7d, 0x0c, - 0x49, 0xcf, 0xd7, 0xfd, 0x21, 0xe9, 0x56, 0x62, 0x74, 0x37, 0xde, 0x88, 0xaa, 0xa9, 0x5c, 0x5d, - 0xb9, 0x07, 0xa9, 0x56, 0x5f, 0xbf, 0x64, 0x73, 0xb2, 0x0f, 0x9b, 0x26, 0x39, 0xf0, 0x5a, 0xb2, - 0x83, 0x72, 0x08, 0xa9, 0x66, 0x7f, 0xe0, 0x5f, 0x37, 0x4c, 0xef, 0x0d, 0x29, 0x92, 0x67, 0xfe, - 0x06, 0xf3, 0x1a, 0xf0, 0x22, 0x11, 0x09, 0xab, 0xc0, 0x1f, 0x36, 0x20, 0xc7, 0xfa, 0xb8, 0xee, - 0xd8, 0x36, 0x36, 0x7c, 0xd3, 0xb1, 0x57, 0x1e, 0x3f, 0x55, 0x30, 0x7e, 0xd5, 0xb8, 0x79, 0x19, - 0xfb, 0x99, 0x3b, 0x84, 0xa7, 0xa2, 0x21, 0x5c, 0x06, 0x74, 0xce, 0x28, 0x22, 0x0d, 0x76, 0xb1, - 0x6d, 0xb8, 0xd7, 0x03, 0xa2, 0xc9, 0x80, 0x37, 0x29, 0xf0, 0x47, 0x4b, 0x00, 0x37, 0x43, 0xcb, - 0x31, 0x78, 0x16, 0x4f, 0x08, 0xbf, 0xdd, 0x59, 0x97, 0x6b, 0xb0, 0x27, 0x08, 0x72, 0xa5, 0x75, - 0xf1, 0x37, 0x09, 0x92, 0x2c, 0x73, 0x84, 0x60, 0xc3, 0xd6, 0xfb, 0x41, 0x6f, 0xd1, 0xdf, 0xb4, - 0x33, 0xf0, 0xc8, 0x34, 0xc2, 0x0e, 0x60, 0x27, 0xf4, 0x04, 0x00, 0x93, 0x96, 0xd3, 0x7a, 0xa6, - 0xf7, 0x26, 0xbf, 0x41, 0x5b, 0xfa, 0xdd, 0xd9, 0x9a, 0x86, 0x6d, 0xa9, 0xa6, 0x70, 0xd8, 0xa1, - 0x4f, 0x01, 0x8c, 0xb0, 0xca, 0xf9, 0x4d, 0x6a, 0xab, 0x2c, 0x7e, 0x1f, 0x6a, 0xc4, 0x4a, 0xf9, - 0xaf, 0x04, 0xb9, 0x0e, 0xf6, 0xbf, 0x70, 0xdc, 0x37, 0x2d, 0xdb, 0xc7, 0xee, 0x85, 0x6e, 0x88, - 0x13, 0x28, 0x00, 0xd8, 0x4c, 0x4f, 0x33, 0x7b, 0x3c, 0x89, 0x14, 0x97, 0xb4, 0x7a, 0xa4, 0x54, - 0xe6, 0x80, 0xb5, 0x70, 0x4a, 0x25, 0x3f, 0xa7, 0x7a, 0x3b, 0xb6, 0x0d, 0xa7, 0x9d, 0xcf, 0xeb, - 0xed, 0xff, 0xb3, 0x4b, 0x94, 0xbf, 0x26, 0x20, 0x1d, 0xd9, 0x28, 0xe8, 0x11, 0x6c, 0x0e, 0x9c, - 0x2f, 0xf8, 0xb4, 0x66, 0xab, 0xef, 0xcc, 0x46, 0xf7, 0x92, 0x3c, 0x56, 0x99, 0x16, 0x3a, 0x0a, - 0x96, 0x46, 0x22, 0xee, 0x35, 0x85, 0x0b, 0x86, 0x6f, 0x14, 0x12, 0x8b, 0x41, 0xd6, 0x2f, 0x5d, - 0x56, 0x29, 0x95, 0x1d, 0xd0, 0x77, 0x61, 0xc7, 0xbc, 0xb4, 0xcd, 0xf1, 0x2c, 0x6d, 0xd0, 0x6e, - 0xca, 0x04, 0x42, 0x3a, 0x72, 0x55, 0xd8, 0x1a, 0xd1, 0x37, 0xe7, 0xf1, 0x51, 0xcb, 0xc7, 0xbd, - 0x5a, 0x35, 0x50, 0x44, 0x3f, 0x01, 0x14, 0xbe, 0xa4, 0xa0, 0xa0, 0x5e, 0x3e, 0x49, 0xcd, 0x95, - 0xc5, 0xb5, 0x57, 0x6f, 0xd9, 0x53, 0x12, 0x4f, 0xf9, 0x73, 0x22, 0xa4, 0x41, 0xb6, 0x50, 0x51, - 0x05, 0xf6, 0x9c, 0xae, 0x87, 0xdd, 0x11, 0xee, 0x69, 0x97, 0xd8, 0xc6, 0xae, 0x4e, 0xfb, 0x8f, - 0x6d, 0x48, 0x14, 0x3c, 0xfa, 0x2c, 0x7c, 0x82, 0x7e, 0x00, 0x9b, 0x64, 0x07, 0xb3, 0xba, 0x65, - 0xab, 0xc5, 0xb9, 0x1b, 0x1b, 0xab, 0x4c, 0x19, 0xbd, 0x0b, 0x29, 0x5a, 0x43, 0xcd, 0xc5, 0x17, - 0xbc, 0x7c, 0xdb, 0x54, 0xa0, 0xe2, 0x0b, 0xf4, 0xc9, 0xb8, 0x38, 0xac, 0xb3, 0x8a, 0xb1, 0xb7, - 0x0c, 0xc6, 0x02, 0x61, 0x89, 0x5e, 0x0b, 0x4b, 0xc4, 0x2a, 0xfc, 0x60, 0x71, 0x89, 0x38, 0x9c, - 0xa0, 0x50, 0x0e, 0x64, 0xa2, 0x1e, 0xe3, 0xb6, 0x80, 0x90, 0x07, 0x1e, 0x07, 0x15, 0x5a, 0xa7, - 0x15, 0x2a, 0xcc, 0x4b, 0x26, 0x28, 0x90, 0xf2, 0x7b, 0x09, 0x0e, 0xc4, 0xe1, 0xad, 0xe4, 0xfb, - 0xd3, 0x49, 0xdf, 0xf7, 0x97, 0xab, 0x41, 0x18, 0x85, 0x0b, 0x99, 0xe8, 0x3d, 0x43, 0xe8, 0xba, - 0x03, 0x19, 0x23, 0x72, 0xff, 0xe0, 0xf3, 0x73, 0x18, 0xdb, 0x07, 0x33, 0x37, 0x16, 0x75, 0xc2, - 0x5e, 0x19, 0x02, 0x8a, 0x6a, 0xf2, 0xa4, 0xeb, 0xb0, 0xc3, 0x01, 0x35, 0x36, 0x73, 0xec, 0x32, - 0x52, 0x9c, 0xef, 0x46, 0xcd, 0xf4, 0xa3, 0xe1, 0xcb, 0xb0, 0xfd, 0xf9, 0x50, 0xb7, 0x7d, 0xd3, - 0xbf, 0xe6, 0xf7, 0x9e, 0xf0, 0xac, 0x1c, 0x42, 0xf6, 0x1c, 0xbb, 0x1e, 0x59, 0xa1, 0xf8, 0xf3, - 0x21, 0xf6, 0x7c, 0x94, 0x87, 0xad, 0x11, 0x93, 0xf0, 0x7c, 0x83, 0xa3, 0xf2, 0x4b, 0xd8, 0x0d, - 0x75, 0xbd, 0x81, 0x63, 0x7b, 0x98, 0x5c, 0xab, 0xdc, 0xa1, 0xed, 0x9b, 0x7d, 0xac, 0x45, 0x2a, - 0x94, 0xe6, 0xb2, 0x0e, 0x29, 0xd4, 0x7d, 0xd8, 0x0d, 0x54, 0x02, 0x5c, 0xf6, 0xb2, 0xb2, 0x5c, - 0xcc, 0x31, 0x95, 0x0e, 0xec, 0x1d, 0x9b, 0x9e, 0xcf, 0x13, 0xf1, 0x82, 0x78, 0x3e, 0x86, 0xe4, - 0x05, 0xbd, 0x62, 0xf2, 0xdc, 0xef, 0x2e, 0xb8, 0x89, 0xaa, 0x5c, 0x5d, 0x69, 0xc3, 0xfe, 0x24, - 0x1e, 0x8f, 0xf9, 0x43, 0xd8, 0xe6, 0x08, 0xa4, 0x9c, 0x64, 0x46, 0xee, 0xc4, 0x42, 0xaa, 0xa1, - 0xaa, 0xf2, 0x02, 0xf6, 0xeb, 0x2e, 0xd6, 0x7d, 0x1c, 0x3c, 0xe2, 0xf1, 0x3d, 0x86, 0x2d, 0xae, - 0xc3, 0x03, 0x9c, 0x83, 0x16, 0x68, 0x2a, 0xc7, 0x70, 0x7b, 0x0a, 0x8c, 0x07, 0xf7, 0x56, 0x68, - 0x1f, 0xc2, 0x7e, 0x03, 0x5b, 0x78, 0x26, 0xb4, 0x02, 0x40, 0xd0, 0x3d, 0xe1, 0x25, 0x3f, 0xc5, - 0x25, 0xad, 0x9e, 0xf2, 0x0e, 0xdc, 0x9e, 0x32, 0x63, 0x41, 0x28, 0xff, 0x91, 0xe0, 0xee, 0xab, - 0x41, 0x6f, 0x1c, 0x5e, 0xcd, 0xb6, 0x1d, 0x9f, 0x2e, 0x3e, 0x6f, 0x39, 0x6c, 0xd4, 0x83, 0xb4, - 0x3e, 0x36, 0xe2, 0x1f, 0x11, 0x4f, 0x67, 0x73, 0x59, 0xe0, 0xa6, 0x1c, 0x11, 0x31, 0xea, 0x8c, - 0xc2, 0xca, 0x3f, 0x82, 0xdc, 0xb4, 0xc2, 0x4a, 0xe4, 0xa9, 0x40, 0x29, 0x3e, 0x00, 0x5e, 0x0c, - 0x13, 0xee, 0x4c, 0xe8, 0x30, 0xfa, 0x5c, 0xae, 0x0a, 0x21, 0x19, 0x27, 0x96, 0x21, 0x63, 0xe5, - 0x3b, 0x20, 0x8b, 0x5c, 0xf1, 0x40, 0x2e, 0x60, 0xaf, 0xe6, 0xfb, 0xba, 0x71, 0xc5, 0x19, 0x72, - 0xb9, 0x10, 0x3e, 0x80, 0x24, 0xa3, 0x09, 0xbe, 0xa1, 0xe2, 0x19, 0x97, 0xeb, 0x29, 0x07, 0xb0, - 0x3f, 0xe9, 0x87, 0xfb, 0x7f, 0x0e, 0x7b, 0x0d, 0xbc, 0xb2, 0xff, 0x60, 0x77, 0x26, 0xc6, 0xbb, - 0x93, 0x78, 0x98, 0x44, 0xe2, 0x1e, 0xfe, 0x28, 0x41, 0x81, 0xb9, 0x9e, 0x61, 0xf1, 0xe5, 0x9c, - 0x9d, 0xc0, 0xad, 0x19, 0x22, 0xe4, 0x79, 0x2f, 0x73, 0x55, 0xc8, 0x4d, 0x33, 0xa0, 0x52, 0x82, - 0x62, 0x5c, 0x40, 0x3c, 0x66, 0x15, 0x0a, 0x2c, 0x97, 0xb7, 0x0c, 0x59, 0x54, 0x9f, 0x12, 0x14, - 0xe3, 0x30, 0xb9, 0xd7, 0x5d, 0xd8, 0xe1, 0xac, 0xcd, 0xbc, 0x28, 0x57, 0x90, 0x0d, 0x04, 0x7c, - 0x93, 0x9c, 0xc3, 0xfe, 0x04, 0x75, 0x68, 0xfc, 0x13, 0x93, 0xad, 0xbc, 0xf7, 0xe6, 0x33, 0x08, - 0xc7, 0x42, 0xfd, 0x19, 0x99, 0xf2, 0x10, 0xd2, 0xcd, 0x5f, 0x63, 0x63, 0xc9, 0x1d, 0x53, 0x82, - 0x0c, 0xd3, 0xe6, 0x51, 0xe5, 0x60, 0x7d, 0xe8, 0x5a, 0xc1, 0x74, 0x0e, 0x5d, 0xeb, 0xf0, 0x3d, - 0xd8, 0xa4, 0x7d, 0x8e, 0x32, 0xb0, 0xfd, 0xf2, 0xe4, 0x75, 0x53, 0xd5, 0x4e, 0x3a, 0xb9, 0x35, - 0xb4, 0x03, 0x29, 0x7e, 0x7a, 0xf6, 0x2c, 0x27, 0x1d, 0x7e, 0x04, 0xe9, 0xc8, 0x75, 0x01, 0x21, - 0xc8, 0x9e, 0x9f, 0x1c, 0xbf, 0x6a, 0x37, 0xb5, 0x97, 0xcd, 0x4e, 0xa3, 0xd5, 0xf9, 0x2c, 0xb7, - 0x86, 0xf6, 0x60, 0x97, 0xcb, 0x6a, 0x67, 0x67, 0xb5, 0xfa, 0xf3, 0x66, 0x23, 0x27, 0x1d, 0x9e, - 0xc3, 0x6d, 0x21, 0xd5, 0xa3, 0x02, 0xdc, 0xe9, 0x34, 0xcf, 0x5e, 0x9f, 0xa8, 0x2f, 0xb4, 0x56, - 0xe7, 0xac, 0xa9, 0x3e, 0xab, 0xd5, 0xa3, 0x60, 0x45, 0x90, 0x67, 0x1f, 0x47, 0x70, 0x2f, 0xc3, - 0x2b, 0x02, 0x83, 0xdb, 0x83, 0xdd, 0x76, 0xad, 0xfe, 0xbc, 0xd5, 0x99, 0x8a, 0x28, 0x10, 0xaa, - 0xaf, 0x3a, 0x1d, 0x22, 0x94, 0xd0, 0x6d, 0xb8, 0x15, 0x08, 0x4f, 0x5f, 0x9d, 0x12, 0xe5, 0x66, - 0x23, 0x97, 0x40, 0x07, 0x80, 0x02, 0xf1, 0x59, 0x53, 0x6d, 0xb7, 0x3a, 0xb5, 0xb3, 0x66, 0x23, - 0xb7, 0x5e, 0xfd, 0x3a, 0x05, 0xd9, 0x60, 0x3f, 0x33, 0xbe, 0x44, 0x2f, 0x61, 0x8b, 0x73, 0x26, - 0x2a, 0x09, 0xa6, 0x79, 0x82, 0xce, 0xe5, 0x7b, 0x73, 0x34, 0x78, 0x33, 0xad, 0x21, 0x0d, 0x32, - 0x51, 0xaa, 0x44, 0xdf, 0x9b, 0x35, 0x12, 0x50, 0xb3, 0xfc, 0xfe, 0x22, 0xb5, 0xd0, 0x41, 0x17, - 0x76, 0x26, 0xf8, 0x0e, 0x09, 0x4c, 0x45, 0xec, 0x2a, 0xdf, 0x5f, 0xa8, 0x17, 0xf5, 0x31, 0x41, - 0x67, 0x22, 0x1f, 0x22, 0x9a, 0x14, 0xf9, 0x10, 0xf3, 0xe2, 0x1a, 0xfa, 0x9d, 0x04, 0xf9, 0x38, - 0xc6, 0x40, 0x47, 0x2b, 0xd3, 0x9b, 0x5c, 0x5d, 0xc5, 0x84, 0x8f, 0x90, 0x03, 0x68, 0x96, 0x25, - 0xd0, 0xf7, 0x17, 0x20, 0x45, 0x69, 0x4b, 0x7e, 0xb8, 0x9c, 0x32, 0x77, 0xa8, 0x41, 0x26, 0x4a, - 0x08, 0xa2, 0xee, 0x10, 0x10, 0x93, 0xa8, 0x3b, 0x84, 0xbc, 0x42, 0xdb, 0x2f, 0xca, 0x07, 0x22, - 0x07, 0x02, 0xe6, 0x91, 0xdf, 0x5f, 0xa4, 0x16, 0x3a, 0xf8, 0x12, 0x0e, 0xc4, 0x6b, 0x1c, 0x55, - 0xe2, 0x82, 0x8c, 0x59, 0xe7, 0xf2, 0x07, 0xcb, 0x1b, 0xf0, 0xf2, 0x7d, 0x09, 0x07, 0xe2, 0x6d, - 0x2e, 0x72, 0x3e, 0x97, 0x4b, 0x44, 0xce, 0xe7, 0x13, 0x05, 0x7a, 0x01, 0x49, 0xfe, 0x29, 0x21, - 0xb8, 0x37, 0x4f, 0x50, 0x88, 0x5c, 0x8a, 0x57, 0xe0, 0x60, 0x4d, 0xd8, 0x20, 0xcb, 0x1c, 0x09, - 0xbe, 0xe5, 0x22, 0x94, 0x20, 0x17, 0xe3, 0x1e, 0x33, 0x98, 0xa7, 0x3f, 0xfd, 0xea, 0x9b, 0xa2, - 0xf4, 0xcf, 0x6f, 0x8a, 0x6b, 0xbf, 0xbd, 0x29, 0x4a, 0x5f, 0xdd, 0x14, 0xa5, 0xaf, 0x6f, 0x8a, - 0xd2, 0xbf, 0x6e, 0x8a, 0xd2, 0x9f, 0xfe, 0x5d, 0x5c, 0xfb, 0xf9, 0x93, 0x15, 0xfe, 0x40, 0x60, - 0x6e, 0xc2, 0xff, 0x10, 0xba, 0x49, 0xfa, 0x07, 0xc2, 0xe3, 0xff, 0x05, 0x00, 0x00, 0xff, 0xff, - 0xd7, 0x93, 0x87, 0xc8, 0xd1, 0x18, 0x00, 0x00, + 0xb6, 0x9d, 0xd0, 0xda, 0x1b, 0x97, 0xfd, 0x43, 0x67, 0x96, 0xc1, 0xb5, 0xdd, 0xad, 0xa7, 0xb1, + 0x53, 0x94, 0x34, 0x05, 0x06, 0x46, 0x23, 0xcb, 0x37, 0x89, 0xa8, 0x2c, 0x79, 0x25, 0xd9, 0x4b, + 0xd8, 0x17, 0xf8, 0x00, 0x0c, 0xbc, 0xf0, 0x15, 0x78, 0x86, 0x19, 0x1e, 0xf9, 0x00, 0xfb, 0xb8, + 0x6f, 0xf0, 0xc8, 0x86, 0x19, 0x1e, 0xf8, 0x14, 0xcc, 0xfd, 0x23, 0x59, 0xb6, 0xaf, 0xfc, 0xa7, + 0x3c, 0xec, 0x9b, 0xef, 0xd1, 0x39, 0xbf, 0xf3, 0x47, 0xe7, 0x9c, 0xdf, 0xd5, 0x18, 0x52, 0xfa, + 0xc0, 0x2c, 0x0f, 0x5c, 0xc7, 0x77, 0x50, 0xae, 0xaf, 0x1b, 0x57, 0xa6, 0x8d, 0xcb, 0xa3, 0x23, + 0xdd, 0x1a, 0x5c, 0xe9, 0x47, 0xf2, 0xa3, 0x4b, 0xd3, 0xbf, 0x1a, 0x76, 0xcb, 0x86, 0xd3, 0xaf, + 0x5c, 0x3a, 0x97, 0x4e, 0x85, 0x2a, 0x76, 0x87, 0x17, 0xf4, 0x44, 0x0f, 0xf4, 0x17, 0x03, 0x90, + 0x6b, 0x11, 0x75, 0xd3, 0x75, 0x6c, 0xc3, 0x71, 0xf1, 0xa3, 0x1e, 0x1e, 0x85, 0x87, 0x8a, 0xe9, + 0x9a, 0x15, 0x7d, 0x60, 0x7a, 0x95, 0x3e, 0xf6, 0xf5, 0x4a, 0xe0, 0xa7, 0x12, 0xc6, 0xa0, 0xfc, + 0x23, 0x01, 0x70, 0xee, 0x58, 0xc3, 0x3e, 0x3e, 0x1d, 0x60, 0x03, 0x1d, 0x40, 0xb2, 0xe7, 0x9a, + 0x23, 0xec, 0xe6, 0xa5, 0x92, 0xf4, 0x20, 0xa5, 0xf2, 0x13, 0x91, 0x5f, 0xe9, 0x76, 0xcf, 0xc2, + 0xf9, 0x04, 0x93, 0xb3, 0x13, 0x3a, 0x06, 0xd0, 0x7d, 0xdf, 0x35, 0xbb, 0x43, 0x1f, 0x7b, 0xf9, + 0xf5, 0xd2, 0xfa, 0x83, 0x74, 0xf5, 0x61, 0x79, 0x3a, 0xaf, 0xf2, 0xd8, 0x43, 0xb9, 0x16, 0xaa, + 0x37, 0x6d, 0xdf, 0xbd, 0x56, 0x23, 0xf6, 0xa8, 0x0d, 0x69, 0x0f, 0x1b, 0x2e, 0xf6, 0xb5, 0x9e, + 0xee, 0xeb, 0xf9, 0x8d, 0x25, 0xe0, 0x4e, 0xa9, 0x7e, 0x43, 0xf7, 0x75, 0x0e, 0xe7, 0x85, 0x02, + 0xf9, 0x53, 0xd8, 0x9d, 0xf2, 0x86, 0x72, 0xb0, 0xfe, 0x06, 0x5f, 0xf3, 0xe4, 0xc8, 0x4f, 0xb4, + 0x0f, 0x9b, 0x23, 0xdd, 0x1a, 0x06, 0x89, 0xb1, 0xc3, 0x93, 0xc4, 0x27, 0x12, 0x31, 0x9f, 0x42, + 0x5f, 0x64, 0x9e, 0x89, 0x98, 0x2b, 0x7f, 0x97, 0x60, 0xa7, 0xcd, 0x22, 0x7f, 0x66, 0x5a, 0x3e, + 0x76, 0x51, 0x16, 0x12, 0x66, 0x8f, 0x1b, 0x27, 0xcc, 0x1e, 0xfa, 0x19, 0x64, 0x2d, 0xbd, 0x8b, + 0x2d, 0xcd, 0xc3, 0x16, 0x36, 0x7c, 0xc7, 0xcd, 0x27, 0x68, 0xc6, 0xd5, 0xd9, 0x8c, 0x27, 0x80, + 0xca, 0xc7, 0xc4, 0xea, 0x94, 0x1b, 0xb1, 0xbc, 0x77, 0xac, 0xa8, 0x4c, 0xfe, 0x31, 0xa0, 0x59, + 0xa5, 0x55, 0xb2, 0x57, 0x7e, 0x01, 0x79, 0xee, 0xb4, 0x6e, 0xe9, 0x9e, 0x57, 0xd7, 0x07, 0x7a, + 0xd7, 0xb4, 0x4c, 0xdf, 0xc4, 0x1e, 0x2a, 0x00, 0x18, 0x83, 0xa1, 0xd6, 0x37, 0x2d, 0xcb, 0xf4, + 0x28, 0xdc, 0xba, 0x9a, 0x32, 0x06, 0xc3, 0x36, 0x15, 0xa0, 0x7b, 0x90, 0xe9, 0xe3, 0xbe, 0xe3, + 0x5e, 0x6b, 0xdd, 0x6b, 0xd2, 0x16, 0x09, 0xaa, 0x90, 0x66, 0xb2, 0xa7, 0x44, 0xa4, 0xfc, 0x45, + 0x82, 0x2d, 0x0e, 0x8f, 0x7e, 0x08, 0xdb, 0xa4, 0x3b, 0xe9, 0x2b, 0x27, 0x58, 0xe9, 0x6a, 0xa1, + 0x4c, 0x04, 0xe3, 0xec, 0x4f, 0xba, 0xbf, 0xc2, 0x86, 0xdf, 0xe6, 0x4a, 0x6a, 0xa8, 0x8e, 0x8e, + 0x60, 0xc3, 0x1b, 0x60, 0x83, 0x7a, 0xa0, 0x66, 0x31, 0x75, 0x23, 0xad, 0xa2, 0x52, 0x55, 0xf4, + 0x31, 0x24, 0x3d, 0x5f, 0xf7, 0x87, 0xa4, 0x5b, 0x89, 0xd1, 0xdd, 0x78, 0x23, 0xaa, 0xa6, 0x72, + 0x75, 0xe5, 0x1e, 0xa4, 0x5a, 0x7d, 0xfd, 0x92, 0xcd, 0xc9, 0x3e, 0x6c, 0x9a, 0xe4, 0xc0, 0x6b, + 0xc9, 0x0e, 0xca, 0x21, 0xa4, 0x9a, 0xfd, 0x81, 0x7f, 0xdd, 0x30, 0xbd, 0x37, 0xa4, 0x48, 0x9e, + 0xf9, 0x1b, 0xcc, 0x6b, 0xc0, 0x8b, 0x44, 0x24, 0xac, 0x02, 0xbf, 0xdf, 0x80, 0x1c, 0xeb, 0xe3, + 0xba, 0x63, 0xdb, 0xd8, 0xf0, 0x4d, 0xc7, 0x5e, 0x79, 0xfc, 0x54, 0xc1, 0xf8, 0x55, 0xe3, 0xe6, + 0x65, 0xec, 0x67, 0xee, 0x10, 0x9e, 0x8a, 0x86, 0x70, 0x19, 0xd0, 0x39, 0xa3, 0x88, 0x34, 0xd8, + 0xc5, 0xb6, 0xe1, 0x5e, 0x0f, 0x88, 0x26, 0x03, 0xde, 0xa4, 0xc0, 0x1f, 0x2d, 0x01, 0xdc, 0x0c, + 0x2d, 0xc7, 0xe0, 0x59, 0x3c, 0x21, 0xfc, 0x76, 0x67, 0x5d, 0xae, 0xc1, 0x9e, 0x20, 0xc8, 0x95, + 0xd6, 0xc5, 0xdf, 0x24, 0x48, 0xb2, 0xcc, 0x11, 0x82, 0x0d, 0x5b, 0xef, 0x07, 0xbd, 0x45, 0x7f, + 0xd3, 0xce, 0xc0, 0x23, 0xd3, 0x08, 0x3b, 0x80, 0x9d, 0xd0, 0x13, 0x00, 0x4c, 0x5a, 0x4e, 0xeb, + 0x99, 0xde, 0x9b, 0xfc, 0x06, 0x6d, 0xe9, 0x77, 0x67, 0x6b, 0x1a, 0xb6, 0xa5, 0x9a, 0xc2, 0x61, + 0x87, 0x3e, 0x05, 0x30, 0xc2, 0x2a, 0xe7, 0x37, 0xa9, 0xad, 0xb2, 0xf8, 0x7d, 0xa8, 0x11, 0x2b, + 0xe5, 0xbf, 0x12, 0xe4, 0x3a, 0xd8, 0xff, 0xc2, 0x71, 0xdf, 0xb4, 0x6c, 0x1f, 0xbb, 0x17, 0xba, + 0x21, 0x4e, 0xa0, 0x00, 0x60, 0x33, 0x3d, 0xcd, 0xec, 0xf1, 0x24, 0x52, 0x5c, 0xd2, 0xea, 0x91, + 0x52, 0x99, 0x03, 0xd6, 0xc2, 0x29, 0x95, 0xfc, 0x9c, 0xea, 0xed, 0xd8, 0x36, 0x9c, 0x76, 0x3e, + 0xaf, 0xb7, 0xff, 0xcf, 0x2e, 0x51, 0xfe, 0x9a, 0x80, 0x74, 0x64, 0xa3, 0xa0, 0x47, 0xb0, 0x39, + 0x70, 0xbe, 0xe0, 0xd3, 0x9a, 0xad, 0xbe, 0x33, 0x1b, 0xdd, 0x4b, 0xf2, 0x58, 0x65, 0x5a, 0xe8, + 0x28, 0x58, 0x1a, 0x89, 0xb8, 0xd7, 0x14, 0x2e, 0x18, 0xbe, 0x51, 0x48, 0x2c, 0x06, 0x59, 0xbf, + 0x74, 0x59, 0xa5, 0x54, 0x76, 0x40, 0xdf, 0x85, 0x1d, 0xf3, 0xd2, 0x36, 0xc7, 0xb3, 0xb4, 0x41, + 0xbb, 0x29, 0x13, 0x08, 0xe9, 0xc8, 0x55, 0x61, 0x6b, 0x44, 0xdf, 0x9c, 0xc7, 0x47, 0x2d, 0x1f, + 0xf7, 0x6a, 0xd5, 0x40, 0x11, 0xfd, 0x04, 0x50, 0xf8, 0x92, 0x82, 0x82, 0x7a, 0xf9, 0x24, 0x35, + 0x57, 0x16, 0xd7, 0x5e, 0xbd, 0x65, 0x4f, 0x49, 0x3c, 0xe5, 0xcf, 0x89, 0x90, 0x06, 0xd9, 0x42, + 0x45, 0x15, 0xd8, 0x73, 0xba, 0x1e, 0x76, 0x47, 0xb8, 0xa7, 0x5d, 0x62, 0x1b, 0xbb, 0x3a, 0xed, + 0x3f, 0xb6, 0x21, 0x51, 0xf0, 0xe8, 0xb3, 0xf0, 0x09, 0xfa, 0x01, 0x6c, 0x92, 0x1d, 0xcc, 0xea, + 0x96, 0xad, 0x16, 0xe7, 0x6e, 0x6c, 0xac, 0x32, 0x65, 0xf4, 0x2e, 0xa4, 0x68, 0x0d, 0x35, 0x17, + 0x5f, 0xf0, 0xf2, 0x6d, 0x53, 0x81, 0x8a, 0x2f, 0xd0, 0x27, 0xe3, 0xe2, 0xb0, 0xce, 0x2a, 0xc6, + 0xde, 0x32, 0x18, 0x0b, 0x84, 0x25, 0x7a, 0x2d, 0x2c, 0x11, 0xab, 0xf0, 0x83, 0xc5, 0x25, 0xe2, + 0x70, 0x82, 0x42, 0x39, 0x90, 0x89, 0x7a, 0x8c, 0xdb, 0x02, 0x42, 0x1e, 0x78, 0x1c, 0x54, 0x68, + 0x9d, 0x56, 0xa8, 0x30, 0x2f, 0x99, 0xa0, 0x40, 0xca, 0x9f, 0x24, 0x38, 0x10, 0x87, 0xb7, 0x92, + 0xef, 0x4f, 0x27, 0x7d, 0xdf, 0x5f, 0xae, 0x06, 0xe1, 0x6b, 0xe2, 0x83, 0xbf, 0x11, 0x0e, 0xbe, + 0xe2, 0x42, 0x26, 0x7a, 0xf3, 0x10, 0x06, 0xd3, 0x81, 0x8c, 0x11, 0xb9, 0x91, 0xf0, 0x89, 0x3a, + 0x8c, 0xed, 0x8c, 0x99, 0x3b, 0x8c, 0x3a, 0x61, 0xaf, 0x0c, 0x01, 0x45, 0x35, 0x79, 0x19, 0xea, + 0xb0, 0xc3, 0x01, 0x35, 0x36, 0x85, 0xec, 0x7a, 0x52, 0x9c, 0xef, 0x46, 0xcd, 0xf4, 0xa3, 0xe1, + 0xcb, 0xb0, 0xfd, 0xf9, 0x50, 0xb7, 0x7d, 0xd3, 0xbf, 0xe6, 0x37, 0xa1, 0xf0, 0xac, 0x1c, 0x42, + 0xf6, 0x1c, 0xbb, 0x1e, 0x59, 0xaa, 0xf8, 0xf3, 0x21, 0xf6, 0x7c, 0x94, 0x87, 0xad, 0x11, 0x93, + 0xf0, 0x7c, 0x83, 0xa3, 0xf2, 0x4b, 0xd8, 0x0d, 0x75, 0xbd, 0x81, 0x63, 0x7b, 0x98, 0x5c, 0xb4, + 0xdc, 0xa1, 0xed, 0x9b, 0x7d, 0xac, 0x45, 0x2a, 0x94, 0xe6, 0xb2, 0x0e, 0x29, 0xd4, 0x7d, 0xd8, + 0x0d, 0x54, 0x02, 0x5c, 0xf6, 0xfa, 0xb2, 0x5c, 0xcc, 0x31, 0x95, 0x0e, 0xec, 0x1d, 0x9b, 0x9e, + 0xcf, 0x13, 0xf1, 0x82, 0x78, 0x3e, 0x86, 0xe4, 0x05, 0xbd, 0x74, 0xf2, 0xdc, 0xef, 0x2e, 0xb8, + 0x9b, 0xaa, 0x5c, 0x5d, 0x69, 0xc3, 0xfe, 0x24, 0x1e, 0x8f, 0xf9, 0x43, 0xd8, 0xe6, 0x08, 0xa4, + 0x9c, 0x64, 0x6a, 0xee, 0xc4, 0x42, 0xaa, 0xa1, 0xaa, 0xf2, 0x02, 0xf6, 0xeb, 0x2e, 0xd6, 0x7d, + 0x1c, 0x3c, 0xe2, 0xf1, 0x3d, 0x86, 0x2d, 0xae, 0xc3, 0x03, 0x9c, 0x83, 0x16, 0x68, 0x2a, 0xc7, + 0x70, 0x7b, 0x0a, 0x8c, 0x07, 0xf7, 0x56, 0x68, 0x1f, 0xc2, 0x7e, 0x03, 0x5b, 0x78, 0x26, 0xb4, + 0x02, 0x40, 0xd0, 0x3d, 0xe1, 0xb5, 0x3f, 0xc5, 0x25, 0xad, 0x9e, 0xf2, 0x0e, 0xdc, 0x9e, 0x32, + 0x63, 0x41, 0x28, 0xff, 0x91, 0xe0, 0xee, 0xab, 0x41, 0x6f, 0x1c, 0x5e, 0xcd, 0xb6, 0x1d, 0x9f, + 0xae, 0x42, 0x6f, 0x39, 0x6c, 0xd4, 0x83, 0xb4, 0x3e, 0x36, 0xe2, 0x9f, 0x15, 0x4f, 0x67, 0x73, + 0x59, 0xe0, 0xa6, 0x1c, 0x11, 0x31, 0x32, 0x8d, 0xc2, 0xca, 0x3f, 0x82, 0xdc, 0xb4, 0xc2, 0x4a, + 0x74, 0xaa, 0x40, 0x29, 0x3e, 0x00, 0x5e, 0x0c, 0x13, 0xee, 0x4c, 0xe8, 0x30, 0x42, 0x5d, 0xae, + 0x0a, 0x21, 0x3d, 0x27, 0x96, 0xa1, 0x67, 0xe5, 0x3b, 0x20, 0x8b, 0x5c, 0xf1, 0x40, 0x2e, 0x60, + 0xaf, 0xe6, 0xfb, 0xba, 0x71, 0xc5, 0x39, 0x73, 0xb9, 0x10, 0x3e, 0x80, 0x24, 0x23, 0x0e, 0xbe, + 0xa1, 0xe2, 0x39, 0x98, 0xeb, 0x29, 0x07, 0xb0, 0x3f, 0xe9, 0x87, 0xfb, 0x7f, 0x0e, 0x7b, 0x0d, + 0xbc, 0xb2, 0xff, 0x60, 0x77, 0x26, 0xc6, 0xbb, 0x93, 0x78, 0x98, 0x44, 0xe2, 0x1e, 0xfe, 0x20, + 0x41, 0x81, 0xb9, 0x9e, 0xe1, 0xf5, 0xe5, 0x9c, 0x9d, 0xc0, 0xad, 0x19, 0x6a, 0xe4, 0x79, 0x2f, + 0x73, 0x79, 0xc8, 0x4d, 0x73, 0xa2, 0x52, 0x82, 0x62, 0x5c, 0x40, 0x3c, 0x66, 0x15, 0x0a, 0x2c, + 0x97, 0xb7, 0x0c, 0x59, 0x54, 0x9f, 0x12, 0x14, 0xe3, 0x30, 0xb9, 0xd7, 0x5d, 0xd8, 0xe1, 0x3c, + 0xce, 0xbc, 0x28, 0x57, 0x90, 0x0d, 0x04, 0x7c, 0x93, 0x9c, 0xc3, 0xfe, 0x04, 0x75, 0x68, 0xfc, + 0xa3, 0x93, 0xad, 0xbc, 0xf7, 0xe6, 0x33, 0x08, 0xc7, 0x42, 0xfd, 0x19, 0x99, 0xf2, 0x10, 0xd2, + 0xcd, 0x5f, 0x63, 0x63, 0xc9, 0x1d, 0x53, 0x82, 0x0c, 0xd3, 0xe6, 0x51, 0xe5, 0x60, 0x7d, 0xe8, + 0x5a, 0xc1, 0x74, 0x0e, 0x5d, 0xeb, 0xf0, 0x3d, 0xd8, 0xa4, 0x7d, 0x8e, 0x32, 0xb0, 0xfd, 0xf2, + 0xe4, 0x75, 0x53, 0xd5, 0x4e, 0x3a, 0xb9, 0x35, 0xb4, 0x03, 0x29, 0x7e, 0x7a, 0xf6, 0x2c, 0x27, + 0x1d, 0x7e, 0x04, 0xe9, 0xc8, 0x05, 0x02, 0x21, 0xc8, 0x9e, 0x9f, 0x1c, 0xbf, 0x6a, 0x37, 0xb5, + 0x97, 0xcd, 0x4e, 0xa3, 0xd5, 0xf9, 0x2c, 0xb7, 0x86, 0xf6, 0x60, 0x97, 0xcb, 0x6a, 0x67, 0x67, + 0xb5, 0xfa, 0xf3, 0x66, 0x23, 0x27, 0x1d, 0x9e, 0xc3, 0x6d, 0x21, 0xf9, 0xa3, 0x02, 0xdc, 0xe9, + 0x34, 0xcf, 0x5e, 0x9f, 0xa8, 0x2f, 0xb4, 0x56, 0xe7, 0xac, 0xa9, 0x3e, 0xab, 0xd5, 0xa3, 0x60, + 0x45, 0x90, 0x67, 0x1f, 0x47, 0x70, 0x2f, 0xc3, 0x2b, 0x02, 0x83, 0xdb, 0x83, 0xdd, 0x76, 0xad, + 0xfe, 0xbc, 0xd5, 0x99, 0x8a, 0x28, 0x10, 0xaa, 0xaf, 0x3a, 0x1d, 0x22, 0x94, 0xd0, 0x6d, 0xb8, + 0x15, 0x08, 0x4f, 0x5f, 0x9d, 0x12, 0xe5, 0x66, 0x23, 0x97, 0x40, 0x07, 0x80, 0x02, 0xf1, 0x59, + 0x53, 0x6d, 0xb7, 0x3a, 0xb5, 0xb3, 0x66, 0x23, 0xb7, 0x5e, 0xfd, 0x3a, 0x05, 0xd9, 0x60, 0x3f, + 0x33, 0xbe, 0x44, 0x2f, 0x61, 0x8b, 0x73, 0x26, 0x2a, 0x09, 0xa6, 0x79, 0x82, 0xce, 0xe5, 0x7b, + 0x73, 0x34, 0x78, 0x33, 0xad, 0x21, 0x0d, 0x32, 0x51, 0xaa, 0x44, 0xdf, 0x9b, 0x35, 0x12, 0x50, + 0xb3, 0xfc, 0xfe, 0x22, 0xb5, 0xd0, 0x41, 0x17, 0x76, 0x26, 0xf8, 0x0e, 0x09, 0x4c, 0x45, 0xec, + 0x2a, 0xdf, 0x5f, 0xa8, 0x17, 0xf5, 0x31, 0x41, 0x67, 0x22, 0x1f, 0x22, 0x9a, 0x14, 0xf9, 0x10, + 0xf3, 0xe2, 0x1a, 0xfa, 0x9d, 0x04, 0xf9, 0x38, 0xc6, 0x40, 0x47, 0x2b, 0xd3, 0x9b, 0x5c, 0x5d, + 0xc5, 0x84, 0x8f, 0x90, 0x03, 0x68, 0x96, 0x25, 0xd0, 0xf7, 0x17, 0x20, 0x45, 0x69, 0x4b, 0x7e, + 0xb8, 0x9c, 0x32, 0x77, 0xa8, 0x41, 0x26, 0x4a, 0x08, 0xa2, 0xee, 0x10, 0x10, 0x93, 0xa8, 0x3b, + 0x84, 0xbc, 0x42, 0xdb, 0x2f, 0xca, 0x07, 0x22, 0x07, 0x02, 0xe6, 0x91, 0xdf, 0x5f, 0xa4, 0x16, + 0x3a, 0xf8, 0x12, 0x0e, 0xc4, 0x6b, 0x1c, 0x55, 0xe2, 0x82, 0x8c, 0x59, 0xe7, 0xf2, 0x07, 0xcb, + 0x1b, 0xf0, 0xf2, 0x7d, 0x09, 0x07, 0xe2, 0x6d, 0x2e, 0x72, 0x3e, 0x97, 0x4b, 0x44, 0xce, 0xe7, + 0x13, 0x05, 0x7a, 0x01, 0x49, 0xfe, 0x29, 0x21, 0xb8, 0x37, 0x4f, 0x50, 0x88, 0x5c, 0x8a, 0x57, + 0xe0, 0x60, 0x4d, 0xd8, 0x20, 0xcb, 0x1c, 0x09, 0xbe, 0xee, 0x22, 0x94, 0x20, 0x17, 0xe3, 0x1e, + 0x33, 0x98, 0xa7, 0x3f, 0xfd, 0xea, 0x9b, 0xa2, 0xf4, 0xcf, 0x6f, 0x8a, 0x6b, 0xbf, 0xbd, 0x29, + 0x4a, 0x5f, 0xdd, 0x14, 0xa5, 0xaf, 0x6f, 0x8a, 0xd2, 0xbf, 0x6e, 0x8a, 0xd2, 0x1f, 0xff, 0x5d, + 0x5c, 0xfb, 0xf9, 0x93, 0x15, 0xfe, 0x52, 0x60, 0x6e, 0xc2, 0x7f, 0x15, 0xba, 0x49, 0xfa, 0x97, + 0xc2, 0xe3, 0xff, 0x05, 0x00, 0x00, 0xff, 0xff, 0x37, 0x72, 0xda, 0x8e, 0xe3, 0x18, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -3507,6 +3515,15 @@ func (m *NetworkInterfaceStatus) MarshalToSizedBuffer(dAtA []byte) (int, error) _ = i var l int _ = l + if len(m.Ips) > 0 { + for iNdEx := len(m.Ips) - 1; iNdEx >= 0; iNdEx-- { + i -= len(m.Ips[iNdEx]) + copy(dAtA[i:], m.Ips[iNdEx]) + i = encodeVarintApi(dAtA, i, uint64(len(m.Ips[iNdEx]))) + i-- + dAtA[i] = 0x22 + } + } if m.State != 0 { i = encodeVarintApi(dAtA, i, uint64(m.State)) i-- @@ -4712,6 +4729,12 @@ func (m *NetworkInterfaceStatus) Size() (n int) { if m.State != 0 { n += 1 + sovApi(uint64(m.State)) } + if len(m.Ips) > 0 { + for _, s := range m.Ips { + l = len(s) + n += 1 + l + sovApi(uint64(l)) + } + } return n } @@ -5315,6 +5338,7 @@ func (this *NetworkInterfaceStatus) String() string { `Name:` + fmt.Sprintf("%v", this.Name) + `,`, `Handle:` + fmt.Sprintf("%v", this.Handle) + `,`, `State:` + fmt.Sprintf("%v", this.State) + `,`, + `Ips:` + fmt.Sprintf("%v", this.Ips) + `,`, `}`, }, "") return s @@ -8211,6 +8235,38 @@ func (m *NetworkInterfaceStatus) Unmarshal(dAtA []byte) error { break } } + case 4: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Ips", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowApi + } + 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 ErrInvalidLengthApi + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthApi + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Ips = append(m.Ips, string(dAtA[iNdEx:postIndex])) + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipApi(dAtA[iNdEx:]) diff --git a/iri/apis/machine/v1alpha1/api.proto b/iri/apis/machine/v1alpha1/api.proto index 05ec5757b..e6763a1d8 100644 --- a/iri/apis/machine/v1alpha1/api.proto +++ b/iri/apis/machine/v1alpha1/api.proto @@ -122,6 +122,7 @@ message NetworkInterfaceStatus { string name = 1; string handle = 2; NetworkInterfaceState state = 3; + repeated string ips = 4; } enum NetworkInterfaceState { diff --git a/poollet/machinepoollet/controllers/machine_controller.go b/poollet/machinepoollet/controllers/machine_controller.go index c4cedee9d..edcf58db6 100644 --- a/poollet/machinepoollet/controllers/machine_controller.go +++ b/poollet/machinepoollet/controllers/machine_controller.go @@ -8,6 +8,7 @@ import ( "errors" "fmt" "strconv" + "time" "github.com/go-logr/logr" "github.com/ironcore-dev/controller-utils/clientutils" @@ -509,6 +510,10 @@ func (r *MachineReconciler) updateNetworkInterfaceStatus( errs = append(errs, err) } } + + if err := r.updateNetworkInterfaceStatusFromIRIStatus(ctx, nic, iriNicStatus); err != nil { + errs = append(errs, err) + } } for _, nic := range unhandledNicByUID { @@ -522,6 +527,36 @@ func (r *MachineReconciler) updateNetworkInterfaceStatus( return errors.Join(errs...) } +var iriNetworkInterfaceStateToNetworkInterfaceState = map[iri.NetworkInterfaceState]networkingv1alpha1.NetworkInterfaceState{ + iri.NetworkInterfaceState_NETWORK_INTERFACE_PENDING: networkingv1alpha1.NetworkInterfaceStatePending, + iri.NetworkInterfaceState_NETWORK_INTERFACE_ATTACHED: networkingv1alpha1.NetworkInterfaceStateAvailable, +} + +func (r *MachineReconciler) updateNetworkInterfaceStatusFromIRIStatus( + ctx context.Context, + nic *networkingv1alpha1.NetworkInterface, + iriNicStatus *iri.NetworkInterfaceStatus, +) error { + if iriNicStatus == nil { + return nil // nothing to do + } + + nicBase := nic.DeepCopy() + nic.Status.IPs = commonv1alpha1.MustParseIPs(iriNicStatus.Ips...) + nic.Status.LastStateTransitionTime = &metav1.Time{Time: time.Now()} + nicState, ok := iriNetworkInterfaceStateToNetworkInterfaceState[iriNicStatus.State] + if !ok { + return fmt.Errorf("encountered unknown network interface state %s", iriNicStatus.State) + } + nic.Status.State = nicState + + if err := r.Status().Patch(ctx, nic, client.MergeFrom(nicBase)); err != nil { + return fmt.Errorf("failed to patch network interface status: %w", err) + } + + return nil +} + func (r *MachineReconciler) updateMachineStatus(ctx context.Context, machine *computev1alpha1.Machine, iriMachine *iri.Machine) error { now := metav1.Now() diff --git a/poollet/machinepoollet/controllers/machine_controller_networkinterface.go b/poollet/machinepoollet/controllers/machine_controller_networkinterface.go index e666bc374..470a578fa 100644 --- a/poollet/machinepoollet/controllers/machine_controller_networkinterface.go +++ b/poollet/machinepoollet/controllers/machine_controller_networkinterface.go @@ -270,6 +270,7 @@ func (r *MachineReconciler) getExistingIRINetworkInterfacesForMachine( MachineId: iriMachine.Metadata.Id, Name: iriNic.Name, }) + if err != nil { if status.Code(err) != codes.NotFound { errs = append(errs, fmt.Errorf("[network interface %s] %w", iriNic.Name, err)) @@ -363,13 +364,13 @@ func (r *MachineReconciler) computeNetworkInterfaceMapping( return nicMapping } -var iriNetworkInterfaceStateToNetworkInterfaceState = map[iri.NetworkInterfaceState]computev1alpha1.NetworkInterfaceState{ +var iriNetworkInterfaceStateToMachineNetworkInterfaceState = map[iri.NetworkInterfaceState]computev1alpha1.NetworkInterfaceState{ iri.NetworkInterfaceState_NETWORK_INTERFACE_PENDING: computev1alpha1.NetworkInterfaceStatePending, iri.NetworkInterfaceState_NETWORK_INTERFACE_ATTACHED: computev1alpha1.NetworkInterfaceStateAttached, } func (r *MachineReconciler) convertIRINetworkInterfaceState(state iri.NetworkInterfaceState) (computev1alpha1.NetworkInterfaceState, error) { - if res, ok := iriNetworkInterfaceStateToNetworkInterfaceState[state]; ok { + if res, ok := iriNetworkInterfaceStateToMachineNetworkInterfaceState[state]; ok { return res, nil } return "", fmt.Errorf("unknown network interface attachment state %v", state) diff --git a/poollet/machinepoollet/controllers/machine_controller_test.go b/poollet/machinepoollet/controllers/machine_controller_test.go index 1aaee32bb..b251f2a67 100644 --- a/poollet/machinepoollet/controllers/machine_controller_test.go +++ b/poollet/machinepoollet/controllers/machine_controller_test.go @@ -152,17 +152,34 @@ var _ = Describe("MachineController", func() { Name: "primary", Handle: "primary-handle", State: iri.NetworkInterfaceState_NETWORK_INTERFACE_ATTACHED, + Ips: []string{"10.0.0.1"}, }, } srv.SetMachines([]*testingmachine.FakeMachine{iriMachine}) By("waiting for the ironcore network interface to have a provider id set") - Eventually(Object(nic)).Should(HaveField("Spec.ProviderID", "primary-handle")) + Eventually(Object(nic)).Should(And( + HaveField("Spec.ProviderID", Equal("primary-handle")), + HaveField("Status", MatchFields(IgnoreExtras, Fields{ + "State": Equal(networkingv1alpha1.NetworkInterfaceStateAvailable), + "IPs": ContainElement(commonv1alpha1.MustParseIP("10.0.0.1")), + })), + )) Eventually(Object(machine)).Should(HaveField("Status.NetworkInterfaces", ConsistOf(MatchFields(IgnoreExtras, Fields{ "Name": Equal("primary"), "Handle": Equal("primary-handle"), "State": Equal(computev1alpha1.NetworkInterfaceStateAttached), })))) + + By("removing the network interface from the machine") + Eventually(Update(machine, func() { + machine.Spec.NetworkInterfaces = []computev1alpha1.NetworkInterface{} + })).Should(Succeed()) + + By("ensuring that the network interface has been removed from the iri machine") + Eventually(srv.Machines[iriMachine.Metadata.Id]).Should(SatisfyAll( + HaveField("Spec.NetworkInterfaces", BeEmpty()), + )) }) It("should correctly manage the power state of a machine", func(ctx SpecContext) {