From e17901d6679a0baa366c82e47af01a1d075e92b1 Mon Sep 17 00:00:00 2001 From: Tim Gross Date: Wed, 18 Sep 2019 16:34:57 -0400 Subject: [PATCH] driver/networking: don't recreate existing network namespaces --- client/allocrunner/network_hook.go | 9 +- client/allocrunner/network_hook_test.go | 4 +- client/allocrunner/network_manager_linux.go | 6 +- drivers/docker/driver.go | 119 +++-- drivers/docker/network.go | 51 +- e2e/connect/client.go | 2 +- plugins/drivers/client.go | 6 +- plugins/drivers/driver.go | 2 +- plugins/drivers/proto/driver.pb.go | 534 ++++++++++---------- plugins/drivers/proto/driver.proto | 5 + plugins/drivers/server.go | 3 +- plugins/drivers/testutils/testing.go | 4 +- 12 files changed, 401 insertions(+), 344 deletions(-) diff --git a/client/allocrunner/network_hook.go b/client/allocrunner/network_hook.go index 7e6936f3e22..aef13f219b1 100644 --- a/client/allocrunner/network_hook.go +++ b/client/allocrunner/network_hook.go @@ -61,7 +61,8 @@ func (h *networkHook) Prerun() error { return nil } - spec, err := h.manager.CreateNetwork(h.alloc.ID) + spec, created, err := h.manager.CreateNetwork(h.alloc.ID) + if err != nil { return fmt.Errorf("failed to create network for alloc: %v", err) } @@ -71,8 +72,10 @@ func (h *networkHook) Prerun() error { h.setter.SetNetworkIsolation(spec) } - if err := h.networkConfigurator.Setup(context.TODO(), h.alloc, spec); err != nil { - return fmt.Errorf("failed to configure networking for alloc: %v", err) + if created { + if err := h.networkConfigurator.Setup(context.TODO(), h.alloc, spec); err != nil { + return fmt.Errorf("failed to configure networking for alloc: %v", err) + } } return nil } diff --git a/client/allocrunner/network_hook_test.go b/client/allocrunner/network_hook_test.go index e54f81943f0..f95475967dd 100644 --- a/client/allocrunner/network_hook_test.go +++ b/client/allocrunner/network_hook_test.go @@ -45,9 +45,9 @@ func TestNetworkHook_Prerun_Postrun(t *testing.T) { destroyCalled := false nm := &testutils.MockDriver{ MockNetworkManager: testutils.MockNetworkManager{ - CreateNetworkF: func(allocID string) (*drivers.NetworkIsolationSpec, error) { + CreateNetworkF: func(allocID string) (*drivers.NetworkIsolationSpec, bool, error) { require.Equal(t, alloc.ID, allocID) - return spec, nil + return spec, false, nil }, DestroyNetworkF: func(allocID string, netSpec *drivers.NetworkIsolationSpec) error { diff --git a/client/allocrunner/network_manager_linux.go b/client/allocrunner/network_manager_linux.go index e9f2e687c25..c3f31bcf20d 100644 --- a/client/allocrunner/network_manager_linux.go +++ b/client/allocrunner/network_manager_linux.go @@ -89,10 +89,10 @@ func newNetworkManager(alloc *structs.Allocation, driverManager drivermanager.Ma // defaultNetworkManager creates a network namespace for the alloc type defaultNetworkManager struct{} -func (*defaultNetworkManager) CreateNetwork(allocID string) (*drivers.NetworkIsolationSpec, error) { +func (*defaultNetworkManager) CreateNetwork(allocID string) (*drivers.NetworkIsolationSpec, bool, error) { netns, err := nsutil.NewNS(allocID) if err != nil { - return nil, err + return nil, false, err } spec := &drivers.NetworkIsolationSpec{ @@ -101,7 +101,7 @@ func (*defaultNetworkManager) CreateNetwork(allocID string) (*drivers.NetworkIso Labels: make(map[string]string), } - return spec, nil + return spec, true, nil } func (*defaultNetworkManager) DestroyNetwork(allocID string, spec *drivers.NetworkIsolationSpec) error { diff --git a/drivers/docker/driver.go b/drivers/docker/driver.go index 2eb8dd86116..5f5784a7e42 100644 --- a/drivers/docker/driver.go +++ b/drivers/docker/driver.go @@ -405,60 +405,26 @@ CREATE: // If the container already exists determine whether it's already // running or if it's dead and needs to be recreated. if strings.Contains(strings.ToLower(createErr.Error()), "container already exists") { - containers, err := client.ListContainers(docker.ListContainersOptions{ - All: true, - }) + + container, err := d.containerByName(config.Name) if err != nil { - d.logger.Error("failed to query list of containers matching name", "container_name", config.Name) - return nil, recoverableErrTimeouts(fmt.Errorf("Failed to query list of containers: %s", err)) + return nil, err } - // Delete matching containers - // Adding a / infront of the container name since Docker returns the - // container names with a / pre-pended to the Nomad generated container names - containerName := "/" + config.Name - d.logger.Debug("searching for container to purge", "container_name", containerName) - for _, shimContainer := range containers { - d.logger.Debug("listed container", "names", hclog.Fmt("%+v", shimContainer.Names)) - found := false - for _, name := range shimContainer.Names { - if name == containerName { - d.logger.Debug("Found container", "containter_name", containerName, "container_id", shimContainer.ID) - found = true - break - } - } - - if !found { - continue - } - - // Inspect the container and if the container isn't dead then return - // the container - container, err := client.InspectContainer(shimContainer.ID) - if err != nil { - err = fmt.Errorf("Failed to inspect container %s: %s", shimContainer.ID, err) - - // This error is always recoverable as it could - // be caused by races between listing - // containers and this container being removed. - // See #2802 - return nil, nstructs.NewRecoverableError(err, true) - } - if container != nil && container.State.Running { - return container, nil - } + if container != nil && container.State.Running { + return container, nil + } - err = client.RemoveContainer(docker.RemoveContainerOptions{ - ID: container.ID, - Force: true, - }) - if err != nil { - d.logger.Error("failed to purge container", "container_id", container.ID) - return nil, recoverableErrTimeouts(fmt.Errorf("Failed to purge container %s: %s", container.ID, err)) - } else if err == nil { - d.logger.Info("purged container", "container_id", container.ID) - } + // Delete matching containers + err = client.RemoveContainer(docker.RemoveContainerOptions{ + ID: container.ID, + Force: true, + }) + if err != nil { + d.logger.Error("failed to purge container", "container_id", container.ID) + return nil, recoverableErrTimeouts(fmt.Errorf("Failed to purge container %s: %s", container.ID, err)) + } else { + d.logger.Info("purged container", "container_id", container.ID) } if attempted < 5 { @@ -1082,6 +1048,59 @@ func (d *Driver) detectIP(c *docker.Container, driverConfig *TaskConfig) (string return ip, auto } +// containerByName finds a running container by name, and returns an error +// if the container is dead or can't be found. +func (d *Driver) containerByName(name string) (*docker.Container, error) { + + client, _, err := d.dockerClients() + if err != nil { + return nil, err + } + containers, err := client.ListContainers(docker.ListContainersOptions{ + All: true, + }) + if err != nil { + d.logger.Error("failed to query list of containers matching name", + "container_name", name) + return nil, recoverableErrTimeouts( + fmt.Errorf("Failed to query list of containers: %s", err)) + } + + // container names with a / pre-pended to the Nomad generated container names + containerName := "/" + name + var ( + shimContainer docker.APIContainers + found bool + ) +OUTER: + for _, shimContainer = range containers { + d.logger.Trace("listed container", "names", hclog.Fmt("%+v", shimContainer.Names)) + for _, name := range shimContainer.Names { + if name == containerName { + d.logger.Trace("Found container", + "container_name", containerName, "container_id", shimContainer.ID) + found = true + break OUTER + } + } + } + if !found { + return nil, nil + } + + container, err := client.InspectContainer(shimContainer.ID) + if err != nil { + err = fmt.Errorf("Failed to inspect container %s: %s", shimContainer.ID, err) + + // This error is always recoverable as it could + // be caused by races between listing + // containers and this container being removed. + // See #2802 + return nil, nstructs.NewRecoverableError(err, true) + } + return container, nil +} + // validateCommand validates that the command only has a single value and // returns a user friendly error message telling them to use the passed // argField. diff --git a/drivers/docker/network.go b/drivers/docker/network.go index bbe69a5136e..400fc062c71 100644 --- a/drivers/docker/network.go +++ b/drivers/docker/network.go @@ -12,11 +12,11 @@ import ( // the parent container so tasks can configure their network mode accordingly const dockerNetSpecLabelKey = "docker_sandbox_container_id" -func (d *Driver) CreateNetwork(allocID string) (*drivers.NetworkIsolationSpec, error) { +func (d *Driver) CreateNetwork(allocID string) (*drivers.NetworkIsolationSpec, bool, error) { // Initialize docker API clients client, _, err := d.dockerClients() if err != nil { - return nil, fmt.Errorf("failed to connect to docker daemon: %s", err) + return nil, false, fmt.Errorf("failed to connect to docker daemon: %s", err) } repo, _ := parseDockerImage(d.config.InfraImage) @@ -29,35 +29,52 @@ func (d *Driver) CreateNetwork(allocID string) (*drivers.NetworkIsolationSpec, e } _, err = d.coordinator.PullImage(d.config.InfraImage, authOptions, allocID, noopLogEventFn) if err != nil { - return nil, err + return nil, false, err } config, err := d.createSandboxContainerConfig(allocID) if err != nil { - return nil, err + return nil, false, err } - container, err := d.createContainer(client, *config, d.config.InfraImage) + specFromContainer := func(c *docker.Container) *drivers.NetworkIsolationSpec { + return &drivers.NetworkIsolationSpec{ + Mode: drivers.NetIsolationModeGroup, + Path: c.NetworkSettings.SandboxKey, + Labels: map[string]string{ + dockerNetSpecLabelKey: c.ID, + }, + } + } + + // We want to return a flag that tells us if the container already + // existed so that callers can decide whether or not to recreate + // the task's network namespace associations. + container, err := d.containerByName(config.Name) + if err != nil { + return nil, false, err + } + if container != nil && container.State.Running { + return specFromContainer(container), false, nil + } + + container, err = d.createContainer(client, *config, d.config.InfraImage) if err != nil { - return nil, err + return nil, false, err } - if err := d.startContainer(container); err != nil { - return nil, err + if err = d.startContainer(container); err != nil { + return nil, false, err } - c, err := client.InspectContainer(container.ID) + // until the container is started, InspectContainer + // returns a mostly-empty struct + container, err = client.InspectContainer(container.ID) if err != nil { - return nil, err + return nil, false, err } - return &drivers.NetworkIsolationSpec{ - Mode: drivers.NetIsolationModeGroup, - Path: c.NetworkSettings.SandboxKey, - Labels: map[string]string{ - dockerNetSpecLabelKey: c.ID, - }, - }, nil + return specFromContainer(container), true, nil } func (d *Driver) DestroyNetwork(allocID string, spec *drivers.NetworkIsolationSpec) error { diff --git a/e2e/connect/client.go b/e2e/connect/client.go index fabf6cb325f..8cea468e5fe 100644 --- a/e2e/connect/client.go +++ b/e2e/connect/client.go @@ -53,7 +53,7 @@ func (tc *ConnectClientStateE2ETest) TestClientRestart(f *framework.F) { tc.jobIds = append(tc.jobIds, restartID) } if err != nil { - t.Skip("node cannot be restarted: %v", err) + t.Skip("node cannot be restarted", err) } e2eutil.RequireConsulStatus(require, consulClient, diff --git a/plugins/drivers/client.go b/plugins/drivers/client.go index 357d5cd257c..e4ffe19a993 100644 --- a/plugins/drivers/client.go +++ b/plugins/drivers/client.go @@ -465,17 +465,17 @@ func (d *driverPluginClient) ExecTaskStreamingRaw(ctx context.Context, } } -func (d *driverPluginClient) CreateNetwork(allocID string) (*NetworkIsolationSpec, error) { +func (d *driverPluginClient) CreateNetwork(allocID string) (*NetworkIsolationSpec, bool, error) { req := &proto.CreateNetworkRequest{ AllocId: allocID, } resp, err := d.client.CreateNetwork(d.doneCtx, req) if err != nil { - return nil, grpcutils.HandleGrpcErr(err, d.doneCtx) + return nil, false, grpcutils.HandleGrpcErr(err, d.doneCtx) } - return NetworkIsolationSpecFromProto(resp.IsolationSpec), nil + return NetworkIsolationSpecFromProto(resp.IsolationSpec), resp.Created, nil } func (d *driverPluginClient) DestroyNetwork(allocID string, spec *NetworkIsolationSpec) error { diff --git a/plugins/drivers/driver.go b/plugins/drivers/driver.go index d921b4eb225..4c127393d59 100644 --- a/plugins/drivers/driver.go +++ b/plugins/drivers/driver.go @@ -83,7 +83,7 @@ type ExecOptions struct { // network namespace for which tasks can join. This only needs to be implemented // if the driver MUST create the network namespace type DriverNetworkManager interface { - CreateNetwork(allocID string) (*NetworkIsolationSpec, error) + CreateNetwork(allocID string) (*NetworkIsolationSpec, bool, error) DestroyNetwork(allocID string, spec *NetworkIsolationSpec) error } diff --git a/plugins/drivers/proto/driver.pb.go b/plugins/drivers/proto/driver.pb.go index e705bbc43ff..8a2087c5f28 100644 --- a/plugins/drivers/proto/driver.pb.go +++ b/plugins/drivers/proto/driver.pb.go @@ -50,7 +50,7 @@ func (x TaskState) String() string { return proto.EnumName(TaskState_name, int32(x)) } func (TaskState) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_driver_3d62bf87918f3eb8, []int{0} + return fileDescriptor_driver_8edefdede9e0ed2d, []int{0} } type FingerprintResponse_HealthState int32 @@ -76,7 +76,7 @@ func (x FingerprintResponse_HealthState) String() string { return proto.EnumName(FingerprintResponse_HealthState_name, int32(x)) } func (FingerprintResponse_HealthState) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_driver_3d62bf87918f3eb8, []int{5, 0} + return fileDescriptor_driver_8edefdede9e0ed2d, []int{5, 0} } type StartTaskResponse_Result int32 @@ -102,7 +102,7 @@ func (x StartTaskResponse_Result) String() string { return proto.EnumName(StartTaskResponse_Result_name, int32(x)) } func (StartTaskResponse_Result) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_driver_3d62bf87918f3eb8, []int{9, 0} + return fileDescriptor_driver_8edefdede9e0ed2d, []int{9, 0} } type DriverCapabilities_FSIsolation int32 @@ -128,7 +128,7 @@ func (x DriverCapabilities_FSIsolation) String() string { return proto.EnumName(DriverCapabilities_FSIsolation_name, int32(x)) } func (DriverCapabilities_FSIsolation) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_driver_3d62bf87918f3eb8, []int{32, 0} + return fileDescriptor_driver_8edefdede9e0ed2d, []int{32, 0} } type NetworkIsolationSpec_NetworkIsolationMode int32 @@ -157,7 +157,7 @@ func (x NetworkIsolationSpec_NetworkIsolationMode) String() string { return proto.EnumName(NetworkIsolationSpec_NetworkIsolationMode_name, int32(x)) } func (NetworkIsolationSpec_NetworkIsolationMode) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_driver_3d62bf87918f3eb8, []int{33, 0} + return fileDescriptor_driver_8edefdede9e0ed2d, []int{33, 0} } type CPUUsage_Fields int32 @@ -192,7 +192,7 @@ func (x CPUUsage_Fields) String() string { return proto.EnumName(CPUUsage_Fields_name, int32(x)) } func (CPUUsage_Fields) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_driver_3d62bf87918f3eb8, []int{51, 0} + return fileDescriptor_driver_8edefdede9e0ed2d, []int{51, 0} } type MemoryUsage_Fields int32 @@ -230,7 +230,7 @@ func (x MemoryUsage_Fields) String() string { return proto.EnumName(MemoryUsage_Fields_name, int32(x)) } func (MemoryUsage_Fields) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_driver_3d62bf87918f3eb8, []int{52, 0} + return fileDescriptor_driver_8edefdede9e0ed2d, []int{52, 0} } type TaskConfigSchemaRequest struct { @@ -243,7 +243,7 @@ func (m *TaskConfigSchemaRequest) Reset() { *m = TaskConfigSchemaRequest func (m *TaskConfigSchemaRequest) String() string { return proto.CompactTextString(m) } func (*TaskConfigSchemaRequest) ProtoMessage() {} func (*TaskConfigSchemaRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_driver_3d62bf87918f3eb8, []int{0} + return fileDescriptor_driver_8edefdede9e0ed2d, []int{0} } func (m *TaskConfigSchemaRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TaskConfigSchemaRequest.Unmarshal(m, b) @@ -275,7 +275,7 @@ func (m *TaskConfigSchemaResponse) Reset() { *m = TaskConfigSchemaRespon func (m *TaskConfigSchemaResponse) String() string { return proto.CompactTextString(m) } func (*TaskConfigSchemaResponse) ProtoMessage() {} func (*TaskConfigSchemaResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_driver_3d62bf87918f3eb8, []int{1} + return fileDescriptor_driver_8edefdede9e0ed2d, []int{1} } func (m *TaskConfigSchemaResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TaskConfigSchemaResponse.Unmarshal(m, b) @@ -312,7 +312,7 @@ func (m *CapabilitiesRequest) Reset() { *m = CapabilitiesRequest{} } func (m *CapabilitiesRequest) String() string { return proto.CompactTextString(m) } func (*CapabilitiesRequest) ProtoMessage() {} func (*CapabilitiesRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_driver_3d62bf87918f3eb8, []int{2} + return fileDescriptor_driver_8edefdede9e0ed2d, []int{2} } func (m *CapabilitiesRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CapabilitiesRequest.Unmarshal(m, b) @@ -347,7 +347,7 @@ func (m *CapabilitiesResponse) Reset() { *m = CapabilitiesResponse{} } func (m *CapabilitiesResponse) String() string { return proto.CompactTextString(m) } func (*CapabilitiesResponse) ProtoMessage() {} func (*CapabilitiesResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_driver_3d62bf87918f3eb8, []int{3} + return fileDescriptor_driver_8edefdede9e0ed2d, []int{3} } func (m *CapabilitiesResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CapabilitiesResponse.Unmarshal(m, b) @@ -384,7 +384,7 @@ func (m *FingerprintRequest) Reset() { *m = FingerprintRequest{} } func (m *FingerprintRequest) String() string { return proto.CompactTextString(m) } func (*FingerprintRequest) ProtoMessage() {} func (*FingerprintRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_driver_3d62bf87918f3eb8, []int{4} + return fileDescriptor_driver_8edefdede9e0ed2d, []int{4} } func (m *FingerprintRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FingerprintRequest.Unmarshal(m, b) @@ -427,7 +427,7 @@ func (m *FingerprintResponse) Reset() { *m = FingerprintResponse{} } func (m *FingerprintResponse) String() string { return proto.CompactTextString(m) } func (*FingerprintResponse) ProtoMessage() {} func (*FingerprintResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_driver_3d62bf87918f3eb8, []int{5} + return fileDescriptor_driver_8edefdede9e0ed2d, []int{5} } func (m *FingerprintResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FingerprintResponse.Unmarshal(m, b) @@ -482,7 +482,7 @@ func (m *RecoverTaskRequest) Reset() { *m = RecoverTaskRequest{} } func (m *RecoverTaskRequest) String() string { return proto.CompactTextString(m) } func (*RecoverTaskRequest) ProtoMessage() {} func (*RecoverTaskRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_driver_3d62bf87918f3eb8, []int{6} + return fileDescriptor_driver_8edefdede9e0ed2d, []int{6} } func (m *RecoverTaskRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RecoverTaskRequest.Unmarshal(m, b) @@ -526,7 +526,7 @@ func (m *RecoverTaskResponse) Reset() { *m = RecoverTaskResponse{} } func (m *RecoverTaskResponse) String() string { return proto.CompactTextString(m) } func (*RecoverTaskResponse) ProtoMessage() {} func (*RecoverTaskResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_driver_3d62bf87918f3eb8, []int{7} + return fileDescriptor_driver_8edefdede9e0ed2d, []int{7} } func (m *RecoverTaskResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RecoverTaskResponse.Unmarshal(m, b) @@ -558,7 +558,7 @@ func (m *StartTaskRequest) Reset() { *m = StartTaskRequest{} } func (m *StartTaskRequest) String() string { return proto.CompactTextString(m) } func (*StartTaskRequest) ProtoMessage() {} func (*StartTaskRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_driver_3d62bf87918f3eb8, []int{8} + return fileDescriptor_driver_8edefdede9e0ed2d, []int{8} } func (m *StartTaskRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_StartTaskRequest.Unmarshal(m, b) @@ -612,7 +612,7 @@ func (m *StartTaskResponse) Reset() { *m = StartTaskResponse{} } func (m *StartTaskResponse) String() string { return proto.CompactTextString(m) } func (*StartTaskResponse) ProtoMessage() {} func (*StartTaskResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_driver_3d62bf87918f3eb8, []int{9} + return fileDescriptor_driver_8edefdede9e0ed2d, []int{9} } func (m *StartTaskResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_StartTaskResponse.Unmarshal(m, b) @@ -672,7 +672,7 @@ func (m *WaitTaskRequest) Reset() { *m = WaitTaskRequest{} } func (m *WaitTaskRequest) String() string { return proto.CompactTextString(m) } func (*WaitTaskRequest) ProtoMessage() {} func (*WaitTaskRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_driver_3d62bf87918f3eb8, []int{10} + return fileDescriptor_driver_8edefdede9e0ed2d, []int{10} } func (m *WaitTaskRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_WaitTaskRequest.Unmarshal(m, b) @@ -713,7 +713,7 @@ func (m *WaitTaskResponse) Reset() { *m = WaitTaskResponse{} } func (m *WaitTaskResponse) String() string { return proto.CompactTextString(m) } func (*WaitTaskResponse) ProtoMessage() {} func (*WaitTaskResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_driver_3d62bf87918f3eb8, []int{11} + return fileDescriptor_driver_8edefdede9e0ed2d, []int{11} } func (m *WaitTaskResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_WaitTaskResponse.Unmarshal(m, b) @@ -765,7 +765,7 @@ func (m *StopTaskRequest) Reset() { *m = StopTaskRequest{} } func (m *StopTaskRequest) String() string { return proto.CompactTextString(m) } func (*StopTaskRequest) ProtoMessage() {} func (*StopTaskRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_driver_3d62bf87918f3eb8, []int{12} + return fileDescriptor_driver_8edefdede9e0ed2d, []int{12} } func (m *StopTaskRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_StopTaskRequest.Unmarshal(m, b) @@ -816,7 +816,7 @@ func (m *StopTaskResponse) Reset() { *m = StopTaskResponse{} } func (m *StopTaskResponse) String() string { return proto.CompactTextString(m) } func (*StopTaskResponse) ProtoMessage() {} func (*StopTaskResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_driver_3d62bf87918f3eb8, []int{13} + return fileDescriptor_driver_8edefdede9e0ed2d, []int{13} } func (m *StopTaskResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_StopTaskResponse.Unmarshal(m, b) @@ -850,7 +850,7 @@ func (m *DestroyTaskRequest) Reset() { *m = DestroyTaskRequest{} } func (m *DestroyTaskRequest) String() string { return proto.CompactTextString(m) } func (*DestroyTaskRequest) ProtoMessage() {} func (*DestroyTaskRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_driver_3d62bf87918f3eb8, []int{14} + return fileDescriptor_driver_8edefdede9e0ed2d, []int{14} } func (m *DestroyTaskRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DestroyTaskRequest.Unmarshal(m, b) @@ -894,7 +894,7 @@ func (m *DestroyTaskResponse) Reset() { *m = DestroyTaskResponse{} } func (m *DestroyTaskResponse) String() string { return proto.CompactTextString(m) } func (*DestroyTaskResponse) ProtoMessage() {} func (*DestroyTaskResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_driver_3d62bf87918f3eb8, []int{15} + return fileDescriptor_driver_8edefdede9e0ed2d, []int{15} } func (m *DestroyTaskResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DestroyTaskResponse.Unmarshal(m, b) @@ -926,7 +926,7 @@ func (m *InspectTaskRequest) Reset() { *m = InspectTaskRequest{} } func (m *InspectTaskRequest) String() string { return proto.CompactTextString(m) } func (*InspectTaskRequest) ProtoMessage() {} func (*InspectTaskRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_driver_3d62bf87918f3eb8, []int{16} + return fileDescriptor_driver_8edefdede9e0ed2d, []int{16} } func (m *InspectTaskRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_InspectTaskRequest.Unmarshal(m, b) @@ -969,7 +969,7 @@ func (m *InspectTaskResponse) Reset() { *m = InspectTaskResponse{} } func (m *InspectTaskResponse) String() string { return proto.CompactTextString(m) } func (*InspectTaskResponse) ProtoMessage() {} func (*InspectTaskResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_driver_3d62bf87918f3eb8, []int{17} + return fileDescriptor_driver_8edefdede9e0ed2d, []int{17} } func (m *InspectTaskResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_InspectTaskResponse.Unmarshal(m, b) @@ -1024,7 +1024,7 @@ func (m *TaskStatsRequest) Reset() { *m = TaskStatsRequest{} } func (m *TaskStatsRequest) String() string { return proto.CompactTextString(m) } func (*TaskStatsRequest) ProtoMessage() {} func (*TaskStatsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_driver_3d62bf87918f3eb8, []int{18} + return fileDescriptor_driver_8edefdede9e0ed2d, []int{18} } func (m *TaskStatsRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TaskStatsRequest.Unmarshal(m, b) @@ -1070,7 +1070,7 @@ func (m *TaskStatsResponse) Reset() { *m = TaskStatsResponse{} } func (m *TaskStatsResponse) String() string { return proto.CompactTextString(m) } func (*TaskStatsResponse) ProtoMessage() {} func (*TaskStatsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_driver_3d62bf87918f3eb8, []int{19} + return fileDescriptor_driver_8edefdede9e0ed2d, []int{19} } func (m *TaskStatsResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TaskStatsResponse.Unmarshal(m, b) @@ -1107,7 +1107,7 @@ func (m *TaskEventsRequest) Reset() { *m = TaskEventsRequest{} } func (m *TaskEventsRequest) String() string { return proto.CompactTextString(m) } func (*TaskEventsRequest) ProtoMessage() {} func (*TaskEventsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_driver_3d62bf87918f3eb8, []int{20} + return fileDescriptor_driver_8edefdede9e0ed2d, []int{20} } func (m *TaskEventsRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TaskEventsRequest.Unmarshal(m, b) @@ -1141,7 +1141,7 @@ func (m *SignalTaskRequest) Reset() { *m = SignalTaskRequest{} } func (m *SignalTaskRequest) String() string { return proto.CompactTextString(m) } func (*SignalTaskRequest) ProtoMessage() {} func (*SignalTaskRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_driver_3d62bf87918f3eb8, []int{21} + return fileDescriptor_driver_8edefdede9e0ed2d, []int{21} } func (m *SignalTaskRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SignalTaskRequest.Unmarshal(m, b) @@ -1185,7 +1185,7 @@ func (m *SignalTaskResponse) Reset() { *m = SignalTaskResponse{} } func (m *SignalTaskResponse) String() string { return proto.CompactTextString(m) } func (*SignalTaskResponse) ProtoMessage() {} func (*SignalTaskResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_driver_3d62bf87918f3eb8, []int{22} + return fileDescriptor_driver_8edefdede9e0ed2d, []int{22} } func (m *SignalTaskResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SignalTaskResponse.Unmarshal(m, b) @@ -1222,7 +1222,7 @@ func (m *ExecTaskRequest) Reset() { *m = ExecTaskRequest{} } func (m *ExecTaskRequest) String() string { return proto.CompactTextString(m) } func (*ExecTaskRequest) ProtoMessage() {} func (*ExecTaskRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_driver_3d62bf87918f3eb8, []int{23} + return fileDescriptor_driver_8edefdede9e0ed2d, []int{23} } func (m *ExecTaskRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ExecTaskRequest.Unmarshal(m, b) @@ -1279,7 +1279,7 @@ func (m *ExecTaskResponse) Reset() { *m = ExecTaskResponse{} } func (m *ExecTaskResponse) String() string { return proto.CompactTextString(m) } func (*ExecTaskResponse) ProtoMessage() {} func (*ExecTaskResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_driver_3d62bf87918f3eb8, []int{24} + return fileDescriptor_driver_8edefdede9e0ed2d, []int{24} } func (m *ExecTaskResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ExecTaskResponse.Unmarshal(m, b) @@ -1332,7 +1332,7 @@ func (m *ExecTaskStreamingIOOperation) Reset() { *m = ExecTaskStreamingI func (m *ExecTaskStreamingIOOperation) String() string { return proto.CompactTextString(m) } func (*ExecTaskStreamingIOOperation) ProtoMessage() {} func (*ExecTaskStreamingIOOperation) Descriptor() ([]byte, []int) { - return fileDescriptor_driver_3d62bf87918f3eb8, []int{25} + return fileDescriptor_driver_8edefdede9e0ed2d, []int{25} } func (m *ExecTaskStreamingIOOperation) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ExecTaskStreamingIOOperation.Unmarshal(m, b) @@ -1379,7 +1379,7 @@ func (m *ExecTaskStreamingRequest) Reset() { *m = ExecTaskStreamingReque func (m *ExecTaskStreamingRequest) String() string { return proto.CompactTextString(m) } func (*ExecTaskStreamingRequest) ProtoMessage() {} func (*ExecTaskStreamingRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_driver_3d62bf87918f3eb8, []int{26} + return fileDescriptor_driver_8edefdede9e0ed2d, []int{26} } func (m *ExecTaskStreamingRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ExecTaskStreamingRequest.Unmarshal(m, b) @@ -1433,7 +1433,7 @@ func (m *ExecTaskStreamingRequest_Setup) Reset() { *m = ExecTaskStreamin func (m *ExecTaskStreamingRequest_Setup) String() string { return proto.CompactTextString(m) } func (*ExecTaskStreamingRequest_Setup) ProtoMessage() {} func (*ExecTaskStreamingRequest_Setup) Descriptor() ([]byte, []int) { - return fileDescriptor_driver_3d62bf87918f3eb8, []int{26, 0} + return fileDescriptor_driver_8edefdede9e0ed2d, []int{26, 0} } func (m *ExecTaskStreamingRequest_Setup) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ExecTaskStreamingRequest_Setup.Unmarshal(m, b) @@ -1486,7 +1486,7 @@ func (m *ExecTaskStreamingRequest_TerminalSize) Reset() { *m = ExecTaskS func (m *ExecTaskStreamingRequest_TerminalSize) String() string { return proto.CompactTextString(m) } func (*ExecTaskStreamingRequest_TerminalSize) ProtoMessage() {} func (*ExecTaskStreamingRequest_TerminalSize) Descriptor() ([]byte, []int) { - return fileDescriptor_driver_3d62bf87918f3eb8, []int{26, 1} + return fileDescriptor_driver_8edefdede9e0ed2d, []int{26, 1} } func (m *ExecTaskStreamingRequest_TerminalSize) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ExecTaskStreamingRequest_TerminalSize.Unmarshal(m, b) @@ -1534,7 +1534,7 @@ func (m *ExecTaskStreamingResponse) Reset() { *m = ExecTaskStreamingResp func (m *ExecTaskStreamingResponse) String() string { return proto.CompactTextString(m) } func (*ExecTaskStreamingResponse) ProtoMessage() {} func (*ExecTaskStreamingResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_driver_3d62bf87918f3eb8, []int{27} + return fileDescriptor_driver_8edefdede9e0ed2d, []int{27} } func (m *ExecTaskStreamingResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ExecTaskStreamingResponse.Unmarshal(m, b) @@ -1594,7 +1594,7 @@ func (m *CreateNetworkRequest) Reset() { *m = CreateNetworkRequest{} } func (m *CreateNetworkRequest) String() string { return proto.CompactTextString(m) } func (*CreateNetworkRequest) ProtoMessage() {} func (*CreateNetworkRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_driver_3d62bf87918f3eb8, []int{28} + return fileDescriptor_driver_8edefdede9e0ed2d, []int{28} } func (m *CreateNetworkRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CreateNetworkRequest.Unmarshal(m, b) @@ -1622,17 +1622,21 @@ func (m *CreateNetworkRequest) GetAllocId() string { } type CreateNetworkResponse struct { - IsolationSpec *NetworkIsolationSpec `protobuf:"bytes,1,opt,name=isolation_spec,json=isolationSpec,proto3" json:"isolation_spec,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + IsolationSpec *NetworkIsolationSpec `protobuf:"bytes,1,opt,name=isolation_spec,json=isolationSpec,proto3" json:"isolation_spec,omitempty"` + // created indicates that the network namespace is newly created + // as a result of this request. if false, the NetworkIsolationSpec + // value returned is an existing spec. + Created bool `protobuf:"varint,2,opt,name=created,proto3" json:"created,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *CreateNetworkResponse) Reset() { *m = CreateNetworkResponse{} } func (m *CreateNetworkResponse) String() string { return proto.CompactTextString(m) } func (*CreateNetworkResponse) ProtoMessage() {} func (*CreateNetworkResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_driver_3d62bf87918f3eb8, []int{29} + return fileDescriptor_driver_8edefdede9e0ed2d, []int{29} } func (m *CreateNetworkResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CreateNetworkResponse.Unmarshal(m, b) @@ -1659,6 +1663,13 @@ func (m *CreateNetworkResponse) GetIsolationSpec() *NetworkIsolationSpec { return nil } +func (m *CreateNetworkResponse) GetCreated() bool { + if m != nil { + return m.Created + } + return false +} + type DestroyNetworkRequest struct { // AllocID of the allocation the network is associated with AllocId string `protobuf:"bytes,1,opt,name=alloc_id,json=allocId,proto3" json:"alloc_id,omitempty"` @@ -1672,7 +1683,7 @@ func (m *DestroyNetworkRequest) Reset() { *m = DestroyNetworkRequest{} } func (m *DestroyNetworkRequest) String() string { return proto.CompactTextString(m) } func (*DestroyNetworkRequest) ProtoMessage() {} func (*DestroyNetworkRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_driver_3d62bf87918f3eb8, []int{30} + return fileDescriptor_driver_8edefdede9e0ed2d, []int{30} } func (m *DestroyNetworkRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DestroyNetworkRequest.Unmarshal(m, b) @@ -1716,7 +1727,7 @@ func (m *DestroyNetworkResponse) Reset() { *m = DestroyNetworkResponse{} func (m *DestroyNetworkResponse) String() string { return proto.CompactTextString(m) } func (*DestroyNetworkResponse) ProtoMessage() {} func (*DestroyNetworkResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_driver_3d62bf87918f3eb8, []int{31} + return fileDescriptor_driver_8edefdede9e0ed2d, []int{31} } func (m *DestroyNetworkResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DestroyNetworkResponse.Unmarshal(m, b) @@ -1756,7 +1767,7 @@ func (m *DriverCapabilities) Reset() { *m = DriverCapabilities{} } func (m *DriverCapabilities) String() string { return proto.CompactTextString(m) } func (*DriverCapabilities) ProtoMessage() {} func (*DriverCapabilities) Descriptor() ([]byte, []int) { - return fileDescriptor_driver_3d62bf87918f3eb8, []int{32} + return fileDescriptor_driver_8edefdede9e0ed2d, []int{32} } func (m *DriverCapabilities) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DriverCapabilities.Unmarshal(m, b) @@ -1824,7 +1835,7 @@ func (m *NetworkIsolationSpec) Reset() { *m = NetworkIsolationSpec{} } func (m *NetworkIsolationSpec) String() string { return proto.CompactTextString(m) } func (*NetworkIsolationSpec) ProtoMessage() {} func (*NetworkIsolationSpec) Descriptor() ([]byte, []int) { - return fileDescriptor_driver_3d62bf87918f3eb8, []int{33} + return fileDescriptor_driver_8edefdede9e0ed2d, []int{33} } func (m *NetworkIsolationSpec) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_NetworkIsolationSpec.Unmarshal(m, b) @@ -1913,7 +1924,7 @@ func (m *TaskConfig) Reset() { *m = TaskConfig{} } func (m *TaskConfig) String() string { return proto.CompactTextString(m) } func (*TaskConfig) ProtoMessage() {} func (*TaskConfig) Descriptor() ([]byte, []int) { - return fileDescriptor_driver_3d62bf87918f3eb8, []int{34} + return fileDescriptor_driver_8edefdede9e0ed2d, []int{34} } func (m *TaskConfig) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TaskConfig.Unmarshal(m, b) @@ -2059,7 +2070,7 @@ func (m *Resources) Reset() { *m = Resources{} } func (m *Resources) String() string { return proto.CompactTextString(m) } func (*Resources) ProtoMessage() {} func (*Resources) Descriptor() ([]byte, []int) { - return fileDescriptor_driver_3d62bf87918f3eb8, []int{35} + return fileDescriptor_driver_8edefdede9e0ed2d, []int{35} } func (m *Resources) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Resources.Unmarshal(m, b) @@ -2106,7 +2117,7 @@ func (m *AllocatedTaskResources) Reset() { *m = AllocatedTaskResources{} func (m *AllocatedTaskResources) String() string { return proto.CompactTextString(m) } func (*AllocatedTaskResources) ProtoMessage() {} func (*AllocatedTaskResources) Descriptor() ([]byte, []int) { - return fileDescriptor_driver_3d62bf87918f3eb8, []int{36} + return fileDescriptor_driver_8edefdede9e0ed2d, []int{36} } func (m *AllocatedTaskResources) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_AllocatedTaskResources.Unmarshal(m, b) @@ -2158,7 +2169,7 @@ func (m *AllocatedCpuResources) Reset() { *m = AllocatedCpuResources{} } func (m *AllocatedCpuResources) String() string { return proto.CompactTextString(m) } func (*AllocatedCpuResources) ProtoMessage() {} func (*AllocatedCpuResources) Descriptor() ([]byte, []int) { - return fileDescriptor_driver_3d62bf87918f3eb8, []int{37} + return fileDescriptor_driver_8edefdede9e0ed2d, []int{37} } func (m *AllocatedCpuResources) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_AllocatedCpuResources.Unmarshal(m, b) @@ -2196,7 +2207,7 @@ func (m *AllocatedMemoryResources) Reset() { *m = AllocatedMemoryResourc func (m *AllocatedMemoryResources) String() string { return proto.CompactTextString(m) } func (*AllocatedMemoryResources) ProtoMessage() {} func (*AllocatedMemoryResources) Descriptor() ([]byte, []int) { - return fileDescriptor_driver_3d62bf87918f3eb8, []int{38} + return fileDescriptor_driver_8edefdede9e0ed2d, []int{38} } func (m *AllocatedMemoryResources) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_AllocatedMemoryResources.Unmarshal(m, b) @@ -2239,7 +2250,7 @@ func (m *NetworkResource) Reset() { *m = NetworkResource{} } func (m *NetworkResource) String() string { return proto.CompactTextString(m) } func (*NetworkResource) ProtoMessage() {} func (*NetworkResource) Descriptor() ([]byte, []int) { - return fileDescriptor_driver_3d62bf87918f3eb8, []int{39} + return fileDescriptor_driver_8edefdede9e0ed2d, []int{39} } func (m *NetworkResource) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_NetworkResource.Unmarshal(m, b) @@ -2313,7 +2324,7 @@ func (m *NetworkPort) Reset() { *m = NetworkPort{} } func (m *NetworkPort) String() string { return proto.CompactTextString(m) } func (*NetworkPort) ProtoMessage() {} func (*NetworkPort) Descriptor() ([]byte, []int) { - return fileDescriptor_driver_3d62bf87918f3eb8, []int{40} + return fileDescriptor_driver_8edefdede9e0ed2d, []int{40} } func (m *NetworkPort) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_NetworkPort.Unmarshal(m, b) @@ -2373,7 +2384,7 @@ func (m *LinuxResources) Reset() { *m = LinuxResources{} } func (m *LinuxResources) String() string { return proto.CompactTextString(m) } func (*LinuxResources) ProtoMessage() {} func (*LinuxResources) Descriptor() ([]byte, []int) { - return fileDescriptor_driver_3d62bf87918f3eb8, []int{41} + return fileDescriptor_driver_8edefdede9e0ed2d, []int{41} } func (m *LinuxResources) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_LinuxResources.Unmarshal(m, b) @@ -2465,7 +2476,7 @@ func (m *Mount) Reset() { *m = Mount{} } func (m *Mount) String() string { return proto.CompactTextString(m) } func (*Mount) ProtoMessage() {} func (*Mount) Descriptor() ([]byte, []int) { - return fileDescriptor_driver_3d62bf87918f3eb8, []int{42} + return fileDescriptor_driver_8edefdede9e0ed2d, []int{42} } func (m *Mount) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Mount.Unmarshal(m, b) @@ -2528,7 +2539,7 @@ func (m *Device) Reset() { *m = Device{} } func (m *Device) String() string { return proto.CompactTextString(m) } func (*Device) ProtoMessage() {} func (*Device) Descriptor() ([]byte, []int) { - return fileDescriptor_driver_3d62bf87918f3eb8, []int{43} + return fileDescriptor_driver_8edefdede9e0ed2d, []int{43} } func (m *Device) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Device.Unmarshal(m, b) @@ -2589,7 +2600,7 @@ func (m *TaskHandle) Reset() { *m = TaskHandle{} } func (m *TaskHandle) String() string { return proto.CompactTextString(m) } func (*TaskHandle) ProtoMessage() {} func (*TaskHandle) Descriptor() ([]byte, []int) { - return fileDescriptor_driver_3d62bf87918f3eb8, []int{44} + return fileDescriptor_driver_8edefdede9e0ed2d, []int{44} } func (m *TaskHandle) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TaskHandle.Unmarshal(m, b) @@ -2656,7 +2667,7 @@ func (m *NetworkOverride) Reset() { *m = NetworkOverride{} } func (m *NetworkOverride) String() string { return proto.CompactTextString(m) } func (*NetworkOverride) ProtoMessage() {} func (*NetworkOverride) Descriptor() ([]byte, []int) { - return fileDescriptor_driver_3d62bf87918f3eb8, []int{45} + return fileDescriptor_driver_8edefdede9e0ed2d, []int{45} } func (m *NetworkOverride) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_NetworkOverride.Unmarshal(m, b) @@ -2714,7 +2725,7 @@ func (m *ExitResult) Reset() { *m = ExitResult{} } func (m *ExitResult) String() string { return proto.CompactTextString(m) } func (*ExitResult) ProtoMessage() {} func (*ExitResult) Descriptor() ([]byte, []int) { - return fileDescriptor_driver_3d62bf87918f3eb8, []int{46} + return fileDescriptor_driver_8edefdede9e0ed2d, []int{46} } func (m *ExitResult) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ExitResult.Unmarshal(m, b) @@ -2777,7 +2788,7 @@ func (m *TaskStatus) Reset() { *m = TaskStatus{} } func (m *TaskStatus) String() string { return proto.CompactTextString(m) } func (*TaskStatus) ProtoMessage() {} func (*TaskStatus) Descriptor() ([]byte, []int) { - return fileDescriptor_driver_3d62bf87918f3eb8, []int{47} + return fileDescriptor_driver_8edefdede9e0ed2d, []int{47} } func (m *TaskStatus) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TaskStatus.Unmarshal(m, b) @@ -2852,7 +2863,7 @@ func (m *TaskDriverStatus) Reset() { *m = TaskDriverStatus{} } func (m *TaskDriverStatus) String() string { return proto.CompactTextString(m) } func (*TaskDriverStatus) ProtoMessage() {} func (*TaskDriverStatus) Descriptor() ([]byte, []int) { - return fileDescriptor_driver_3d62bf87918f3eb8, []int{48} + return fileDescriptor_driver_8edefdede9e0ed2d, []int{48} } func (m *TaskDriverStatus) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TaskDriverStatus.Unmarshal(m, b) @@ -2897,7 +2908,7 @@ func (m *TaskStats) Reset() { *m = TaskStats{} } func (m *TaskStats) String() string { return proto.CompactTextString(m) } func (*TaskStats) ProtoMessage() {} func (*TaskStats) Descriptor() ([]byte, []int) { - return fileDescriptor_driver_3d62bf87918f3eb8, []int{49} + return fileDescriptor_driver_8edefdede9e0ed2d, []int{49} } func (m *TaskStats) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TaskStats.Unmarshal(m, b) @@ -2959,7 +2970,7 @@ func (m *TaskResourceUsage) Reset() { *m = TaskResourceUsage{} } func (m *TaskResourceUsage) String() string { return proto.CompactTextString(m) } func (*TaskResourceUsage) ProtoMessage() {} func (*TaskResourceUsage) Descriptor() ([]byte, []int) { - return fileDescriptor_driver_3d62bf87918f3eb8, []int{50} + return fileDescriptor_driver_8edefdede9e0ed2d, []int{50} } func (m *TaskResourceUsage) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TaskResourceUsage.Unmarshal(m, b) @@ -3011,7 +3022,7 @@ func (m *CPUUsage) Reset() { *m = CPUUsage{} } func (m *CPUUsage) String() string { return proto.CompactTextString(m) } func (*CPUUsage) ProtoMessage() {} func (*CPUUsage) Descriptor() ([]byte, []int) { - return fileDescriptor_driver_3d62bf87918f3eb8, []int{51} + return fileDescriptor_driver_8edefdede9e0ed2d, []int{51} } func (m *CPUUsage) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CPUUsage.Unmarshal(m, b) @@ -3099,7 +3110,7 @@ func (m *MemoryUsage) Reset() { *m = MemoryUsage{} } func (m *MemoryUsage) String() string { return proto.CompactTextString(m) } func (*MemoryUsage) ProtoMessage() {} func (*MemoryUsage) Descriptor() ([]byte, []int) { - return fileDescriptor_driver_3d62bf87918f3eb8, []int{52} + return fileDescriptor_driver_8edefdede9e0ed2d, []int{52} } func (m *MemoryUsage) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MemoryUsage.Unmarshal(m, b) @@ -3197,7 +3208,7 @@ func (m *DriverTaskEvent) Reset() { *m = DriverTaskEvent{} } func (m *DriverTaskEvent) String() string { return proto.CompactTextString(m) } func (*DriverTaskEvent) ProtoMessage() {} func (*DriverTaskEvent) Descriptor() ([]byte, []int) { - return fileDescriptor_driver_3d62bf87918f3eb8, []int{53} + return fileDescriptor_driver_8edefdede9e0ed2d, []int{53} } func (m *DriverTaskEvent) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DriverTaskEvent.Unmarshal(m, b) @@ -4087,229 +4098,230 @@ var _Driver_serviceDesc = grpc.ServiceDesc{ } func init() { - proto.RegisterFile("plugins/drivers/proto/driver.proto", fileDescriptor_driver_3d62bf87918f3eb8) -} - -var fileDescriptor_driver_3d62bf87918f3eb8 = []byte{ - // 3516 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x5a, 0x4f, 0x6f, 0x23, 0xc9, - 0x75, 0x57, 0xf3, 0x9f, 0xc8, 0x47, 0x89, 0x6a, 0x95, 0xa4, 0x59, 0x0e, 0x37, 0xc9, 0x8e, 0x1b, - 0x70, 0x20, 0xd8, 0xbb, 0xd4, 0xae, 0x8c, 0xec, 0xac, 0xd6, 0xb3, 0x9e, 0xe5, 0x52, 0x1c, 0x49, - 0x3b, 0x12, 0xa5, 0x14, 0x29, 0x8c, 0x27, 0x1b, 0x6f, 0xa7, 0xd5, 0x5d, 0x43, 0xf6, 0x88, 0xfd, - 0x67, 0xba, 0x8b, 0x1a, 0xc9, 0x46, 0x90, 0xc0, 0x01, 0x02, 0x07, 0x48, 0x90, 0x5c, 0x1c, 0x5f, - 0x72, 0x08, 0x9c, 0x63, 0xf2, 0x01, 0x82, 0x04, 0x3e, 0xe7, 0x43, 0x24, 0x97, 0xdc, 0x72, 0xc9, - 0x21, 0xdf, 0x20, 0xa8, 0x3f, 0xdd, 0xec, 0x16, 0x39, 0x9e, 0x26, 0x35, 0xa7, 0xee, 0x7a, 0x55, - 0xf5, 0xab, 0x57, 0xef, 0xbd, 0xaa, 0xf7, 0xaa, 0xea, 0x81, 0xe6, 0x8f, 0xc6, 0x03, 0xdb, 0x0d, - 0x77, 0xac, 0xc0, 0xbe, 0x22, 0x41, 0xb8, 0xe3, 0x07, 0x1e, 0xf5, 0x64, 0xa9, 0xc9, 0x0b, 0xe8, - 0xbb, 0x43, 0x23, 0x1c, 0xda, 0xa6, 0x17, 0xf8, 0x4d, 0xd7, 0x73, 0x0c, 0xab, 0x29, 0xfb, 0x34, - 0x65, 0x1f, 0xd1, 0xac, 0xf1, 0x7b, 0x03, 0xcf, 0x1b, 0x8c, 0x88, 0x40, 0xb8, 0x18, 0xbf, 0xd8, - 0xb1, 0xc6, 0x81, 0x41, 0x6d, 0xcf, 0x95, 0xf5, 0x1f, 0xdc, 0xae, 0xa7, 0xb6, 0x43, 0x42, 0x6a, - 0x38, 0xbe, 0x6c, 0xf0, 0xe5, 0xc0, 0xa6, 0xc3, 0xf1, 0x45, 0xd3, 0xf4, 0x9c, 0x9d, 0x78, 0xc8, - 0x1d, 0x3e, 0xe4, 0x4e, 0xc4, 0x66, 0x38, 0x34, 0x02, 0x62, 0xed, 0x0c, 0xcd, 0x51, 0xe8, 0x13, - 0x93, 0x7d, 0x75, 0xf6, 0x23, 0x11, 0x0e, 0xb2, 0x23, 0x84, 0x34, 0x18, 0x9b, 0x34, 0x9a, 0xaf, - 0x41, 0x69, 0x60, 0x5f, 0x8c, 0x29, 0x11, 0x40, 0xda, 0x7d, 0x78, 0xaf, 0x6f, 0x84, 0x97, 0x6d, - 0xcf, 0x7d, 0x61, 0x0f, 0x7a, 0xe6, 0x90, 0x38, 0x06, 0x26, 0xaf, 0xc6, 0x24, 0xa4, 0xda, 0x1f, - 0x43, 0x7d, 0xba, 0x2a, 0xf4, 0x3d, 0x37, 0x24, 0xe8, 0x4b, 0x28, 0x30, 0x6e, 0xea, 0xca, 0x03, - 0x65, 0xbb, 0xba, 0xfb, 0x61, 0xf3, 0x4d, 0x82, 0x13, 0x3c, 0x34, 0xe5, 0x2c, 0x9a, 0x3d, 0x9f, + proto.RegisterFile("plugins/drivers/proto/driver.proto", fileDescriptor_driver_8edefdede9e0ed2d) +} + +var fileDescriptor_driver_8edefdede9e0ed2d = []byte{ + // 3525 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x5a, 0x4f, 0x6f, 0x23, 0x47, + 0x76, 0x57, 0xf3, 0x9f, 0xc8, 0x47, 0x89, 0x6a, 0x95, 0xa4, 0x31, 0x87, 0x4e, 0xe2, 0xd9, 0x06, + 0x36, 0x10, 0x76, 0x6d, 0xca, 0xd6, 0x22, 0x1e, 0xcb, 0x3b, 0xde, 0x31, 0x4d, 0x71, 0x24, 0x79, + 0x24, 0x4a, 0x29, 0x52, 0x98, 0x9d, 0x38, 0xeb, 0x4e, 0xab, 0xbb, 0x86, 0xec, 0x11, 0xfb, 0x8f, + 0xbb, 0x8b, 0x1a, 0x69, 0x83, 0x20, 0xc1, 0x06, 0x08, 0x36, 0x40, 0x82, 0xe4, 0xe2, 0xec, 0x25, + 0x87, 0x60, 0x73, 0x4c, 0x3e, 0x40, 0x90, 0x60, 0xcf, 0xf9, 0x10, 0xc9, 0x25, 0xb7, 0x5c, 0x72, + 0xc8, 0x37, 0x58, 0xd4, 0x9f, 0x6e, 0x76, 0x8b, 0x1c, 0x4f, 0x93, 0x9a, 0x53, 0x77, 0xbd, 0xaa, + 0xfa, 0xd5, 0xab, 0xf7, 0x5e, 0xd5, 0x7b, 0x55, 0xf5, 0x40, 0xf3, 0x47, 0xe3, 0x81, 0xed, 0x86, + 0x3b, 0x56, 0x60, 0x5f, 0x91, 0x20, 0xdc, 0xf1, 0x03, 0x8f, 0x7a, 0xb2, 0xd4, 0xe4, 0x05, 0xf4, + 0xfd, 0xa1, 0x11, 0x0e, 0x6d, 0xd3, 0x0b, 0xfc, 0xa6, 0xeb, 0x39, 0x86, 0xd5, 0x94, 0x7d, 0x9a, + 0xb2, 0x8f, 0x68, 0xd6, 0xf8, 0xbd, 0x81, 0xe7, 0x0d, 0x46, 0x44, 0x20, 0x5c, 0x8c, 0x5f, 0xec, + 0x58, 0xe3, 0xc0, 0xa0, 0xb6, 0xe7, 0xca, 0xfa, 0xf7, 0x6e, 0xd7, 0x53, 0xdb, 0x21, 0x21, 0x35, + 0x1c, 0x5f, 0x36, 0xf8, 0x7c, 0x60, 0xd3, 0xe1, 0xf8, 0xa2, 0x69, 0x7a, 0xce, 0x4e, 0x3c, 0xe4, + 0x0e, 0x1f, 0x72, 0x27, 0x62, 0x33, 0x1c, 0x1a, 0x01, 0xb1, 0x76, 0x86, 0xe6, 0x28, 0xf4, 0x89, + 0xc9, 0xbe, 0x3a, 0xfb, 0x91, 0x08, 0x07, 0xd9, 0x11, 0x42, 0x1a, 0x8c, 0x4d, 0x1a, 0xcd, 0xd7, + 0xa0, 0x34, 0xb0, 0x2f, 0xc6, 0x94, 0x08, 0x20, 0xed, 0x3e, 0xbc, 0xd3, 0x37, 0xc2, 0xcb, 0xb6, + 0xe7, 0xbe, 0xb0, 0x07, 0x3d, 0x73, 0x48, 0x1c, 0x03, 0x93, 0x6f, 0xc6, 0x24, 0xa4, 0xda, 0x1f, + 0x43, 0x7d, 0xba, 0x2a, 0xf4, 0x3d, 0x37, 0x24, 0xe8, 0x73, 0x28, 0x30, 0x6e, 0xea, 0xca, 0x03, + 0x65, 0xbb, 0xba, 0xfb, 0x7e, 0xf3, 0x75, 0x82, 0x13, 0x3c, 0x34, 0xe5, 0x2c, 0x9a, 0x3d, 0x9f, 0x98, 0x98, 0xf7, 0xd4, 0xb6, 0x60, 0xa3, 0x6d, 0xf8, 0xc6, 0x85, 0x3d, 0xb2, 0xa9, 0x4d, 0xc2, - 0x68, 0xd0, 0x31, 0x6c, 0xa6, 0xc9, 0x72, 0xc0, 0x9f, 0xc0, 0x8a, 0x99, 0xa0, 0xcb, 0x81, 0xf7, + 0x68, 0xd0, 0x31, 0x6c, 0xa6, 0xc9, 0x72, 0xc0, 0x9f, 0xc1, 0x8a, 0x99, 0xa0, 0xcb, 0x81, 0xf7, 0x9a, 0x99, 0x34, 0xd6, 0xdc, 0xe7, 0xa5, 0x14, 0x70, 0x0a, 0x4e, 0xdb, 0x04, 0xf4, 0xc4, 0x76, 0x07, 0x24, 0xf0, 0x03, 0xdb, 0xa5, 0x11, 0x33, 0xbf, 0xc9, 0xc3, 0x46, 0x8a, 0x2c, 0x99, 0x79, - 0x09, 0x10, 0xcb, 0x91, 0xb1, 0x92, 0xdf, 0xae, 0xee, 0x7e, 0x9d, 0x91, 0x95, 0x19, 0x78, 0xcd, - 0x56, 0x0c, 0xd6, 0x71, 0x69, 0x70, 0x83, 0x13, 0xe8, 0xe8, 0x5b, 0x28, 0x0d, 0x89, 0x31, 0xa2, + 0x09, 0x10, 0xcb, 0x91, 0xb1, 0x92, 0xdf, 0xae, 0xee, 0x7e, 0x99, 0x91, 0x95, 0x19, 0x78, 0xcd, + 0x56, 0x0c, 0xd6, 0x71, 0x69, 0x70, 0x83, 0x13, 0xe8, 0xe8, 0x6b, 0x28, 0x0d, 0x89, 0x31, 0xa2, 0xc3, 0x7a, 0xee, 0x81, 0xb2, 0x5d, 0xdb, 0x7d, 0x72, 0x87, 0x71, 0x0e, 0x39, 0x50, 0x8f, 0x1a, - 0x94, 0x60, 0x89, 0x8a, 0x3e, 0x02, 0x24, 0xfe, 0x74, 0x8b, 0x84, 0x66, 0x60, 0xfb, 0xcc, 0x90, + 0x94, 0x60, 0x89, 0x8a, 0x3e, 0x00, 0x24, 0xfe, 0x74, 0x8b, 0x84, 0x66, 0x60, 0xfb, 0xcc, 0x90, 0xeb, 0xf9, 0x07, 0xca, 0x76, 0x05, 0xaf, 0x8b, 0x9a, 0xfd, 0x49, 0x45, 0xc3, 0x87, 0xb5, 0x5b, 0xdc, 0x22, 0x15, 0xf2, 0x97, 0xe4, 0x86, 0x6b, 0xa4, 0x82, 0xd9, 0x2f, 0x3a, 0x80, 0xe2, 0x95, - 0x31, 0x1a, 0x13, 0xce, 0x72, 0x75, 0xf7, 0x93, 0xb7, 0x99, 0x87, 0x34, 0xd1, 0x89, 0x1c, 0xb0, - 0xe8, 0xff, 0x79, 0xee, 0x33, 0x45, 0xdb, 0x83, 0x6a, 0x82, 0x6f, 0x54, 0x03, 0x38, 0xef, 0xee, + 0x31, 0x1a, 0x13, 0xce, 0x72, 0x75, 0xf7, 0xa3, 0x37, 0x99, 0x87, 0x34, 0xd1, 0x89, 0x1c, 0xb0, + 0xe8, 0xff, 0x69, 0xee, 0x13, 0x45, 0xdb, 0x83, 0x6a, 0x82, 0x6f, 0x54, 0x03, 0x38, 0xef, 0xee, 0x77, 0xfa, 0x9d, 0x76, 0xbf, 0xb3, 0xaf, 0x2e, 0xa1, 0x55, 0xa8, 0x9c, 0x77, 0x0f, 0x3b, 0xad, 0xe3, 0xfe, 0xe1, 0x73, 0x55, 0x41, 0x55, 0x58, 0x8e, 0x0a, 0x39, 0xed, 0x1a, 0x10, 0x26, 0xa6, - 0x77, 0x45, 0x02, 0x66, 0xc8, 0x52, 0xab, 0xe8, 0x3d, 0x58, 0xa6, 0x46, 0x78, 0xa9, 0xdb, 0x96, - 0xe4, 0xb9, 0xc4, 0x8a, 0x47, 0x16, 0x3a, 0x82, 0xd2, 0xd0, 0x70, 0xad, 0xd1, 0xdb, 0xf9, 0x4e, + 0x77, 0x45, 0x02, 0x66, 0xc8, 0x52, 0xab, 0xe8, 0x1d, 0x58, 0xa6, 0x46, 0x78, 0xa9, 0xdb, 0x96, + 0xe4, 0xb9, 0xc4, 0x8a, 0x47, 0x16, 0x3a, 0x82, 0xd2, 0xd0, 0x70, 0xad, 0xd1, 0x9b, 0xf9, 0x4e, 0x8b, 0x9a, 0x81, 0x1f, 0xf2, 0x8e, 0x58, 0x02, 0x30, 0xeb, 0x4e, 0x8d, 0x2c, 0x14, 0xa0, 0x3d, 0x07, 0xb5, 0x47, 0x8d, 0x80, 0x26, 0xd9, 0xe9, 0x40, 0x81, 0x8d, 0x2f, 0x2d, 0x7a, 0x9e, 0x31, - 0xc5, 0xca, 0xc4, 0xbc, 0xbb, 0xf6, 0x7f, 0x39, 0x58, 0x4f, 0x60, 0x4b, 0x4b, 0x7d, 0x06, 0xa5, + 0xc5, 0xca, 0xc4, 0xbc, 0xbb, 0xf6, 0xff, 0x39, 0x58, 0x4f, 0x60, 0x4b, 0x4b, 0x7d, 0x06, 0xa5, 0x80, 0x84, 0xe3, 0x11, 0xe5, 0xf0, 0xb5, 0xdd, 0xc7, 0x19, 0xe1, 0xa7, 0x90, 0x9a, 0x98, 0xc3, 0x60, 0x09, 0x87, 0xb6, 0x41, 0x15, 0x3d, 0x74, 0x12, 0x04, 0x5e, 0xa0, 0x3b, 0xe1, 0x80, 0x4b, 0xad, 0x82, 0x6b, 0x82, 0xde, 0x61, 0xe4, 0x93, 0x70, 0x90, 0x90, 0x6a, 0xfe, 0x8e, 0x52, 0x45, - 0x06, 0xa8, 0x2e, 0xa1, 0xaf, 0xbd, 0xe0, 0x52, 0x67, 0xa2, 0x0d, 0x6c, 0x8b, 0xd4, 0x0b, 0x1c, - 0xf4, 0xd3, 0x8c, 0xa0, 0x5d, 0xd1, 0xfd, 0x54, 0xf6, 0xc6, 0x6b, 0x6e, 0x9a, 0xa0, 0x7d, 0x1f, + 0x06, 0xa8, 0x2e, 0xa1, 0xaf, 0xbc, 0xe0, 0x52, 0x67, 0xa2, 0x0d, 0x6c, 0x8b, 0xd4, 0x0b, 0x1c, + 0xf4, 0xe3, 0x8c, 0xa0, 0x5d, 0xd1, 0xfd, 0x54, 0xf6, 0xc6, 0x6b, 0x6e, 0x9a, 0xa0, 0xfd, 0x10, 0x4a, 0x62, 0xa6, 0xcc, 0x92, 0x7a, 0xe7, 0xed, 0x76, 0xa7, 0xd7, 0x53, 0x97, 0x50, 0x05, 0x8a, - 0xb8, 0xd3, 0xc7, 0xcc, 0xc2, 0x2a, 0x50, 0x7c, 0xd2, 0xea, 0xb7, 0x8e, 0xd5, 0x9c, 0xf6, 0x3d, + 0xb8, 0xd3, 0xc7, 0xcc, 0xc2, 0x2a, 0x50, 0x7c, 0xd2, 0xea, 0xb7, 0x8e, 0xd5, 0x9c, 0xf6, 0x03, 0x58, 0x7b, 0x66, 0xd8, 0x34, 0x8b, 0x71, 0x69, 0x1e, 0xa8, 0x93, 0xb6, 0x52, 0x3b, 0x47, 0x29, 0xed, 0x64, 0x17, 0x4d, 0xe7, 0xda, 0xa6, 0xb7, 0xf4, 0xa1, 0x42, 0x9e, 0x04, 0x81, 0x54, 0x01, - 0xfb, 0xd5, 0x5e, 0xc3, 0x5a, 0x8f, 0x7a, 0x7e, 0x26, 0xcb, 0xff, 0x01, 0x2c, 0x33, 0x1f, 0xe5, + 0xfb, 0xd5, 0x5e, 0xc1, 0x5a, 0x8f, 0x7a, 0x7e, 0x26, 0xcb, 0xff, 0x11, 0x2c, 0x33, 0x1f, 0xe5, 0x8d, 0xa9, 0x34, 0xfd, 0xfb, 0x4d, 0xe1, 0xc3, 0x9a, 0x91, 0x0f, 0x6b, 0xee, 0x4b, 0x1f, 0x87, 0xa3, 0x96, 0xe8, 0x1e, 0x94, 0x42, 0x7b, 0xe0, 0x1a, 0x23, 0xb9, 0x5b, 0xc8, 0x92, 0x86, 0x98, 0x91, 0x47, 0x03, 0x4b, 0xc3, 0x6f, 0x03, 0xda, 0x27, 0x21, 0x0d, 0xbc, 0x9b, 0x4c, 0xfc, 0x6c, 0x42, 0xf1, 0x85, 0x17, 0x98, 0x62, 0x21, 0x96, 0xb1, 0x28, 0xb0, 0x45, 0x95, 0x02, 0x91, 0xd8, - 0x1f, 0x01, 0x3a, 0x72, 0x99, 0x4f, 0xc9, 0xa6, 0x88, 0xbf, 0xcb, 0xc1, 0x46, 0xaa, 0xbd, 0x54, + 0x1f, 0x00, 0x3a, 0x72, 0x99, 0x4f, 0xc9, 0xa6, 0x88, 0xbf, 0xcf, 0xc1, 0x46, 0xaa, 0xbd, 0x54, 0xc6, 0xe2, 0xeb, 0x90, 0x6d, 0x4c, 0xe3, 0x50, 0xac, 0x43, 0x74, 0x0a, 0x25, 0xd1, 0x42, 0x4a, - 0xf2, 0xe1, 0x1c, 0x40, 0xc2, 0x4d, 0x49, 0x38, 0x09, 0x33, 0xd3, 0xe8, 0xf3, 0xef, 0xd6, 0xe8, - 0x5f, 0x83, 0x1a, 0xcd, 0x23, 0x7c, 0xab, 0x6e, 0xbe, 0x86, 0x0d, 0xd3, 0x1b, 0x8d, 0x88, 0xc9, - 0xac, 0x41, 0xb7, 0x5d, 0x4a, 0x82, 0x2b, 0x63, 0xf4, 0x76, 0xbb, 0x41, 0x93, 0x5e, 0x47, 0xb2, - 0x93, 0xf6, 0x0d, 0xac, 0x27, 0x06, 0x96, 0x8a, 0x78, 0x02, 0xc5, 0x90, 0x11, 0xa4, 0x26, 0x3e, - 0x9e, 0x53, 0x13, 0x21, 0x16, 0xdd, 0xb5, 0x0d, 0x01, 0xde, 0xb9, 0x22, 0x6e, 0x3c, 0x2d, 0x6d, + 0xf2, 0xe1, 0x1c, 0x40, 0xc2, 0x4d, 0x49, 0x38, 0x09, 0x33, 0xd3, 0xe8, 0xf3, 0x6f, 0xd7, 0xe8, + 0x5f, 0x81, 0x1a, 0xcd, 0x23, 0x7c, 0xa3, 0x6e, 0xbe, 0x84, 0x0d, 0xd3, 0x1b, 0x8d, 0x88, 0xc9, + 0xac, 0x41, 0xb7, 0x5d, 0x4a, 0x82, 0x2b, 0x63, 0xf4, 0x66, 0xbb, 0x41, 0x93, 0x5e, 0x47, 0xb2, + 0x93, 0xf6, 0x15, 0xac, 0x27, 0x06, 0x96, 0x8a, 0x78, 0x02, 0xc5, 0x90, 0x11, 0xa4, 0x26, 0x3e, + 0x9c, 0x53, 0x13, 0x21, 0x16, 0xdd, 0xb5, 0x0d, 0x01, 0xde, 0xb9, 0x22, 0x6e, 0x3c, 0x2d, 0x6d, 0x1f, 0xd6, 0x7b, 0xdc, 0x4c, 0x33, 0xd9, 0xe1, 0xc4, 0xc4, 0x73, 0x29, 0x13, 0xdf, 0x04, 0x94, 0x44, 0x91, 0x86, 0x78, 0x03, 0x6b, 0x9d, 0x6b, 0x62, 0x66, 0x42, 0xae, 0xc3, 0xb2, 0xe9, 0x39, 0x8e, 0xe1, 0x5a, 0xf5, 0xdc, 0x83, 0xfc, 0x76, 0x05, 0x47, 0xc5, 0xe4, 0x5a, 0xcc, 0x67, 0x5d, - 0x8b, 0xda, 0xdf, 0x28, 0xa0, 0x4e, 0xc6, 0x96, 0x82, 0x64, 0xdc, 0x53, 0x8b, 0x01, 0xb1, 0xb1, + 0x8b, 0xda, 0xdf, 0x2a, 0xa0, 0x4e, 0xc6, 0x96, 0x82, 0x64, 0xdc, 0x53, 0x8b, 0x01, 0xb1, 0xb1, 0x57, 0xb0, 0x2c, 0x49, 0x7a, 0xb4, 0x5d, 0x08, 0x3a, 0x09, 0x82, 0xc4, 0x76, 0x94, 0xbf, 0xe3, 0x76, 0xa4, 0x1d, 0xc2, 0xef, 0x44, 0xec, 0xf4, 0x68, 0x40, 0x0c, 0xc7, 0x76, 0x07, 0x47, 0xa7, 0xa7, 0x3e, 0x11, 0x8c, 0x23, 0x04, 0x05, 0xcb, 0xa0, 0x86, 0x64, 0x8c, 0xff, 0xb3, 0x45, 0x6f, - 0x8e, 0xbc, 0x30, 0x5e, 0xf4, 0xbc, 0xa0, 0xfd, 0x47, 0x1e, 0xea, 0x53, 0x50, 0x91, 0x78, 0xbf, - 0x81, 0x62, 0x48, 0xe8, 0xd8, 0x97, 0xa6, 0xd2, 0xc9, 0xcc, 0xf0, 0x6c, 0xbc, 0x66, 0x8f, 0x81, - 0x61, 0x81, 0x89, 0x06, 0x50, 0xa6, 0xf4, 0x46, 0x0f, 0xed, 0x9f, 0x46, 0x01, 0xc1, 0xf1, 0x5d, - 0xf1, 0xfb, 0x24, 0x70, 0x6c, 0xd7, 0x18, 0xf5, 0xec, 0x9f, 0x12, 0xbc, 0x4c, 0xe9, 0x0d, 0xfb, + 0x8e, 0xbc, 0x30, 0x5e, 0xf4, 0xbc, 0xa0, 0xfd, 0x67, 0x1e, 0xea, 0x53, 0x50, 0x91, 0x78, 0xbf, + 0x82, 0x62, 0x48, 0xe8, 0xd8, 0x97, 0xa6, 0xd2, 0xc9, 0xcc, 0xf0, 0x6c, 0xbc, 0x66, 0x8f, 0x81, + 0x61, 0x81, 0x89, 0x06, 0x50, 0xa6, 0xf4, 0x46, 0x0f, 0xed, 0x9f, 0x47, 0x01, 0xc1, 0xf1, 0x5d, + 0xf1, 0xfb, 0x24, 0x70, 0x6c, 0xd7, 0x18, 0xf5, 0xec, 0x9f, 0x13, 0xbc, 0x4c, 0xe9, 0x0d, 0xfb, 0x41, 0xcf, 0x99, 0xc1, 0x5b, 0xb6, 0x2b, 0xc5, 0xde, 0x5e, 0x74, 0x94, 0x84, 0x80, 0xb1, 0x40, 0x6c, 0x1c, 0x43, 0x91, 0xcf, 0x69, 0x11, 0x43, 0x54, 0x21, 0x4f, 0xe9, 0x0d, 0x67, 0xaa, 0x8c, 0xd9, 0x6f, 0xe3, 0x11, 0xac, 0x24, 0x67, 0xc0, 0x0c, 0x69, 0x48, 0xec, 0xc1, 0x50, 0x18, 0x58, - 0x11, 0xcb, 0x12, 0xd3, 0xe4, 0x6b, 0xdb, 0x92, 0x21, 0x6b, 0x11, 0x8b, 0x82, 0xf6, 0xaf, 0x39, - 0xb8, 0x3f, 0x43, 0x32, 0xd2, 0x58, 0xbf, 0x49, 0x19, 0xeb, 0x3b, 0x92, 0x42, 0x64, 0xf1, 0xdf, - 0xa4, 0x2c, 0xfe, 0x1d, 0x82, 0xb3, 0x65, 0x73, 0x0f, 0x4a, 0xe4, 0xda, 0xa6, 0xc4, 0x92, 0xa2, - 0x92, 0xa5, 0xc4, 0x72, 0x2a, 0xdc, 0x75, 0x39, 0x7d, 0x02, 0x9b, 0xed, 0x80, 0x18, 0x94, 0xc8, + 0x11, 0xcb, 0x12, 0xd3, 0xe4, 0x2b, 0xdb, 0x92, 0x21, 0x6b, 0x11, 0x8b, 0x82, 0xf6, 0x6f, 0x39, + 0xb8, 0x3f, 0x43, 0x32, 0xd2, 0x58, 0xbf, 0x4a, 0x19, 0xeb, 0x5b, 0x92, 0x42, 0x64, 0xf1, 0x5f, + 0xa5, 0x2c, 0xfe, 0x2d, 0x82, 0xb3, 0x65, 0x73, 0x0f, 0x4a, 0xe4, 0xda, 0xa6, 0xc4, 0x92, 0xa2, + 0x92, 0xa5, 0xc4, 0x72, 0x2a, 0xdc, 0x75, 0x39, 0x7d, 0x04, 0x9b, 0xed, 0x80, 0x18, 0x94, 0xc8, 0xad, 0x3c, 0xb2, 0xff, 0xfb, 0x50, 0x36, 0x46, 0x23, 0xcf, 0x9c, 0xa8, 0x75, 0x99, 0x97, 0x8f, - 0x2c, 0xed, 0x67, 0xb0, 0x75, 0xab, 0x8b, 0x14, 0xf4, 0x05, 0xd4, 0xec, 0xd0, 0x1b, 0xf1, 0x39, - 0xe8, 0x89, 0x43, 0xdc, 0x0f, 0xe7, 0xf3, 0x26, 0x47, 0x11, 0x06, 0x3f, 0xd3, 0xad, 0xda, 0xc9, - 0xa2, 0xf6, 0xf7, 0x0a, 0x6c, 0x49, 0x57, 0x9d, 0x99, 0xe3, 0x19, 0x8c, 0xe5, 0xde, 0x39, 0x63, - 0x75, 0xb8, 0x77, 0x9b, 0x2f, 0xb9, 0x79, 0xff, 0x63, 0x1e, 0xd0, 0xf4, 0x31, 0x11, 0x7d, 0x07, - 0x56, 0x42, 0xe2, 0x5a, 0xba, 0xd8, 0xf8, 0x85, 0x4f, 0x2a, 0xe3, 0x2a, 0xa3, 0x09, 0x0f, 0x10, - 0xb2, 0xbd, 0x8c, 0x5c, 0x4b, 0x6e, 0xcb, 0x98, 0xff, 0xa3, 0x21, 0xac, 0xbc, 0x08, 0xf5, 0x78, - 0x6c, 0x6e, 0x19, 0xb5, 0xcc, 0xfb, 0xd3, 0x34, 0x1f, 0xcd, 0x27, 0xbd, 0x78, 0x5e, 0xb8, 0xfa, - 0x22, 0x8c, 0x0b, 0xe8, 0x17, 0x0a, 0xbc, 0x17, 0xc5, 0x07, 0x13, 0xf1, 0x39, 0x9e, 0x45, 0xc2, - 0x7a, 0xe1, 0x41, 0x7e, 0xbb, 0xb6, 0x7b, 0x76, 0x07, 0xf9, 0x4d, 0x11, 0x4f, 0x3c, 0x8b, 0xe0, - 0x2d, 0x77, 0x06, 0x35, 0x44, 0x4d, 0xd8, 0x70, 0xc6, 0x21, 0xd5, 0x4d, 0x6e, 0x77, 0xba, 0x6c, - 0x54, 0x2f, 0x72, 0xb9, 0xac, 0xb3, 0xaa, 0x94, 0x45, 0x6a, 0x4d, 0xa8, 0x26, 0xa6, 0x85, 0xca, - 0x50, 0xe8, 0x9e, 0x76, 0x3b, 0xea, 0x12, 0x02, 0x28, 0xb5, 0x0f, 0xf1, 0xe9, 0x69, 0x5f, 0x84, - 0xdb, 0x47, 0x27, 0xad, 0x83, 0x8e, 0x9a, 0xd3, 0xfe, 0x37, 0x07, 0x9b, 0xb3, 0x98, 0x44, 0x16, - 0x14, 0xd8, 0x84, 0xe5, 0x19, 0xe7, 0xdd, 0xcf, 0x97, 0xa3, 0x33, 0x3d, 0xfb, 0x86, 0xdc, 0xd4, - 0x2a, 0x98, 0xff, 0x23, 0x1d, 0x4a, 0x23, 0xe3, 0x82, 0x8c, 0xc2, 0x7a, 0x9e, 0xdf, 0x02, 0x1c, - 0xdc, 0x65, 0xec, 0x63, 0x8e, 0x24, 0xae, 0x00, 0x24, 0x6c, 0x63, 0x0f, 0xaa, 0x09, 0xf2, 0x8c, - 0xb3, 0xf6, 0x66, 0xf2, 0xac, 0x5d, 0x49, 0x1e, 0x9c, 0x1f, 0x4f, 0x4b, 0x8b, 0xcd, 0x86, 0xc9, - 0xf9, 0xf0, 0xb4, 0xd7, 0x17, 0xa7, 0x9a, 0x03, 0x7c, 0x7a, 0x7e, 0xa6, 0x2a, 0x8c, 0xd8, 0x6f, - 0xf5, 0x9e, 0xaa, 0xb9, 0x58, 0x0d, 0x79, 0xed, 0x5f, 0x96, 0x01, 0x26, 0xe7, 0x4c, 0x54, 0x83, - 0x5c, 0xbc, 0x68, 0x73, 0xb6, 0xc5, 0xe4, 0xe1, 0x1a, 0x4e, 0x34, 0x30, 0xff, 0x47, 0xbb, 0xb0, - 0xe5, 0x84, 0x03, 0xdf, 0x30, 0x2f, 0x75, 0x79, 0x3c, 0x34, 0x79, 0x67, 0xbe, 0x00, 0x56, 0xf0, - 0x86, 0xac, 0x94, 0x06, 0x2e, 0x70, 0x8f, 0x21, 0x4f, 0xdc, 0x2b, 0x6e, 0xac, 0xd5, 0xdd, 0xcf, - 0xe7, 0x3e, 0xff, 0x36, 0x3b, 0xee, 0x95, 0x90, 0x19, 0x83, 0x41, 0x3a, 0x80, 0x45, 0xae, 0x6c, - 0x93, 0xe8, 0x0c, 0xb4, 0xc8, 0x41, 0xbf, 0x9c, 0x1f, 0x74, 0x9f, 0x63, 0xc4, 0xd0, 0x15, 0x2b, - 0x2a, 0xa3, 0x2e, 0x54, 0x02, 0x12, 0x7a, 0xe3, 0xc0, 0x24, 0x61, 0xbd, 0x34, 0x57, 0x88, 0x8a, - 0xa3, 0x7e, 0x78, 0x02, 0x81, 0xf6, 0xa1, 0xe4, 0x78, 0x63, 0x97, 0x86, 0xf5, 0x65, 0xce, 0xec, - 0x87, 0x19, 0xc1, 0x4e, 0x58, 0x27, 0x2c, 0xfb, 0xa2, 0x03, 0x58, 0x16, 0x2c, 0x86, 0xf5, 0x32, - 0x87, 0xf9, 0x28, 0xeb, 0x5e, 0xc3, 0x7b, 0xe1, 0xa8, 0x37, 0xd3, 0xea, 0x38, 0x24, 0x41, 0xbd, - 0x22, 0xb4, 0xca, 0xfe, 0xd1, 0xfb, 0x50, 0x11, 0x9b, 0xb6, 0x65, 0x07, 0x75, 0xe0, 0x15, 0x62, - 0x17, 0xdf, 0xb7, 0x03, 0xf4, 0x01, 0x54, 0x85, 0x97, 0xd5, 0xf9, 0xea, 0xa8, 0xf2, 0x6a, 0x10, - 0xa4, 0x33, 0xb6, 0x46, 0x44, 0x03, 0x12, 0x04, 0xa2, 0xc1, 0x4a, 0xdc, 0x80, 0x04, 0x01, 0x6f, - 0xf0, 0xfb, 0xb0, 0xc6, 0x63, 0x93, 0x41, 0xe0, 0x8d, 0x7d, 0x9d, 0xdb, 0xd4, 0x2a, 0x6f, 0xb4, - 0xca, 0xc8, 0x07, 0x8c, 0xda, 0x65, 0xc6, 0x75, 0x1f, 0xca, 0x2f, 0xbd, 0x0b, 0xd1, 0xa0, 0x26, - 0x7c, 0xc7, 0x4b, 0xef, 0x22, 0xaa, 0x8a, 0xdd, 0xca, 0x5a, 0xda, 0xad, 0xbc, 0x82, 0x7b, 0xd3, - 0xfb, 0x23, 0x77, 0x2f, 0xea, 0xdd, 0xdd, 0xcb, 0xa6, 0x3b, 0x83, 0xda, 0xf8, 0x14, 0xca, 0x91, - 0xe5, 0xcc, 0xb3, 0x62, 0x1b, 0x8f, 0xa0, 0x96, 0xb6, 0xbb, 0xb9, 0xd6, 0xfb, 0x7f, 0x2a, 0x50, - 0x89, 0x2d, 0x0c, 0xb9, 0xb0, 0xc1, 0x25, 0x60, 0x50, 0x62, 0xe9, 0x13, 0x83, 0x15, 0xbe, 0xfe, - 0x8b, 0x8c, 0x73, 0x6e, 0x45, 0x08, 0xf2, 0x5c, 0x21, 0xad, 0x17, 0xc5, 0xc8, 0x93, 0xf1, 0xbe, - 0x85, 0xb5, 0x91, 0xed, 0x8e, 0xaf, 0x13, 0x63, 0x09, 0xf7, 0xfd, 0x07, 0x19, 0xc7, 0x3a, 0x66, - 0xbd, 0x27, 0x63, 0xd4, 0x46, 0xa9, 0xb2, 0xf6, 0xcb, 0x1c, 0xdc, 0x9b, 0xcd, 0x0e, 0xea, 0x42, - 0xde, 0xf4, 0xc7, 0x72, 0x6a, 0x8f, 0xe6, 0x9d, 0x5a, 0xdb, 0x1f, 0x4f, 0x46, 0x65, 0x40, 0xe8, - 0x19, 0x94, 0x1c, 0xe2, 0x78, 0xc1, 0x8d, 0x9c, 0xc1, 0xe3, 0x79, 0x21, 0x4f, 0x78, 0xef, 0x09, - 0xaa, 0x84, 0x43, 0x18, 0xca, 0xd2, 0x5e, 0x42, 0xb9, 0x33, 0xcd, 0x79, 0x84, 0x8f, 0x20, 0x71, - 0x8c, 0xa3, 0x7d, 0x0a, 0x5b, 0x33, 0xa7, 0x82, 0x7e, 0x17, 0xc0, 0xf4, 0xc7, 0x3a, 0xbf, 0x62, - 0x15, 0x7a, 0xcf, 0xe3, 0x8a, 0xe9, 0x8f, 0x7b, 0x9c, 0xa0, 0x3d, 0x84, 0xfa, 0x9b, 0xf8, 0x65, - 0xeb, 0x5d, 0x70, 0xac, 0x3b, 0x17, 0x5c, 0x06, 0x79, 0x5c, 0x16, 0x84, 0x93, 0x0b, 0xed, 0x57, - 0x39, 0x58, 0xbb, 0xc5, 0x0e, 0x0b, 0x81, 0xc5, 0xfe, 0x11, 0x1d, 0x2e, 0x44, 0x89, 0x6d, 0x26, - 0xa6, 0x6d, 0x45, 0xd7, 0x52, 0xfc, 0x9f, 0xbb, 0x11, 0x5f, 0x5e, 0x19, 0xe5, 0x6c, 0x9f, 0x19, - 0xb4, 0x73, 0x61, 0xd3, 0x90, 0x47, 0xc9, 0x45, 0x2c, 0x0a, 0xe8, 0x39, 0xd4, 0x02, 0x12, 0x92, - 0xe0, 0x8a, 0x58, 0xba, 0xef, 0x05, 0x34, 0x12, 0xd8, 0xee, 0x7c, 0x02, 0x3b, 0xf3, 0x02, 0x8a, - 0x57, 0x23, 0x24, 0x56, 0x0a, 0xd1, 0x33, 0x58, 0xb5, 0x6e, 0x5c, 0xc3, 0xb1, 0x4d, 0x89, 0x5c, - 0x5a, 0x18, 0x79, 0x45, 0x02, 0x71, 0x60, 0x6d, 0x0f, 0xaa, 0x89, 0x4a, 0x36, 0x31, 0xee, 0xc4, - 0xa5, 0x4c, 0x44, 0x21, 0xbd, 0x7e, 0x8b, 0x72, 0xfd, 0x6a, 0xff, 0x94, 0x83, 0x5a, 0x7a, 0x01, - 0x44, 0xfa, 0xf3, 0x49, 0x60, 0x7b, 0x56, 0x42, 0x7f, 0x67, 0x9c, 0xc0, 0x74, 0xc4, 0xaa, 0x5f, - 0x8d, 0x3d, 0x6a, 0x44, 0x3a, 0x32, 0xfd, 0xf1, 0x1f, 0xb2, 0xf2, 0x2d, 0xdd, 0xe7, 0x6f, 0xe9, - 0x1e, 0x7d, 0x08, 0x48, 0xea, 0x77, 0x64, 0x3b, 0x36, 0xd5, 0x2f, 0x6e, 0x28, 0x11, 0xf2, 0xcf, - 0x63, 0x55, 0xd4, 0x1c, 0xb3, 0x8a, 0xaf, 0x18, 0x1d, 0x69, 0xb0, 0xea, 0x79, 0x8e, 0x1e, 0x9a, - 0x5e, 0x40, 0x74, 0xc3, 0x7a, 0xc9, 0x03, 0xba, 0x3c, 0xae, 0x7a, 0x9e, 0xd3, 0x63, 0xb4, 0x96, - 0xf5, 0x92, 0xed, 0xf1, 0xa6, 0x3f, 0x0e, 0x09, 0xd5, 0xd9, 0x87, 0xbb, 0xc5, 0x0a, 0x06, 0x41, - 0x6a, 0xfb, 0xe3, 0x30, 0xd1, 0xc0, 0x21, 0x0e, 0x73, 0x75, 0x89, 0x06, 0x27, 0xc4, 0x61, 0xa3, - 0xac, 0x9c, 0x91, 0xc0, 0x24, 0x2e, 0xed, 0xdb, 0xe6, 0x25, 0xf3, 0x62, 0xca, 0xb6, 0x82, 0x53, - 0x34, 0xed, 0x27, 0x50, 0xe4, 0x5e, 0x8f, 0x4d, 0x9e, 0x7b, 0x0c, 0xee, 0x50, 0x84, 0x78, 0xcb, - 0x8c, 0xc0, 0xdd, 0xc9, 0xfb, 0x50, 0x19, 0x7a, 0xa1, 0x74, 0x47, 0xc2, 0xf2, 0xca, 0x8c, 0xc0, - 0x2b, 0x1b, 0x50, 0x0e, 0x88, 0x61, 0x79, 0xee, 0x28, 0x3a, 0xd9, 0xc6, 0x65, 0xed, 0x15, 0x94, - 0xc4, 0xf6, 0x7b, 0x07, 0xfc, 0x8f, 0x00, 0x99, 0xc2, 0x8f, 0xf9, 0xec, 0xa4, 0x1c, 0x86, 0xb6, - 0xe7, 0x86, 0xd1, 0x73, 0x8a, 0xa8, 0x39, 0x9b, 0x54, 0x68, 0xff, 0xa5, 0x88, 0x10, 0x4b, 0x5c, - 0x74, 0xb3, 0xc3, 0x38, 0xb3, 0x34, 0x76, 0x62, 0x10, 0x27, 0xea, 0xa8, 0xc8, 0x0e, 0x93, 0x32, - 0x92, 0xca, 0x2d, 0xfa, 0x4e, 0x20, 0x01, 0xa2, 0xfb, 0x35, 0x22, 0x0f, 0x25, 0xf3, 0xde, 0xaf, - 0x11, 0x71, 0xbf, 0x46, 0xd8, 0xd1, 0x48, 0xc6, 0x78, 0x02, 0xae, 0xc0, 0x43, 0xbc, 0xaa, 0x15, - 0x5f, 0x62, 0x12, 0xed, 0x7f, 0x94, 0x78, 0xaf, 0x88, 0x2e, 0x1b, 0xd1, 0xb7, 0x50, 0x66, 0xcb, - 0x4e, 0x77, 0x0c, 0x5f, 0x3e, 0x9d, 0xb5, 0x17, 0xbb, 0xc7, 0x6c, 0xb2, 0x55, 0x76, 0x62, 0xf8, - 0x22, 0x42, 0x5b, 0xf6, 0x45, 0x89, 0xed, 0x39, 0x86, 0x35, 0xd9, 0x73, 0xd8, 0x3f, 0xfa, 0x2e, - 0xd4, 0x8c, 0x31, 0xf5, 0x74, 0xc3, 0xba, 0x22, 0x01, 0xb5, 0x43, 0x22, 0x75, 0xbf, 0xca, 0xa8, - 0xad, 0x88, 0xd8, 0xf8, 0x1c, 0x56, 0x92, 0x98, 0x6f, 0xf3, 0xbe, 0xc5, 0xa4, 0xf7, 0xfd, 0x13, - 0x80, 0xc9, 0xc1, 0x9d, 0xd9, 0x08, 0xb9, 0xb6, 0xa9, 0x6e, 0x46, 0xc7, 0x92, 0x22, 0x2e, 0x33, - 0x42, 0x9b, 0x05, 0xe0, 0xe9, 0x5b, 0xc5, 0x62, 0x74, 0xab, 0xc8, 0x56, 0x2d, 0x5b, 0x68, 0x97, - 0xf6, 0x68, 0x14, 0x5f, 0x26, 0x54, 0x3c, 0xcf, 0x79, 0xca, 0x09, 0xda, 0x6f, 0x72, 0xc2, 0x56, - 0xc4, 0xfd, 0x70, 0xa6, 0x70, 0xfc, 0x5d, 0xa9, 0x7a, 0x0f, 0x20, 0xa4, 0x46, 0xc0, 0x42, 0x09, - 0x23, 0xba, 0xce, 0x68, 0x4c, 0x5d, 0x4b, 0xf6, 0xa3, 0x67, 0x6e, 0x5c, 0x91, 0xad, 0x5b, 0x14, - 0x7d, 0x01, 0x2b, 0xa6, 0xe7, 0xf8, 0x23, 0x22, 0x3b, 0x17, 0xdf, 0xda, 0xb9, 0x1a, 0xb7, 0x6f, - 0xd1, 0xc4, 0x25, 0x4a, 0xe9, 0xae, 0x97, 0x28, 0xff, 0xa6, 0x88, 0x6b, 0xee, 0xe4, 0x2d, 0x3b, - 0x1a, 0xcc, 0x78, 0xca, 0x3d, 0x58, 0xf0, 0xca, 0xfe, 0xb7, 0xbd, 0xe3, 0x36, 0xbe, 0xc8, 0xf2, - 0x70, 0xfa, 0xe6, 0xe0, 0xee, 0xdf, 0xf3, 0x50, 0x89, 0x6f, 0xb8, 0xa7, 0x74, 0xff, 0x19, 0x54, - 0xe2, 0x1c, 0x03, 0xb9, 0x41, 0xfc, 0x56, 0xf5, 0xc4, 0x8d, 0xd1, 0x0b, 0x40, 0xc6, 0x60, 0x10, - 0x07, 0x6d, 0xfa, 0x38, 0x34, 0x06, 0xd1, 0xfb, 0xc2, 0x67, 0x73, 0xc8, 0x21, 0xf2, 0x5b, 0xe7, - 0xac, 0x3f, 0x56, 0x8d, 0xc1, 0x20, 0x45, 0x41, 0x3f, 0x83, 0xad, 0xf4, 0x18, 0xfa, 0xc5, 0x8d, - 0xee, 0xdb, 0x96, 0x3c, 0xf6, 0x1d, 0xce, 0x7b, 0xc9, 0xdf, 0x4c, 0xc1, 0x7f, 0x75, 0x73, 0x66, - 0x5b, 0x42, 0xe6, 0x28, 0x98, 0xaa, 0x68, 0xfc, 0x19, 0xbc, 0xf7, 0x86, 0xe6, 0x33, 0x74, 0xd0, - 0x4d, 0x3f, 0x5e, 0x2f, 0x2e, 0x84, 0x84, 0xf6, 0x7e, 0xad, 0x88, 0xb7, 0x88, 0xb4, 0x4c, 0x5a, - 0xc9, 0xb8, 0x75, 0x27, 0xe3, 0x38, 0xed, 0xb3, 0x73, 0x01, 0xcf, 0x43, 0xd5, 0xaf, 0x6f, 0x85, - 0xaa, 0x59, 0x83, 0x18, 0x11, 0xf1, 0x09, 0x20, 0x89, 0xa0, 0xfd, 0x73, 0x1e, 0xca, 0x11, 0x3a, - 0x3f, 0xb4, 0xdd, 0x84, 0x94, 0x38, 0x7a, 0x7c, 0xb3, 0xa2, 0x60, 0x10, 0x24, 0x7e, 0x8b, 0xf0, - 0x3e, 0x54, 0xd8, 0xd9, 0x50, 0x54, 0xe7, 0x78, 0x75, 0x99, 0x11, 0x78, 0xe5, 0x07, 0x50, 0xa5, - 0x1e, 0x35, 0x46, 0x3a, 0xe5, 0xbe, 0x3c, 0x2f, 0x7a, 0x73, 0x12, 0xf7, 0xe4, 0xe8, 0xfb, 0xb0, - 0x4e, 0x87, 0x81, 0x47, 0xe9, 0x88, 0xc5, 0x77, 0x3c, 0xa2, 0x11, 0x01, 0x48, 0x01, 0xab, 0x71, - 0x85, 0x88, 0x74, 0x42, 0xb6, 0x7b, 0x4f, 0x1a, 0x33, 0xd3, 0xe5, 0x9b, 0x48, 0x01, 0xaf, 0xc6, - 0x54, 0x66, 0xda, 0xcc, 0x79, 0xfa, 0x22, 0x5a, 0xe0, 0x7b, 0x85, 0x82, 0xa3, 0x22, 0xd2, 0x61, - 0xcd, 0x21, 0x46, 0x38, 0x0e, 0x88, 0xa5, 0xbf, 0xb0, 0xc9, 0xc8, 0x12, 0x67, 0xed, 0x5a, 0xe6, - 0xf0, 0x3b, 0x12, 0x4b, 0xf3, 0x09, 0xef, 0x8d, 0x6b, 0x11, 0x9c, 0x28, 0xb3, 0xc8, 0x41, 0xfc, - 0xa1, 0x35, 0xa8, 0xf6, 0x9e, 0xf7, 0xfa, 0x9d, 0x13, 0xfd, 0xe4, 0x74, 0xbf, 0x23, 0xf3, 0x13, - 0x7a, 0x1d, 0x2c, 0x8a, 0x0a, 0xab, 0xef, 0x9f, 0xf6, 0x5b, 0xc7, 0x7a, 0xff, 0xa8, 0xfd, 0xb4, - 0xa7, 0xe6, 0xd0, 0x16, 0xac, 0xf7, 0x0f, 0xf1, 0x69, 0xbf, 0x7f, 0xdc, 0xd9, 0xd7, 0xcf, 0x3a, - 0xf8, 0xe8, 0x74, 0xbf, 0xa7, 0xe6, 0x11, 0x82, 0xda, 0x84, 0xdc, 0x3f, 0x3a, 0xe9, 0xa8, 0x05, - 0x54, 0x85, 0xe5, 0xb3, 0x0e, 0x6e, 0x77, 0xba, 0x7d, 0xb5, 0xa8, 0xfd, 0x2a, 0x0f, 0xd5, 0x84, - 0x16, 0x99, 0x21, 0x07, 0xa1, 0x88, 0xf3, 0x0b, 0x98, 0xfd, 0xf2, 0xf7, 0x14, 0xc3, 0x1c, 0x0a, - 0xed, 0x14, 0xb0, 0x28, 0xf0, 0xd8, 0xde, 0xb8, 0x4e, 0xac, 0xf3, 0x02, 0x2e, 0x3b, 0xc6, 0xb5, - 0x00, 0xf9, 0x0e, 0xac, 0x5c, 0x92, 0xc0, 0x25, 0x23, 0x59, 0x2f, 0x34, 0x52, 0x15, 0x34, 0xd1, - 0x64, 0x1b, 0x54, 0xd9, 0x64, 0x02, 0x23, 0xd4, 0x51, 0x13, 0xf4, 0x93, 0x08, 0x6c, 0x13, 0x8a, - 0xa2, 0x7a, 0x59, 0x8c, 0xcf, 0x0b, 0xcc, 0x4d, 0x85, 0xaf, 0x0d, 0x9f, 0xc7, 0x77, 0x05, 0xcc, - 0xff, 0xd1, 0xc5, 0xb4, 0x7e, 0x4a, 0x5c, 0x3f, 0x7b, 0xf3, 0x9b, 0xf3, 0x9b, 0x54, 0x34, 0x8c, - 0x55, 0xb4, 0x0c, 0x79, 0x1c, 0x3d, 0xea, 0xb7, 0x5b, 0xed, 0x43, 0xa6, 0x96, 0x55, 0xa8, 0x9c, - 0xb4, 0x7e, 0xac, 0x9f, 0xf7, 0xf8, 0x4d, 0x23, 0x52, 0x61, 0xe5, 0x69, 0x07, 0x77, 0x3b, 0xc7, - 0x92, 0x92, 0x47, 0x9b, 0xa0, 0x4a, 0xca, 0xa4, 0x5d, 0x81, 0x21, 0x88, 0xdf, 0x22, 0x2a, 0x43, - 0xa1, 0xf7, 0xac, 0x75, 0xa6, 0x96, 0xb4, 0xff, 0xce, 0xc1, 0x9a, 0x70, 0x0b, 0xf1, 0xf3, 0xe3, - 0x9b, 0x9f, 0x5f, 0x92, 0x17, 0x17, 0xb9, 0xf4, 0xc5, 0x45, 0x14, 0x84, 0x72, 0xaf, 0x9e, 0x9f, - 0x04, 0xa1, 0xfc, 0xc2, 0x23, 0xb5, 0xe3, 0x17, 0xe6, 0xd9, 0xf1, 0xeb, 0xb0, 0xec, 0x90, 0x30, - 0xd6, 0x5b, 0x05, 0x47, 0x45, 0x64, 0x43, 0xd5, 0x70, 0x5d, 0x8f, 0xf2, 0x8b, 0x8c, 0xe8, 0x58, - 0x74, 0x30, 0xd7, 0x9d, 0x75, 0x3c, 0xe3, 0x66, 0x6b, 0x82, 0x24, 0x36, 0xe6, 0x24, 0x76, 0xe3, - 0x47, 0xa0, 0xde, 0x6e, 0x30, 0x8f, 0x3b, 0xfc, 0xde, 0x27, 0x13, 0x6f, 0x48, 0xd8, 0xba, 0x38, - 0xef, 0x3e, 0xed, 0x9e, 0x3e, 0xeb, 0xaa, 0x4b, 0xac, 0x80, 0xcf, 0xbb, 0xdd, 0xa3, 0xee, 0x81, - 0xaa, 0x20, 0x80, 0x52, 0xe7, 0xc7, 0x47, 0xfd, 0xce, 0xbe, 0x9a, 0xdb, 0xfd, 0xf5, 0x3a, 0x94, - 0x04, 0x93, 0xe8, 0x97, 0x32, 0x12, 0x48, 0xa6, 0xb6, 0xa1, 0x1f, 0xcd, 0x1d, 0x51, 0xa7, 0xd2, - 0xe5, 0x1a, 0x8f, 0x17, 0xee, 0x2f, 0x5f, 0x20, 0x96, 0xd0, 0x5f, 0x29, 0xb0, 0x92, 0x7a, 0x7d, - 0xc8, 0x7a, 0x1b, 0x3a, 0x23, 0x93, 0xae, 0xf1, 0xc3, 0x85, 0xfa, 0xc6, 0xbc, 0xfc, 0x42, 0x81, - 0x6a, 0x22, 0x87, 0x0c, 0xed, 0x2d, 0x92, 0x77, 0x26, 0x38, 0xf9, 0x7c, 0xf1, 0x94, 0x35, 0x6d, - 0xe9, 0x63, 0x05, 0xfd, 0xa5, 0x02, 0xd5, 0x44, 0x36, 0x55, 0x66, 0x56, 0xa6, 0x73, 0xbf, 0x32, - 0xb3, 0x32, 0x2b, 0x79, 0x6b, 0x09, 0xfd, 0xb9, 0x02, 0x95, 0x38, 0x33, 0x0a, 0x3d, 0x9c, 0x3f, - 0x97, 0x4a, 0x30, 0xf1, 0xd9, 0xa2, 0x49, 0x58, 0xda, 0x12, 0xfa, 0x53, 0x28, 0x47, 0x69, 0x44, - 0x28, 0xab, 0xf7, 0xba, 0x95, 0xa3, 0xd4, 0x78, 0x38, 0x77, 0xbf, 0xe4, 0xf0, 0x51, 0x6e, 0x4f, - 0xe6, 0xe1, 0x6f, 0x65, 0x21, 0x35, 0x1e, 0xce, 0xdd, 0x2f, 0x1e, 0x9e, 0x59, 0x42, 0x22, 0x05, - 0x28, 0xb3, 0x25, 0x4c, 0xe7, 0x1e, 0x65, 0xb6, 0x84, 0x59, 0x19, 0x47, 0x82, 0x91, 0x44, 0x12, - 0x51, 0x66, 0x46, 0xa6, 0x13, 0x95, 0x32, 0x33, 0x32, 0x23, 0x67, 0x49, 0x5b, 0x42, 0x3f, 0x57, - 0x92, 0xe7, 0x82, 0x87, 0x73, 0xe7, 0xca, 0xcc, 0x69, 0x92, 0x53, 0xd9, 0x3a, 0x7c, 0x81, 0xfe, - 0x5c, 0xde, 0x62, 0x88, 0x54, 0x1b, 0x34, 0x0f, 0x58, 0x2a, 0x3b, 0xa7, 0xf1, 0xe9, 0x62, 0xce, - 0x86, 0x33, 0xf1, 0x17, 0x0a, 0xc0, 0x24, 0x29, 0x27, 0x33, 0x13, 0x53, 0xd9, 0x40, 0x8d, 0xbd, - 0x05, 0x7a, 0x26, 0x17, 0x48, 0x94, 0x34, 0x90, 0x79, 0x81, 0xdc, 0x4a, 0x1a, 0xca, 0xbc, 0x40, - 0x6e, 0x27, 0xfc, 0x68, 0x4b, 0xe8, 0x1f, 0x14, 0x58, 0x9f, 0x4a, 0x5a, 0x40, 0x8f, 0xef, 0x98, - 0xb7, 0xd2, 0xf8, 0x72, 0x71, 0x80, 0x88, 0xb5, 0x6d, 0xe5, 0x63, 0x05, 0xfd, 0xb5, 0x02, 0xab, - 0xa9, 0x37, 0x60, 0x94, 0xd9, 0x4b, 0xcd, 0x48, 0x7f, 0x68, 0x3c, 0x5a, 0xac, 0x73, 0x2c, 0xad, - 0xbf, 0x55, 0xa0, 0x96, 0x4e, 0x07, 0x40, 0x8f, 0xe6, 0xdb, 0x16, 0x6e, 0x31, 0xf4, 0xc5, 0x82, - 0xbd, 0x23, 0x8e, 0xbe, 0x5a, 0xfe, 0xa3, 0xa2, 0x88, 0xde, 0x4a, 0xfc, 0xf3, 0x83, 0xff, 0x0f, - 0x00, 0x00, 0xff, 0xff, 0x53, 0x5e, 0xb3, 0xe1, 0xb7, 0x30, 0x00, 0x00, + 0x2c, 0xed, 0x5b, 0x05, 0xb6, 0x6e, 0xf5, 0x91, 0x92, 0xbe, 0x80, 0x9a, 0x1d, 0x7a, 0x23, 0x3e, + 0x09, 0x3d, 0x71, 0x8a, 0xfb, 0xf1, 0x7c, 0xee, 0xe4, 0x28, 0xc2, 0xe0, 0x87, 0xba, 0x55, 0x3b, + 0x59, 0xe4, 0x56, 0xc5, 0x07, 0xb7, 0xe4, 0x6a, 0x8e, 0x8a, 0xda, 0x3f, 0x28, 0xb0, 0x25, 0xbd, + 0x78, 0xe6, 0xc9, 0xcc, 0x60, 0x39, 0xf7, 0xb6, 0x59, 0xd6, 0xea, 0x70, 0xef, 0x36, 0x5f, 0x72, + 0x5f, 0xff, 0xa7, 0x3c, 0xa0, 0xe9, 0x13, 0x24, 0xfa, 0x1e, 0xac, 0x84, 0xc4, 0xb5, 0x74, 0xe1, + 0x13, 0x84, 0xbb, 0x2a, 0xe3, 0x2a, 0xa3, 0x09, 0xe7, 0x10, 0xb2, 0x6d, 0x8e, 0x5c, 0x4b, 0x6e, + 0xcb, 0x98, 0xff, 0xa3, 0x21, 0xac, 0xbc, 0x08, 0xf5, 0x78, 0x6c, 0x6e, 0x34, 0xb5, 0xcc, 0x5b, + 0xd7, 0x34, 0x1f, 0xcd, 0x27, 0xbd, 0x78, 0x5e, 0xb8, 0xfa, 0x22, 0x8c, 0x0b, 0xe8, 0x97, 0x0a, + 0xbc, 0x13, 0x85, 0x0e, 0x13, 0xf1, 0x39, 0x9e, 0x45, 0xc2, 0x7a, 0xe1, 0x41, 0x7e, 0xbb, 0xb6, + 0x7b, 0x76, 0x07, 0xf9, 0x4d, 0x11, 0x4f, 0x3c, 0x8b, 0xe0, 0x2d, 0x77, 0x06, 0x35, 0x44, 0x4d, + 0xd8, 0x70, 0xc6, 0x21, 0xd5, 0x85, 0x15, 0xe8, 0xb2, 0x51, 0xbd, 0xc8, 0xe5, 0xb2, 0xce, 0xaa, + 0x52, 0xb6, 0xaa, 0x35, 0xa1, 0x9a, 0x98, 0x16, 0x2a, 0x43, 0xa1, 0x7b, 0xda, 0xed, 0xa8, 0x4b, + 0x08, 0xa0, 0xd4, 0x3e, 0xc4, 0xa7, 0xa7, 0x7d, 0x11, 0x89, 0x1f, 0x9d, 0xb4, 0x0e, 0x3a, 0x6a, + 0x4e, 0xfb, 0xbf, 0x1c, 0x6c, 0xce, 0x62, 0x12, 0x59, 0x50, 0x60, 0x13, 0x96, 0xc7, 0x9f, 0xb7, + 0x3f, 0x5f, 0x8e, 0xce, 0xf4, 0xec, 0x1b, 0x72, 0xbf, 0xab, 0x60, 0xfe, 0x8f, 0x74, 0x28, 0x8d, + 0x8c, 0x0b, 0x32, 0x0a, 0xeb, 0x79, 0x7e, 0x41, 0x70, 0x70, 0x97, 0xb1, 0x8f, 0x39, 0x92, 0xb8, + 0x1d, 0x90, 0xb0, 0x8d, 0x3d, 0xa8, 0x26, 0xc8, 0x33, 0x8e, 0xe1, 0x9b, 0xc9, 0x63, 0x78, 0x25, + 0x79, 0xa6, 0x7e, 0x3c, 0x2d, 0x2d, 0x36, 0x1b, 0x26, 0xe7, 0xc3, 0xd3, 0x5e, 0x5f, 0x1c, 0x78, + 0x0e, 0xf0, 0xe9, 0xf9, 0x99, 0xaa, 0x30, 0x62, 0xbf, 0xd5, 0x7b, 0xaa, 0xe6, 0x62, 0x35, 0xe4, + 0xb5, 0x7f, 0x5d, 0x06, 0x98, 0x1c, 0x41, 0x51, 0x0d, 0x72, 0xf1, 0xa2, 0xcd, 0xd9, 0x16, 0x93, + 0x87, 0x6b, 0x38, 0xd1, 0xc0, 0xfc, 0x1f, 0xed, 0xc2, 0x96, 0x13, 0x0e, 0x7c, 0xc3, 0xbc, 0xd4, + 0xe5, 0xc9, 0xd1, 0xe4, 0x9d, 0xf9, 0x02, 0x58, 0xc1, 0x1b, 0xb2, 0x52, 0x1a, 0xb8, 0xc0, 0x3d, + 0x86, 0x3c, 0x71, 0xaf, 0xb8, 0xb1, 0x56, 0x77, 0x3f, 0x9d, 0xfb, 0x68, 0xdc, 0xec, 0xb8, 0x57, + 0x42, 0x66, 0x0c, 0x06, 0xe9, 0x00, 0x16, 0xb9, 0xb2, 0x4d, 0xa2, 0x33, 0xd0, 0x22, 0x07, 0xfd, + 0x7c, 0x7e, 0xd0, 0x7d, 0x8e, 0x11, 0x43, 0x57, 0xac, 0xa8, 0x8c, 0xba, 0x50, 0x09, 0x48, 0xe8, + 0x8d, 0x03, 0x93, 0x84, 0xf5, 0xd2, 0x5c, 0xd1, 0x2b, 0x8e, 0xfa, 0xe1, 0x09, 0x04, 0xda, 0x87, + 0x92, 0xe3, 0x8d, 0x5d, 0x1a, 0xd6, 0x97, 0x39, 0xb3, 0xef, 0x67, 0x04, 0x3b, 0x61, 0x9d, 0xb0, + 0xec, 0x8b, 0x0e, 0x60, 0x59, 0xb0, 0x18, 0xd6, 0xcb, 0x1c, 0xe6, 0x83, 0xac, 0x7b, 0x0d, 0xef, + 0x85, 0xa3, 0xde, 0x4c, 0xab, 0xe3, 0x90, 0x04, 0xf5, 0x8a, 0xd0, 0x2a, 0xfb, 0x47, 0xef, 0x42, + 0x45, 0x6c, 0xda, 0x96, 0x1d, 0xd4, 0x81, 0x57, 0x88, 0x5d, 0x7c, 0xdf, 0x0e, 0xd0, 0x7b, 0x50, + 0x15, 0x0e, 0x58, 0xe7, 0xab, 0xa3, 0xca, 0xab, 0x41, 0x90, 0xce, 0xd8, 0x1a, 0x11, 0x0d, 0x48, + 0x10, 0x88, 0x06, 0x2b, 0x71, 0x03, 0x12, 0x04, 0xbc, 0xc1, 0xef, 0xc3, 0x1a, 0x0f, 0x5b, 0x06, + 0x81, 0x37, 0xf6, 0x75, 0x6e, 0x53, 0xab, 0xbc, 0xd1, 0x2a, 0x23, 0x1f, 0x30, 0x6a, 0x97, 0x19, + 0xd7, 0x7d, 0x28, 0xbf, 0xf4, 0x2e, 0x44, 0x83, 0x9a, 0xf0, 0x1d, 0x2f, 0xbd, 0x8b, 0xa8, 0x2a, + 0x76, 0x2b, 0x6b, 0x69, 0xb7, 0xf2, 0x0d, 0xdc, 0x9b, 0xde, 0x1f, 0xb9, 0x7b, 0x51, 0xef, 0xee, + 0x5e, 0x36, 0xdd, 0x19, 0xd4, 0xc6, 0xc7, 0x50, 0x8e, 0x2c, 0x67, 0x9e, 0x15, 0xdb, 0x78, 0x04, + 0xb5, 0xb4, 0xdd, 0xcd, 0xb5, 0xde, 0xff, 0x4b, 0x81, 0x4a, 0x6c, 0x61, 0xc8, 0x85, 0x0d, 0x2e, + 0x01, 0xe6, 0x8f, 0xf5, 0x89, 0xc1, 0x8a, 0x28, 0xe0, 0xb3, 0x8c, 0x73, 0x6e, 0x45, 0x08, 0xf2, + 0xc8, 0x21, 0xad, 0x17, 0xc5, 0xc8, 0x93, 0xf1, 0xbe, 0x86, 0xb5, 0x91, 0xed, 0x8e, 0xaf, 0x13, + 0x63, 0x09, 0xf7, 0xfd, 0x07, 0x19, 0xc7, 0x3a, 0x66, 0xbd, 0x27, 0x63, 0xd4, 0x46, 0xa9, 0xb2, + 0xf6, 0x6d, 0x0e, 0xee, 0xcd, 0x66, 0x07, 0x75, 0x21, 0x6f, 0xfa, 0x63, 0x39, 0xb5, 0x47, 0xf3, + 0x4e, 0xad, 0xed, 0x8f, 0x27, 0xa3, 0x32, 0x20, 0xf4, 0x0c, 0x4a, 0x0e, 0x71, 0xbc, 0xe0, 0x46, + 0xce, 0xe0, 0xf1, 0xbc, 0x90, 0x27, 0xbc, 0xf7, 0x04, 0x55, 0xc2, 0x21, 0x0c, 0x65, 0x69, 0x2f, + 0xa1, 0xdc, 0x99, 0xe6, 0x3c, 0xdd, 0x47, 0x90, 0x38, 0xc6, 0xd1, 0x3e, 0x86, 0xad, 0x99, 0x53, + 0x41, 0xbf, 0x0b, 0x60, 0xfa, 0x63, 0x9d, 0xdf, 0xbe, 0x0a, 0xbd, 0xe7, 0x71, 0xc5, 0xf4, 0xc7, + 0x3d, 0x4e, 0xd0, 0x1e, 0x42, 0xfd, 0x75, 0xfc, 0xb2, 0xf5, 0x2e, 0x38, 0xd6, 0x9d, 0x0b, 0x2e, + 0x83, 0x3c, 0x2e, 0x0b, 0xc2, 0xc9, 0x85, 0xf6, 0xab, 0x1c, 0xac, 0xdd, 0x62, 0x87, 0x45, 0xc7, + 0x62, 0xff, 0x88, 0xce, 0x1d, 0xa2, 0xc4, 0x36, 0x13, 0xd3, 0xb6, 0xa2, 0x1b, 0x2b, 0xfe, 0xcf, + 0xdd, 0x88, 0x2f, 0x6f, 0x93, 0x72, 0xb6, 0xcf, 0x0c, 0xda, 0xb9, 0xb0, 0x69, 0xc8, 0x03, 0xe8, + 0x22, 0x16, 0x05, 0xf4, 0x1c, 0x6a, 0x01, 0x09, 0x49, 0x70, 0x45, 0x2c, 0xdd, 0xf7, 0x02, 0x1a, + 0x09, 0x6c, 0x77, 0x3e, 0x81, 0x9d, 0x79, 0x01, 0xc5, 0xab, 0x11, 0x12, 0x2b, 0x85, 0xe8, 0x19, + 0xac, 0x5a, 0x37, 0xae, 0xe1, 0xd8, 0xa6, 0x44, 0x2e, 0x2d, 0x8c, 0xbc, 0x22, 0x81, 0x38, 0xb0, + 0xb6, 0x07, 0xd5, 0x44, 0x25, 0x9b, 0x18, 0x77, 0xe2, 0x52, 0x26, 0xa2, 0x90, 0x5e, 0xbf, 0x45, + 0xb9, 0x7e, 0xb5, 0x7f, 0xce, 0x41, 0x2d, 0xbd, 0x00, 0x22, 0xfd, 0xf9, 0x24, 0xb0, 0x3d, 0x2b, + 0xa1, 0xbf, 0x33, 0x4e, 0x60, 0x3a, 0x62, 0xd5, 0xdf, 0x8c, 0x3d, 0x6a, 0x44, 0x3a, 0x32, 0xfd, + 0xf1, 0x1f, 0xb2, 0xf2, 0x2d, 0xdd, 0xe7, 0x6f, 0xe9, 0x1e, 0xbd, 0x0f, 0x48, 0xea, 0x77, 0x64, + 0x3b, 0x36, 0xd5, 0x2f, 0x6e, 0x28, 0x11, 0xf2, 0xcf, 0x63, 0x55, 0xd4, 0x1c, 0xb3, 0x8a, 0x2f, + 0x18, 0x1d, 0x69, 0xb0, 0xea, 0x79, 0x8e, 0x1e, 0x9a, 0x5e, 0x40, 0x74, 0xc3, 0x7a, 0xc9, 0x03, + 0xba, 0x3c, 0xae, 0x7a, 0x9e, 0xd3, 0x63, 0xb4, 0x96, 0xf5, 0x92, 0xed, 0xf1, 0xa6, 0x3f, 0x0e, + 0x09, 0xd5, 0xd9, 0x87, 0xbb, 0xc5, 0x0a, 0x06, 0x41, 0x6a, 0xfb, 0xe3, 0x30, 0xd1, 0xc0, 0x21, + 0x0e, 0x73, 0x75, 0x89, 0x06, 0x27, 0xc4, 0x61, 0xa3, 0xac, 0x9c, 0x91, 0xc0, 0x24, 0x2e, 0xed, + 0xdb, 0xe6, 0x25, 0xf3, 0x62, 0xca, 0xb6, 0x82, 0x53, 0x34, 0xed, 0x67, 0x50, 0xe4, 0x5e, 0x8f, + 0x4d, 0x9e, 0x7b, 0x0c, 0xee, 0x50, 0x84, 0x78, 0xcb, 0x8c, 0xc0, 0xdd, 0xc9, 0xbb, 0x50, 0x19, + 0x7a, 0xa1, 0x74, 0x47, 0xc2, 0xf2, 0xca, 0x8c, 0xc0, 0x2b, 0x1b, 0x50, 0x0e, 0x88, 0x61, 0x79, + 0xee, 0x28, 0x3a, 0xf4, 0xc6, 0x65, 0xed, 0x1b, 0x28, 0x89, 0xed, 0xf7, 0x0e, 0xf8, 0x1f, 0x00, + 0x32, 0x85, 0x1f, 0xf3, 0xd9, 0x21, 0x3a, 0x0c, 0x6d, 0xcf, 0x0d, 0xa3, 0x97, 0x16, 0x51, 0x73, + 0x36, 0xa9, 0xd0, 0xfe, 0x5b, 0x11, 0x21, 0x96, 0xb8, 0x03, 0x67, 0x27, 0x2a, 0x66, 0x69, 0xec, + 0xc4, 0x20, 0x0e, 0xdb, 0x51, 0x91, 0x9d, 0x33, 0x65, 0x24, 0x95, 0x5b, 0xf4, 0x09, 0x41, 0x02, + 0x44, 0x57, 0x6f, 0x44, 0x1e, 0x4a, 0xe6, 0xbd, 0x7a, 0x23, 0xe2, 0xea, 0x8d, 0xb0, 0xa3, 0x91, + 0x8c, 0xf1, 0x04, 0x5c, 0x81, 0x87, 0x78, 0x55, 0x2b, 0xbe, 0xdf, 0x24, 0xda, 0xff, 0x2a, 0xf1, + 0x5e, 0x11, 0xdd, 0x43, 0xa2, 0xaf, 0xa1, 0xcc, 0x96, 0x9d, 0xee, 0x18, 0xbe, 0x7c, 0x55, 0x6b, + 0x2f, 0x76, 0xc5, 0xd9, 0x64, 0xab, 0xec, 0xc4, 0xf0, 0x45, 0x84, 0xb6, 0xec, 0x8b, 0x12, 0xdb, + 0x73, 0x0c, 0x6b, 0xb2, 0xe7, 0xb0, 0x7f, 0xf4, 0x7d, 0xa8, 0x19, 0x63, 0xea, 0xe9, 0x86, 0x75, + 0x45, 0x02, 0x6a, 0x87, 0x44, 0xea, 0x7e, 0x95, 0x51, 0x5b, 0x11, 0xb1, 0xf1, 0x29, 0xac, 0x24, + 0x31, 0xdf, 0xe4, 0x7d, 0x8b, 0x49, 0xef, 0xfb, 0x27, 0x00, 0x93, 0x33, 0x3d, 0xb3, 0x11, 0x72, + 0x6d, 0x53, 0xdd, 0x8c, 0x8e, 0x25, 0x45, 0x5c, 0x66, 0x84, 0x36, 0x0b, 0xc0, 0xd3, 0x17, 0x8e, + 0xc5, 0xe8, 0xc2, 0x91, 0xad, 0x5a, 0xb6, 0xd0, 0x2e, 0xed, 0xd1, 0x28, 0xbe, 0x67, 0xa8, 0x78, + 0x9e, 0xf3, 0x94, 0x13, 0xb4, 0xdf, 0xe4, 0x84, 0xad, 0x88, 0xab, 0xe3, 0x4c, 0xe1, 0xf8, 0xdb, + 0x52, 0xf5, 0x1e, 0x40, 0x48, 0x8d, 0x80, 0x85, 0x12, 0x46, 0x74, 0xd3, 0xd1, 0x98, 0xba, 0xb1, + 0xec, 0x47, 0x2f, 0xe0, 0xb8, 0x22, 0x5b, 0xb7, 0x28, 0xfa, 0x0c, 0x56, 0x4c, 0xcf, 0xf1, 0x47, + 0x44, 0x76, 0x2e, 0xbe, 0xb1, 0x73, 0x35, 0x6e, 0xdf, 0xa2, 0x89, 0xfb, 0x95, 0xd2, 0x5d, 0xef, + 0x57, 0xfe, 0x5d, 0x11, 0x37, 0xe0, 0xc9, 0x0b, 0x78, 0x34, 0x98, 0xf1, 0xca, 0x7b, 0xb0, 0xe0, + 0x6d, 0xfe, 0x77, 0x3d, 0xf1, 0x36, 0x3e, 0xcb, 0xf2, 0xa6, 0xfa, 0xfa, 0xe0, 0xee, 0x3f, 0xf2, + 0x50, 0x89, 0x2f, 0xbf, 0xa7, 0x74, 0xff, 0x09, 0x54, 0xe2, 0xf4, 0x03, 0xb9, 0x41, 0x7c, 0xa7, + 0x7a, 0xe2, 0xc6, 0xe8, 0x05, 0x20, 0x63, 0x30, 0x88, 0x83, 0x36, 0x7d, 0x1c, 0x1a, 0x83, 0xe8, + 0xe9, 0xe1, 0x93, 0x39, 0xe4, 0x10, 0xf9, 0xad, 0x73, 0xd6, 0x1f, 0xab, 0xc6, 0x60, 0x90, 0xa2, + 0xa0, 0x3f, 0x85, 0xad, 0xf4, 0x18, 0xfa, 0xc5, 0x8d, 0xee, 0xdb, 0x96, 0x3c, 0xf6, 0x1d, 0xce, + 0x7b, 0xff, 0xdf, 0x4c, 0xc1, 0x7f, 0x71, 0x73, 0x66, 0x5b, 0x42, 0xe6, 0x28, 0x98, 0xaa, 0x68, + 0xfc, 0x39, 0xbc, 0xf3, 0x9a, 0xe6, 0x33, 0x74, 0xd0, 0x4d, 0xbf, 0x6b, 0x2f, 0x2e, 0x84, 0x84, + 0xf6, 0x7e, 0xad, 0x88, 0x67, 0x8a, 0xb4, 0x4c, 0x5a, 0xc9, 0xb8, 0x75, 0x27, 0xe3, 0x38, 0xed, + 0xb3, 0x73, 0x01, 0xcf, 0x43, 0xd5, 0x2f, 0x6f, 0x85, 0xaa, 0x59, 0x83, 0x18, 0x11, 0xf1, 0x09, + 0x20, 0x89, 0xa0, 0xfd, 0x4b, 0x1e, 0xca, 0x11, 0x3a, 0x3f, 0xb4, 0xdd, 0x84, 0x94, 0x38, 0x7a, + 0x7c, 0xb3, 0xa2, 0x60, 0x10, 0x24, 0x7e, 0x8b, 0xf0, 0x2e, 0x54, 0xd8, 0xd9, 0x50, 0x54, 0xe7, + 0x78, 0x75, 0x99, 0x11, 0x78, 0xe5, 0x7b, 0x50, 0xa5, 0x1e, 0x35, 0x46, 0x3a, 0xe5, 0xbe, 0x3c, + 0x2f, 0x7a, 0x73, 0x12, 0xf7, 0xe4, 0xe8, 0x87, 0xb0, 0x4e, 0x87, 0x81, 0x47, 0xe9, 0x88, 0xc5, + 0x77, 0x3c, 0xa2, 0x11, 0x01, 0x48, 0x01, 0xab, 0x71, 0x85, 0x88, 0x74, 0x42, 0xb6, 0x7b, 0x4f, + 0x1a, 0x33, 0xd3, 0xe5, 0x9b, 0x48, 0x01, 0xaf, 0xc6, 0x54, 0x66, 0xda, 0xcc, 0x79, 0xfa, 0x22, + 0x5a, 0xe0, 0x7b, 0x85, 0x82, 0xa3, 0x22, 0xd2, 0x61, 0xcd, 0x21, 0x46, 0x38, 0x0e, 0x88, 0xa5, + 0xbf, 0xb0, 0xc9, 0xc8, 0x12, 0x67, 0xed, 0x5a, 0xe6, 0xf0, 0x3b, 0x12, 0x4b, 0xf3, 0x09, 0xef, + 0x8d, 0x6b, 0x11, 0x9c, 0x28, 0xb3, 0xc8, 0x41, 0xfc, 0xa1, 0x35, 0xa8, 0xf6, 0x9e, 0xf7, 0xfa, + 0x9d, 0x13, 0xfd, 0xe4, 0x74, 0xbf, 0x23, 0x53, 0x17, 0x7a, 0x1d, 0x2c, 0x8a, 0x0a, 0xab, 0xef, + 0x9f, 0xf6, 0x5b, 0xc7, 0x7a, 0xff, 0xa8, 0xfd, 0xb4, 0xa7, 0xe6, 0xd0, 0x16, 0xac, 0xf7, 0x0f, + 0xf1, 0x69, 0xbf, 0x7f, 0xdc, 0xd9, 0xd7, 0xcf, 0x3a, 0xf8, 0xe8, 0x74, 0xbf, 0xa7, 0xe6, 0x11, + 0x82, 0xda, 0x84, 0xdc, 0x3f, 0x3a, 0xe9, 0xa8, 0x05, 0x54, 0x85, 0xe5, 0xb3, 0x0e, 0x6e, 0x77, + 0xba, 0x7d, 0xb5, 0xa8, 0xfd, 0x2a, 0x0f, 0xd5, 0x84, 0x16, 0x99, 0x21, 0x07, 0xa1, 0x88, 0xf3, + 0x0b, 0x98, 0xfd, 0xf2, 0xa7, 0x16, 0xc3, 0x1c, 0x0a, 0xed, 0x14, 0xb0, 0x28, 0xf0, 0xd8, 0xde, + 0xb8, 0x4e, 0xac, 0xf3, 0x02, 0x2e, 0x3b, 0xc6, 0xb5, 0x00, 0xf9, 0x1e, 0xac, 0x5c, 0x92, 0xc0, + 0x25, 0x23, 0x59, 0x2f, 0x34, 0x52, 0x15, 0x34, 0xd1, 0x64, 0x1b, 0x54, 0xd9, 0x64, 0x02, 0x23, + 0xd4, 0x51, 0x13, 0xf4, 0x93, 0x08, 0x6c, 0x13, 0x8a, 0xa2, 0x7a, 0x59, 0x8c, 0xcf, 0x0b, 0xcc, + 0x4d, 0x85, 0xaf, 0x0c, 0x9f, 0xc7, 0x77, 0x05, 0xcc, 0xff, 0xd1, 0xc5, 0xb4, 0x7e, 0x4a, 0x5c, + 0x3f, 0x7b, 0xf3, 0x9b, 0xf3, 0xeb, 0x54, 0x34, 0x8c, 0x55, 0xb4, 0x0c, 0x79, 0x1c, 0xbd, 0xf7, + 0xb7, 0x5b, 0xed, 0x43, 0xa6, 0x96, 0x55, 0xa8, 0x9c, 0xb4, 0x7e, 0xaa, 0x9f, 0xf7, 0xf8, 0x4d, + 0x23, 0x52, 0x61, 0xe5, 0x69, 0x07, 0x77, 0x3b, 0xc7, 0x92, 0x92, 0x47, 0x9b, 0xa0, 0x4a, 0xca, + 0xa4, 0x5d, 0x81, 0x21, 0x88, 0xdf, 0x22, 0x2a, 0x43, 0xa1, 0xf7, 0xac, 0x75, 0xa6, 0x96, 0xb4, + 0xff, 0xc9, 0xc1, 0x9a, 0x70, 0x0b, 0xf1, 0xcb, 0xe4, 0xeb, 0x5f, 0x66, 0x92, 0x17, 0x17, 0xb9, + 0xf4, 0xc5, 0x45, 0x14, 0x84, 0x72, 0xaf, 0x9e, 0x9f, 0x04, 0xa1, 0xfc, 0xc2, 0x23, 0xb5, 0xe3, + 0x17, 0xe6, 0xd9, 0xf1, 0xeb, 0xb0, 0xec, 0x90, 0x30, 0xd6, 0x5b, 0x05, 0x47, 0x45, 0x64, 0x43, + 0xd5, 0x70, 0x5d, 0x8f, 0xf2, 0x8b, 0x8c, 0xe8, 0x58, 0x74, 0x30, 0xd7, 0x9d, 0x75, 0x3c, 0xe3, + 0x66, 0x6b, 0x82, 0x24, 0x36, 0xe6, 0x24, 0x76, 0xe3, 0x27, 0xa0, 0xde, 0x6e, 0x30, 0x8f, 0x3b, + 0xfc, 0xc1, 0x47, 0x13, 0x6f, 0x48, 0xd8, 0xba, 0x38, 0xef, 0x3e, 0xed, 0x9e, 0x3e, 0xeb, 0xaa, + 0x4b, 0xac, 0x80, 0xcf, 0xbb, 0xdd, 0xa3, 0xee, 0x81, 0xaa, 0x20, 0x80, 0x52, 0xe7, 0xa7, 0x47, + 0xfd, 0xce, 0xbe, 0x9a, 0xdb, 0xfd, 0xf5, 0x3a, 0x94, 0x04, 0x93, 0xe8, 0x5b, 0x19, 0x09, 0x24, + 0xb3, 0xde, 0xd0, 0x4f, 0xe6, 0x8e, 0xa8, 0x53, 0x99, 0x74, 0x8d, 0xc7, 0x0b, 0xf7, 0x97, 0x2f, + 0x10, 0x4b, 0xe8, 0xaf, 0x15, 0x58, 0x49, 0xbd, 0x3e, 0x64, 0xbd, 0x0d, 0x9d, 0x91, 0x64, 0xd7, + 0xf8, 0xf1, 0x42, 0x7d, 0x63, 0x5e, 0x7e, 0xa9, 0x40, 0x35, 0x91, 0x5e, 0x86, 0xf6, 0x16, 0x49, + 0x49, 0x13, 0x9c, 0x7c, 0xba, 0x78, 0x36, 0x9b, 0xb6, 0xf4, 0xa1, 0x82, 0xfe, 0x4a, 0x81, 0x6a, + 0x22, 0xd1, 0x2a, 0x33, 0x2b, 0xd3, 0x69, 0x61, 0x99, 0x59, 0x99, 0x95, 0xd7, 0xb5, 0x84, 0xfe, + 0x42, 0x81, 0x4a, 0x9c, 0x34, 0x85, 0x1e, 0xce, 0x9f, 0x66, 0x25, 0x98, 0xf8, 0x64, 0xd1, 0xfc, + 0x2c, 0x6d, 0x09, 0xfd, 0x19, 0x94, 0xa3, 0x0c, 0x23, 0x94, 0xd5, 0x7b, 0xdd, 0x4a, 0x5f, 0x6a, + 0x3c, 0x9c, 0xbb, 0x5f, 0x72, 0xf8, 0x28, 0xed, 0x27, 0xf3, 0xf0, 0xb7, 0x12, 0x94, 0x1a, 0x0f, + 0xe7, 0xee, 0x17, 0x0f, 0xcf, 0x2c, 0x21, 0x91, 0x1d, 0x94, 0xd9, 0x12, 0xa6, 0xd3, 0x92, 0x32, + 0x5b, 0xc2, 0xac, 0x64, 0x24, 0xc1, 0x48, 0x22, 0xbf, 0x28, 0x33, 0x23, 0xd3, 0x39, 0x4c, 0x99, + 0x19, 0x99, 0x91, 0xce, 0xa4, 0x2d, 0xa1, 0x5f, 0x28, 0xc9, 0x73, 0xc1, 0xc3, 0xb9, 0xd3, 0x68, + 0xe6, 0x34, 0xc9, 0xa9, 0x44, 0x1e, 0xbe, 0x40, 0x7f, 0x21, 0x6f, 0x31, 0x44, 0x16, 0x0e, 0x9a, + 0x07, 0x2c, 0x95, 0xb8, 0xd3, 0xf8, 0x78, 0x31, 0x67, 0xc3, 0x99, 0xf8, 0x4b, 0x05, 0x60, 0x92, + 0xaf, 0x93, 0x99, 0x89, 0xa9, 0x44, 0xa1, 0xc6, 0xde, 0x02, 0x3d, 0x93, 0x0b, 0x24, 0xca, 0x27, + 0xc8, 0xbc, 0x40, 0x6e, 0xe5, 0x13, 0x65, 0x5e, 0x20, 0xb7, 0x73, 0x81, 0xb4, 0x25, 0xf4, 0x8f, + 0x0a, 0xac, 0x4f, 0xe5, 0x33, 0xa0, 0xc7, 0x77, 0x4c, 0x69, 0x69, 0x7c, 0xbe, 0x38, 0x40, 0xc4, + 0xda, 0xb6, 0xf2, 0xa1, 0x82, 0xfe, 0x46, 0x81, 0xd5, 0xd4, 0x1b, 0x30, 0xca, 0xec, 0xa5, 0x66, + 0x64, 0x46, 0x34, 0x1e, 0x2d, 0xd6, 0x39, 0x96, 0xd6, 0xdf, 0x29, 0x50, 0x4b, 0xa7, 0x03, 0xa0, + 0x47, 0xf3, 0x6d, 0x0b, 0xb7, 0x18, 0xfa, 0x6c, 0xc1, 0xde, 0x11, 0x47, 0x5f, 0x2c, 0xff, 0x51, + 0x51, 0x44, 0x6f, 0x25, 0xfe, 0xf9, 0xd1, 0x6f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x81, 0xc8, 0x42, + 0x4f, 0xd2, 0x30, 0x00, 0x00, } diff --git a/plugins/drivers/proto/driver.proto b/plugins/drivers/proto/driver.proto index 56364a7653b..653fe348663 100644 --- a/plugins/drivers/proto/driver.proto +++ b/plugins/drivers/proto/driver.proto @@ -331,6 +331,11 @@ message CreateNetworkRequest { message CreateNetworkResponse { NetworkIsolationSpec isolation_spec = 1; + + // created indicates that the network namespace is newly created + // as a result of this request. if false, the NetworkIsolationSpec + // value returned is an existing spec. + bool created = 2; } message DestroyNetworkRequest { diff --git a/plugins/drivers/server.go b/plugins/drivers/server.go index cf08f1964d6..61d3d8cf83f 100644 --- a/plugins/drivers/server.go +++ b/plugins/drivers/server.go @@ -387,13 +387,14 @@ func (b *driverPluginServer) CreateNetwork(ctx context.Context, req *proto.Creat return nil, fmt.Errorf("CreateNetwork RPC not supported by driver") } - spec, err := nm.CreateNetwork(req.AllocId) + spec, created, err := nm.CreateNetwork(req.AllocId) if err != nil { return nil, err } return &proto.CreateNetworkResponse{ IsolationSpec: NetworkIsolationSpecToProto(spec), + Created: created, }, nil } diff --git a/plugins/drivers/testutils/testing.go b/plugins/drivers/testutils/testing.go index 69518a2f3e0..eba3fda700a 100644 --- a/plugins/drivers/testutils/testing.go +++ b/plugins/drivers/testutils/testing.go @@ -199,11 +199,11 @@ type MockDriver struct { } type MockNetworkManager struct { - CreateNetworkF func(string) (*drivers.NetworkIsolationSpec, error) + CreateNetworkF func(string) (*drivers.NetworkIsolationSpec, bool, error) DestroyNetworkF func(string, *drivers.NetworkIsolationSpec) error } -func (m *MockNetworkManager) CreateNetwork(id string) (*drivers.NetworkIsolationSpec, error) { +func (m *MockNetworkManager) CreateNetwork(id string) (*drivers.NetworkIsolationSpec, bool, error) { return m.CreateNetworkF(id) } func (m *MockNetworkManager) DestroyNetwork(id string, spec *drivers.NetworkIsolationSpec) error {