From c282960d0ee9b0ca1fb952b0b874aeed878ceac3 Mon Sep 17 00:00:00 2001 From: Casey Link Date: Mon, 24 Apr 2017 14:05:44 +0200 Subject: [PATCH 1/4] Add API links for fetching related resources * Adds helper methods to the Type classes to return the dynamic link * Adds method to the Service classes to fetch the link contents with type safety * Fix the Makefile --- generator/Makefile | 16 ++++++++++------ generator/generator.go | 37 +++++++++++++++++++++++++++++++++++++ generator/service.template | 8 +++++++- generator/type.template | 18 ++++++++++++++++++ 4 files changed, 72 insertions(+), 7 deletions(-) diff --git a/generator/Makefile b/generator/Makefile index 3189885..4dcbe92 100644 --- a/generator/Makefile +++ b/generator/Makefile @@ -1,12 +1,16 @@ -.PHONY clean deps +.PHONY := clean deps build default + +default: clean build + ./generator clean: - go clean -i ./... - rm -rf ../src/main/java/io/rancher/type - rm -rf ../src/main/java/io/rancher/service + go clean -i ./... + rm -rf ../src/main/java/io/rancher/type + rm -rf ../src/main/java/io/rancher/service deps: - go get -t ./... + go get -t ./... build: - go build ./... \ No newline at end of file + go build ./... + diff --git a/generator/generator.go b/generator/generator.go index 84a269a..76d4806 100644 --- a/generator/generator.go +++ b/generator/generator.go @@ -9,6 +9,7 @@ import ( "regexp" "strings" "text/template" + "sort" "github.com/rancher/go-rancher/client" ) @@ -48,6 +49,7 @@ func (m metadata) ListImports() []string { imports[i] = k i++ } + sort.Strings(imports) return imports } @@ -58,6 +60,7 @@ func (m metadata) ListActionImports() []string { imports[i] = k i++ } + sort.Strings(imports) return imports } @@ -168,6 +171,37 @@ func getResourceActions(schema client.Schema, m metadata) map[string]client.Acti return result } +func getServiceLinks(schema client.Schema, m metadata) map[string]string { + result := map[string]string{} + for i := range schema.IncludeableLinks { + link := schema.IncludeableLinks[i] + if _, ok := schemaExists[link]; ok { + if strings.HasSuffix(link, "s") { + singular := link[:len(link)-1] + class := capitalize(singular) + result[link] = "TypeCollection<" + class +">" + m.importActionClass("io.rancher.type." + class) + } else { + class := capitalize(link) + result[link] = class + m.importActionClass("io.rancher.type." + class) + } + } + } + return result +} + +func getLinks(schema client.Schema) map[string]string { + result := map[string]string{} + for i := range schema.IncludeableLinks { + link := schema.IncludeableLinks[i] + if _, ok := schemaExists[link]; ok { + result[link] = capitalize(link); + } + } + return result +} + func generateType(schema client.Schema) error { return generateTemplate(schema, path.Join(TYPE_SOURCE_OUTPUT_DIR, capitalize(schema.Id)+".java"), "type.template") } @@ -197,6 +231,8 @@ func generateTemplate(schema client.Schema, outputPath string, templateName stri "collection": capitalize(schema.Id) + "Collection", "structFields": typeMap, "resourceActions": getResourceActions(schema, metadata), + "serviceLinks": getServiceLinks(schema, metadata), + "links": getLinks(schema), "type": schema.Id, "meta": metadata, } @@ -251,6 +287,7 @@ func generateFiles() error { } schemaExists[schema.Id] = true + schemaExists[schema.PluralName] = true } for _, schema := range schemas.Data { diff --git a/generator/service.template b/generator/service.template index 0b30ba6..3f99607 100644 --- a/generator/service.template +++ b/generator/service.template @@ -14,6 +14,7 @@ import retrofit2.http.POST; import retrofit2.http.PUT; import retrofit2.http.Path; import retrofit2.http.QueryMap; +import retrofit2.http.Url; public interface {{.class}}Service { @@ -21,7 +22,7 @@ public interface {{.class}}Service { Call> list(); @GET("{{.type}}") - Call> list(@QueryMap Filters filters); + Call> list(@QueryMap Filters filters); @GET("{{.type}}/{id}") Call<{{.class}}> get(@Path("id") String id); @@ -40,4 +41,9 @@ public interface {{.class}}Service { {{else}} Call<{{.Output | capitalize}}> {{$key}}(@Path("id") String id, @Body {{.Input | capitalize}} {{.Input}}); {{end}}{{end}} + + {{range $key, $value := .serviceLinks}} + @GET + Call<{{$value}}> getLink{{$key | capitalize}}(@Url String url ); + {{end}} } diff --git a/generator/type.template b/generator/type.template index c450a24..4283463 100644 --- a/generator/type.template +++ b/generator/type.template @@ -1,9 +1,27 @@ package io.rancher.type; +import java.util.Map; + import io.rancher.base.AbstractType;{{range $import := .meta.ListImports}} import {{$import}};{{end}} public class {{.class}} extends AbstractType { + + private Map links; + + public Map getLinks() { + return links; + } + + public void setLinks(Map links) { + this.links = links; + } + {{range $key, $value := .links}} + public String get{{$value}}Link() { + return this.links.get("{{$key}}"); + } + {{end}} + {{range $key, $value := .structFields}} private {{$value}} {{$key | toCamelCase}}; {{end}}{{range $key, $value := .structFields}} From 47d2b3fc6969e914e944f0b28d19e2ec1ba28299 Mon Sep 17 00:00:00 2001 From: Casey Link Date: Mon, 24 Apr 2017 14:04:04 +0200 Subject: [PATCH 2/4] Update API Schema and include Links --- generator/schemas.json | 4106 +++++++++-------- src/main/java/io/rancher/base/Filters.java | 2 +- .../io/rancher/service/AccountService.java | 65 +- .../rancher/service/ActiveSettingService.java | 5 +- .../service/AddOutputsInputService.java | 5 +- .../AddRemoveClusterHostInputService.java | 37 - ...veLoadBalancerServiceLinkInputService.java | 5 +- .../AddRemoveServiceLinkInputService.java | 5 +- .../java/io/rancher/service/AgentService.java | 17 +- .../service/Amazonec2ConfigService.java | 5 +- .../io/rancher/service/ApiKeyService.java | 17 +- .../io/rancher/service/AuditLogService.java | 9 +- .../rancher/service/AzureConfigService.java | 5 +- .../rancher/service/AzureadconfigService.java | 5 +- .../io/rancher/service/BackupService.java | 17 +- .../rancher/service/BackupTargetService.java | 13 +- .../service/BaseMachineConfigService.java | 5 +- .../service/BlkioDeviceOptionService.java | 5 +- .../rancher/service/CertificateService.java | 9 +- .../service/ChangeSecretInputService.java | 5 +- .../io/rancher/service/ClusterService.java | 64 - .../service/ComposeConfigInputService.java | 5 +- .../rancher/service/ComposeConfigService.java | 5 +- .../service/ComposeProjectService.java | 13 +- .../service/ComposeServiceService.java | 17 +- .../io/rancher/service/ConfigItemService.java | 5 +- .../service/ConfigItemStatusService.java | 13 +- .../service/ContainerEventService.java | 13 +- .../rancher/service/ContainerExecService.java | 5 +- .../rancher/service/ContainerLogsService.java | 5 +- .../service/ContainerProxyService.java | 5 +- .../io/rancher/service/ContainerService.java | 48 +- .../io/rancher/service/CredentialService.java | 17 +- .../service/DatabasechangelogService.java | 5 +- .../service/DatabasechangeloglockService.java | 5 +- .../service/DigitaloceanConfigService.java | 5 +- .../io/rancher/service/DnsServiceService.java | 21 +- .../rancher/service/DockerBuildService.java | 5 +- .../rancher/service/DynamicSchemaService.java | 9 +- .../rancher/service/EnvironmentService.java | 17 +- .../service/EnvironmentUpgradeService.java | 5 +- .../service/ExoscaleConfigService.java | 37 - .../ExtensionImplementationService.java | 5 +- .../service/ExtensionPointService.java | 5 +- .../service/ExternalDnsEventService.java | 9 +- .../rancher/service/ExternalEventService.java | 9 +- ...ndlerExternalHandlerProcessMapService.java | 5 +- .../ExternalHandlerProcessConfigService.java | 5 +- .../ExternalHandlerProcessService.java | 5 +- .../service/ExternalHandlerService.java | 5 +- .../service/ExternalHostEventService.java | 9 +- .../service/ExternalServiceEventService.java | 9 +- .../service/ExternalServiceService.java | 19 +- .../ExternalStoragePoolEventService.java | 9 +- .../service/ExternalVolumeEventService.java | 9 +- .../service/FieldDocumentationService.java | 5 +- .../rancher/service/GithubconfigService.java | 5 +- .../rancher/service/HaConfigInputService.java | 5 +- .../io/rancher/service/HaConfigService.java | 5 +- .../rancher/service/HaproxyConfigService.java | 5 +- .../HealthcheckInstanceHostMapService.java | 17 +- .../io/rancher/service/HostAccessService.java | 5 +- .../service/HostApiProxyTokenService.java | 5 +- .../java/io/rancher/service/HostService.java | 25 +- .../io/rancher/service/IdentityService.java | 5 +- .../java/io/rancher/service/ImageService.java | 17 +- .../InServiceUpgradeStrategyService.java | 5 +- .../service/InstanceConsoleInputService.java | 5 +- .../service/InstanceConsoleService.java | 5 +- .../service/InstanceHealthCheckService.java | 5 +- .../rancher/service/InstanceLinkService.java | 13 +- .../io/rancher/service/InstanceService.java | 41 +- .../rancher/service/InstanceStopService.java | 5 +- .../IpAddressAssociateInputService.java | 5 +- .../io/rancher/service/IpAddressService.java | 17 +- .../service/KubernetesServiceService.java | 25 +- .../java/io/rancher/service/LabelService.java | 17 +- .../rancher/service/LaunchConfigService.java | 50 +- .../io/rancher/service/LdapconfigService.java | 5 +- ...ancerAppCookieStickinessPolicyService.java | 5 +- .../service/LoadBalancerConfigService.java | 5 +- ...BalancerCookieStickinessPolicyService.java | 5 +- .../LoadBalancerServiceLinkService.java | 5 +- .../service/LoadBalancerServiceService.java | 19 +- .../service/LocalAuthConfigService.java | 5 +- .../io/rancher/service/LogConfigService.java | 5 +- .../rancher/service/MachineDriverService.java | 5 +- .../io/rancher/service/MachineService.java | 13 +- .../java/io/rancher/service/MountService.java | 17 +- .../io/rancher/service/NetworkService.java | 9 +- .../io/rancher/service/NfsConfigService.java | 5 +- .../service/OpenldapconfigService.java | 5 +- .../service/OpenstackConfigService.java | 37 - .../rancher/service/PacketConfigService.java | 5 +- .../io/rancher/service/PasswordService.java | 19 +- .../rancher/service/PhysicalHostService.java | 13 +- .../java/io/rancher/service/PortService.java | 13 +- .../service/ProcessDefinitionService.java | 5 +- .../service/ProcessExecutionService.java | 5 +- .../service/ProcessInstanceService.java | 5 +- .../rancher/service/ProjectMemberService.java | 9 +- .../io/rancher/service/ProjectService.java | 67 +- .../service/PublicEndpointService.java | 5 +- .../io/rancher/service/PublishService.java | 5 +- .../io/rancher/service/PullTaskService.java | 9 +- .../service/RackspaceConfigService.java | 37 - ...RecreateOnQuorumStrategyConfigService.java | 5 +- .../io/rancher/service/RegisterService.java | 11 +- .../service/RegistrationTokenService.java | 17 +- .../service/RegistryCredentialService.java | 21 +- .../io/rancher/service/RegistryService.java | 25 +- .../service/ResourceDefinitionService.java | 5 +- .../rancher/service/RestartPolicyService.java | 5 +- .../RestoreFromBackupInputService.java | 5 +- .../service/RevertToSnapshotInputService.java | 5 +- .../RollingRestartStrategyService.java | 5 +- .../rancher/service/ScalePolicyService.java | 5 +- .../service/SecondaryLaunchConfigService.java | 54 +- .../service/ServiceConsumeMapService.java | 13 +- .../rancher/service/ServiceEventService.java | 17 +- .../service/ServiceExposeMapService.java | 17 +- .../rancher/service/ServiceLinkService.java | 5 +- .../rancher/service/ServiceProxyService.java | 5 +- .../service/ServiceRestartService.java | 5 +- .../io/rancher/service/ServiceService.java | 21 +- .../service/ServiceUpgradeService.java | 5 +- .../ServiceUpgradeStrategyService.java | 5 +- .../service/ServicesPortRangeService.java | 5 +- .../service/SetLabelsInputService.java | 5 +- ...tLoadBalancerServiceLinksInputService.java | 5 +- .../SetProjectMembersInputService.java | 5 +- .../service/SetServiceLinksInputService.java | 5 +- .../io/rancher/service/SettingService.java | 5 +- .../service/SnapshotBackupInputService.java | 5 +- .../io/rancher/service/SnapshotService.java | 18 +- .../service/SoftlayerConfigService.java | 37 - .../service/StateTransitionService.java | 5 +- .../rancher/service/StatsAccessService.java | 5 +- .../rancher/service/StoragePoolService.java | 25 +- .../io/rancher/service/SubscribeService.java | 5 +- .../rancher/service/TaskInstanceService.java | 9 +- .../java/io/rancher/service/TaskService.java | 5 +- .../ToServiceUpgradeStrategyService.java | 5 +- .../service/TypeDocumentationService.java | 5 +- .../service/UbiquityConfigService.java | 37 - .../service/UserPreferenceService.java | 59 + .../service/VirtualMachineDiskService.java | 5 +- .../service/VirtualMachineService.java | 50 +- .../service/VirtualboxConfigService.java | 37 - .../service/VmwarevcloudairConfigService.java | 37 - .../service/VmwarevsphereConfigService.java | 37 - .../io/rancher/service/VolumeService.java | 32 +- .../service/VolumeSnapshotInputService.java | 5 +- src/main/java/io/rancher/type/Account.java | 74 + .../java/io/rancher/type/ActiveSetting.java | 14 + .../java/io/rancher/type/AddOutputsInput.java | 14 + .../type/AddRemoveClusterHostInput.java | 17 - ...AddRemoveLoadBalancerServiceLinkInput.java | 14 + .../type/AddRemoveServiceLinkInput.java | 14 + src/main/java/io/rancher/type/Agent.java | 26 + .../java/io/rancher/type/Amazonec2Config.java | 64 + src/main/java/io/rancher/type/ApiKey.java | 26 + src/main/java/io/rancher/type/AuditLog.java | 18 + .../java/io/rancher/type/AzureConfig.java | 14 + .../java/io/rancher/type/Azureadconfig.java | 14 + src/main/java/io/rancher/type/Backup.java | 26 + .../java/io/rancher/type/BackupTarget.java | 22 + .../io/rancher/type/BaseMachineConfig.java | 14 + .../io/rancher/type/BlkioDeviceOption.java | 14 + .../java/io/rancher/type/Certificate.java | 20 +- .../io/rancher/type/ChangeSecretInput.java | 14 + .../java/io/rancher/type/ComposeConfig.java | 14 + .../io/rancher/type/ComposeConfigInput.java | 14 + .../java/io/rancher/type/ComposeProject.java | 22 + .../java/io/rancher/type/ComposeService.java | 28 +- src/main/java/io/rancher/type/ConfigItem.java | 14 + .../io/rancher/type/ConfigItemStatus.java | 22 + src/main/java/io/rancher/type/Container.java | 50 + .../java/io/rancher/type/ContainerEvent.java | 22 + .../java/io/rancher/type/ContainerExec.java | 14 + .../java/io/rancher/type/ContainerLogs.java | 14 + .../java/io/rancher/type/ContainerProxy.java | 14 + src/main/java/io/rancher/type/Credential.java | 26 + .../io/rancher/type/Databasechangelog.java | 14 + .../rancher/type/Databasechangeloglock.java | 14 + .../io/rancher/type/DigitaloceanConfig.java | 34 + src/main/java/io/rancher/type/DnsService.java | 26 + .../java/io/rancher/type/DockerBuild.java | 14 + .../java/io/rancher/type/DynamicSchema.java | 20 +- .../java/io/rancher/type/Environment.java | 22 + .../io/rancher/type/EnvironmentUpgrade.java | 14 + .../java/io/rancher/type/ExoscaleConfig.java | 88 - .../rancher/type/ExtensionImplementation.java | 14 + .../java/io/rancher/type/ExtensionPoint.java | 14 + .../io/rancher/type/ExternalDnsEvent.java | 18 + .../java/io/rancher/type/ExternalEvent.java | 18 + .../java/io/rancher/type/ExternalHandler.java | 14 + ...ernalHandlerExternalHandlerProcessMap.java | 14 + .../rancher/type/ExternalHandlerProcess.java | 14 + .../type/ExternalHandlerProcessConfig.java | 14 + .../io/rancher/type/ExternalHostEvent.java | 18 + .../java/io/rancher/type/ExternalService.java | 28 +- .../io/rancher/type/ExternalServiceEvent.java | 18 + .../type/ExternalStoragePoolEvent.java | 18 + .../io/rancher/type/ExternalVolumeEvent.java | 18 + .../io/rancher/type/FieldDocumentation.java | 14 + .../java/io/rancher/type/Githubconfig.java | 14 + src/main/java/io/rancher/type/HaConfig.java | 14 + .../java/io/rancher/type/HaConfigInput.java | 14 + .../java/io/rancher/type/HaproxyConfig.java | 14 + .../type/HealthcheckInstanceHostMap.java | 26 + src/main/java/io/rancher/type/Host.java | 34 + src/main/java/io/rancher/type/HostAccess.java | 14 + .../io/rancher/type/HostApiProxyToken.java | 14 + src/main/java/io/rancher/type/Identity.java | 14 + src/main/java/io/rancher/type/Image.java | 26 + .../type/InServiceUpgradeStrategy.java | 14 + src/main/java/io/rancher/type/Instance.java | 46 + .../java/io/rancher/type/InstanceConsole.java | 14 + .../io/rancher/type/InstanceConsoleInput.java | 14 + .../io/rancher/type/InstanceHealthCheck.java | 14 + .../java/io/rancher/type/InstanceLink.java | 22 + .../java/io/rancher/type/InstanceStop.java | 14 + src/main/java/io/rancher/type/IpAddress.java | 26 + .../rancher/type/IpAddressAssociateInput.java | 14 + .../io/rancher/type/KubernetesService.java | 26 + src/main/java/io/rancher/type/Label.java | 26 + .../java/io/rancher/type/LaunchConfig.java | 50 + src/main/java/io/rancher/type/Ldapconfig.java | 14 + ...LoadBalancerAppCookieStickinessPolicy.java | 14 + .../io/rancher/type/LoadBalancerConfig.java | 14 + .../LoadBalancerCookieStickinessPolicy.java | 14 + .../io/rancher/type/LoadBalancerService.java | 26 + .../rancher/type/LoadBalancerServiceLink.java | 14 + .../java/io/rancher/type/LocalAuthConfig.java | 14 + src/main/java/io/rancher/type/LogConfig.java | 14 + src/main/java/io/rancher/type/Machine.java | 72 +- .../java/io/rancher/type/MachineDriver.java | 14 + src/main/java/io/rancher/type/Mount.java | 26 + src/main/java/io/rancher/type/Network.java | 18 + src/main/java/io/rancher/type/NfsConfig.java | 14 + .../java/io/rancher/type/Openldapconfig.java | 14 + .../java/io/rancher/type/OpenstackConfig.java | 217 - .../java/io/rancher/type/PacketConfig.java | 14 + src/main/java/io/rancher/type/Password.java | 26 + .../java/io/rancher/type/PhysicalHost.java | 22 + src/main/java/io/rancher/type/Port.java | 22 + .../io/rancher/type/ProcessDefinition.java | 14 + .../io/rancher/type/ProcessExecution.java | 14 + .../java/io/rancher/type/ProcessInstance.java | 14 + src/main/java/io/rancher/type/Project.java | 74 + .../java/io/rancher/type/ProjectMember.java | 18 + .../java/io/rancher/type/PublicEndpoint.java | 14 + src/main/java/io/rancher/type/Publish.java | 14 + src/main/java/io/rancher/type/PullTask.java | 18 + .../java/io/rancher/type/RackspaceConfig.java | 97 - .../type/RecreateOnQuorumStrategyConfig.java | 14 + src/main/java/io/rancher/type/Register.java | 18 + .../io/rancher/type/RegistrationToken.java | 26 + src/main/java/io/rancher/type/Registry.java | 34 + .../io/rancher/type/RegistryCredential.java | 30 + .../io/rancher/type/ResourceDefinition.java | 14 + .../java/io/rancher/type/RestartPolicy.java | 14 + .../rancher/type/RestoreFromBackupInput.java | 14 + .../rancher/type/RevertToSnapshotInput.java | 14 + .../rancher/type/RollingRestartStrategy.java | 14 + .../java/io/rancher/type/ScalePolicy.java | 14 + .../rancher/type/SecondaryLaunchConfig.java | 50 + src/main/java/io/rancher/type/Service.java | 28 +- .../io/rancher/type/ServiceConsumeMap.java | 22 + .../java/io/rancher/type/ServiceEvent.java | 26 + .../io/rancher/type/ServiceExposeMap.java | 26 + .../java/io/rancher/type/ServiceLink.java | 14 + .../java/io/rancher/type/ServiceProxy.java | 14 + .../java/io/rancher/type/ServiceRestart.java | 14 + .../java/io/rancher/type/ServiceUpgrade.java | 14 + .../rancher/type/ServiceUpgradeStrategy.java | 14 + .../io/rancher/type/ServicesPortRange.java | 14 + .../java/io/rancher/type/SetLabelsInput.java | 14 + .../SetLoadBalancerServiceLinksInput.java | 14 + .../rancher/type/SetProjectMembersInput.java | 14 + .../io/rancher/type/SetServiceLinksInput.java | 14 + src/main/java/io/rancher/type/Setting.java | 14 + src/main/java/io/rancher/type/Snapshot.java | 26 + .../io/rancher/type/SnapshotBackupInput.java | 14 + .../java/io/rancher/type/SoftlayerConfig.java | 157 - .../java/io/rancher/type/StateTransition.java | 14 + .../java/io/rancher/type/StatsAccess.java | 14 + .../java/io/rancher/type/StoragePool.java | 36 +- src/main/java/io/rancher/type/Subscribe.java | 14 + src/main/java/io/rancher/type/Task.java | 14 + .../java/io/rancher/type/TaskInstance.java | 18 + .../type/ToServiceUpgradeStrategy.java | 14 + .../io/rancher/type/TypeDocumentation.java | 14 + .../java/io/rancher/type/UbiquityConfig.java | 67 - .../{Cluster.java => UserPreference.java} | 129 +- .../java/io/rancher/type/VirtualMachine.java | 52 +- .../io/rancher/type/VirtualMachineDisk.java | 14 + .../io/rancher/type/VirtualboxConfig.java | 77 - .../rancher/type/VmwarevcloudairConfig.java | 147 - .../io/rancher/type/VmwarevsphereConfig.java | 127 - src/main/java/io/rancher/type/Volume.java | 38 + .../io/rancher/type/VolumeSnapshotInput.java | 14 + 303 files changed, 6555 insertions(+), 3546 deletions(-) delete mode 100644 src/main/java/io/rancher/service/AddRemoveClusterHostInputService.java delete mode 100644 src/main/java/io/rancher/service/ClusterService.java delete mode 100644 src/main/java/io/rancher/service/ExoscaleConfigService.java delete mode 100644 src/main/java/io/rancher/service/OpenstackConfigService.java delete mode 100644 src/main/java/io/rancher/service/RackspaceConfigService.java delete mode 100644 src/main/java/io/rancher/service/SoftlayerConfigService.java delete mode 100644 src/main/java/io/rancher/service/UbiquityConfigService.java create mode 100644 src/main/java/io/rancher/service/UserPreferenceService.java delete mode 100644 src/main/java/io/rancher/service/VirtualboxConfigService.java delete mode 100644 src/main/java/io/rancher/service/VmwarevcloudairConfigService.java delete mode 100644 src/main/java/io/rancher/service/VmwarevsphereConfigService.java delete mode 100644 src/main/java/io/rancher/type/AddRemoveClusterHostInput.java delete mode 100644 src/main/java/io/rancher/type/ExoscaleConfig.java delete mode 100644 src/main/java/io/rancher/type/OpenstackConfig.java delete mode 100644 src/main/java/io/rancher/type/RackspaceConfig.java delete mode 100644 src/main/java/io/rancher/type/SoftlayerConfig.java delete mode 100644 src/main/java/io/rancher/type/UbiquityConfig.java rename src/main/java/io/rancher/type/{Cluster.java => UserPreference.java} (56%) delete mode 100644 src/main/java/io/rancher/type/VirtualboxConfig.java delete mode 100644 src/main/java/io/rancher/type/VmwarevcloudairConfig.java delete mode 100644 src/main/java/io/rancher/type/VmwarevsphereConfig.java diff --git a/generator/schemas.json b/generator/schemas.json index 4cedb9c..7af0249 100644 --- a/generator/schemas.json +++ b/generator/schemas.json @@ -300,39 +300,39 @@ } }, "includeableLinks": [ - "projectmembers", - "auditlogs", - "credentials", - "environments", - "instances", - "serviceexposemaps", - "networks", - "ports", + "externalevents", "serviceconsumemaps", + "agents", "instancelinks", + "containerevents", + "volumes", + "instances", + "backuptargets", "ipaddresses", - "storagepools", - "externalevents", - "images", + "serviceexposemaps", "hosts", - "volumes", - "mounts", - "serviceevents", - "services", - "dynamicschemas", - "agents", - "labels", - "healthcheckinstancehostmaps", + "physicalhosts", + "credentials", + "backups", "snapshots", + "healthcheckinstancehostmaps", "certificates", - "backuptargets", + "networks", + "services", + "storagepools", "configitemstatuses", - "physicalhosts", - "containerevents", - "backups" + "labels", + "environments", + "userpreferences", + "ports", + "mounts", + "auditlogs", + "projectmembers", + "serviceevents", + "images" ], "resourceActions": { - "restore": { + "update": { "input": null, "output": "account" }, @@ -340,37 +340,37 @@ "input": null, "output": "account" }, - "create": { + "remove": { "input": null, "output": "account" }, - "update": { + "restore": { "input": null, "output": "account" }, - "purge": { + "deactivate": { "input": null, "output": "account" }, - "remove": { + "create": { "input": null, "output": "account" }, - "deactivate": { + "purge": { "input": null, "output": "account" } }, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ - "GET", - "POST" - ], "resourceMethods": [ "GET", "PUT", "DELETE" + ], + "collectionMethods": [ + "GET", + "POST" ] }, { @@ -431,12 +431,12 @@ "resourceActions": {}, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [], "resourceMethods": [ "GET", "PUT", "DELETE" - ] + ], + "collectionMethods": [] }, { "id": "addOutputsInput", @@ -462,10 +462,10 @@ "resourceActions": {}, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ + "resourceMethods": [ "GET" ], - "resourceMethods": [ + "collectionMethods": [ "GET" ] }, @@ -492,10 +492,10 @@ "resourceActions": {}, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [], "resourceMethods": [ "GET" - ] + ], + "collectionMethods": [] }, { "id": "addRemoveServiceLinkInput", @@ -520,12 +520,10 @@ "resourceActions": {}, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ - "POST" - ], "resourceMethods": [ "GET" - ] + ], + "collectionMethods": [] }, { "id": "agent", @@ -844,54 +842,257 @@ } }, "includeableLinks": [ - "instances", - "hosts", "storagepools", "configitemstatuses", "physicalhosts", - "account" + "hosts", + "account", + "instances" ], "resourceActions": { - "reconnect": { + "update": { "input": null, "output": "agent" }, - "restore": { + "activate": { "input": null, "output": "agent" }, - "activate": { + "remove": { "input": null, "output": "agent" }, - "create": { + "reconnect": { "input": null, "output": "agent" }, - "update": { + "restore": { "input": null, "output": "agent" }, - "purge": { + "deactivate": { "input": null, "output": "agent" }, - "remove": { + "create": { "input": null, "output": "agent" }, - "deactivate": { + "purge": { "input": null, "output": "agent" } }, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ + "resourceMethods": [ "GET" ], + "collectionMethods": [ + "GET" + ] + }, + { + "id": "amazonec2Config", + "type": "schema", + "links": { + "self": "http://localhost:8082/v1/schemas/amazonec2config", + "collection": "http://localhost:8082/v1/amazonec2configs" + }, + "actions": {}, + "pluralName": "amazonec2Configs", + "resourceFields": { + "accessKey": { + "type": "string", + "description": "AWS Access Key", + "create": true, + "update": false, + "readOnCreateOnly": false, + "default": "" + }, + "ami": { + "type": "string", + "description": "AWS machine image", + "create": true, + "update": false, + "readOnCreateOnly": false, + "default": "" + }, + "deviceName": { + "type": "string", + "description": "AWS root device name", + "create": true, + "update": false, + "readOnCreateOnly": false, + "default": "/dev/sda1" + }, + "iamInstanceProfile": { + "type": "string", + "description": "AWS IAM Instance Profile", + "create": true, + "update": false, + "readOnCreateOnly": false, + "default": "" + }, + "instanceType": { + "type": "string", + "description": "AWS instance type", + "create": true, + "update": false, + "readOnCreateOnly": false, + "default": "t2.micro" + }, + "monitoring": { + "type": "boolean", + "description": "Set this flag to enable CloudWatch monitoring", + "create": true, + "update": false, + "readOnCreateOnly": false + }, + "privateAddressOnly": { + "type": "boolean", + "description": "Only use a private IP address", + "create": true, + "update": false, + "readOnCreateOnly": false + }, + "region": { + "type": "string", + "description": "AWS region", + "create": true, + "update": false, + "readOnCreateOnly": false, + "default": "us-east-1" + }, + "requestSpotInstance": { + "type": "boolean", + "description": "Set this flag to request spot instance", + "create": true, + "update": false, + "readOnCreateOnly": false + }, + "rootSize": { + "type": "string", + "description": "AWS root disk size (in GB)", + "create": true, + "update": false, + "readOnCreateOnly": false, + "default": "16" + }, + "secretKey": { + "type": "string", + "description": "AWS Secret Key", + "create": true, + "update": false, + "readOnCreateOnly": false, + "default": "" + }, + "securityGroup": { + "type": "string", + "description": "AWS VPC security group", + "create": true, + "update": false, + "readOnCreateOnly": false, + "default": "docker-machine" + }, + "sessionToken": { + "type": "string", + "description": "AWS Session Token", + "create": true, + "update": false, + "readOnCreateOnly": false, + "default": "" + }, + "spotPrice": { + "type": "string", + "description": "AWS spot instance bid price (in dollar)", + "create": true, + "update": false, + "readOnCreateOnly": false, + "default": "0.50" + }, + "sshKeypath": { + "type": "string", + "description": "SSH Key for Instance", + "create": true, + "update": false, + "readOnCreateOnly": false, + "default": "" + }, + "sshUser": { + "type": "string", + "description": "Set the name of the ssh user", + "create": true, + "update": false, + "readOnCreateOnly": false, + "default": "ubuntu" + }, + "subnetId": { + "type": "string", + "description": "AWS VPC subnet id", + "create": true, + "update": false, + "readOnCreateOnly": false, + "default": "" + }, + "tags": { + "type": "string", + "description": "AWS Tags (e.g. key1,value1,key2,value2)", + "create": true, + "update": false, + "readOnCreateOnly": false, + "default": "" + }, + "useEbsOptimizedInstance": { + "type": "boolean", + "description": "Create an EBS optimized instance", + "create": true, + "update": false, + "readOnCreateOnly": false + }, + "usePrivateAddress": { + "type": "boolean", + "description": "Force the usage of private IP address", + "create": true, + "update": false, + "readOnCreateOnly": false + }, + "volumeType": { + "type": "string", + "description": "Amazon EBS volume type", + "create": true, + "update": false, + "readOnCreateOnly": false, + "default": "gp2" + }, + "vpcId": { + "type": "string", + "description": "AWS VPC id", + "create": true, + "update": false, + "readOnCreateOnly": false, + "default": "" + }, + "zone": { + "type": "string", + "description": "AWS zone for instance (i.e. a,b,c,d,e)", + "create": true, + "update": false, + "readOnCreateOnly": false, + "default": "a" + } + }, + "collectionFilters": {}, + "includeableLinks": [], + "resourceActions": {}, + "collectionActions": {}, + "collectionFields": {}, "resourceMethods": [ "GET" + ], + "collectionMethods": [ + "GET", + "POST" ] }, { @@ -1204,46 +1405,46 @@ }, "includeableLinks": [ "images", - "instances", - "account" + "account", + "instances" ], "resourceActions": { - "activate": { + "update": { "input": null, "output": "credential" }, - "create": { + "activate": { "input": null, "output": "credential" }, - "update": { + "remove": { "input": null, "output": "credential" }, - "purge": { + "deactivate": { "input": null, "output": "credential" }, - "remove": { + "create": { "input": null, "output": "credential" }, - "deactivate": { + "purge": { "input": null, "output": "credential" } }, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ - "GET", - "POST" - ], "resourceMethods": [ "GET", "PUT", "DELETE" - ] + ], + "collectionMethods": [ + "GET", + "POST" + ] }, { "id": "auditLog", @@ -1536,17 +1737,129 @@ } }, "includeableLinks": [ - "authenticatedasaccount", - "account" + "account", + "authenticatedasaccount" ], "resourceActions": {}, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ + "resourceMethods": [ "GET" ], + "collectionMethods": [ + "GET" + ] + }, + { + "id": "azureConfig", + "type": "schema", + "links": { + "self": "http://localhost:8082/v1/schemas/azureconfig", + "collection": "http://localhost:8082/v1/azureconfigs" + }, + "actions": {}, + "pluralName": "azureConfigs", + "resourceFields": { + "dockerPort": { + "type": "string", + "description": "Azure Docker port", + "create": true, + "update": false, + "readOnCreateOnly": false, + "default": "2376" + }, + "dockerSwarmMasterPort": { + "type": "string", + "description": "Azure Docker Swarm master port", + "create": true, + "update": false, + "readOnCreateOnly": false, + "default": "3376" + }, + "image": { + "type": "string", + "description": "Azure image name. Default is Ubuntu 14.04 LTS x64", + "create": true, + "update": false, + "readOnCreateOnly": false, + "default": "" + }, + "location": { + "type": "string", + "description": "Azure location", + "create": true, + "update": false, + "readOnCreateOnly": false, + "default": "West US" + }, + "password": { + "type": "string", + "description": "Azure user password", + "create": true, + "update": false, + "readOnCreateOnly": false, + "default": "" + }, + "publishSettingsFile": { + "type": "string", + "description": "Azure publish settings file", + "create": true, + "update": false, + "readOnCreateOnly": false, + "default": "" + }, + "size": { + "type": "string", + "description": "Azure size", + "create": true, + "update": false, + "readOnCreateOnly": false, + "default": "Small" + }, + "sshPort": { + "type": "string", + "description": "Azure SSH port", + "create": true, + "update": false, + "readOnCreateOnly": false, + "default": "22" + }, + "subscriptionCert": { + "type": "string", + "description": "Azure subscription cert", + "create": true, + "update": false, + "readOnCreateOnly": false, + "default": "" + }, + "subscriptionId": { + "type": "string", + "description": "Azure subscription ID", + "create": true, + "update": false, + "readOnCreateOnly": false, + "default": "" + }, + "username": { + "type": "string", + "description": "Azure username", + "create": true, + "update": false, + "readOnCreateOnly": false, + "default": "ubuntu" + } + }, + "collectionFilters": {}, + "includeableLinks": [], + "resourceActions": {}, + "collectionActions": {}, + "collectionFields": {}, "resourceMethods": [ "GET" + ], + "collectionMethods": [ + "GET", + "POST" ] }, { @@ -1640,13 +1953,13 @@ "resourceActions": {}, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ - "GET", - "POST" - ], "resourceMethods": [ "GET", "PUT" + ], + "collectionMethods": [ + "GET", + "POST" ] }, { @@ -1974,29 +2287,28 @@ } }, "includeableLinks": [ + "snapshot", "volume", "account", - "snapshot", "backuptarget" ], "resourceActions": { - "create": { + "remove": { "input": null, "output": "backup" }, - "remove": { + "create": { "input": null, "output": "backup" } }, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ + "resourceMethods": [ "GET" ], - "resourceMethods": [ - "GET", - "DELETE" + "collectionMethods": [ + "GET" ] }, { @@ -2267,24 +2579,22 @@ "backups" ], "resourceActions": { - "create": { + "remove": { "input": null, "output": "backupTarget" }, - "remove": { + "create": { "input": null, "output": "backupTarget" } }, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ - "GET", - "POST" - ], "resourceMethods": [ - "GET", - "DELETE" + "GET" + ], + "collectionMethods": [ + "GET" ] }, { @@ -2301,10 +2611,10 @@ "resourceActions": {}, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [], "resourceMethods": [ "GET" - ] + ], + "collectionMethods": [] }, { "id": "blkioDeviceOption", @@ -2361,12 +2671,10 @@ "resourceActions": {}, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ - "POST" - ], "resourceMethods": [ "GET" - ] + ], + "collectionMethods": [] }, { "id": "certificate", @@ -2381,7 +2689,7 @@ "accountId": { "type": "reference[account]", "description": null, - "create": true, + "create": false, "update": false, "nullable": true, "readOnCreateOnly": false, @@ -2758,29 +3066,26 @@ "account" ], "resourceActions": { - "create": { + "update": { "input": null, "output": "certificate" }, - "update": { + "remove": { "input": null, "output": "certificate" }, - "remove": { + "create": { "input": null, "output": "certificate" } }, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ - "GET", - "POST" - ], "resourceMethods": [ - "GET", - "PUT", - "DELETE" + "GET" + ], + "collectionMethods": [ + "GET" ] }, { @@ -2814,11 +3119,11 @@ "resourceActions": {}, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ - "POST" - ], "resourceMethods": [ "GET" + ], + "collectionMethods": [ + "POST" ] }, { @@ -2850,10 +3155,10 @@ "resourceActions": {}, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [], "resourceMethods": [ "GET" - ] + ], + "collectionMethods": [] }, { "id": "composeConfigInput", @@ -2878,11 +3183,11 @@ "resourceActions": {}, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ - "POST" - ], "resourceMethods": [ "GET" + ], + "collectionMethods": [ + "POST" ] }, { @@ -3223,28 +3528,28 @@ } }, "includeableLinks": [ - "configitemstatuses", "services", + "configitemstatuses", "account" ], "resourceActions": { - "rollback": { + "finishupgrade": { "input": null, "output": "environment" }, - "error": { + "remove": { "input": null, "output": "environment" }, - "remove": { + "error": { "input": null, "output": "environment" }, - "finishupgrade": { + "cancelupgrade": { "input": null, "output": "environment" }, - "cancelrollback": { + "rollback": { "input": null, "output": "environment" }, @@ -3252,21 +3557,18 @@ "input": null, "output": "environment" }, - "cancelupgrade": { + "cancelrollback": { "input": null, "output": "environment" } }, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ - "GET", - "POST" - ], "resourceMethods": [ - "GET", - "PUT", - "DELETE" + "GET" + ], + "collectionMethods": [ + "GET" ] }, { @@ -3725,17 +4027,16 @@ } }, "includeableLinks": [ - "consumedbyservices", "environment", - "instances", "consumedservices", "configitemstatuses", "serviceexposemaps", - "dynamicschemas", - "account" + "account", + "instances", + "consumedbyservices" ], "resourceActions": { - "rollback": { + "finishupgrade": { "input": null, "output": "service" }, @@ -3743,35 +4044,34 @@ "input": null, "output": "service" }, - "finishupgrade": { + "cancelupgrade": { "input": null, "output": "service" }, - "cancelrollback": { + "rollback": { "input": null, "output": "service" }, - "activate": { + "create": { "input": null, "output": "service" }, - "create": { + "activate": { "input": null, "output": "service" }, - "cancelupgrade": { + "cancelrollback": { "input": null, "output": "service" } }, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ + "resourceMethods": [ "GET" ], - "resourceMethods": [ - "GET", - "DELETE" + "collectionMethods": [ + "GET" ] }, { @@ -3851,10 +4151,10 @@ "resourceActions": {}, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ + "resourceMethods": [ "GET" ], - "resourceMethods": [ + "collectionMethods": [ "GET" ] }, @@ -4086,18 +4386,18 @@ } }, "includeableLinks": [ - "agent", - "account" + "account", + "agent" ], "resourceActions": {}, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ - "GET" - ], "resourceMethods": [ "GET", "PUT" + ], + "collectionMethods": [ + "GET" ] }, { @@ -5241,86 +5541,86 @@ } }, "includeableLinks": [ - "agent", - "networkcontainer", - "credentials", - "instances", - "hosts", - "volumes", - "mounts", - "serviceevents", - "serviceexposemaps", "services", - "ports", + "networkcontainer", "instancelinks", - "healthcheckinstancehostmaps", - "registrycredential", + "volumes", "targetinstancelinks", + "instances", + "agent", + "registrycredential", "instancelabels", - "account" + "ports", + "mounts", + "serviceexposemaps", + "serviceevents", + "hosts", + "account", + "credentials", + "healthcheckinstancehostmaps" ], "resourceActions": { - "updateunhealthy": { + "update": { "input": null, "output": "instance" }, - "console": { - "input": "instanceConsoleInput", - "output": "instanceConsole" - }, - "restore": { - "input": null, + "stop": { + "input": "instanceStop", "output": "instance" }, "restart": { "input": null, "output": "instance" }, - "deallocate": { + "updatereinitializing": { "input": null, "output": "instance" }, - "start": { + "error": { "input": null, "output": "instance" }, - "updatereinitializing": { + "remove": { "input": null, "output": "instance" }, - "update": { + "updatehealthy": { "input": null, "output": "instance" }, - "purge": { + "migrate": { "input": null, "output": "instance" }, - "error": { + "allocate": { "input": null, "output": "instance" }, - "remove": { + "create": { "input": null, "output": "instance" }, - "allocate": { + "console": { + "input": "instanceConsoleInput", + "output": "instanceConsole" + }, + "start": { "input": null, "output": "instance" }, - "stop": { - "input": "instanceStop", + "restore": { + "input": null, "output": "instance" }, - "create": { + "deallocate": { "input": null, "output": "instance" }, - "updatehealthy": { + "updateunhealthy": { "input": null, "output": "instance" }, - "migrate": { + "purge": { "input": null, "output": "instance" }, @@ -5343,14 +5643,11 @@ }, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ - "GET", - "POST" - ], "resourceMethods": [ - "GET", - "PUT", - "DELETE" + "GET" + ], + "collectionMethods": [ + "GET" ] }, { @@ -5634,21 +5931,21 @@ "account" ], "resourceActions": { - "create": { + "remove": { "input": null, "output": "containerEvent" }, - "remove": { + "create": { "input": null, "output": "containerEvent" } }, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ + "resourceMethods": [ "GET" ], - "resourceMethods": [ + "collectionMethods": [ "GET" ] }, @@ -5704,12 +6001,11 @@ "resourceActions": {}, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ - "GET", - "POST" - ], "resourceMethods": [ "GET" + ], + "collectionMethods": [ + "GET" ] }, { @@ -5747,12 +6043,10 @@ "resourceActions": {}, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ - "POST" - ], "resourceMethods": [ "GET" - ] + ], + "collectionMethods": [] }, { "id": "containerProxy", @@ -5793,12 +6087,10 @@ "resourceActions": {}, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ - "POST" - ], "resourceMethods": [ "GET" - ] + ], + "collectionMethods": [] }, { "id": "credential", @@ -6110,43 +6402,43 @@ }, "includeableLinks": [ "images", - "instances", - "account" + "account", + "instances" ], "resourceActions": { - "activate": { + "update": { "input": null, "output": "credential" }, - "create": { + "activate": { "input": null, "output": "credential" }, - "update": { + "remove": { "input": null, "output": "credential" }, - "purge": { + "deactivate": { "input": null, "output": "credential" }, - "remove": { + "create": { "input": null, "output": "credential" }, - "deactivate": { + "purge": { "input": null, "output": "credential" } }, "collectionActions": {}, "collectionFields": {}, + "resourceMethods": [ + "GET" + ], "collectionMethods": [ "GET", "POST" - ], - "resourceMethods": [ - "GET" ] }, { @@ -6384,12 +6676,12 @@ "resourceActions": {}, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ - "GET" - ], "resourceMethods": [ "GET", "DELETE" + ], + "collectionMethods": [ + "GET" ] }, { @@ -6486,12 +6778,113 @@ "resourceActions": {}, "collectionActions": {}, "collectionFields": {}, + "resourceMethods": [ + "GET", + "DELETE" + ], "collectionMethods": [ "GET" - ], + ] + }, + { + "id": "digitaloceanConfig", + "type": "schema", + "links": { + "self": "http://localhost:8082/v1/schemas/digitaloceanconfig", + "collection": "http://localhost:8082/v1/digitaloceanconfigs" + }, + "actions": {}, + "pluralName": "digitaloceanConfigs", + "resourceFields": { + "accessToken": { + "type": "string", + "description": "Digital Ocean access token", + "create": true, + "update": false, + "readOnCreateOnly": false, + "default": "" + }, + "backups": { + "type": "boolean", + "description": "enable backups for droplet", + "create": true, + "update": false, + "readOnCreateOnly": false + }, + "image": { + "type": "string", + "description": "Digital Ocean Image", + "create": true, + "update": false, + "readOnCreateOnly": false, + "default": "ubuntu-15-10-x64" + }, + "ipv6": { + "type": "boolean", + "description": "enable ipv6 for droplet", + "create": true, + "update": false, + "readOnCreateOnly": false + }, + "privateNetworking": { + "type": "boolean", + "description": "enable private networking for droplet", + "create": true, + "update": false, + "readOnCreateOnly": false + }, + "region": { + "type": "string", + "description": "Digital Ocean region", + "create": true, + "update": false, + "readOnCreateOnly": false, + "default": "nyc3" + }, + "size": { + "type": "string", + "description": "Digital Ocean size", + "create": true, + "update": false, + "readOnCreateOnly": false, + "default": "512mb" + }, + "sshPort": { + "type": "string", + "description": "SSH port", + "create": true, + "update": false, + "readOnCreateOnly": false, + "default": "22" + }, + "sshUser": { + "type": "string", + "description": "SSH username", + "create": true, + "update": false, + "readOnCreateOnly": false, + "default": "root" + }, + "userdata": { + "type": "string", + "description": "path to file with cloud-init user-data", + "create": true, + "update": false, + "readOnCreateOnly": false, + "default": "" + } + }, + "collectionFilters": {}, + "includeableLinks": [], + "resourceActions": {}, + "collectionActions": {}, + "collectionFields": {}, "resourceMethods": [ + "GET" + ], + "collectionMethods": [ "GET", - "DELETE" + "POST" ] }, { @@ -6650,7 +7043,7 @@ "type": "boolean", "description": null, "create": true, - "update": false, + "update": true, "nullable": true, "readOnCreateOnly": false }, @@ -6933,83 +7326,79 @@ } }, "includeableLinks": [ - "consumedbyservices", "environment", - "instances", "consumedservices", "configitemstatuses", "serviceexposemaps", - "dynamicschemas", - "account" + "account", + "instances", + "consumedbyservices" ], "resourceActions": { - "rollback": { + "update": { "input": null, "output": "service" }, - "upgrade": { - "input": "serviceUpgrade", + "finishupgrade": { + "input": null, "output": "service" }, "restart": { "input": "serviceRestart", "output": "service" }, - "update": { + "remove": { "input": null, "output": "service" }, - "remove": { - "input": null, + "setservicelinks": { + "input": "setServiceLinksInput", "output": "service" }, - "deactivate": { + "cancelupgrade": { "input": null, "output": "service" }, - "finishupgrade": { - "input": null, + "removeservicelink": { + "input": "addRemoveServiceLinkInput", "output": "service" }, - "cancelrollback": { + "rollback": { "input": null, "output": "service" }, - "removeservicelink": { - "input": "addRemoveServiceLinkInput", + "create": { + "input": null, "output": "service" }, "activate": { "input": null, "output": "service" }, + "upgrade": { + "input": "serviceUpgrade", + "output": "service" + }, "addservicelink": { "input": "addRemoveServiceLinkInput", "output": "service" }, - "create": { + "deactivate": { "input": null, "output": "service" }, - "cancelupgrade": { + "cancelrollback": { "input": null, "output": "service" - }, - "setservicelinks": { - "input": "setServiceLinksInput", - "output": "service" } }, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ - "GET", - "POST" - ], "resourceMethods": [ - "GET", - "PUT", - "DELETE" + "GET" + ], + "collectionMethods": [ + "GET" ] }, { @@ -7076,28 +7465,27 @@ "resourceActions": {}, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ - "GET", - "POST" - ], "resourceMethods": [ "GET" + ], + "collectionMethods": [ + "GET" ] }, { - "id": "dynamicSchema", + "id": "environment", "type": "schema", "links": { - "self": "http://localhost:8082/v1/schemas/dynamicschema", - "collection": "http://localhost:8082/v1/dynamicschemas" + "self": "http://localhost:8082/v1/schemas/environment", + "collection": "http://localhost:8082/v1/environments" }, "actions": {}, - "pluralName": "dynamicSchemas", + "pluralName": "environments", "resourceFields": { "accountId": { "type": "reference[account]", "description": null, - "create": true, + "create": false, "update": false, "nullable": true, "readOnCreateOnly": false, @@ -7119,34 +7507,43 @@ "update": false, "nullable": true, "readOnCreateOnly": false, - "maxLength": 65535 + "maxLength": 16777215 }, - "definition": { + "description": { "type": "string", "description": null, "create": true, - "update": false, + "update": true, "nullable": true, "readOnCreateOnly": false, - "maxLength": 16777215 + "maxLength": 1024 }, - "description": { + "externalId": { "type": "string", "description": null, "create": true, "update": true, "nullable": true, "readOnCreateOnly": false, - "maxLength": 1024 + "maxLength": 128 }, - "id": { - "type": "int", + "healthState": { + "type": "string", "description": null, "create": false, "update": false, "nullable": true, - "readOnCreateOnly": false - }, + "readOnCreateOnly": false, + "maxLength": 128 + }, + "id": { + "type": "int", + "description": null, + "create": false, + "update": false, + "nullable": true, + "readOnCreateOnly": false + }, "kind": { "type": "string", "description": null, @@ -7158,17 +7555,20 @@ }, "name": { "type": "string", + "validChars": "a-zA-Z0-9-", "description": null, "create": true, "update": true, "nullable": true, + "required": true, "readOnCreateOnly": false, - "maxLength": 255 + "minLength": 1, + "maxLength": 63 }, - "parent": { - "type": "string", + "removeTime": { + "type": "date", "description": null, - "create": true, + "create": false, "update": false, "nullable": true, "readOnCreateOnly": false, @@ -7191,11 +7591,21 @@ "readOnCreateOnly": false, "maxLength": 128, "options": [ + "activating", "active", - "creating", - "purged", + "canceled-upgrade", + "canceling-rollback", + "canceling-upgrade", + "error", + "erroring", + "finishing-upgrade", + "removed", "removing", - "requested" + "requested", + "rolling-back", + "updating-active", + "upgraded", + "upgrading" ] }, "uuid": { @@ -7235,13 +7645,58 @@ "nullable": true, "readOnCreateOnly": false }, - "roles": { - "type": "array[string]", + "dockerCompose": { + "type": "string", + "description": null, + "create": true, + "update": false, + "readOnCreateOnly": false + }, + "rancherCompose": { + "type": "string", + "description": null, + "create": true, + "update": false, + "readOnCreateOnly": false + }, + "environment": { + "type": "map[string]", + "description": null, + "create": true, + "update": false, + "readOnCreateOnly": false + }, + "previousExternalId": { + "type": "string", + "description": null, + "create": true, + "update": true, + "nullable": true, + "readOnCreateOnly": false + }, + "previousEnvironment": { + "type": "map[string]", + "description": null, + "create": true, + "update": true, + "nullable": true, + "readOnCreateOnly": false + }, + "startOnCreate": { + "type": "boolean", "description": null, "create": true, "update": false, "nullable": true, "readOnCreateOnly": false + }, + "outputs": { + "type": "map[string]", + "description": null, + "create": true, + "update": true, + "nullable": true, + "readOnCreateOnly": false } }, "collectionFilters": { @@ -7265,7 +7720,7 @@ "notnull" ] }, - "definition": { + "description": { "modifiers": [ "eq", "ne", @@ -7276,7 +7731,18 @@ "notnull" ] }, - "description": { + "externalId": { + "modifiers": [ + "eq", + "ne", + "prefix", + "like", + "notlike", + "null", + "notnull" + ] + }, + "healthState": { "modifiers": [ "eq", "ne", @@ -7321,13 +7787,14 @@ "notnull" ] }, - "parent": { + "removeTime": { "modifiers": [ "eq", "ne", - "prefix", - "like", - "notlike", + "lt", + "lte", + "gt", + "gte", "null", "notnull" ] @@ -7344,14 +7811,6 @@ "notnull" ] }, - "serviceId": { - "modifiers": [ - "eq", - "ne", - "null", - "notnull" - ] - }, "state": { "modifiers": [ "eq", @@ -7373,492 +7832,106 @@ } }, "includeableLinks": [ + "services", + "configitemstatuses", "account" ], "resourceActions": { - "create": { + "upgrade": { + "input": "environmentUpgrade", + "output": "environment" + }, + "update": { + "input": null, + "output": "environment" + }, + "finishupgrade": { "input": null, - "output": "dynamicSchema" + "output": "environment" }, "remove": { "input": null, - "output": "dynamicSchema" + "output": "environment" + }, + "error": { + "input": null, + "output": "environment" + }, + "cancelupgrade": { + "input": null, + "output": "environment" + }, + "addoutputs": { + "input": "addOutputsInput", + "output": "environment" + }, + "activateservices": { + "input": null, + "output": "environment" + }, + "rollback": { + "input": null, + "output": "environment" + }, + "deactivateservices": { + "input": null, + "output": "environment" + }, + "create": { + "input": null, + "output": "environment" + }, + "cancelrollback": { + "input": null, + "output": "environment" + }, + "exportconfig": { + "input": "composeConfigInput", + "output": "composeConfig" } }, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ - "GET", - "POST" - ], "resourceMethods": [ - "GET", - "DELETE" + "GET" + ], + "collectionMethods": [ + "GET" ] }, { - "id": "environment", + "id": "environmentUpgrade", "type": "schema", "links": { - "self": "http://localhost:8082/v1/schemas/environment", - "collection": "http://localhost:8082/v1/environments" + "self": "http://localhost:8082/v1/schemas/environmentupgrade", + "collection": "http://localhost:8082/v1/environmentupgrades" }, "actions": {}, - "pluralName": "environments", + "pluralName": "environmentUpgrades", "resourceFields": { - "accountId": { - "type": "reference[account]", - "description": null, - "create": false, - "update": false, - "nullable": true, - "readOnCreateOnly": false, - "maxLength": 255 - }, - "created": { - "type": "date", - "description": null, - "create": false, - "update": false, - "nullable": true, - "readOnCreateOnly": false, - "maxLength": 255 - }, - "data": { - "type": "map[json]", - "description": null, - "create": false, - "update": false, - "nullable": true, - "readOnCreateOnly": false, - "maxLength": 16777215 - }, - "description": { + "dockerCompose": { "type": "string", "description": null, "create": true, - "update": true, - "nullable": true, - "readOnCreateOnly": false, - "maxLength": 1024 + "update": false, + "readOnCreateOnly": false }, - "externalId": { + "rancherCompose": { "type": "string", "description": null, "create": true, - "update": true, - "nullable": true, - "readOnCreateOnly": false, - "maxLength": 128 - }, - "healthState": { - "type": "string", - "description": null, - "create": false, - "update": false, - "nullable": true, - "readOnCreateOnly": false, - "maxLength": 128 - }, - "id": { - "type": "int", - "description": null, - "create": false, "update": false, - "nullable": true, "readOnCreateOnly": false }, - "kind": { + "externalId": { "type": "string", "description": null, - "create": false, + "create": true, "update": false, - "nullable": true, - "readOnCreateOnly": false, - "maxLength": 255 + "readOnCreateOnly": false }, - "name": { - "type": "string", - "validChars": "a-zA-Z0-9-", - "description": null, - "create": true, - "update": true, - "nullable": true, - "required": true, - "readOnCreateOnly": false, - "minLength": 1, - "maxLength": 63 - }, - "removeTime": { - "type": "date", - "description": null, - "create": false, - "update": false, - "nullable": true, - "readOnCreateOnly": false, - "maxLength": 255 - }, - "removed": { - "type": "date", - "description": null, - "create": false, - "update": false, - "nullable": true, - "readOnCreateOnly": false, - "maxLength": 255 - }, - "state": { - "type": "enum", - "description": null, - "create": false, - "update": false, - "readOnCreateOnly": false, - "maxLength": 128, - "options": [ - "activating", - "active", - "canceled-upgrade", - "canceling-rollback", - "canceling-upgrade", - "error", - "erroring", - "finishing-upgrade", - "removed", - "removing", - "requested", - "rolling-back", - "updating-active", - "upgraded", - "upgrading" - ] - }, - "uuid": { - "type": "string", - "description": null, - "create": false, - "update": false, - "nullable": true, - "readOnCreateOnly": false, - "maxLength": 128 - }, - "transitioning": { - "type": "enum", - "description": null, - "create": false, - "update": false, - "readOnCreateOnly": false, - "options": [ - "yes", - "no", - "error" - ] - }, - "transitioningMessage": { - "type": "string", - "description": null, - "create": false, - "update": false, - "nullable": true, - "readOnCreateOnly": false - }, - "transitioningProgress": { - "type": "int", - "description": null, - "create": false, - "update": false, - "nullable": true, - "readOnCreateOnly": false - }, - "dockerCompose": { - "type": "string", - "description": null, - "create": true, - "update": false, - "readOnCreateOnly": false - }, - "rancherCompose": { - "type": "string", - "description": null, - "create": true, - "update": false, - "readOnCreateOnly": false - }, - "environment": { - "type": "map[string]", - "description": null, - "create": true, - "update": false, - "readOnCreateOnly": false - }, - "previousExternalId": { - "type": "string", - "description": null, - "create": true, - "update": true, - "nullable": true, - "readOnCreateOnly": false - }, - "previousEnvironment": { - "type": "map[string]", - "description": null, - "create": true, - "update": true, - "nullable": true, - "readOnCreateOnly": false - }, - "startOnCreate": { - "type": "boolean", - "description": null, - "create": true, - "update": false, - "nullable": true, - "readOnCreateOnly": false - }, - "outputs": { - "type": "map[string]", - "description": null, - "create": true, - "update": true, - "nullable": true, - "readOnCreateOnly": false - } - }, - "collectionFilters": { - "accountId": { - "modifiers": [ - "eq", - "ne", - "null", - "notnull" - ] - }, - "created": { - "modifiers": [ - "eq", - "ne", - "lt", - "lte", - "gt", - "gte", - "null", - "notnull" - ] - }, - "description": { - "modifiers": [ - "eq", - "ne", - "prefix", - "like", - "notlike", - "null", - "notnull" - ] - }, - "externalId": { - "modifiers": [ - "eq", - "ne", - "prefix", - "like", - "notlike", - "null", - "notnull" - ] - }, - "healthState": { - "modifiers": [ - "eq", - "ne", - "prefix", - "like", - "notlike", - "null", - "notnull" - ] - }, - "id": { - "modifiers": [ - "eq", - "ne", - "lt", - "lte", - "gt", - "gte", - "null", - "notnull" - ] - }, - "kind": { - "modifiers": [ - "eq", - "ne", - "prefix", - "like", - "notlike", - "null", - "notnull" - ] - }, - "name": { - "modifiers": [ - "eq", - "ne", - "prefix", - "like", - "notlike", - "null", - "notnull" - ] - }, - "removeTime": { - "modifiers": [ - "eq", - "ne", - "lt", - "lte", - "gt", - "gte", - "null", - "notnull" - ] - }, - "removed": { - "modifiers": [ - "eq", - "ne", - "lt", - "lte", - "gt", - "gte", - "null", - "notnull" - ] - }, - "state": { - "modifiers": [ - "eq", - "ne", - "null", - "notnull" - ] - }, - "uuid": { - "modifiers": [ - "eq", - "ne", - "prefix", - "like", - "notlike", - "null", - "notnull" - ] - } - }, - "includeableLinks": [ - "configitemstatuses", - "services", - "account" - ], - "resourceActions": { - "rollback": { - "input": null, - "output": "environment" - }, - "upgrade": { - "input": "environmentUpgrade", - "output": "environment" - }, - "addoutputs": { - "input": "addOutputsInput", - "output": "environment" - }, - "update": { - "input": null, - "output": "environment" - }, - "error": { - "input": null, - "output": "environment" - }, - "remove": { - "input": null, - "output": "environment" - }, - "finishupgrade": { - "input": null, - "output": "environment" - }, - "cancelrollback": { - "input": null, - "output": "environment" - }, - "deactivateservices": { - "input": null, - "output": "environment" - }, - "activateservices": { - "input": null, - "output": "environment" - }, - "create": { - "input": null, - "output": "environment" - }, - "exportconfig": { - "input": "composeConfigInput", - "output": "composeConfig" - }, - "cancelupgrade": { - "input": null, - "output": "environment" - } - }, - "collectionActions": {}, - "collectionFields": {}, - "collectionMethods": [ - "GET", - "POST" - ], - "resourceMethods": [ - "GET", - "PUT", - "DELETE" - ] - }, - { - "id": "environmentUpgrade", - "type": "schema", - "links": { - "self": "http://localhost:8082/v1/schemas/environmentupgrade", - "collection": "http://localhost:8082/v1/environmentupgrades" - }, - "actions": {}, - "pluralName": "environmentUpgrades", - "resourceFields": { - "dockerCompose": { - "type": "string", - "description": null, - "create": true, - "update": false, - "readOnCreateOnly": false - }, - "rancherCompose": { - "type": "string", - "description": null, - "create": true, - "update": false, - "readOnCreateOnly": false - }, - "externalId": { - "type": "string", - "description": null, - "create": true, - "update": false, - "readOnCreateOnly": false - }, - "environment": { - "type": "map[string]", + "environment": { + "type": "map[string]", "description": null, "create": true, "update": false, @@ -7870,12 +7943,11 @@ "resourceActions": {}, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ - "GET", - "POST" - ], "resourceMethods": [ "GET" + ], + "collectionMethods": [ + "GET" ] }, { @@ -7914,10 +7986,10 @@ "resourceActions": {}, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [], "resourceMethods": [ "GET" - ] + ], + "collectionMethods": [] }, { "id": "extensionPoint", @@ -7970,10 +8042,10 @@ "resourceActions": {}, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ + "resourceMethods": [ "GET" ], - "resourceMethods": [ + "collectionMethods": [ "GET" ] }, @@ -8231,21 +8303,21 @@ "account" ], "resourceActions": { - "create": { + "remove": { "input": null, "output": "externalEvent" }, - "remove": { + "create": { "input": null, "output": "externalEvent" } }, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ + "resourceMethods": [ "GET" ], - "resourceMethods": [ + "collectionMethods": [ "GET" ] }, @@ -8482,21 +8554,21 @@ "account" ], "resourceActions": { - "create": { + "remove": { "input": null, "output": "externalEvent" }, - "remove": { + "create": { "input": null, "output": "externalEvent" } }, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ + "resourceMethods": [ "GET" ], - "resourceMethods": [ + "collectionMethods": [ "GET" ] }, @@ -8792,11 +8864,11 @@ } }, "includeableLinks": [ - "externalhandlerprocesses", - "externalhandlerexternalhandlerprocessmaps" + "externalhandlerexternalhandlerprocessmaps", + "externalhandlerprocesses" ], "resourceActions": { - "restore": { + "update": { "input": null, "output": "externalHandler" }, @@ -8804,36 +8876,36 @@ "input": null, "output": "externalHandler" }, - "create": { + "remove": { "input": null, "output": "externalHandler" }, - "update": { + "restore": { "input": null, "output": "externalHandler" }, - "purge": { + "deactivate": { "input": null, "output": "externalHandler" }, - "remove": { + "create": { "input": null, "output": "externalHandler" }, - "deactivate": { + "purge": { "input": null, "output": "externalHandler" } }, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ - "GET", - "POST" - ], "resourceMethods": [ "GET", "PUT" + ], + "collectionMethods": [ + "GET", + "POST" ] }, { @@ -9139,7 +9211,7 @@ "externalhandlerprocess" ], "resourceActions": { - "restore": { + "update": { "input": null, "output": "externalHandlerExternalHandlerProcessMap" }, @@ -9147,33 +9219,33 @@ "input": null, "output": "externalHandlerExternalHandlerProcessMap" }, - "create": { + "remove": { "input": null, "output": "externalHandlerExternalHandlerProcessMap" }, - "update": { + "restore": { "input": null, "output": "externalHandlerExternalHandlerProcessMap" }, - "purge": { + "deactivate": { "input": null, "output": "externalHandlerExternalHandlerProcessMap" }, - "remove": { + "create": { "input": null, "output": "externalHandlerExternalHandlerProcessMap" }, - "deactivate": { + "purge": { "input": null, "output": "externalHandlerExternalHandlerProcessMap" } }, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ + "resourceMethods": [ "GET" ], - "resourceMethods": [ + "collectionMethods": [ "GET" ] }, @@ -9426,7 +9498,7 @@ "externalhandlers" ], "resourceActions": { - "restore": { + "update": { "input": null, "output": "externalHandlerProcess" }, @@ -9434,33 +9506,33 @@ "input": null, "output": "externalHandlerProcess" }, - "create": { + "remove": { "input": null, "output": "externalHandlerProcess" }, - "update": { + "restore": { "input": null, "output": "externalHandlerProcess" }, - "purge": { + "deactivate": { "input": null, "output": "externalHandlerProcess" }, - "remove": { + "create": { "input": null, "output": "externalHandlerProcess" }, - "deactivate": { + "purge": { "input": null, "output": "externalHandlerProcess" } }, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ + "resourceMethods": [ "GET" ], - "resourceMethods": [ + "collectionMethods": [ "GET" ] }, @@ -9493,11 +9565,11 @@ "resourceActions": {}, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ - "POST" - ], "resourceMethods": [ "GET" + ], + "collectionMethods": [ + "POST" ] }, { @@ -9757,23 +9829,22 @@ "account" ], "resourceActions": { - "create": { + "remove": { "input": null, "output": "externalEvent" }, - "remove": { + "create": { "input": null, "output": "externalEvent" } }, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ - "GET", - "POST" - ], "resourceMethods": [ "GET" + ], + "collectionMethods": [ + "GET" ] }, { @@ -10214,45 +10285,40 @@ } }, "includeableLinks": [ - "consumedbyservices", "environment", - "instances", "consumedservices", "configitemstatuses", "serviceexposemaps", - "dynamicschemas", - "account" + "account", + "instances", + "consumedbyservices" ], "resourceActions": { - "rollback": { + "update": { "input": null, "output": "service" }, - "upgrade": { - "input": "serviceUpgrade", + "finishupgrade": { + "input": null, "output": "service" }, "restart": { "input": "serviceRestart", "output": "service" }, - "update": { - "input": null, - "output": "service" - }, "remove": { "input": null, "output": "service" }, - "deactivate": { + "cancelupgrade": { "input": null, "output": "service" }, - "finishupgrade": { + "rollback": { "input": null, "output": "service" }, - "cancelrollback": { + "create": { "input": null, "output": "service" }, @@ -10260,25 +10326,26 @@ "input": null, "output": "service" }, - "create": { + "upgrade": { + "input": "serviceUpgrade", + "output": "service" + }, + "deactivate": { "input": null, "output": "service" }, - "cancelupgrade": { + "cancelrollback": { "input": null, "output": "service" } }, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ - "GET", - "POST" - ], "resourceMethods": [ - "GET", - "PUT", - "DELETE" + "GET" + ], + "collectionMethods": [ + "GET" ] }, { @@ -10529,21 +10596,21 @@ "account" ], "resourceActions": { - "create": { + "remove": { "input": null, "output": "externalEvent" }, - "remove": { + "create": { "input": null, "output": "externalEvent" } }, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ + "resourceMethods": [ "GET" ], - "resourceMethods": [ + "collectionMethods": [ "GET" ] }, @@ -10795,21 +10862,21 @@ "account" ], "resourceActions": { - "create": { + "remove": { "input": null, "output": "externalEvent" }, - "remove": { + "create": { "input": null, "output": "externalEvent" } }, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ + "resourceMethods": [ "GET" ], - "resourceMethods": [ + "collectionMethods": [ "GET" ] }, @@ -11054,21 +11121,21 @@ "account" ], "resourceActions": { - "create": { + "remove": { "input": null, "output": "externalEvent" }, - "remove": { + "create": { "input": null, "output": "externalEvent" } }, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ + "resourceMethods": [ "GET" ], - "resourceMethods": [ + "collectionMethods": [ "GET" ] }, @@ -11094,10 +11161,10 @@ "resourceActions": {}, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [], "resourceMethods": [ "GET" - ] + ], + "collectionMethods": [] }, { "id": "githubconfig", @@ -11191,13 +11258,13 @@ "resourceActions": {}, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ - "GET", - "POST" - ], "resourceMethods": [ "GET", "PUT" + ], + "collectionMethods": [ + "GET", + "POST" ] }, { @@ -11252,12 +11319,12 @@ }, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ - "GET" - ], "resourceMethods": [ "GET", "PUT" + ], + "collectionMethods": [ + "GET" ] }, { @@ -11443,12 +11510,12 @@ "resourceActions": {}, "collectionActions": {}, "collectionFields": {}, + "resourceMethods": [ + "GET" + ], "collectionMethods": [ "GET", "POST" - ], - "resourceMethods": [ - "GET" ] }, { @@ -11484,13 +11551,10 @@ "resourceActions": {}, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ - "POST" - ], "resourceMethods": [ - "GET", - "PUT" - ] + "GET" + ], + "collectionMethods": [] }, { "id": "healthcheckInstanceHostMap", @@ -11820,26 +11884,26 @@ } }, "includeableLinks": [ - "instance", "host", - "account" + "account", + "instance" ], "resourceActions": { - "create": { + "remove": { "input": null, "output": "healthcheckInstanceHostMap" }, - "remove": { + "create": { "input": null, "output": "healthcheckInstanceHostMap" } }, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ + "resourceMethods": [ "GET" ], - "resourceMethods": [ + "collectionMethods": [ "GET" ] }, @@ -12248,63 +12312,61 @@ } }, "includeableLinks": [ - "agent", - "instances", - "hosts", - "volumes", - "serviceevents", - "hostlabels", - "healthcheckinstancehostmaps", "ipaddresses", "storagepools", + "clusters", "physicalhost", + "hostlabels", + "serviceevents", + "hosts", + "containerevents", "account", - "clusters", - "containerevents" + "volumes", + "instances", + "healthcheckinstancehostmaps", + "agent" ], "resourceActions": { - "restore": { + "update": { "input": null, "output": "host" }, - "dockersocket": { - "input": null, - "output": "hostAccess" - }, "activate": { "input": null, "output": "host" }, - "create": { + "remove": { "input": null, "output": "host" }, - "update": { + "restore": { "input": null, "output": "host" }, - "purge": { + "dockersocket": { + "input": null, + "output": "hostAccess" + }, + "deactivate": { "input": null, "output": "host" }, - "remove": { + "create": { "input": null, "output": "host" }, - "deactivate": { + "purge": { "input": null, "output": "host" } }, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ + "resourceMethods": [ "GET" ], - "resourceMethods": [ - "GET", - "PUT", - "DELETE" + "collectionMethods": [ + "GET" ] }, { @@ -12337,10 +12399,10 @@ "resourceActions": {}, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ + "resourceMethods": [ "GET" ], - "resourceMethods": [ + "collectionMethods": [ "GET" ] }, @@ -12381,10 +12443,10 @@ "resourceActions": {}, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ + "resourceMethods": [ "GET" ], - "resourceMethods": [ + "collectionMethods": [ "GET" ] }, @@ -12505,10 +12567,10 @@ "resourceActions": {}, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ + "resourceMethods": [ "GET" ], - "resourceMethods": [ + "collectionMethods": [ "GET" ] }, @@ -12858,13 +12920,13 @@ } }, "includeableLinks": [ - "instances", "storagepools", + "account", "volumes", - "account" + "instances" ], "resourceActions": { - "restore": { + "update": { "input": null, "output": "image" }, @@ -12872,33 +12934,33 @@ "input": null, "output": "image" }, - "create": { + "remove": { "input": null, "output": "image" }, - "update": { + "restore": { "input": null, "output": "image" }, - "purge": { + "deactivate": { "input": null, "output": "image" }, - "remove": { + "create": { "input": null, "output": "image" }, - "deactivate": { + "purge": { "input": null, "output": "image" } }, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ + "resourceMethods": [ "GET" ], - "resourceMethods": [ + "collectionMethods": [ "GET" ] }, @@ -12978,12 +13040,10 @@ "resourceActions": {}, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ - "POST" - ], "resourceMethods": [ "GET" - ] + ], + "collectionMethods": [] }, { "id": "instance", @@ -13547,93 +13607,93 @@ } }, "includeableLinks": [ - "credentials", - "instances", - "hosts", - "volumes", - "mounts", - "serviceevents", - "serviceexposemaps", "services", - "ports", "instancelinks", - "healthcheckinstancehostmaps", + "volumes", "targetinstancelinks", + "instances", "instancelabels", - "account" + "ports", + "mounts", + "hosts", + "serviceevents", + "serviceexposemaps", + "account", + "credentials", + "healthcheckinstancehostmaps" ], "resourceActions": { - "updateunhealthy": { + "update": { "input": null, "output": "instance" }, - "console": { - "input": "instanceConsoleInput", - "output": "instanceConsole" - }, - "restore": { - "input": null, + "stop": { + "input": "instanceStop", "output": "instance" }, "restart": { "input": null, "output": "instance" }, - "deallocate": { + "updatereinitializing": { "input": null, "output": "instance" }, - "start": { + "error": { "input": null, "output": "instance" }, - "updatereinitializing": { + "remove": { "input": null, "output": "instance" }, - "update": { + "updatehealthy": { "input": null, "output": "instance" }, - "purge": { + "migrate": { "input": null, "output": "instance" }, - "error": { + "allocate": { "input": null, "output": "instance" }, - "remove": { + "create": { "input": null, "output": "instance" }, - "allocate": { + "console": { + "input": "instanceConsoleInput", + "output": "instanceConsole" + }, + "start": { "input": null, "output": "instance" }, - "stop": { - "input": "instanceStop", + "restore": { + "input": null, "output": "instance" }, - "create": { + "deallocate": { "input": null, "output": "instance" }, - "updatehealthy": { + "updateunhealthy": { "input": null, "output": "instance" }, - "migrate": { + "purge": { "input": null, "output": "instance" } }, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ + "resourceMethods": [ "GET" ], - "resourceMethods": [ + "collectionMethods": [ "GET" ] }, @@ -13673,10 +13733,10 @@ "resourceActions": {}, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [], "resourceMethods": [ "GET" - ] + ], + "collectionMethods": [] }, { "id": "instanceConsoleInput", @@ -13692,10 +13752,10 @@ "resourceActions": {}, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [], "resourceMethods": [ "GET" - ] + ], + "collectionMethods": [] }, { "id": "instanceHealthCheck", @@ -13814,11 +13874,11 @@ "resourceActions": {}, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ - "POST" - ], "resourceMethods": [ "GET" + ], + "collectionMethods": [ + "POST" ] }, { @@ -14153,11 +14213,11 @@ }, "includeableLinks": [ "targetinstance", - "instance", - "account" + "account", + "instance" ], "resourceActions": { - "restore": { + "update": { "input": null, "output": "instanceLink" }, @@ -14165,35 +14225,34 @@ "input": null, "output": "instanceLink" }, - "create": { + "remove": { "input": null, "output": "instanceLink" }, - "update": { + "restore": { "input": null, "output": "instanceLink" }, - "purge": { + "deactivate": { "input": null, "output": "instanceLink" }, - "remove": { + "create": { "input": null, "output": "instanceLink" }, - "deactivate": { + "purge": { "input": null, "output": "instanceLink" } }, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ + "resourceMethods": [ "GET" ], - "resourceMethods": [ - "GET", - "PUT" + "collectionMethods": [ + "GET" ] }, { @@ -14225,12 +14284,10 @@ "resourceActions": {}, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ - "POST" - ], "resourceMethods": [ "GET" - ] + ], + "collectionMethods": [] }, { "id": "ipAddress", @@ -14580,14 +14637,14 @@ } }, "includeableLinks": [ + "privateports", "publicports", "hosts", - "privateports", "account", "network" ], "resourceActions": { - "restore": { + "update": { "input": null, "output": "ipAddress" }, @@ -14595,41 +14652,41 @@ "input": null, "output": "ipAddress" }, - "create": { + "remove": { "input": null, "output": "ipAddress" }, - "update": { + "disassociate": { "input": null, "output": "ipAddress" }, - "purge": { + "restore": { "input": null, "output": "ipAddress" }, - "associate": { - "input": "ipAddressAssociateInput", - "output": "ipPool" - }, - "remove": { + "deactivate": { "input": null, "output": "ipAddress" }, - "deactivate": { + "create": { "input": null, "output": "ipAddress" }, - "disassociate": { + "purge": { "input": null, "output": "ipAddress" + }, + "associate": { + "input": "ipAddressAssociateInput", + "output": "ipPool" } }, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ + "resourceMethods": [ "GET" ], - "resourceMethods": [ + "collectionMethods": [ "GET" ] }, @@ -14655,12 +14712,10 @@ "resourceActions": {}, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ - "POST" - ], "resourceMethods": [ "GET" - ] + ], + "collectionMethods": [] }, { "id": "kubernetesService", @@ -15060,79 +15115,78 @@ } }, "includeableLinks": [ - "consumedbyservices", "environment", - "instances", "consumedservices", "configitemstatuses", "serviceexposemaps", - "dynamicschemas", - "account" + "account", + "instances", + "consumedbyservices" ], "resourceActions": { - "rollback": { + "update": { "input": null, "output": "service" }, - "upgrade": { - "input": "serviceUpgrade", + "finishupgrade": { + "input": null, "output": "service" }, "restart": { "input": "serviceRestart", "output": "service" }, - "update": { + "remove": { "input": null, "output": "service" }, - "remove": { - "input": null, + "setservicelinks": { + "input": "setServiceLinksInput", "output": "service" }, - "deactivate": { + "cancelupgrade": { "input": null, "output": "service" }, - "finishupgrade": { - "input": null, + "removeservicelink": { + "input": "addRemoveServiceLinkInput", "output": "service" }, - "cancelrollback": { + "rollback": { "input": null, "output": "service" }, - "removeservicelink": { - "input": "addRemoveServiceLinkInput", + "create": { + "input": null, "output": "service" }, "activate": { "input": null, "output": "service" }, + "upgrade": { + "input": "serviceUpgrade", + "output": "service" + }, "addservicelink": { "input": "addRemoveServiceLinkInput", "output": "service" }, - "create": { + "deactivate": { "input": null, "output": "service" }, - "cancelupgrade": { + "cancelrollback": { "input": null, "output": "service" - }, - "setservicelinks": { - "input": "setServiceLinksInput", - "output": "service" } }, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ + "resourceMethods": [ "GET" ], - "resourceMethods": [ + "collectionMethods": [ "GET" ] }, @@ -15441,26 +15495,26 @@ } }, "includeableLinks": [ - "instances", "hosts", - "account" + "account", + "instances" ], "resourceActions": { - "create": { + "remove": { "input": null, "output": "label" }, - "remove": { + "create": { "input": null, "output": "label" } }, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ + "resourceMethods": [ "GET" ], - "resourceMethods": [ + "collectionMethods": [ "GET" ] }, @@ -16651,86 +16705,86 @@ } }, "includeableLinks": [ - "agent", - "networkcontainer", - "credentials", - "instances", - "hosts", - "volumes", - "mounts", - "serviceevents", - "serviceexposemaps", "services", - "ports", + "networkcontainer", "instancelinks", - "healthcheckinstancehostmaps", - "registrycredential", + "volumes", "targetinstancelinks", + "instances", + "agent", + "registrycredential", "instancelabels", - "account" + "ports", + "mounts", + "serviceexposemaps", + "serviceevents", + "hosts", + "account", + "credentials", + "healthcheckinstancehostmaps" ], "resourceActions": { - "updateunhealthy": { + "update": { "input": null, "output": "instance" }, - "console": { - "input": "instanceConsoleInput", - "output": "instanceConsole" - }, - "restore": { - "input": null, + "stop": { + "input": "instanceStop", "output": "instance" }, "restart": { "input": null, "output": "instance" }, - "deallocate": { + "updatereinitializing": { "input": null, "output": "instance" }, - "start": { + "error": { "input": null, "output": "instance" }, - "updatereinitializing": { + "remove": { "input": null, "output": "instance" }, - "update": { + "updatehealthy": { "input": null, "output": "instance" }, - "purge": { + "migrate": { "input": null, "output": "instance" }, - "error": { + "allocate": { "input": null, "output": "instance" }, - "remove": { + "create": { "input": null, "output": "instance" }, - "allocate": { + "console": { + "input": "instanceConsoleInput", + "output": "instanceConsole" + }, + "start": { "input": null, "output": "instance" }, - "stop": { - "input": "instanceStop", + "restore": { + "input": null, "output": "instance" }, - "create": { + "deallocate": { "input": null, "output": "instance" }, - "updatehealthy": { + "updateunhealthy": { "input": null, "output": "instance" }, - "migrate": { + "purge": { "input": null, "output": "instance" }, @@ -16749,12 +16803,12 @@ }, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ - "POST" - ], "resourceMethods": [ "GET", "PUT" + ], + "collectionMethods": [ + "POST" ] }, { @@ -17003,13 +17057,13 @@ "resourceActions": {}, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ - "GET", - "POST" - ], "resourceMethods": [ "GET", "PUT" + ], + "collectionMethods": [ + "GET", + "POST" ] }, { @@ -17087,13 +17141,10 @@ "resourceActions": {}, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ - "POST" - ], "resourceMethods": [ - "GET", - "PUT" - ] + "GET" + ], + "collectionMethods": [] }, { "id": "loadBalancerConfig", @@ -17127,14 +17178,11 @@ "resourceActions": {}, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ - "GET", - "POST" - ], "resourceMethods": [ - "GET", - "PUT", - "DELETE" + "GET" + ], + "collectionMethods": [ + "GET" ] }, { @@ -17209,13 +17257,10 @@ "resourceActions": {}, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ - "POST" - ], "resourceMethods": [ - "GET", - "PUT" - ] + "GET" + ], + "collectionMethods": [] }, { "id": "loadBalancerService", @@ -17388,7 +17433,7 @@ "type": "boolean", "description": null, "create": true, - "update": false, + "update": true, "nullable": true, "readOnCreateOnly": false }, @@ -17720,83 +17765,79 @@ } }, "includeableLinks": [ - "consumedbyservices", "environment", - "instances", "consumedservices", "configitemstatuses", "serviceexposemaps", - "dynamicschemas", - "account" + "account", + "instances", + "consumedbyservices" ], "resourceActions": { - "rollback": { + "update": { "input": null, "output": "service" }, - "upgrade": { - "input": "serviceUpgrade", + "finishupgrade": { + "input": null, "output": "service" }, "restart": { "input": "serviceRestart", "output": "service" }, - "update": { + "remove": { "input": null, "output": "service" }, - "remove": { - "input": null, + "setservicelinks": { + "input": "setLoadBalancerServiceLinksInput", "output": "service" }, - "deactivate": { + "cancelupgrade": { "input": null, "output": "service" }, - "finishupgrade": { - "input": null, + "removeservicelink": { + "input": "addRemoveLoadBalancerServiceLinkInput", "output": "service" }, - "cancelrollback": { + "rollback": { "input": null, "output": "service" }, - "removeservicelink": { - "input": "addRemoveLoadBalancerServiceLinkInput", + "create": { + "input": null, "output": "service" }, "activate": { "input": null, "output": "service" }, - "addservicelink": { - "input": "addRemoveLoadBalancerServiceLinkInput", + "upgrade": { + "input": "serviceUpgrade", "output": "service" }, - "create": { - "input": null, + "addservicelink": { + "input": "addRemoveLoadBalancerServiceLinkInput", "output": "service" }, - "cancelupgrade": { + "deactivate": { "input": null, "output": "service" }, - "setservicelinks": { - "input": "setLoadBalancerServiceLinksInput", + "cancelrollback": { + "input": null, "output": "service" } }, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ - "GET", - "POST" - ], "resourceMethods": [ - "GET", - "PUT", - "DELETE" + "GET" + ], + "collectionMethods": [ + "GET" ] }, { @@ -17837,11 +17878,11 @@ "resourceActions": {}, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ - "POST" - ], "resourceMethods": [ "GET" + ], + "collectionMethods": [ + "POST" ] }, { @@ -17907,12 +17948,12 @@ "resourceActions": {}, "collectionActions": {}, "collectionFields": {}, + "resourceMethods": [ + "GET" + ], "collectionMethods": [ "GET", "POST" - ], - "resourceMethods": [ - "GET" ] }, { @@ -17948,12 +17989,10 @@ "resourceActions": {}, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ - "POST" - ], "resourceMethods": [ "GET" - ] + ], + "collectionMethods": [] }, { "id": "machine", @@ -18007,8 +18046,7 @@ "create": false, "update": false, "nullable": true, - "readOnCreateOnly": false, - "maxLength": 128 + "readOnCreateOnly": false }, "externalId": { "type": "string", @@ -18042,9 +18080,7 @@ "create": true, "update": false, "required": true, - "readOnCreateOnly": false, - "minLength": 1, - "maxLength": 255 + "readOnCreateOnly": false }, "removeTime": { "type": "date", @@ -18084,6 +18120,15 @@ "updating" ] }, + "uuid": { + "type": "string", + "description": null, + "create": false, + "update": false, + "nullable": true, + "readOnCreateOnly": false, + "maxLength": 128 + }, "transitioning": { "type": "enum", "description": null, @@ -18112,19 +18157,18 @@ "nullable": true, "readOnCreateOnly": false }, - "uuid": { - "type": "string", + "amazonec2Config": { + "type": "amazonec2Config", "description": null, "create": false, "update": false, "nullable": true, - "readOnCreateOnly": false, - "maxLength": 128 + "readOnCreateOnly": false }, "authCertificateAuthority": { "type": "string", "description": null, - "create": true, + "create": false, "update": false, "nullable": true, "readOnCreateOnly": false @@ -18132,31 +18176,23 @@ "authKey": { "type": "string", "description": null, - "create": true, + "create": false, "update": false, "nullable": true, "readOnCreateOnly": false }, - "extractedConfig": { - "type": "string", + "azureConfig": { + "type": "azureConfig", "description": null, "create": false, - "update": true, - "nullable": true, - "readOnCreateOnly": false - }, - "labels": { - "type": "map[string]", - "description": null, - "create": true, - "update": true, + "update": false, "nullable": true, "readOnCreateOnly": false }, - "engineInstallUrl": { - "type": "string", + "digitaloceanConfig": { + "type": "digitaloceanConfig", "description": null, - "create": true, + "create": false, "update": false, "nullable": true, "readOnCreateOnly": false @@ -18164,15 +18200,15 @@ "dockerVersion": { "type": "string", "description": null, - "create": true, + "create": false, "update": false, "nullable": true, "readOnCreateOnly": false }, - "engineOpt": { + "engineEnv": { "type": "map[string]", "description": null, - "create": true, + "create": false, "update": false, "nullable": true, "readOnCreateOnly": false @@ -18180,15 +18216,15 @@ "engineInsecureRegistry": { "type": "array[string]", "description": null, - "create": true, + "create": false, "update": false, "nullable": true, "readOnCreateOnly": false }, - "engineRegistryMirror": { - "type": "array[string]", + "engineInstallUrl": { + "type": "string", "description": null, - "create": true, + "create": false, "update": false, "nullable": true, "readOnCreateOnly": false @@ -18196,7 +18232,23 @@ "engineLabel": { "type": "map[string]", "description": null, - "create": true, + "create": false, + "update": false, + "nullable": true, + "readOnCreateOnly": false + }, + "engineOpt": { + "type": "map[string]", + "description": null, + "create": false, + "update": false, + "nullable": true, + "readOnCreateOnly": false + }, + "engineRegistryMirror": { + "type": "array[string]", + "description": null, + "create": false, "update": false, "nullable": true, "readOnCreateOnly": false @@ -18204,15 +18256,23 @@ "engineStorageDriver": { "type": "string", "description": null, - "create": true, + "create": false, "update": false, "nullable": true, "readOnCreateOnly": false }, - "engineEnv": { + "labels": { "type": "map[string]", "description": null, - "create": true, + "create": false, + "update": false, + "nullable": true, + "readOnCreateOnly": false + }, + "packetConfig": { + "type": "packetConfig", + "description": null, + "create": false, "update": false, "nullable": true, "readOnCreateOnly": false @@ -18363,15 +18423,15 @@ "account" ], "resourceActions": { - "create": { + "update": { "input": null, "output": "physicalHost" }, - "update": { + "bootstrap": { "input": null, "output": "physicalHost" }, - "bootstrap": { + "remove": { "input": null, "output": "physicalHost" }, @@ -18379,21 +18439,18 @@ "input": null, "output": "physicalHost" }, - "remove": { + "create": { "input": null, "output": "physicalHost" } }, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ - "GET", - "POST" - ], "resourceMethods": [ - "GET", - "PUT", - "DELETE" + "GET" + ], + "collectionMethods": [ + "GET" ] }, { @@ -18453,8 +18510,8 @@ "name": { "type": "string", "description": null, - "create": true, - "update": true, + "create": false, + "update": false, "nullable": true, "readOnCreateOnly": false, "maxLength": 255 @@ -18715,7 +18772,7 @@ }, "includeableLinks": [], "resourceActions": { - "reactivate": { + "update": { "input": null, "output": "machineDriver" }, @@ -18723,7 +18780,7 @@ "input": null, "output": "machineDriver" }, - "update": { + "remove": { "input": null, "output": "machineDriver" }, @@ -18731,25 +18788,29 @@ "input": null, "output": "machineDriver" }, - "remove": { + "deactivate": { "input": null, "output": "machineDriver" }, - "deactivate": { + "reactivate": { + "input": null, + "output": "machineDriver" + }, + "create": { "input": null, "output": "machineDriver" } }, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ - "GET", - "POST" - ], "resourceMethods": [ "GET", "PUT", "DELETE" + ], + "collectionMethods": [ + "GET", + "POST" ] }, { @@ -19083,29 +19144,29 @@ }, "includeableLinks": [ "volume", - "instance", - "account" + "account", + "instance" ], "resourceActions": { - "create": { + "remove": { "input": null, "output": "mount" }, - "remove": { + "deactivate": { "input": null, "output": "mount" }, - "deactivate": { + "create": { "input": null, "output": "mount" } }, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ + "resourceMethods": [ "GET" ], - "resourceMethods": [ + "collectionMethods": [ "GET" ] }, @@ -19394,7 +19455,7 @@ "account" ], "resourceActions": { - "restore": { + "update": { "input": null, "output": "network" }, @@ -19402,33 +19463,33 @@ "input": null, "output": "network" }, - "create": { + "remove": { "input": null, "output": "network" }, - "update": { + "restore": { "input": null, "output": "network" }, - "purge": { + "deactivate": { "input": null, "output": "network" }, - "remove": { + "create": { "input": null, "output": "network" }, - "deactivate": { + "purge": { "input": null, "output": "network" } }, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ + "resourceMethods": [ "GET" ], - "resourceMethods": [ + "collectionMethods": [ "GET" ] }, @@ -19471,10 +19532,10 @@ "resourceActions": {}, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [], "resourceMethods": [ "GET" - ] + ], + "collectionMethods": [] }, { "id": "openldapconfig", @@ -19674,33 +19735,106 @@ }, "userNameField": { "type": "string", - "transform": "", - "description": null, + "transform": "", + "description": null, + "create": true, + "update": false, + "required": true, + "readOnCreateOnly": false, + "default": "givenName" + }, + "userObjectClass": { + "type": "string", + "transform": "", + "description": null, + "create": true, + "update": false, + "required": true, + "readOnCreateOnly": false, + "default": "inetOrgPerson" + }, + "userSearchField": { + "type": "string", + "transform": "", + "description": null, + "create": true, + "update": false, + "required": true, + "readOnCreateOnly": false, + "default": "uid" + } + }, + "collectionFilters": {}, + "includeableLinks": [], + "resourceActions": {}, + "collectionActions": {}, + "collectionFields": {}, + "resourceMethods": [ + "GET", + "PUT" + ], + "collectionMethods": [ + "GET", + "POST" + ] + }, + { + "id": "packetConfig", + "type": "schema", + "links": { + "self": "http://localhost:8082/v1/schemas/packetconfig", + "collection": "http://localhost:8082/v1/packetconfigs" + }, + "actions": {}, + "pluralName": "packetConfigs", + "resourceFields": { + "apiKey": { + "type": "string", + "description": "Packet api key", + "create": true, + "update": false, + "readOnCreateOnly": false, + "default": "" + }, + "billingCycle": { + "type": "string", + "description": "Packet billing cycle, hourly or monthly", + "create": true, + "update": false, + "readOnCreateOnly": false, + "default": "hourly" + }, + "facilityCode": { + "type": "string", + "description": "Packet facility code", + "create": true, + "update": false, + "readOnCreateOnly": false, + "default": "ewr1" + }, + "os": { + "type": "string", + "description": "Packet OS, possible values are: ubuntu_14_04", "create": true, "update": false, - "required": true, "readOnCreateOnly": false, - "default": "givenName" + "default": "ubuntu_14_04" }, - "userObjectClass": { + "plan": { "type": "string", - "transform": "", - "description": null, + "description": "Packet Server Plan", "create": true, "update": false, - "required": true, "readOnCreateOnly": false, - "default": "inetOrgPerson" + "default": "baremetal_1" }, - "userSearchField": { + "projectId": { "type": "string", - "transform": "", - "description": null, + "description": "Packet Project Id", "create": true, "update": false, - "required": true, "readOnCreateOnly": false, - "default": "uid" + "default": "" } }, "collectionFilters": {}, @@ -19708,13 +19842,12 @@ "resourceActions": {}, "collectionActions": {}, "collectionFields": {}, + "resourceMethods": [ + "GET" + ], "collectionMethods": [ "GET", "POST" - ], - "resourceMethods": [ - "GET", - "PUT" ] }, { @@ -20028,31 +20161,31 @@ }, "includeableLinks": [ "images", - "instances", - "account" + "account", + "instances" ], "resourceActions": { - "activate": { + "update": { "input": null, "output": "credential" }, - "create": { + "activate": { "input": null, "output": "credential" }, - "update": { + "remove": { "input": null, "output": "credential" }, - "purge": { + "deactivate": { "input": null, "output": "credential" }, - "remove": { + "create": { "input": null, "output": "credential" }, - "deactivate": { + "purge": { "input": null, "output": "credential" }, @@ -20063,14 +20196,14 @@ }, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ - "GET", - "POST" - ], "resourceMethods": [ "GET", "PUT", "DELETE" + ], + "collectionMethods": [ + "GET", + "POST" ] }, { @@ -20384,15 +20517,15 @@ "account" ], "resourceActions": { - "create": { + "update": { "input": null, "output": "physicalHost" }, - "update": { + "bootstrap": { "input": null, "output": "physicalHost" }, - "bootstrap": { + "remove": { "input": null, "output": "physicalHost" }, @@ -20400,17 +20533,17 @@ "input": null, "output": "physicalHost" }, - "remove": { + "create": { "input": null, "output": "physicalHost" } }, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ + "resourceMethods": [ "GET" ], - "resourceMethods": [ + "collectionMethods": [ "GET" ] }, @@ -20799,11 +20932,11 @@ "includeableLinks": [ "privateipaddress", "publicipaddress", - "instance", - "account" + "account", + "instance" ], "resourceActions": { - "restore": { + "update": { "input": null, "output": "port" }, @@ -20811,35 +20944,34 @@ "input": null, "output": "port" }, - "create": { + "remove": { "input": null, "output": "port" }, - "update": { + "restore": { "input": null, "output": "port" }, - "purge": { + "deactivate": { "input": null, "output": "port" }, - "remove": { + "create": { "input": null, "output": "port" }, - "deactivate": { + "purge": { "input": null, "output": "port" } }, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ + "resourceMethods": [ "GET" ], - "resourceMethods": [ - "GET", - "PUT" + "collectionMethods": [ + "GET" ] }, { @@ -20914,10 +21046,10 @@ "resourceActions": {}, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ + "resourceMethods": [ "GET" ], - "resourceMethods": [ + "collectionMethods": [ "GET" ] }, @@ -21026,10 +21158,10 @@ "resourceActions": {}, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ + "resourceMethods": [ "GET" ], - "resourceMethods": [ + "collectionMethods": [ "GET" ] }, @@ -21304,10 +21436,10 @@ "resourceActions": {}, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ + "resourceMethods": [ "GET" ], - "resourceMethods": [ + "collectionMethods": [ "GET" ] }, @@ -21343,7 +21475,7 @@ "type": "string", "description": null, "create": true, - "update": false, + "update": true, "nullable": true, "readOnCreateOnly": false, "maxLength": 1024 @@ -21370,7 +21502,7 @@ "type": "string", "description": null, "create": true, - "update": false, + "update": true, "nullable": true, "readOnCreateOnly": false, "maxLength": 255 @@ -21643,39 +21775,39 @@ } }, "includeableLinks": [ - "projectmembers", - "auditlogs", - "credentials", - "environments", - "instances", - "serviceexposemaps", - "networks", - "ports", + "externalevents", "serviceconsumemaps", + "agents", "instancelinks", + "containerevents", + "volumes", + "instances", + "backuptargets", "ipaddresses", - "storagepools", - "externalevents", - "images", + "serviceexposemaps", "hosts", - "volumes", - "mounts", - "serviceevents", - "services", - "dynamicschemas", - "agents", - "labels", - "healthcheckinstancehostmaps", + "physicalhosts", + "credentials", + "backups", "snapshots", + "healthcheckinstancehostmaps", "certificates", - "backuptargets", + "networks", + "services", + "storagepools", "configitemstatuses", - "physicalhosts", - "containerevents", - "backups" + "labels", + "environments", + "userpreferences", + "ports", + "mounts", + "auditlogs", + "projectmembers", + "serviceevents", + "images" ], "resourceActions": { - "restore": { + "update": { "input": null, "output": "account" }, @@ -21683,23 +21815,23 @@ "input": null, "output": "account" }, - "create": { + "remove": { "input": null, "output": "account" }, - "update": { + "restore": { "input": null, "output": "account" }, - "purge": { + "deactivate": { "input": null, "output": "account" }, - "remove": { + "create": { "input": null, "output": "account" }, - "deactivate": { + "purge": { "input": null, "output": "account" }, @@ -21714,12 +21846,14 @@ }, "collectionActions": {}, "collectionFields": {}, + "resourceMethods": [ + "GET", + "PUT", + "DELETE" + ], "collectionMethods": [ "GET", "POST" - ], - "resourceMethods": [ - "GET" ] }, { @@ -22074,7 +22208,7 @@ "project" ], "resourceActions": { - "restore": { + "update": { "input": null, "output": "projectMember" }, @@ -22082,34 +22216,35 @@ "input": null, "output": "projectMember" }, - "create": { + "remove": { "input": null, "output": "projectMember" }, - "update": { + "restore": { "input": null, "output": "projectMember" }, - "purge": { + "deactivate": { "input": null, "output": "projectMember" }, - "remove": { + "create": { "input": null, "output": "projectMember" }, - "deactivate": { + "purge": { "input": null, "output": "projectMember" } }, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ - "GET" - ], "resourceMethods": [ "GET" + ], + "collectionMethods": [ + "GET", + "POST" ] }, { @@ -22166,10 +22301,10 @@ "resourceActions": {}, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [], "resourceMethods": [ "GET" - ] + ], + "collectionMethods": [] }, { "id": "publish", @@ -22288,11 +22423,11 @@ "resourceActions": {}, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ - "POST" - ], "resourceMethods": [ "GET" + ], + "collectionMethods": [ + "POST" ] }, { @@ -22606,7 +22741,7 @@ "account" ], "resourceActions": { - "restore": { + "update": { "input": null, "output": "genericObject" }, @@ -22614,35 +22749,34 @@ "input": null, "output": "genericObject" }, - "create": { + "remove": { "input": null, "output": "genericObject" }, - "update": { + "restore": { "input": null, "output": "genericObject" }, - "purge": { + "deactivate": { "input": null, "output": "genericObject" }, - "remove": { + "create": { "input": null, "output": "genericObject" }, - "deactivate": { + "purge": { "input": null, "output": "genericObject" } }, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ - "GET", - "POST" - ], "resourceMethods": [ "GET" + ], + "collectionMethods": [ + "GET" ] }, { @@ -22670,12 +22804,10 @@ "resourceActions": {}, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ - "POST" - ], "resourceMethods": [ "GET" - ] + ], + "collectionMethods": [] }, { "id": "register", @@ -22982,7 +23114,7 @@ "account" ], "resourceActions": { - "restore": { + "update": { "input": null, "output": "genericObject" }, @@ -22990,23 +23122,23 @@ "input": null, "output": "genericObject" }, - "create": { + "remove": { "input": null, "output": "genericObject" }, - "update": { + "restore": { "input": null, "output": "genericObject" }, - "purge": { + "deactivate": { "input": null, "output": "genericObject" }, - "remove": { + "create": { "input": null, "output": "genericObject" }, - "deactivate": { + "purge": { "input": null, "output": "genericObject" }, @@ -23017,12 +23149,11 @@ }, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ - "GET", - "POST" - ], "resourceMethods": [ "GET" + ], + "collectionMethods": [ + "GET" ] }, { @@ -23038,7 +23169,7 @@ "accountId": { "type": "reference[account]", "description": null, - "create": true, + "create": false, "update": false, "nullable": true, "readOnCreateOnly": false, @@ -23345,43 +23476,42 @@ }, "includeableLinks": [ "images", - "instances", - "account" + "account", + "instances" ], "resourceActions": { - "activate": { + "update": { "input": null, "output": "credential" }, - "create": { + "activate": { "input": null, "output": "credential" }, - "update": { + "remove": { "input": null, "output": "credential" }, - "purge": { + "deactivate": { "input": null, "output": "credential" }, - "remove": { + "create": { "input": null, "output": "credential" }, - "deactivate": { + "purge": { "input": null, "output": "credential" } }, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ - "GET", - "POST" - ], "resourceMethods": [ "GET" + ], + "collectionMethods": [ + "GET" ] }, { @@ -23779,14 +23909,14 @@ } }, "includeableLinks": [ + "hosts", "images", + "account", "credentials", - "hosts", - "volumes", - "account" + "volumes" ], "resourceActions": { - "restore": { + "update": { "input": null, "output": "storagePool" }, @@ -23794,37 +23924,34 @@ "input": null, "output": "storagePool" }, - "create": { + "remove": { "input": null, "output": "storagePool" }, - "update": { + "restore": { "input": null, "output": "storagePool" }, - "purge": { + "deactivate": { "input": null, "output": "storagePool" }, - "remove": { + "create": { "input": null, "output": "storagePool" }, - "deactivate": { + "purge": { "input": null, "output": "storagePool" } }, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ - "GET", - "POST" - ], "resourceMethods": [ - "GET", - "PUT", - "DELETE" + "GET" + ], + "collectionMethods": [ + "GET" ] }, { @@ -24154,47 +24281,44 @@ } }, "includeableLinks": [ - "registry", "images", - "instances", - "account" + "account", + "registry", + "instances" ], "resourceActions": { - "activate": { + "update": { "input": null, "output": "credential" }, - "create": { + "activate": { "input": null, "output": "credential" }, - "update": { + "remove": { "input": null, "output": "credential" }, - "purge": { + "deactivate": { "input": null, "output": "credential" }, - "remove": { + "create": { "input": null, "output": "credential" }, - "deactivate": { + "purge": { "input": null, "output": "credential" } }, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ - "GET", - "POST" - ], "resourceMethods": [ - "GET", - "PUT", - "DELETE" + "GET" + ], + "collectionMethods": [ + "GET" ] }, { @@ -24227,10 +24351,10 @@ "resourceActions": {}, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ + "resourceMethods": [ "GET" ], - "resourceMethods": [ + "collectionMethods": [ "GET" ] }, @@ -24263,12 +24387,10 @@ "resourceActions": {}, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ - "POST" - ], "resourceMethods": [ "GET" - ] + ], + "collectionMethods": [] }, { "id": "restoreFromBackupInput", @@ -24293,10 +24415,10 @@ "resourceActions": {}, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [], "resourceMethods": [ "GET" - ] + ], + "collectionMethods": [] }, { "id": "revertToSnapshotInput", @@ -24321,10 +24443,10 @@ "resourceActions": {}, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [], "resourceMethods": [ "GET" - ] + ], + "collectionMethods": [] }, { "id": "rollingRestartStrategy", @@ -24363,12 +24485,10 @@ "resourceActions": {}, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ - "POST" - ], "resourceMethods": [ "GET" - ] + ], + "collectionMethods": [] }, { "id": "scalePolicy", @@ -24420,10 +24540,10 @@ "resourceActions": {}, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ + "resourceMethods": [ "GET" ], - "resourceMethods": [ + "collectionMethods": [ "GET" ] }, @@ -24506,10 +24626,10 @@ "resourceActions": {}, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ + "resourceMethods": [ "GET" ], - "resourceMethods": [ + "collectionMethods": [ "GET" ] }, @@ -25711,86 +25831,86 @@ } }, "includeableLinks": [ - "agent", - "networkcontainer", - "credentials", - "instances", - "hosts", - "volumes", - "mounts", - "serviceevents", - "serviceexposemaps", "services", - "ports", + "networkcontainer", "instancelinks", - "healthcheckinstancehostmaps", - "registrycredential", + "volumes", "targetinstancelinks", + "instances", + "agent", + "registrycredential", "instancelabels", - "account" + "ports", + "mounts", + "serviceexposemaps", + "serviceevents", + "hosts", + "account", + "credentials", + "healthcheckinstancehostmaps" ], "resourceActions": { - "updateunhealthy": { + "update": { "input": null, "output": "instance" }, - "console": { - "input": "instanceConsoleInput", - "output": "instanceConsole" - }, - "restore": { - "input": null, + "stop": { + "input": "instanceStop", "output": "instance" }, "restart": { "input": null, "output": "instance" }, - "deallocate": { + "updatereinitializing": { "input": null, "output": "instance" }, - "start": { + "error": { "input": null, "output": "instance" }, - "updatereinitializing": { + "remove": { "input": null, "output": "instance" }, - "update": { + "updatehealthy": { "input": null, "output": "instance" }, - "purge": { + "migrate": { "input": null, "output": "instance" }, - "error": { + "allocate": { "input": null, "output": "instance" }, - "remove": { + "create": { "input": null, "output": "instance" }, - "allocate": { + "console": { + "input": "instanceConsoleInput", + "output": "instanceConsole" + }, + "start": { "input": null, "output": "instance" }, - "stop": { - "input": "instanceStop", + "restore": { + "input": null, "output": "instance" }, - "create": { + "deallocate": { "input": null, "output": "instance" }, - "updatehealthy": { + "updateunhealthy": { "input": null, "output": "instance" }, - "migrate": { + "purge": { "input": null, "output": "instance" }, @@ -25809,12 +25929,11 @@ }, "collectionActions": {}, "collectionFields": {}, + "resourceMethods": [ + "GET" + ], "collectionMethods": [ "POST" - ], - "resourceMethods": [ - "GET", - "PUT" ] }, { @@ -26113,7 +26232,7 @@ "type": "boolean", "description": null, "create": true, - "update": false, + "update": true, "nullable": true, "readOnCreateOnly": false }, @@ -26321,83 +26440,79 @@ } }, "includeableLinks": [ - "consumedbyservices", "environment", - "instances", "consumedservices", "configitemstatuses", "serviceexposemaps", - "dynamicschemas", - "account" + "account", + "instances", + "consumedbyservices" ], "resourceActions": { - "rollback": { + "update": { "input": null, "output": "service" }, - "upgrade": { - "input": "serviceUpgrade", + "finishupgrade": { + "input": null, "output": "service" }, "restart": { "input": "serviceRestart", "output": "service" }, - "update": { + "remove": { "input": null, "output": "service" }, - "remove": { - "input": null, + "setservicelinks": { + "input": "setServiceLinksInput", "output": "service" }, - "deactivate": { + "cancelupgrade": { "input": null, "output": "service" }, - "finishupgrade": { - "input": null, + "removeservicelink": { + "input": "addRemoveServiceLinkInput", "output": "service" }, - "cancelrollback": { + "rollback": { "input": null, "output": "service" }, - "removeservicelink": { - "input": "addRemoveServiceLinkInput", + "create": { + "input": null, "output": "service" }, "activate": { "input": null, "output": "service" }, + "upgrade": { + "input": "serviceUpgrade", + "output": "service" + }, "addservicelink": { "input": "addRemoveServiceLinkInput", "output": "service" }, - "create": { + "deactivate": { "input": null, "output": "service" }, - "cancelupgrade": { + "cancelrollback": { "input": null, "output": "service" - }, - "setservicelinks": { - "input": "setServiceLinksInput", - "output": "service" } }, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ - "GET", - "POST" - ], "resourceMethods": [ - "GET", - "PUT", - "DELETE" + "GET" + ], + "collectionMethods": [ + "GET" ] }, { @@ -26699,30 +26814,30 @@ }, "includeableLinks": [ "service", - "account", + "instancelinks", "consumedservice", - "instancelinks" + "account" ], "resourceActions": { - "create": { + "update": { "input": null, "output": "serviceConsumeMap" }, - "update": { + "remove": { "input": null, "output": "serviceConsumeMap" }, - "remove": { + "create": { "input": null, "output": "serviceConsumeMap" } }, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ + "resourceMethods": [ "GET" ], - "resourceMethods": [ + "collectionMethods": [ "GET" ] }, @@ -27083,26 +27198,26 @@ } }, "includeableLinks": [ - "instance", "host", - "account" + "account", + "instance" ], "resourceActions": { - "create": { + "remove": { "input": null, "output": "serviceEvent" }, - "remove": { + "create": { "input": null, "output": "serviceEvent" } }, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ + "resourceMethods": [ "GET" ], - "resourceMethods": [ + "collectionMethods": [ "GET" ] }, @@ -27460,26 +27575,26 @@ } }, "includeableLinks": [ - "instance", "service", - "account" + "account", + "instance" ], "resourceActions": { - "create": { + "remove": { "input": null, "output": "serviceExposeMap" }, - "remove": { + "create": { "input": null, "output": "serviceExposeMap" } }, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ + "resourceMethods": [ "GET" ], - "resourceMethods": [ + "collectionMethods": [ "GET" ] }, @@ -27522,11 +27637,11 @@ "resourceActions": {}, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ - "POST" - ], "resourceMethods": [ "GET" + ], + "collectionMethods": [ + "POST" ] }, { @@ -27593,12 +27708,11 @@ "resourceActions": {}, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ - "GET", - "POST" - ], "resourceMethods": [ "GET" + ], + "collectionMethods": [ + "GET" ] }, { @@ -27625,12 +27739,10 @@ "resourceActions": {}, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ - "POST" - ], "resourceMethods": [ "GET" - ] + ], + "collectionMethods": [] }, { "id": "serviceUpgrade", @@ -27664,13 +27776,11 @@ "includeableLinks": [], "resourceActions": {}, "collectionActions": {}, - "collectionFields": {}, - "collectionMethods": [ - "POST" - ], + "collectionFields": {}, "resourceMethods": [ "GET" - ] + ], + "collectionMethods": [] }, { "id": "serviceUpgradeStrategy", @@ -27709,10 +27819,10 @@ "resourceActions": {}, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [], "resourceMethods": [ "GET" - ] + ], + "collectionMethods": [] }, { "id": "servicesPortRange", @@ -27753,12 +27863,12 @@ "resourceActions": {}, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ - "POST" - ], "resourceMethods": [ "GET", "PUT" + ], + "collectionMethods": [ + "POST" ] }, { @@ -27783,11 +27893,11 @@ "resourceActions": {}, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ - "POST" - ], "resourceMethods": [ "GET" + ], + "collectionMethods": [ + "POST" ] }, { @@ -27813,10 +27923,10 @@ "resourceActions": {}, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [], "resourceMethods": [ "GET" - ] + ], + "collectionMethods": [] }, { "id": "setProjectMembersInput", @@ -27842,12 +27952,10 @@ "resourceActions": {}, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ - "POST" - ], "resourceMethods": [ "GET" - ] + ], + "collectionMethods": [] }, { "id": "setServiceLinksInput", @@ -27872,12 +27980,10 @@ "resourceActions": {}, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ - "POST" - ], "resourceMethods": [ "GET" - ] + ], + "collectionMethods": [] }, { "id": "setting", @@ -27977,14 +28083,14 @@ "resourceActions": {}, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ - "GET", - "POST" - ], "resourceMethods": [ "GET", "PUT", "DELETE" + ], + "collectionMethods": [ + "GET", + "POST" ] }, { @@ -28263,27 +28369,26 @@ "backups" ], "resourceActions": { - "backup": { - "input": "snapshotBackupInput", - "output": "backup" - }, - "create": { + "remove": { "input": null, "output": "snapshot" }, - "remove": { + "create": { "input": null, "output": "snapshot" + }, + "backup": { + "input": "snapshotBackupInput", + "output": "backup" } }, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ + "resourceMethods": [ "GET" ], - "resourceMethods": [ - "GET", - "DELETE" + "collectionMethods": [ + "GET" ] }, { @@ -28482,21 +28587,21 @@ "backuptarget" ], "resourceActions": { - "create": { + "remove": { "input": null, "output": "backup" }, - "remove": { + "create": { "input": null, "output": "backup" } }, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ + "resourceMethods": [ "GET" ], - "resourceMethods": [ + "collectionMethods": [ "GET" ] }, @@ -28514,10 +28619,10 @@ "resourceActions": {}, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [], "resourceMethods": [ "GET" - ] + ], + "collectionMethods": [] }, { "id": "statsAccess", @@ -28549,10 +28654,10 @@ "resourceActions": {}, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ + "resourceMethods": [ "GET" ], - "resourceMethods": [ + "collectionMethods": [ "GET" ] }, @@ -28832,7 +28937,203 @@ "notnull" ] }, - "kind": { + "kind": { + "modifiers": [ + "eq", + "ne", + "prefix", + "like", + "notlike", + "null", + "notnull" + ] + }, + "name": { + "modifiers": [ + "eq", + "ne", + "prefix", + "like", + "notlike", + "null", + "notnull" + ] + }, + "physicalTotalSizeMb": { + "modifiers": [ + "eq", + "ne", + "lt", + "lte", + "gt", + "gte", + "null", + "notnull" + ] + }, + "removeTime": { + "modifiers": [ + "eq", + "ne", + "lt", + "lte", + "gt", + "gte", + "null", + "notnull" + ] + }, + "removed": { + "modifiers": [ + "eq", + "ne", + "lt", + "lte", + "gt", + "gte", + "null", + "notnull" + ] + }, + "state": { + "modifiers": [ + "eq", + "ne", + "null", + "notnull" + ] + }, + "uuid": { + "modifiers": [ + "eq", + "ne", + "prefix", + "like", + "notlike", + "null", + "notnull" + ] + }, + "virtualTotalSizeMb": { + "modifiers": [ + "eq", + "ne", + "lt", + "lte", + "gt", + "gte", + "null", + "notnull" + ] + }, + "volumeAccessMode": { + "modifiers": [ + "eq", + "ne", + "prefix", + "like", + "notlike", + "null", + "notnull" + ] + }, + "zoneId": { + "modifiers": [ + "eq", + "ne", + "null", + "notnull" + ] + } + }, + "includeableLinks": [ + "hosts", + "images", + "account", + "credentials", + "volumes" + ], + "resourceActions": { + "update": { + "input": null, + "output": "storagePool" + }, + "activate": { + "input": null, + "output": "storagePool" + }, + "remove": { + "input": null, + "output": "storagePool" + }, + "restore": { + "input": null, + "output": "storagePool" + }, + "deactivate": { + "input": null, + "output": "storagePool" + }, + "create": { + "input": null, + "output": "storagePool" + }, + "purge": { + "input": null, + "output": "storagePool" + } + }, + "collectionActions": {}, + "collectionFields": {}, + "resourceMethods": [ + "GET" + ], + "collectionMethods": [ + "GET" + ] + }, + { + "id": "task", + "type": "schema", + "links": { + "self": "http://localhost:8082/v1/schemas/task", + "collection": "http://localhost:8082/v1/tasks" + }, + "actions": {}, + "pluralName": "tasks", + "resourceFields": { + "id": { + "type": "int", + "description": null, + "create": false, + "update": false, + "nullable": true, + "readOnCreateOnly": false + }, + "name": { + "type": "string", + "description": null, + "create": true, + "update": true, + "nullable": true, + "readOnCreateOnly": false, + "maxLength": 128 + } + }, + "collectionFilters": { + "id": { + "modifiers": [ + "eq", + "ne", + "lt", + "lte", + "gt", + "gte", + "null", + "notnull" + ] + }, + "name": { "modifiers": [ "eq", "ne", @@ -28842,19 +29143,99 @@ "null", "notnull" ] + } + }, + "includeableLinks": [ + "taskinstances" + ], + "resourceActions": { + "execute": { + "input": null, + "output": "task" + } + }, + "collectionActions": {}, + "collectionFields": {}, + "resourceMethods": [ + "GET" + ], + "collectionMethods": [ + "GET" + ] + }, + { + "id": "taskInstance", + "type": "schema", + "links": { + "self": "http://localhost:8082/v1/schemas/taskinstance", + "collection": "http://localhost:8082/v1/taskinstances" + }, + "actions": {}, + "pluralName": "taskInstances", + "resourceFields": { + "endTime": { + "type": "date", + "description": null, + "create": false, + "update": false, + "nullable": true, + "readOnCreateOnly": false, + "maxLength": 255 + }, + "exception": { + "type": "string", + "description": null, + "create": false, + "update": false, + "nullable": true, + "readOnCreateOnly": false, + "maxLength": 255 + }, + "id": { + "type": "int", + "description": null, + "create": false, + "update": false, + "nullable": true, + "readOnCreateOnly": false }, "name": { - "modifiers": [ - "eq", - "ne", - "prefix", - "like", - "notlike", - "null", - "notnull" - ] + "type": "string", + "description": null, + "create": true, + "update": true, + "nullable": true, + "readOnCreateOnly": false, + "maxLength": 128 }, - "physicalTotalSizeMb": { + "serverId": { + "type": "string", + "description": null, + "create": false, + "update": false, + "nullable": true, + "readOnCreateOnly": false, + "maxLength": 128 + }, + "startTime": { + "type": "date", + "description": null, + "create": false, + "update": false, + "readOnCreateOnly": false, + "maxLength": 255 + }, + "taskId": { + "type": "reference[task]", + "description": null, + "create": false, + "update": false, + "readOnCreateOnly": false, + "maxLength": 255 + } + }, + "collectionFilters": { + "endTime": { "modifiers": [ "eq", "ne", @@ -28866,19 +29247,18 @@ "notnull" ] }, - "removeTime": { + "exception": { "modifiers": [ "eq", "ne", - "lt", - "lte", - "gt", - "gte", + "prefix", + "like", + "notlike", "null", "notnull" ] }, - "removed": { + "id": { "modifiers": [ "eq", "ne", @@ -28890,15 +29270,18 @@ "notnull" ] }, - "state": { + "name": { "modifiers": [ "eq", "ne", + "prefix", + "like", + "notlike", "null", "notnull" ] }, - "uuid": { + "serverId": { "modifiers": [ "eq", "ne", @@ -28909,7 +29292,7 @@ "notnull" ] }, - "virtualTotalSizeMb": { + "startTime": { "modifiers": [ "eq", "ne", @@ -28921,18 +29304,7 @@ "notnull" ] }, - "volumeAccessMode": { - "modifiers": [ - "eq", - "ne", - "prefix", - "like", - "notlike", - "null", - "notnull" - ] - }, - "zoneId": { + "taskId": { "modifiers": [ "eq", "ne", @@ -28942,182 +29314,142 @@ } }, "includeableLinks": [ - "images", - "credentials", - "hosts", - "volumes", - "account" + "task" ], - "resourceActions": { - "restore": { - "input": null, - "output": "storagePool" - }, - "activate": { - "input": null, - "output": "storagePool" - }, - "create": { - "input": null, - "output": "storagePool" - }, - "update": { - "input": null, - "output": "storagePool" - }, - "purge": { - "input": null, - "output": "storagePool" - }, - "remove": { - "input": null, - "output": "storagePool" - }, - "deactivate": { - "input": null, - "output": "storagePool" - } - }, + "resourceActions": {}, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ + "resourceMethods": [ "GET" ], - "resourceMethods": [ + "collectionMethods": [ "GET" ] }, { - "id": "subscribe", + "id": "toServiceUpgradeStrategy", "type": "schema", "links": { - "self": "http://localhost:8082/v1/schemas/subscribe", - "collection": "http://localhost:8082/v1/subscribe" + "self": "http://localhost:8082/v1/schemas/toserviceupgradestrategy" }, "actions": {}, - "pluralName": "subscribe", + "pluralName": "toServiceUpgradeStrategys", "resourceFields": { - "agentId": { - "type": "reference[agent]", + "batchSize": { + "type": "int", + "transform": "", "description": null, "create": true, "update": false, "nullable": true, - "readOnCreateOnly": false + "readOnCreateOnly": false, + "min": 1, + "default": 1 }, - "eventNames": { - "type": "array[string]", - "validChars": "*._0-9a-zA-Z;=", + "finalScale": { + "type": "int", "transform": "", "description": null, "create": true, "update": false, + "nullable": true, "readOnCreateOnly": false, - "minLength": 1 - } - }, - "collectionFilters": { - "eventNames": { - "modifiers": [ - "eq" - ] + "min": 1, + "default": 1 + }, + "intervalMillis": { + "type": "int", + "transform": "", + "description": null, + "create": true, + "update": false, + "nullable": true, + "readOnCreateOnly": false, + "min": 100, + "default": 2000 + }, + "toServiceId": { + "type": "reference[service]", + "transform": "", + "description": null, + "create": true, + "update": false, + "readOnCreateOnly": false + }, + "updateLinks": { + "type": "boolean", + "description": null, + "create": true, + "update": false, + "readOnCreateOnly": false } }, + "collectionFilters": {}, "includeableLinks": [], "resourceActions": {}, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ - "GET", - "POST" - ], "resourceMethods": [ "GET" - ] + ], + "collectionMethods": [] }, { - "id": "task", + "id": "typeDocumentation", "type": "schema", "links": { - "self": "http://localhost:8082/v1/schemas/task", - "collection": "http://localhost:8082/v1/tasks" + "self": "http://localhost:8082/v1/schemas/typedocumentation", + "collection": "http://localhost:8082/v1/typedocumentations" }, "actions": {}, - "pluralName": "tasks", + "pluralName": "typeDocumentations", "resourceFields": { + "description": { + "type": "string", + "description": null, + "create": true, + "update": true, + "readOnCreateOnly": false + }, "id": { - "type": "int", + "type": "string", "description": null, "create": false, "update": false, - "nullable": true, "readOnCreateOnly": false }, - "name": { - "type": "string", + "resourceFields": { + "type": "map[fieldDocumentation]", "description": null, - "create": true, - "update": true, - "nullable": true, - "readOnCreateOnly": false, - "maxLength": 128 - } - }, - "collectionFilters": { - "id": { - "modifiers": [ - "eq", - "ne", - "lt", - "lte", - "gt", - "gte", - "null", - "notnull" - ] - }, - "name": { - "modifiers": [ - "eq", - "ne", - "prefix", - "like", - "notlike", - "null", - "notnull" - ] - } - }, - "includeableLinks": [ - "taskinstances" - ], - "resourceActions": { - "execute": { - "input": null, - "output": "task" + "create": false, + "update": false, + "readOnCreateOnly": false } }, + "collectionFilters": {}, + "includeableLinks": [], + "resourceActions": {}, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ + "resourceMethods": [ "GET" ], - "resourceMethods": [ + "collectionMethods": [ "GET" ] }, { - "id": "taskInstance", + "id": "userPreference", "type": "schema", "links": { - "self": "http://localhost:8082/v1/schemas/taskinstance", - "collection": "http://localhost:8082/v1/taskinstances" + "self": "http://localhost:8082/v1/schemas/userpreference", + "collection": "http://localhost:8082/v1/userpreferences" }, "actions": {}, - "pluralName": "taskInstances", + "pluralName": "userPreferences", "resourceFields": { - "endTime": { - "type": "date", + "accountId": { + "type": "reference[account]", "description": null, "create": false, "update": false, @@ -29125,8 +29457,8 @@ "readOnCreateOnly": false, "maxLength": 255 }, - "exception": { - "type": "string", + "created": { + "type": "date", "description": null, "create": false, "update": false, @@ -29134,6 +29466,24 @@ "readOnCreateOnly": false, "maxLength": 255 }, + "data": { + "type": "map[json]", + "description": null, + "create": false, + "update": false, + "nullable": true, + "readOnCreateOnly": false, + "maxLength": 16777215 + }, + "description": { + "type": "string", + "description": null, + "create": true, + "update": true, + "nullable": true, + "readOnCreateOnly": false, + "maxLength": 1024 + }, "id": { "type": "int", "description": null, @@ -29142,6 +29492,15 @@ "nullable": true, "readOnCreateOnly": false }, + "kind": { + "type": "string", + "description": null, + "create": false, + "update": false, + "nullable": true, + "readOnCreateOnly": false, + "maxLength": 255 + }, "name": { "type": "string", "description": null, @@ -29149,36 +29508,118 @@ "update": true, "nullable": true, "readOnCreateOnly": false, - "maxLength": 128 + "maxLength": 255 }, - "serverId": { - "type": "string", + "removeTime": { + "type": "date", "description": null, "create": false, "update": false, "nullable": true, "readOnCreateOnly": false, - "maxLength": 128 + "maxLength": 255 }, - "startTime": { + "removed": { "type": "date", "description": null, "create": false, "update": false, + "nullable": true, "readOnCreateOnly": false, "maxLength": 255 }, - "taskId": { - "type": "reference[task]", + "state": { + "type": "enum", "description": null, "create": false, "update": false, "readOnCreateOnly": false, - "maxLength": 255 + "maxLength": 128, + "options": [ + "activating", + "active", + "deactivating", + "inactive", + "purged", + "purging", + "registering", + "removed", + "removing", + "requested", + "restoring", + "updating-active", + "updating-inactive" + ] + }, + "uuid": { + "type": "string", + "description": null, + "create": false, + "update": false, + "nullable": true, + "readOnCreateOnly": false, + "maxLength": 128 + }, + "value": { + "type": "string", + "description": null, + "create": true, + "update": true, + "nullable": true, + "readOnCreateOnly": false, + "maxLength": 16777215 + }, + "transitioning": { + "type": "enum", + "description": null, + "create": false, + "update": false, + "readOnCreateOnly": false, + "options": [ + "yes", + "no", + "error" + ] + }, + "transitioningMessage": { + "type": "string", + "description": null, + "create": false, + "update": false, + "nullable": true, + "readOnCreateOnly": false + }, + "transitioningProgress": { + "type": "int", + "description": null, + "create": false, + "update": false, + "nullable": true, + "readOnCreateOnly": false + }, + "all": { + "type": "boolean", + "description": null, + "create": false, + "update": false, + "readOnCreateOnly": false } }, "collectionFilters": { - "endTime": { + "accountId": { + "modifiers": [ + "eq", + "ne", + "null", + "notnull" + ] + }, + "all": { + "modifiers": [ + "eq" + ] + }, + "created": { "modifiers": [ "eq", "ne", @@ -29190,7 +29631,7 @@ "notnull" ] }, - "exception": { + "description": { "modifiers": [ "eq", "ne", @@ -29213,7 +29654,7 @@ "notnull" ] }, - "name": { + "kind": { "modifiers": [ "eq", "ne", @@ -29224,7 +29665,7 @@ "notnull" ] }, - "serverId": { + "name": { "modifiers": [ "eq", "ne", @@ -29235,7 +29676,7 @@ "notnull" ] }, - "startTime": { + "removeTime": { "modifiers": [ "eq", "ne", @@ -29247,140 +29688,92 @@ "notnull" ] }, - "taskId": { + "removed": { "modifiers": [ "eq", "ne", - "null", - "notnull" - ] - } - }, - "includeableLinks": [ - "task" - ], - "resourceActions": {}, - "collectionActions": {}, - "collectionFields": {}, - "collectionMethods": [ - "GET" - ], - "resourceMethods": [ - "GET" - ] - }, - { - "id": "toServiceUpgradeStrategy", - "type": "schema", - "links": { - "self": "http://localhost:8082/v1/schemas/toserviceupgradestrategy" - }, - "actions": {}, - "pluralName": "toServiceUpgradeStrategys", - "resourceFields": { - "batchSize": { - "type": "int", - "transform": "", - "description": null, - "create": true, - "update": false, - "nullable": true, - "readOnCreateOnly": false, - "min": 1, - "default": 1 - }, - "finalScale": { - "type": "int", - "transform": "", - "description": null, - "create": true, - "update": false, - "nullable": true, - "readOnCreateOnly": false, - "min": 1, - "default": 1 + "lt", + "lte", + "gt", + "gte", + "null", + "notnull" + ] }, - "intervalMillis": { - "type": "int", - "transform": "", - "description": null, - "create": true, - "update": false, - "nullable": true, - "readOnCreateOnly": false, - "min": 100, - "default": 2000 + "state": { + "modifiers": [ + "eq", + "ne", + "null", + "notnull" + ] }, - "toServiceId": { - "type": "reference[service]", - "transform": "", - "description": null, - "create": true, - "update": false, - "readOnCreateOnly": false + "uuid": { + "modifiers": [ + "eq", + "ne", + "prefix", + "like", + "notlike", + "null", + "notnull" + ] }, - "updateLinks": { - "type": "boolean", - "description": null, - "create": true, - "update": false, - "readOnCreateOnly": false + "value": { + "modifiers": [ + "eq", + "ne", + "prefix", + "like", + "notlike", + "null", + "notnull" + ] } }, - "collectionFilters": {}, - "includeableLinks": [], - "resourceActions": {}, - "collectionActions": {}, - "collectionFields": {}, - "collectionMethods": [ - "POST" + "includeableLinks": [ + "account" ], - "resourceMethods": [ - "GET" - ] - }, - { - "id": "typeDocumentation", - "type": "schema", - "links": { - "self": "http://localhost:8082/v1/schemas/typedocumentation", - "collection": "http://localhost:8082/v1/typedocumentations" - }, - "actions": {}, - "pluralName": "typeDocumentations", - "resourceFields": { - "description": { - "type": "string", - "description": null, - "create": true, - "update": true, - "readOnCreateOnly": false + "resourceActions": { + "update": { + "input": null, + "output": "userPreference" }, - "id": { - "type": "string", - "description": null, - "create": false, - "update": false, - "readOnCreateOnly": false + "activate": { + "input": null, + "output": "userPreference" }, - "resourceFields": { - "type": "map[fieldDocumentation]", - "description": null, - "create": false, - "update": false, - "readOnCreateOnly": false + "remove": { + "input": null, + "output": "userPreference" + }, + "restore": { + "input": null, + "output": "userPreference" + }, + "deactivate": { + "input": null, + "output": "userPreference" + }, + "create": { + "input": null, + "output": "userPreference" + }, + "purge": { + "input": null, + "output": "userPreference" } }, - "collectionFilters": {}, - "includeableLinks": [], - "resourceActions": {}, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ - "GET" - ], "resourceMethods": [ - "GET" + "GET", + "PUT", + "DELETE" + ], + "collectionMethods": [ + "GET", + "POST" ] }, { @@ -30323,85 +30716,85 @@ } }, "includeableLinks": [ - "agent", - "credentials", - "instances", - "hosts", - "volumes", - "mounts", - "serviceevents", - "serviceexposemaps", "services", - "ports", "instancelinks", - "healthcheckinstancehostmaps", - "registrycredential", + "volumes", "targetinstancelinks", + "instances", + "agent", + "registrycredential", "instancelabels", - "account" + "ports", + "mounts", + "serviceexposemaps", + "hosts", + "serviceevents", + "account", + "credentials", + "healthcheckinstancehostmaps" ], "resourceActions": { - "updateunhealthy": { + "update": { "input": null, "output": "instance" }, - "console": { - "input": "instanceConsoleInput", - "output": "instanceConsole" - }, - "restore": { - "input": null, + "stop": { + "input": "instanceStop", "output": "instance" }, "restart": { "input": null, "output": "instance" }, - "deallocate": { + "updatereinitializing": { "input": null, "output": "instance" }, - "start": { + "error": { "input": null, "output": "instance" }, - "updatereinitializing": { + "remove": { "input": null, "output": "instance" }, - "update": { + "updatehealthy": { "input": null, "output": "instance" }, - "purge": { + "migrate": { "input": null, "output": "instance" }, - "error": { + "allocate": { "input": null, "output": "instance" }, - "remove": { + "create": { "input": null, "output": "instance" }, - "allocate": { + "console": { + "input": "instanceConsoleInput", + "output": "instanceConsole" + }, + "start": { "input": null, "output": "instance" }, - "stop": { - "input": "instanceStop", + "restore": { + "input": null, "output": "instance" }, - "create": { + "deallocate": { "input": null, "output": "instance" }, - "updatehealthy": { + "updateunhealthy": { "input": null, "output": "instance" }, - "migrate": { + "purge": { "input": null, "output": "instance" }, @@ -30424,14 +30817,11 @@ }, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ - "GET", - "POST" - ], "resourceMethods": [ - "GET", - "PUT", - "DELETE" + "GET" + ], + "collectionMethods": [ + "GET" ] }, { @@ -30506,12 +30896,10 @@ "resourceActions": {}, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ - "POST" - ], "resourceMethods": [ "GET" - ] + ], + "collectionMethods": [] }, { "id": "volume", @@ -30992,19 +31380,31 @@ } }, "includeableLinks": [ - "snapshots", - "image", - "instance", - "storagepools", "mounts", + "storagepools", + "image", "account", - "backups" + "backups", + "snapshots", + "instance" ], "resourceActions": { - "allocate": { + "update": { + "input": null, + "output": "volume" + }, + "activate": { + "input": null, + "output": "volume" + }, + "remove": { "input": null, "output": "volume" }, + "snapshot": { + "input": "volumeSnapshotInput", + "output": "snapshot" + }, "restore": { "input": null, "output": "volume" @@ -31017,7 +31417,7 @@ "input": null, "output": "volume" }, - "activate": { + "allocate": { "input": null, "output": "volume" }, @@ -31025,36 +31425,22 @@ "input": null, "output": "volume" }, - "update": { - "input": null, - "output": "volume" - }, "purge": { "input": null, "output": "volume" }, - "remove": { - "input": null, - "output": "volume" - }, "reverttosnapshot": { "input": "revertToSnapshotInput", "output": "volume" - }, - "snapshot": { - "input": "volumeSnapshotInput", - "output": "snapshot" } }, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [ - "GET", - "POST" - ], "resourceMethods": [ - "GET", - "DELETE" + "GET" + ], + "collectionMethods": [ + "GET" ] }, { @@ -31080,10 +31466,10 @@ "resourceActions": {}, "collectionActions": {}, "collectionFields": {}, - "collectionMethods": [], "resourceMethods": [ "GET" - ] + ], + "collectionMethods": [] } ], "sortLinks": {}, diff --git a/src/main/java/io/rancher/base/Filters.java b/src/main/java/io/rancher/base/Filters.java index da9e8b9..23b1130 100644 --- a/src/main/java/io/rancher/base/Filters.java +++ b/src/main/java/io/rancher/base/Filters.java @@ -2,5 +2,5 @@ import java.util.HashMap; -public class Filters extends HashMap { +public class Filters extends HashMap { } diff --git a/src/main/java/io/rancher/service/AccountService.java b/src/main/java/io/rancher/service/AccountService.java index 4d19b4d..582dcaf 100644 --- a/src/main/java/io/rancher/service/AccountService.java +++ b/src/main/java/io/rancher/service/AccountService.java @@ -3,6 +3,21 @@ import io.rancher.base.Filters; import io.rancher.base.TypeCollection; import io.rancher.type.Account; +import io.rancher.type.Agent; +import io.rancher.type.Backup; +import io.rancher.type.Certificate; +import io.rancher.type.Credential; +import io.rancher.type.Environment; +import io.rancher.type.Host; +import io.rancher.type.Image; +import io.rancher.type.Instance; +import io.rancher.type.Label; +import io.rancher.type.Mount; +import io.rancher.type.Network; +import io.rancher.type.Port; +import io.rancher.type.Service; +import io.rancher.type.Snapshot; +import io.rancher.type.Volume; import retrofit2.Call; import retrofit2.Response; @@ -13,6 +28,7 @@ import retrofit2.http.PUT; import retrofit2.http.Path; import retrofit2.http.QueryMap; +import retrofit2.http.Url; public interface AccountService { @@ -20,7 +36,7 @@ public interface AccountService { Call> list(); @GET("account") - Call> list(@QueryMap Filters filters); + Call> list(@QueryMap Filters filters); @GET("account/{id}") Call get(@Path("id") String id); @@ -49,4 +65,51 @@ public interface AccountService { @POST("account/{id}?action=restore") Call restore(@Path("id") String id); + + + @GET + Call> getLinkAgents(@Url String url ); + + @GET + Call> getLinkBackups(@Url String url ); + + @GET + Call> getLinkCertificates(@Url String url ); + + @GET + Call> getLinkCredentials(@Url String url ); + + @GET + Call> getLinkEnvironments(@Url String url ); + + @GET + Call> getLinkHosts(@Url String url ); + + @GET + Call> getLinkImages(@Url String url ); + + @GET + Call> getLinkInstances(@Url String url ); + + @GET + Call> getLinkLabels(@Url String url ); + + @GET + Call> getLinkMounts(@Url String url ); + + @GET + Call> getLinkNetworks(@Url String url ); + + @GET + Call> getLinkPorts(@Url String url ); + + @GET + Call> getLinkServices(@Url String url ); + + @GET + Call> getLinkSnapshots(@Url String url ); + + @GET + Call> getLinkVolumes(@Url String url ); + } diff --git a/src/main/java/io/rancher/service/ActiveSettingService.java b/src/main/java/io/rancher/service/ActiveSettingService.java index a88f960..93fc4c5 100644 --- a/src/main/java/io/rancher/service/ActiveSettingService.java +++ b/src/main/java/io/rancher/service/ActiveSettingService.java @@ -13,6 +13,7 @@ import retrofit2.http.PUT; import retrofit2.http.Path; import retrofit2.http.QueryMap; +import retrofit2.http.Url; public interface ActiveSettingService { @@ -20,7 +21,7 @@ public interface ActiveSettingService { Call> list(); @GET("activeSetting") - Call> list(@QueryMap Filters filters); + Call> list(@QueryMap Filters filters); @GET("activeSetting/{id}") Call get(@Path("id") String id); @@ -34,4 +35,6 @@ public interface ActiveSettingService { @DELETE("activeSetting/{id}") Call delete(@Path("id") String id); + + } diff --git a/src/main/java/io/rancher/service/AddOutputsInputService.java b/src/main/java/io/rancher/service/AddOutputsInputService.java index afb7d2c..3fb6808 100644 --- a/src/main/java/io/rancher/service/AddOutputsInputService.java +++ b/src/main/java/io/rancher/service/AddOutputsInputService.java @@ -13,6 +13,7 @@ import retrofit2.http.PUT; import retrofit2.http.Path; import retrofit2.http.QueryMap; +import retrofit2.http.Url; public interface AddOutputsInputService { @@ -20,7 +21,7 @@ public interface AddOutputsInputService { Call> list(); @GET("addOutputsInput") - Call> list(@QueryMap Filters filters); + Call> list(@QueryMap Filters filters); @GET("addOutputsInput/{id}") Call get(@Path("id") String id); @@ -34,4 +35,6 @@ public interface AddOutputsInputService { @DELETE("addOutputsInput/{id}") Call delete(@Path("id") String id); + + } diff --git a/src/main/java/io/rancher/service/AddRemoveClusterHostInputService.java b/src/main/java/io/rancher/service/AddRemoveClusterHostInputService.java deleted file mode 100644 index 7b33b50..0000000 --- a/src/main/java/io/rancher/service/AddRemoveClusterHostInputService.java +++ /dev/null @@ -1,37 +0,0 @@ -package io.rancher.service; - -import io.rancher.base.Filters; -import io.rancher.base.TypeCollection; -import io.rancher.type.AddRemoveClusterHostInput; - -import retrofit2.Call; -import retrofit2.Response; -import retrofit2.http.Body; -import retrofit2.http.DELETE; -import retrofit2.http.GET; -import retrofit2.http.POST; -import retrofit2.http.PUT; -import retrofit2.http.Path; -import retrofit2.http.QueryMap; - -public interface AddRemoveClusterHostInputService { - - @GET("addRemoveClusterHostInput") - Call> list(); - - @GET("addRemoveClusterHostInput") - Call> list(@QueryMap Filters filters); - - @GET("addRemoveClusterHostInput/{id}") - Call get(@Path("id") String id); - - @POST("addRemoveClusterHostInput") - Call create(@Body AddRemoveClusterHostInput addRemoveClusterHostInput); - - @PUT("addRemoveClusterHostInput/{id}") - Call update(@Path("id") String id, @Body AddRemoveClusterHostInput addRemoveClusterHostInput); - - @DELETE("addRemoveClusterHostInput/{id}") - Call delete(@Path("id") String id); - -} diff --git a/src/main/java/io/rancher/service/AddRemoveLoadBalancerServiceLinkInputService.java b/src/main/java/io/rancher/service/AddRemoveLoadBalancerServiceLinkInputService.java index f85e6e5..8e61aa4 100644 --- a/src/main/java/io/rancher/service/AddRemoveLoadBalancerServiceLinkInputService.java +++ b/src/main/java/io/rancher/service/AddRemoveLoadBalancerServiceLinkInputService.java @@ -13,6 +13,7 @@ import retrofit2.http.PUT; import retrofit2.http.Path; import retrofit2.http.QueryMap; +import retrofit2.http.Url; public interface AddRemoveLoadBalancerServiceLinkInputService { @@ -20,7 +21,7 @@ public interface AddRemoveLoadBalancerServiceLinkInputService { Call> list(); @GET("addRemoveLoadBalancerServiceLinkInput") - Call> list(@QueryMap Filters filters); + Call> list(@QueryMap Filters filters); @GET("addRemoveLoadBalancerServiceLinkInput/{id}") Call get(@Path("id") String id); @@ -34,4 +35,6 @@ public interface AddRemoveLoadBalancerServiceLinkInputService { @DELETE("addRemoveLoadBalancerServiceLinkInput/{id}") Call delete(@Path("id") String id); + + } diff --git a/src/main/java/io/rancher/service/AddRemoveServiceLinkInputService.java b/src/main/java/io/rancher/service/AddRemoveServiceLinkInputService.java index 38da8a5..65bcafc 100644 --- a/src/main/java/io/rancher/service/AddRemoveServiceLinkInputService.java +++ b/src/main/java/io/rancher/service/AddRemoveServiceLinkInputService.java @@ -13,6 +13,7 @@ import retrofit2.http.PUT; import retrofit2.http.Path; import retrofit2.http.QueryMap; +import retrofit2.http.Url; public interface AddRemoveServiceLinkInputService { @@ -20,7 +21,7 @@ public interface AddRemoveServiceLinkInputService { Call> list(); @GET("addRemoveServiceLinkInput") - Call> list(@QueryMap Filters filters); + Call> list(@QueryMap Filters filters); @GET("addRemoveServiceLinkInput/{id}") Call get(@Path("id") String id); @@ -34,4 +35,6 @@ public interface AddRemoveServiceLinkInputService { @DELETE("addRemoveServiceLinkInput/{id}") Call delete(@Path("id") String id); + + } diff --git a/src/main/java/io/rancher/service/AgentService.java b/src/main/java/io/rancher/service/AgentService.java index 255cee0..aacf5f4 100644 --- a/src/main/java/io/rancher/service/AgentService.java +++ b/src/main/java/io/rancher/service/AgentService.java @@ -3,6 +3,9 @@ import io.rancher.base.Filters; import io.rancher.base.TypeCollection; import io.rancher.type.Agent; +import io.rancher.type.Account; +import io.rancher.type.Host; +import io.rancher.type.Instance; import retrofit2.Call; import retrofit2.Response; @@ -13,6 +16,7 @@ import retrofit2.http.PUT; import retrofit2.http.Path; import retrofit2.http.QueryMap; +import retrofit2.http.Url; public interface AgentService { @@ -20,7 +24,7 @@ public interface AgentService { Call> list(); @GET("agent") - Call> list(@QueryMap Filters filters); + Call> list(@QueryMap Filters filters); @GET("agent/{id}") Call get(@Path("id") String id); @@ -52,4 +56,15 @@ public interface AgentService { @POST("agent/{id}?action=restore") Call restore(@Path("id") String id); + + + @GET + Call getLinkAccount(@Url String url ); + + @GET + Call> getLinkHosts(@Url String url ); + + @GET + Call> getLinkInstances(@Url String url ); + } diff --git a/src/main/java/io/rancher/service/Amazonec2ConfigService.java b/src/main/java/io/rancher/service/Amazonec2ConfigService.java index 49641e9..4f2d420 100644 --- a/src/main/java/io/rancher/service/Amazonec2ConfigService.java +++ b/src/main/java/io/rancher/service/Amazonec2ConfigService.java @@ -13,6 +13,7 @@ import retrofit2.http.PUT; import retrofit2.http.Path; import retrofit2.http.QueryMap; +import retrofit2.http.Url; public interface Amazonec2ConfigService { @@ -20,7 +21,7 @@ public interface Amazonec2ConfigService { Call> list(); @GET("amazonec2Config") - Call> list(@QueryMap Filters filters); + Call> list(@QueryMap Filters filters); @GET("amazonec2Config/{id}") Call get(@Path("id") String id); @@ -34,4 +35,6 @@ public interface Amazonec2ConfigService { @DELETE("amazonec2Config/{id}") Call delete(@Path("id") String id); + + } diff --git a/src/main/java/io/rancher/service/ApiKeyService.java b/src/main/java/io/rancher/service/ApiKeyService.java index 5a36354..d5231ab 100644 --- a/src/main/java/io/rancher/service/ApiKeyService.java +++ b/src/main/java/io/rancher/service/ApiKeyService.java @@ -3,7 +3,10 @@ import io.rancher.base.Filters; import io.rancher.base.TypeCollection; import io.rancher.type.ApiKey; +import io.rancher.type.Account; import io.rancher.type.Credential; +import io.rancher.type.Image; +import io.rancher.type.Instance; import retrofit2.Call; import retrofit2.Response; @@ -14,6 +17,7 @@ import retrofit2.http.PUT; import retrofit2.http.Path; import retrofit2.http.QueryMap; +import retrofit2.http.Url; public interface ApiKeyService { @@ -21,7 +25,7 @@ public interface ApiKeyService { Call> list(); @GET("apiKey") - Call> list(@QueryMap Filters filters); + Call> list(@QueryMap Filters filters); @GET("apiKey/{id}") Call get(@Path("id") String id); @@ -47,4 +51,15 @@ public interface ApiKeyService { @POST("apiKey/{id}?action=remove") Call remove(@Path("id") String id); + + + @GET + Call getLinkAccount(@Url String url ); + + @GET + Call> getLinkImages(@Url String url ); + + @GET + Call> getLinkInstances(@Url String url ); + } diff --git a/src/main/java/io/rancher/service/AuditLogService.java b/src/main/java/io/rancher/service/AuditLogService.java index c3770e3..8eb118e 100644 --- a/src/main/java/io/rancher/service/AuditLogService.java +++ b/src/main/java/io/rancher/service/AuditLogService.java @@ -3,6 +3,7 @@ import io.rancher.base.Filters; import io.rancher.base.TypeCollection; import io.rancher.type.AuditLog; +import io.rancher.type.Account; import retrofit2.Call; import retrofit2.Response; @@ -13,6 +14,7 @@ import retrofit2.http.PUT; import retrofit2.http.Path; import retrofit2.http.QueryMap; +import retrofit2.http.Url; public interface AuditLogService { @@ -20,7 +22,7 @@ public interface AuditLogService { Call> list(); @GET("auditLog") - Call> list(@QueryMap Filters filters); + Call> list(@QueryMap Filters filters); @GET("auditLog/{id}") Call get(@Path("id") String id); @@ -34,4 +36,9 @@ public interface AuditLogService { @DELETE("auditLog/{id}") Call delete(@Path("id") String id); + + + @GET + Call getLinkAccount(@Url String url ); + } diff --git a/src/main/java/io/rancher/service/AzureConfigService.java b/src/main/java/io/rancher/service/AzureConfigService.java index a3f13ee..0df59da 100644 --- a/src/main/java/io/rancher/service/AzureConfigService.java +++ b/src/main/java/io/rancher/service/AzureConfigService.java @@ -13,6 +13,7 @@ import retrofit2.http.PUT; import retrofit2.http.Path; import retrofit2.http.QueryMap; +import retrofit2.http.Url; public interface AzureConfigService { @@ -20,7 +21,7 @@ public interface AzureConfigService { Call> list(); @GET("azureConfig") - Call> list(@QueryMap Filters filters); + Call> list(@QueryMap Filters filters); @GET("azureConfig/{id}") Call get(@Path("id") String id); @@ -34,4 +35,6 @@ public interface AzureConfigService { @DELETE("azureConfig/{id}") Call delete(@Path("id") String id); + + } diff --git a/src/main/java/io/rancher/service/AzureadconfigService.java b/src/main/java/io/rancher/service/AzureadconfigService.java index ece5e0f..d9175a9 100644 --- a/src/main/java/io/rancher/service/AzureadconfigService.java +++ b/src/main/java/io/rancher/service/AzureadconfigService.java @@ -13,6 +13,7 @@ import retrofit2.http.PUT; import retrofit2.http.Path; import retrofit2.http.QueryMap; +import retrofit2.http.Url; public interface AzureadconfigService { @@ -20,7 +21,7 @@ public interface AzureadconfigService { Call> list(); @GET("azureadconfig") - Call> list(@QueryMap Filters filters); + Call> list(@QueryMap Filters filters); @GET("azureadconfig/{id}") Call get(@Path("id") String id); @@ -34,4 +35,6 @@ public interface AzureadconfigService { @DELETE("azureadconfig/{id}") Call delete(@Path("id") String id); + + } diff --git a/src/main/java/io/rancher/service/BackupService.java b/src/main/java/io/rancher/service/BackupService.java index c459c12..4d39ea5 100644 --- a/src/main/java/io/rancher/service/BackupService.java +++ b/src/main/java/io/rancher/service/BackupService.java @@ -3,6 +3,9 @@ import io.rancher.base.Filters; import io.rancher.base.TypeCollection; import io.rancher.type.Backup; +import io.rancher.type.Account; +import io.rancher.type.Snapshot; +import io.rancher.type.Volume; import retrofit2.Call; import retrofit2.Response; @@ -13,6 +16,7 @@ import retrofit2.http.PUT; import retrofit2.http.Path; import retrofit2.http.QueryMap; +import retrofit2.http.Url; public interface BackupService { @@ -20,7 +24,7 @@ public interface BackupService { Call> list(); @GET("backup") - Call> list(@QueryMap Filters filters); + Call> list(@QueryMap Filters filters); @GET("backup/{id}") Call get(@Path("id") String id); @@ -37,4 +41,15 @@ public interface BackupService { @POST("backup/{id}?action=remove") Call remove(@Path("id") String id); + + + @GET + Call getLinkAccount(@Url String url ); + + @GET + Call getLinkSnapshot(@Url String url ); + + @GET + Call getLinkVolume(@Url String url ); + } diff --git a/src/main/java/io/rancher/service/BackupTargetService.java b/src/main/java/io/rancher/service/BackupTargetService.java index e6b2e51..fc2a8c8 100644 --- a/src/main/java/io/rancher/service/BackupTargetService.java +++ b/src/main/java/io/rancher/service/BackupTargetService.java @@ -3,6 +3,8 @@ import io.rancher.base.Filters; import io.rancher.base.TypeCollection; import io.rancher.type.BackupTarget; +import io.rancher.type.Account; +import io.rancher.type.Backup; import retrofit2.Call; import retrofit2.Response; @@ -13,6 +15,7 @@ import retrofit2.http.PUT; import retrofit2.http.Path; import retrofit2.http.QueryMap; +import retrofit2.http.Url; public interface BackupTargetService { @@ -20,7 +23,7 @@ public interface BackupTargetService { Call> list(); @GET("backupTarget") - Call> list(@QueryMap Filters filters); + Call> list(@QueryMap Filters filters); @GET("backupTarget/{id}") Call get(@Path("id") String id); @@ -37,4 +40,12 @@ public interface BackupTargetService { @POST("backupTarget/{id}?action=remove") Call remove(@Path("id") String id); + + + @GET + Call getLinkAccount(@Url String url ); + + @GET + Call> getLinkBackups(@Url String url ); + } diff --git a/src/main/java/io/rancher/service/BaseMachineConfigService.java b/src/main/java/io/rancher/service/BaseMachineConfigService.java index 579be6e..7c76e32 100644 --- a/src/main/java/io/rancher/service/BaseMachineConfigService.java +++ b/src/main/java/io/rancher/service/BaseMachineConfigService.java @@ -13,6 +13,7 @@ import retrofit2.http.PUT; import retrofit2.http.Path; import retrofit2.http.QueryMap; +import retrofit2.http.Url; public interface BaseMachineConfigService { @@ -20,7 +21,7 @@ public interface BaseMachineConfigService { Call> list(); @GET("baseMachineConfig") - Call> list(@QueryMap Filters filters); + Call> list(@QueryMap Filters filters); @GET("baseMachineConfig/{id}") Call get(@Path("id") String id); @@ -34,4 +35,6 @@ public interface BaseMachineConfigService { @DELETE("baseMachineConfig/{id}") Call delete(@Path("id") String id); + + } diff --git a/src/main/java/io/rancher/service/BlkioDeviceOptionService.java b/src/main/java/io/rancher/service/BlkioDeviceOptionService.java index d7952df..e680a27 100644 --- a/src/main/java/io/rancher/service/BlkioDeviceOptionService.java +++ b/src/main/java/io/rancher/service/BlkioDeviceOptionService.java @@ -13,6 +13,7 @@ import retrofit2.http.PUT; import retrofit2.http.Path; import retrofit2.http.QueryMap; +import retrofit2.http.Url; public interface BlkioDeviceOptionService { @@ -20,7 +21,7 @@ public interface BlkioDeviceOptionService { Call> list(); @GET("blkioDeviceOption") - Call> list(@QueryMap Filters filters); + Call> list(@QueryMap Filters filters); @GET("blkioDeviceOption/{id}") Call get(@Path("id") String id); @@ -34,4 +35,6 @@ public interface BlkioDeviceOptionService { @DELETE("blkioDeviceOption/{id}") Call delete(@Path("id") String id); + + } diff --git a/src/main/java/io/rancher/service/CertificateService.java b/src/main/java/io/rancher/service/CertificateService.java index 8e891b9..f50e2c8 100644 --- a/src/main/java/io/rancher/service/CertificateService.java +++ b/src/main/java/io/rancher/service/CertificateService.java @@ -3,6 +3,7 @@ import io.rancher.base.Filters; import io.rancher.base.TypeCollection; import io.rancher.type.Certificate; +import io.rancher.type.Account; import retrofit2.Call; import retrofit2.Response; @@ -13,6 +14,7 @@ import retrofit2.http.PUT; import retrofit2.http.Path; import retrofit2.http.QueryMap; +import retrofit2.http.Url; public interface CertificateService { @@ -20,7 +22,7 @@ public interface CertificateService { Call> list(); @GET("certificate") - Call> list(@QueryMap Filters filters); + Call> list(@QueryMap Filters filters); @GET("certificate/{id}") Call get(@Path("id") String id); @@ -37,4 +39,9 @@ public interface CertificateService { @POST("certificate/{id}?action=remove") Call remove(@Path("id") String id); + + + @GET + Call getLinkAccount(@Url String url ); + } diff --git a/src/main/java/io/rancher/service/ChangeSecretInputService.java b/src/main/java/io/rancher/service/ChangeSecretInputService.java index 36e6c3f..fc5bcc7 100644 --- a/src/main/java/io/rancher/service/ChangeSecretInputService.java +++ b/src/main/java/io/rancher/service/ChangeSecretInputService.java @@ -13,6 +13,7 @@ import retrofit2.http.PUT; import retrofit2.http.Path; import retrofit2.http.QueryMap; +import retrofit2.http.Url; public interface ChangeSecretInputService { @@ -20,7 +21,7 @@ public interface ChangeSecretInputService { Call> list(); @GET("changeSecretInput") - Call> list(@QueryMap Filters filters); + Call> list(@QueryMap Filters filters); @GET("changeSecretInput/{id}") Call get(@Path("id") String id); @@ -34,4 +35,6 @@ public interface ChangeSecretInputService { @DELETE("changeSecretInput/{id}") Call delete(@Path("id") String id); + + } diff --git a/src/main/java/io/rancher/service/ClusterService.java b/src/main/java/io/rancher/service/ClusterService.java deleted file mode 100644 index 1c47d80..0000000 --- a/src/main/java/io/rancher/service/ClusterService.java +++ /dev/null @@ -1,64 +0,0 @@ -package io.rancher.service; - -import io.rancher.base.Filters; -import io.rancher.base.TypeCollection; -import io.rancher.type.Cluster; -import io.rancher.type.AddRemoveClusterHostInput; -import io.rancher.type.HostAccess; -import io.rancher.type.Host; - -import retrofit2.Call; -import retrofit2.Response; -import retrofit2.http.Body; -import retrofit2.http.DELETE; -import retrofit2.http.GET; -import retrofit2.http.POST; -import retrofit2.http.PUT; -import retrofit2.http.Path; -import retrofit2.http.QueryMap; - -public interface ClusterService { - - @GET("cluster") - Call> list(); - - @GET("cluster") - Call> list(@QueryMap Filters filters); - - @GET("cluster/{id}") - Call get(@Path("id") String id); - - @POST("cluster") - Call create(@Body Cluster cluster); - - @PUT("cluster/{id}") - Call update(@Path("id") String id, @Body Cluster cluster); - - @DELETE("cluster/{id}") - Call delete(@Path("id") String id); - - @POST("cluster/{id}?action=activate") - Call activate(@Path("id") String id); - - @POST("cluster/{id}?action=addhost") - Call addhost(@Path("id") String id, @Body AddRemoveClusterHostInput addRemoveClusterHostInput); - - @POST("cluster/{id}?action=deactivate") - Call deactivate(@Path("id") String id); - - @POST("cluster/{id}?action=dockersocket") - Call dockersocket(@Path("id") String id); - - @POST("cluster/{id}?action=purge") - Call purge(@Path("id") String id); - - @POST("cluster/{id}?action=remove") - Call remove(@Path("id") String id); - - @POST("cluster/{id}?action=removehost") - Call removehost(@Path("id") String id, @Body AddRemoveClusterHostInput addRemoveClusterHostInput); - - @POST("cluster/{id}?action=restore") - Call restore(@Path("id") String id); - -} diff --git a/src/main/java/io/rancher/service/ComposeConfigInputService.java b/src/main/java/io/rancher/service/ComposeConfigInputService.java index adaa263..ff372ba 100644 --- a/src/main/java/io/rancher/service/ComposeConfigInputService.java +++ b/src/main/java/io/rancher/service/ComposeConfigInputService.java @@ -13,6 +13,7 @@ import retrofit2.http.PUT; import retrofit2.http.Path; import retrofit2.http.QueryMap; +import retrofit2.http.Url; public interface ComposeConfigInputService { @@ -20,7 +21,7 @@ public interface ComposeConfigInputService { Call> list(); @GET("composeConfigInput") - Call> list(@QueryMap Filters filters); + Call> list(@QueryMap Filters filters); @GET("composeConfigInput/{id}") Call get(@Path("id") String id); @@ -34,4 +35,6 @@ public interface ComposeConfigInputService { @DELETE("composeConfigInput/{id}") Call delete(@Path("id") String id); + + } diff --git a/src/main/java/io/rancher/service/ComposeConfigService.java b/src/main/java/io/rancher/service/ComposeConfigService.java index ac9f10c..986a09d 100644 --- a/src/main/java/io/rancher/service/ComposeConfigService.java +++ b/src/main/java/io/rancher/service/ComposeConfigService.java @@ -13,6 +13,7 @@ import retrofit2.http.PUT; import retrofit2.http.Path; import retrofit2.http.QueryMap; +import retrofit2.http.Url; public interface ComposeConfigService { @@ -20,7 +21,7 @@ public interface ComposeConfigService { Call> list(); @GET("composeConfig") - Call> list(@QueryMap Filters filters); + Call> list(@QueryMap Filters filters); @GET("composeConfig/{id}") Call get(@Path("id") String id); @@ -34,4 +35,6 @@ public interface ComposeConfigService { @DELETE("composeConfig/{id}") Call delete(@Path("id") String id); + + } diff --git a/src/main/java/io/rancher/service/ComposeProjectService.java b/src/main/java/io/rancher/service/ComposeProjectService.java index 36351f4..18330d7 100644 --- a/src/main/java/io/rancher/service/ComposeProjectService.java +++ b/src/main/java/io/rancher/service/ComposeProjectService.java @@ -3,7 +3,9 @@ import io.rancher.base.Filters; import io.rancher.base.TypeCollection; import io.rancher.type.ComposeProject; +import io.rancher.type.Account; import io.rancher.type.Environment; +import io.rancher.type.Service; import retrofit2.Call; import retrofit2.Response; @@ -14,6 +16,7 @@ import retrofit2.http.PUT; import retrofit2.http.Path; import retrofit2.http.QueryMap; +import retrofit2.http.Url; public interface ComposeProjectService { @@ -21,7 +24,7 @@ public interface ComposeProjectService { Call> list(); @GET("composeProject") - Call> list(@QueryMap Filters filters); + Call> list(@QueryMap Filters filters); @GET("composeProject/{id}") Call get(@Path("id") String id); @@ -53,4 +56,12 @@ public interface ComposeProjectService { @POST("composeProject/{id}?action=rollback") Call rollback(@Path("id") String id); + + + @GET + Call getLinkAccount(@Url String url ); + + @GET + Call> getLinkServices(@Url String url ); + } diff --git a/src/main/java/io/rancher/service/ComposeServiceService.java b/src/main/java/io/rancher/service/ComposeServiceService.java index 3f96759..57ee5d5 100644 --- a/src/main/java/io/rancher/service/ComposeServiceService.java +++ b/src/main/java/io/rancher/service/ComposeServiceService.java @@ -3,6 +3,9 @@ import io.rancher.base.Filters; import io.rancher.base.TypeCollection; import io.rancher.type.ComposeService; +import io.rancher.type.Account; +import io.rancher.type.Environment; +import io.rancher.type.Instance; import io.rancher.type.Service; import retrofit2.Call; @@ -14,6 +17,7 @@ import retrofit2.http.PUT; import retrofit2.http.Path; import retrofit2.http.QueryMap; +import retrofit2.http.Url; public interface ComposeServiceService { @@ -21,7 +25,7 @@ public interface ComposeServiceService { Call> list(); @GET("composeService") - Call> list(@QueryMap Filters filters); + Call> list(@QueryMap Filters filters); @GET("composeService/{id}") Call get(@Path("id") String id); @@ -53,4 +57,15 @@ public interface ComposeServiceService { @POST("composeService/{id}?action=rollback") Call rollback(@Path("id") String id); + + + @GET + Call getLinkAccount(@Url String url ); + + @GET + Call getLinkEnvironment(@Url String url ); + + @GET + Call> getLinkInstances(@Url String url ); + } diff --git a/src/main/java/io/rancher/service/ConfigItemService.java b/src/main/java/io/rancher/service/ConfigItemService.java index 3367e8c..7d59687 100644 --- a/src/main/java/io/rancher/service/ConfigItemService.java +++ b/src/main/java/io/rancher/service/ConfigItemService.java @@ -13,6 +13,7 @@ import retrofit2.http.PUT; import retrofit2.http.Path; import retrofit2.http.QueryMap; +import retrofit2.http.Url; public interface ConfigItemService { @@ -20,7 +21,7 @@ public interface ConfigItemService { Call> list(); @GET("configItem") - Call> list(@QueryMap Filters filters); + Call> list(@QueryMap Filters filters); @GET("configItem/{id}") Call get(@Path("id") String id); @@ -34,4 +35,6 @@ public interface ConfigItemService { @DELETE("configItem/{id}") Call delete(@Path("id") String id); + + } diff --git a/src/main/java/io/rancher/service/ConfigItemStatusService.java b/src/main/java/io/rancher/service/ConfigItemStatusService.java index 1a65600..efb0f86 100644 --- a/src/main/java/io/rancher/service/ConfigItemStatusService.java +++ b/src/main/java/io/rancher/service/ConfigItemStatusService.java @@ -3,6 +3,8 @@ import io.rancher.base.Filters; import io.rancher.base.TypeCollection; import io.rancher.type.ConfigItemStatus; +import io.rancher.type.Account; +import io.rancher.type.Agent; import retrofit2.Call; import retrofit2.Response; @@ -13,6 +15,7 @@ import retrofit2.http.PUT; import retrofit2.http.Path; import retrofit2.http.QueryMap; +import retrofit2.http.Url; public interface ConfigItemStatusService { @@ -20,7 +23,7 @@ public interface ConfigItemStatusService { Call> list(); @GET("configItemStatus") - Call> list(@QueryMap Filters filters); + Call> list(@QueryMap Filters filters); @GET("configItemStatus/{id}") Call get(@Path("id") String id); @@ -34,4 +37,12 @@ public interface ConfigItemStatusService { @DELETE("configItemStatus/{id}") Call delete(@Path("id") String id); + + + @GET + Call getLinkAccount(@Url String url ); + + @GET + Call getLinkAgent(@Url String url ); + } diff --git a/src/main/java/io/rancher/service/ContainerEventService.java b/src/main/java/io/rancher/service/ContainerEventService.java index d6734d0..4be3499 100644 --- a/src/main/java/io/rancher/service/ContainerEventService.java +++ b/src/main/java/io/rancher/service/ContainerEventService.java @@ -3,6 +3,8 @@ import io.rancher.base.Filters; import io.rancher.base.TypeCollection; import io.rancher.type.ContainerEvent; +import io.rancher.type.Account; +import io.rancher.type.Host; import retrofit2.Call; import retrofit2.Response; @@ -13,6 +15,7 @@ import retrofit2.http.PUT; import retrofit2.http.Path; import retrofit2.http.QueryMap; +import retrofit2.http.Url; public interface ContainerEventService { @@ -20,7 +23,7 @@ public interface ContainerEventService { Call> list(); @GET("containerEvent") - Call> list(@QueryMap Filters filters); + Call> list(@QueryMap Filters filters); @GET("containerEvent/{id}") Call get(@Path("id") String id); @@ -37,4 +40,12 @@ public interface ContainerEventService { @POST("containerEvent/{id}?action=remove") Call remove(@Path("id") String id); + + + @GET + Call getLinkAccount(@Url String url ); + + @GET + Call getLinkHost(@Url String url ); + } diff --git a/src/main/java/io/rancher/service/ContainerExecService.java b/src/main/java/io/rancher/service/ContainerExecService.java index b5fd847..7538f48 100644 --- a/src/main/java/io/rancher/service/ContainerExecService.java +++ b/src/main/java/io/rancher/service/ContainerExecService.java @@ -13,6 +13,7 @@ import retrofit2.http.PUT; import retrofit2.http.Path; import retrofit2.http.QueryMap; +import retrofit2.http.Url; public interface ContainerExecService { @@ -20,7 +21,7 @@ public interface ContainerExecService { Call> list(); @GET("containerExec") - Call> list(@QueryMap Filters filters); + Call> list(@QueryMap Filters filters); @GET("containerExec/{id}") Call get(@Path("id") String id); @@ -34,4 +35,6 @@ public interface ContainerExecService { @DELETE("containerExec/{id}") Call delete(@Path("id") String id); + + } diff --git a/src/main/java/io/rancher/service/ContainerLogsService.java b/src/main/java/io/rancher/service/ContainerLogsService.java index 6c8e7c6..8df13ff 100644 --- a/src/main/java/io/rancher/service/ContainerLogsService.java +++ b/src/main/java/io/rancher/service/ContainerLogsService.java @@ -13,6 +13,7 @@ import retrofit2.http.PUT; import retrofit2.http.Path; import retrofit2.http.QueryMap; +import retrofit2.http.Url; public interface ContainerLogsService { @@ -20,7 +21,7 @@ public interface ContainerLogsService { Call> list(); @GET("containerLogs") - Call> list(@QueryMap Filters filters); + Call> list(@QueryMap Filters filters); @GET("containerLogs/{id}") Call get(@Path("id") String id); @@ -34,4 +35,6 @@ public interface ContainerLogsService { @DELETE("containerLogs/{id}") Call delete(@Path("id") String id); + + } diff --git a/src/main/java/io/rancher/service/ContainerProxyService.java b/src/main/java/io/rancher/service/ContainerProxyService.java index c9a034b..b28025d 100644 --- a/src/main/java/io/rancher/service/ContainerProxyService.java +++ b/src/main/java/io/rancher/service/ContainerProxyService.java @@ -13,6 +13,7 @@ import retrofit2.http.PUT; import retrofit2.http.Path; import retrofit2.http.QueryMap; +import retrofit2.http.Url; public interface ContainerProxyService { @@ -20,7 +21,7 @@ public interface ContainerProxyService { Call> list(); @GET("containerProxy") - Call> list(@QueryMap Filters filters); + Call> list(@QueryMap Filters filters); @GET("containerProxy/{id}") Call get(@Path("id") String id); @@ -34,4 +35,6 @@ public interface ContainerProxyService { @DELETE("containerProxy/{id}") Call delete(@Path("id") String id); + + } diff --git a/src/main/java/io/rancher/service/ContainerService.java b/src/main/java/io/rancher/service/ContainerService.java index caec172..999c224 100644 --- a/src/main/java/io/rancher/service/ContainerService.java +++ b/src/main/java/io/rancher/service/ContainerService.java @@ -3,15 +3,23 @@ import io.rancher.base.Filters; import io.rancher.base.TypeCollection; import io.rancher.type.Container; -import io.rancher.type.InstanceStop; -import io.rancher.type.ContainerProxy; +import io.rancher.type.Account; +import io.rancher.type.Agent; import io.rancher.type.ContainerExec; import io.rancher.type.ContainerLogs; +import io.rancher.type.ContainerProxy; +import io.rancher.type.Credential; +import io.rancher.type.Host; import io.rancher.type.HostAccess; -import io.rancher.type.InstanceConsoleInput; -import io.rancher.type.InstanceConsole; import io.rancher.type.Instance; +import io.rancher.type.InstanceConsole; +import io.rancher.type.InstanceConsoleInput; +import io.rancher.type.InstanceStop; +import io.rancher.type.Mount; +import io.rancher.type.Port; +import io.rancher.type.Service; import io.rancher.type.SetLabelsInput; +import io.rancher.type.Volume; import retrofit2.Call; import retrofit2.Response; @@ -22,6 +30,7 @@ import retrofit2.http.PUT; import retrofit2.http.Path; import retrofit2.http.QueryMap; +import retrofit2.http.Url; public interface ContainerService { @@ -29,7 +38,7 @@ public interface ContainerService { Call> list(); @GET("container") - Call> list(@QueryMap Filters filters); + Call> list(@QueryMap Filters filters); @GET("container/{id}") Call get(@Path("id") String id); @@ -97,4 +106,33 @@ public interface ContainerService { @POST("container/{id}?action=updateunhealthy") Call updateunhealthy(@Path("id") String id); + + + @GET + Call getLinkAccount(@Url String url ); + + @GET + Call getLinkAgent(@Url String url ); + + @GET + Call> getLinkCredentials(@Url String url ); + + @GET + Call> getLinkHosts(@Url String url ); + + @GET + Call> getLinkInstances(@Url String url ); + + @GET + Call> getLinkMounts(@Url String url ); + + @GET + Call> getLinkPorts(@Url String url ); + + @GET + Call> getLinkServices(@Url String url ); + + @GET + Call> getLinkVolumes(@Url String url ); + } diff --git a/src/main/java/io/rancher/service/CredentialService.java b/src/main/java/io/rancher/service/CredentialService.java index 5e800f6..27f07ae 100644 --- a/src/main/java/io/rancher/service/CredentialService.java +++ b/src/main/java/io/rancher/service/CredentialService.java @@ -3,6 +3,9 @@ import io.rancher.base.Filters; import io.rancher.base.TypeCollection; import io.rancher.type.Credential; +import io.rancher.type.Account; +import io.rancher.type.Image; +import io.rancher.type.Instance; import retrofit2.Call; import retrofit2.Response; @@ -13,6 +16,7 @@ import retrofit2.http.PUT; import retrofit2.http.Path; import retrofit2.http.QueryMap; +import retrofit2.http.Url; public interface CredentialService { @@ -20,7 +24,7 @@ public interface CredentialService { Call> list(); @GET("credential") - Call> list(@QueryMap Filters filters); + Call> list(@QueryMap Filters filters); @GET("credential/{id}") Call get(@Path("id") String id); @@ -46,4 +50,15 @@ public interface CredentialService { @POST("credential/{id}?action=remove") Call remove(@Path("id") String id); + + + @GET + Call getLinkAccount(@Url String url ); + + @GET + Call> getLinkImages(@Url String url ); + + @GET + Call> getLinkInstances(@Url String url ); + } diff --git a/src/main/java/io/rancher/service/DatabasechangelogService.java b/src/main/java/io/rancher/service/DatabasechangelogService.java index 7446d7e..27e6700 100644 --- a/src/main/java/io/rancher/service/DatabasechangelogService.java +++ b/src/main/java/io/rancher/service/DatabasechangelogService.java @@ -13,6 +13,7 @@ import retrofit2.http.PUT; import retrofit2.http.Path; import retrofit2.http.QueryMap; +import retrofit2.http.Url; public interface DatabasechangelogService { @@ -20,7 +21,7 @@ public interface DatabasechangelogService { Call> list(); @GET("databasechangelog") - Call> list(@QueryMap Filters filters); + Call> list(@QueryMap Filters filters); @GET("databasechangelog/{id}") Call get(@Path("id") String id); @@ -34,4 +35,6 @@ public interface DatabasechangelogService { @DELETE("databasechangelog/{id}") Call delete(@Path("id") String id); + + } diff --git a/src/main/java/io/rancher/service/DatabasechangeloglockService.java b/src/main/java/io/rancher/service/DatabasechangeloglockService.java index 16ac194..db98c84 100644 --- a/src/main/java/io/rancher/service/DatabasechangeloglockService.java +++ b/src/main/java/io/rancher/service/DatabasechangeloglockService.java @@ -13,6 +13,7 @@ import retrofit2.http.PUT; import retrofit2.http.Path; import retrofit2.http.QueryMap; +import retrofit2.http.Url; public interface DatabasechangeloglockService { @@ -20,7 +21,7 @@ public interface DatabasechangeloglockService { Call> list(); @GET("databasechangeloglock") - Call> list(@QueryMap Filters filters); + Call> list(@QueryMap Filters filters); @GET("databasechangeloglock/{id}") Call get(@Path("id") String id); @@ -34,4 +35,6 @@ public interface DatabasechangeloglockService { @DELETE("databasechangeloglock/{id}") Call delete(@Path("id") String id); + + } diff --git a/src/main/java/io/rancher/service/DigitaloceanConfigService.java b/src/main/java/io/rancher/service/DigitaloceanConfigService.java index 6d3d818..d9c1225 100644 --- a/src/main/java/io/rancher/service/DigitaloceanConfigService.java +++ b/src/main/java/io/rancher/service/DigitaloceanConfigService.java @@ -13,6 +13,7 @@ import retrofit2.http.PUT; import retrofit2.http.Path; import retrofit2.http.QueryMap; +import retrofit2.http.Url; public interface DigitaloceanConfigService { @@ -20,7 +21,7 @@ public interface DigitaloceanConfigService { Call> list(); @GET("digitaloceanConfig") - Call> list(@QueryMap Filters filters); + Call> list(@QueryMap Filters filters); @GET("digitaloceanConfig/{id}") Call get(@Path("id") String id); @@ -34,4 +35,6 @@ public interface DigitaloceanConfigService { @DELETE("digitaloceanConfig/{id}") Call delete(@Path("id") String id); + + } diff --git a/src/main/java/io/rancher/service/DnsServiceService.java b/src/main/java/io/rancher/service/DnsServiceService.java index 481b996..1f127bd 100644 --- a/src/main/java/io/rancher/service/DnsServiceService.java +++ b/src/main/java/io/rancher/service/DnsServiceService.java @@ -3,11 +3,14 @@ import io.rancher.base.Filters; import io.rancher.base.TypeCollection; import io.rancher.type.DnsService; +import io.rancher.type.Account; +import io.rancher.type.AddRemoveServiceLinkInput; +import io.rancher.type.Environment; +import io.rancher.type.Instance; +import io.rancher.type.Service; import io.rancher.type.ServiceRestart; import io.rancher.type.ServiceUpgrade; -import io.rancher.type.AddRemoveServiceLinkInput; import io.rancher.type.SetServiceLinksInput; -import io.rancher.type.Service; import retrofit2.Call; import retrofit2.Response; @@ -18,6 +21,7 @@ import retrofit2.http.PUT; import retrofit2.http.Path; import retrofit2.http.QueryMap; +import retrofit2.http.Url; public interface DnsServiceService { @@ -25,7 +29,7 @@ public interface DnsServiceService { Call> list(); @GET("dnsService") - Call> list(@QueryMap Filters filters); + Call> list(@QueryMap Filters filters); @GET("dnsService/{id}") Call get(@Path("id") String id); @@ -75,4 +79,15 @@ public interface DnsServiceService { @POST("dnsService/{id}?action=upgrade") Call upgrade(@Path("id") String id, @Body ServiceUpgrade serviceUpgrade); + + + @GET + Call getLinkAccount(@Url String url ); + + @GET + Call getLinkEnvironment(@Url String url ); + + @GET + Call> getLinkInstances(@Url String url ); + } diff --git a/src/main/java/io/rancher/service/DockerBuildService.java b/src/main/java/io/rancher/service/DockerBuildService.java index 9de6ab4..9adfd2c 100644 --- a/src/main/java/io/rancher/service/DockerBuildService.java +++ b/src/main/java/io/rancher/service/DockerBuildService.java @@ -13,6 +13,7 @@ import retrofit2.http.PUT; import retrofit2.http.Path; import retrofit2.http.QueryMap; +import retrofit2.http.Url; public interface DockerBuildService { @@ -20,7 +21,7 @@ public interface DockerBuildService { Call> list(); @GET("dockerBuild") - Call> list(@QueryMap Filters filters); + Call> list(@QueryMap Filters filters); @GET("dockerBuild/{id}") Call get(@Path("id") String id); @@ -34,4 +35,6 @@ public interface DockerBuildService { @DELETE("dockerBuild/{id}") Call delete(@Path("id") String id); + + } diff --git a/src/main/java/io/rancher/service/DynamicSchemaService.java b/src/main/java/io/rancher/service/DynamicSchemaService.java index d55a880..7d4c5f0 100644 --- a/src/main/java/io/rancher/service/DynamicSchemaService.java +++ b/src/main/java/io/rancher/service/DynamicSchemaService.java @@ -3,6 +3,7 @@ import io.rancher.base.Filters; import io.rancher.base.TypeCollection; import io.rancher.type.DynamicSchema; +import io.rancher.type.Account; import retrofit2.Call; import retrofit2.Response; @@ -13,6 +14,7 @@ import retrofit2.http.PUT; import retrofit2.http.Path; import retrofit2.http.QueryMap; +import retrofit2.http.Url; public interface DynamicSchemaService { @@ -20,7 +22,7 @@ public interface DynamicSchemaService { Call> list(); @GET("dynamicSchema") - Call> list(@QueryMap Filters filters); + Call> list(@QueryMap Filters filters); @GET("dynamicSchema/{id}") Call get(@Path("id") String id); @@ -37,4 +39,9 @@ public interface DynamicSchemaService { @POST("dynamicSchema/{id}?action=remove") Call remove(@Path("id") String id); + + + @GET + Call getLinkAccount(@Url String url ); + } diff --git a/src/main/java/io/rancher/service/EnvironmentService.java b/src/main/java/io/rancher/service/EnvironmentService.java index 39045d1..a797670 100644 --- a/src/main/java/io/rancher/service/EnvironmentService.java +++ b/src/main/java/io/rancher/service/EnvironmentService.java @@ -3,10 +3,12 @@ import io.rancher.base.Filters; import io.rancher.base.TypeCollection; import io.rancher.type.Environment; -import io.rancher.type.ComposeConfig; -import io.rancher.type.EnvironmentUpgrade; +import io.rancher.type.Account; import io.rancher.type.AddOutputsInput; +import io.rancher.type.ComposeConfig; import io.rancher.type.ComposeConfigInput; +import io.rancher.type.EnvironmentUpgrade; +import io.rancher.type.Service; import retrofit2.Call; import retrofit2.Response; @@ -17,6 +19,7 @@ import retrofit2.http.PUT; import retrofit2.http.Path; import retrofit2.http.QueryMap; +import retrofit2.http.Url; public interface EnvironmentService { @@ -24,7 +27,7 @@ public interface EnvironmentService { Call> list(); @GET("environment") - Call> list(@QueryMap Filters filters); + Call> list(@QueryMap Filters filters); @GET("environment/{id}") Call get(@Path("id") String id); @@ -71,4 +74,12 @@ public interface EnvironmentService { @POST("environment/{id}?action=upgrade") Call upgrade(@Path("id") String id, @Body EnvironmentUpgrade environmentUpgrade); + + + @GET + Call getLinkAccount(@Url String url ); + + @GET + Call> getLinkServices(@Url String url ); + } diff --git a/src/main/java/io/rancher/service/EnvironmentUpgradeService.java b/src/main/java/io/rancher/service/EnvironmentUpgradeService.java index ff2b4e3..09548d9 100644 --- a/src/main/java/io/rancher/service/EnvironmentUpgradeService.java +++ b/src/main/java/io/rancher/service/EnvironmentUpgradeService.java @@ -13,6 +13,7 @@ import retrofit2.http.PUT; import retrofit2.http.Path; import retrofit2.http.QueryMap; +import retrofit2.http.Url; public interface EnvironmentUpgradeService { @@ -20,7 +21,7 @@ public interface EnvironmentUpgradeService { Call> list(); @GET("environmentUpgrade") - Call> list(@QueryMap Filters filters); + Call> list(@QueryMap Filters filters); @GET("environmentUpgrade/{id}") Call get(@Path("id") String id); @@ -34,4 +35,6 @@ public interface EnvironmentUpgradeService { @DELETE("environmentUpgrade/{id}") Call delete(@Path("id") String id); + + } diff --git a/src/main/java/io/rancher/service/ExoscaleConfigService.java b/src/main/java/io/rancher/service/ExoscaleConfigService.java deleted file mode 100644 index 99eb50e..0000000 --- a/src/main/java/io/rancher/service/ExoscaleConfigService.java +++ /dev/null @@ -1,37 +0,0 @@ -package io.rancher.service; - -import io.rancher.base.Filters; -import io.rancher.base.TypeCollection; -import io.rancher.type.ExoscaleConfig; - -import retrofit2.Call; -import retrofit2.Response; -import retrofit2.http.Body; -import retrofit2.http.DELETE; -import retrofit2.http.GET; -import retrofit2.http.POST; -import retrofit2.http.PUT; -import retrofit2.http.Path; -import retrofit2.http.QueryMap; - -public interface ExoscaleConfigService { - - @GET("exoscaleConfig") - Call> list(); - - @GET("exoscaleConfig") - Call> list(@QueryMap Filters filters); - - @GET("exoscaleConfig/{id}") - Call get(@Path("id") String id); - - @POST("exoscaleConfig") - Call create(@Body ExoscaleConfig exoscaleConfig); - - @PUT("exoscaleConfig/{id}") - Call update(@Path("id") String id, @Body ExoscaleConfig exoscaleConfig); - - @DELETE("exoscaleConfig/{id}") - Call delete(@Path("id") String id); - -} diff --git a/src/main/java/io/rancher/service/ExtensionImplementationService.java b/src/main/java/io/rancher/service/ExtensionImplementationService.java index b3e3aea..d76edb0 100644 --- a/src/main/java/io/rancher/service/ExtensionImplementationService.java +++ b/src/main/java/io/rancher/service/ExtensionImplementationService.java @@ -13,6 +13,7 @@ import retrofit2.http.PUT; import retrofit2.http.Path; import retrofit2.http.QueryMap; +import retrofit2.http.Url; public interface ExtensionImplementationService { @@ -20,7 +21,7 @@ public interface ExtensionImplementationService { Call> list(); @GET("extensionImplementation") - Call> list(@QueryMap Filters filters); + Call> list(@QueryMap Filters filters); @GET("extensionImplementation/{id}") Call get(@Path("id") String id); @@ -34,4 +35,6 @@ public interface ExtensionImplementationService { @DELETE("extensionImplementation/{id}") Call delete(@Path("id") String id); + + } diff --git a/src/main/java/io/rancher/service/ExtensionPointService.java b/src/main/java/io/rancher/service/ExtensionPointService.java index 4a6739c..0f2df91 100644 --- a/src/main/java/io/rancher/service/ExtensionPointService.java +++ b/src/main/java/io/rancher/service/ExtensionPointService.java @@ -13,6 +13,7 @@ import retrofit2.http.PUT; import retrofit2.http.Path; import retrofit2.http.QueryMap; +import retrofit2.http.Url; public interface ExtensionPointService { @@ -20,7 +21,7 @@ public interface ExtensionPointService { Call> list(); @GET("extensionPoint") - Call> list(@QueryMap Filters filters); + Call> list(@QueryMap Filters filters); @GET("extensionPoint/{id}") Call get(@Path("id") String id); @@ -34,4 +35,6 @@ public interface ExtensionPointService { @DELETE("extensionPoint/{id}") Call delete(@Path("id") String id); + + } diff --git a/src/main/java/io/rancher/service/ExternalDnsEventService.java b/src/main/java/io/rancher/service/ExternalDnsEventService.java index 5270ab5..f602aeb 100644 --- a/src/main/java/io/rancher/service/ExternalDnsEventService.java +++ b/src/main/java/io/rancher/service/ExternalDnsEventService.java @@ -3,6 +3,7 @@ import io.rancher.base.Filters; import io.rancher.base.TypeCollection; import io.rancher.type.ExternalDnsEvent; +import io.rancher.type.Account; import io.rancher.type.ExternalEvent; import retrofit2.Call; @@ -14,6 +15,7 @@ import retrofit2.http.PUT; import retrofit2.http.Path; import retrofit2.http.QueryMap; +import retrofit2.http.Url; public interface ExternalDnsEventService { @@ -21,7 +23,7 @@ public interface ExternalDnsEventService { Call> list(); @GET("externalDnsEvent") - Call> list(@QueryMap Filters filters); + Call> list(@QueryMap Filters filters); @GET("externalDnsEvent/{id}") Call get(@Path("id") String id); @@ -38,4 +40,9 @@ public interface ExternalDnsEventService { @POST("externalDnsEvent/{id}?action=remove") Call remove(@Path("id") String id); + + + @GET + Call getLinkAccount(@Url String url ); + } diff --git a/src/main/java/io/rancher/service/ExternalEventService.java b/src/main/java/io/rancher/service/ExternalEventService.java index bd7dddf..dec31b5 100644 --- a/src/main/java/io/rancher/service/ExternalEventService.java +++ b/src/main/java/io/rancher/service/ExternalEventService.java @@ -3,6 +3,7 @@ import io.rancher.base.Filters; import io.rancher.base.TypeCollection; import io.rancher.type.ExternalEvent; +import io.rancher.type.Account; import retrofit2.Call; import retrofit2.Response; @@ -13,6 +14,7 @@ import retrofit2.http.PUT; import retrofit2.http.Path; import retrofit2.http.QueryMap; +import retrofit2.http.Url; public interface ExternalEventService { @@ -20,7 +22,7 @@ public interface ExternalEventService { Call> list(); @GET("externalEvent") - Call> list(@QueryMap Filters filters); + Call> list(@QueryMap Filters filters); @GET("externalEvent/{id}") Call get(@Path("id") String id); @@ -37,4 +39,9 @@ public interface ExternalEventService { @POST("externalEvent/{id}?action=remove") Call remove(@Path("id") String id); + + + @GET + Call getLinkAccount(@Url String url ); + } diff --git a/src/main/java/io/rancher/service/ExternalHandlerExternalHandlerProcessMapService.java b/src/main/java/io/rancher/service/ExternalHandlerExternalHandlerProcessMapService.java index 98bfac9..a559ebb 100644 --- a/src/main/java/io/rancher/service/ExternalHandlerExternalHandlerProcessMapService.java +++ b/src/main/java/io/rancher/service/ExternalHandlerExternalHandlerProcessMapService.java @@ -13,6 +13,7 @@ import retrofit2.http.PUT; import retrofit2.http.Path; import retrofit2.http.QueryMap; +import retrofit2.http.Url; public interface ExternalHandlerExternalHandlerProcessMapService { @@ -20,7 +21,7 @@ public interface ExternalHandlerExternalHandlerProcessMapService { Call> list(); @GET("externalHandlerExternalHandlerProcessMap") - Call> list(@QueryMap Filters filters); + Call> list(@QueryMap Filters filters); @GET("externalHandlerExternalHandlerProcessMap/{id}") Call get(@Path("id") String id); @@ -49,4 +50,6 @@ public interface ExternalHandlerExternalHandlerProcessMapService { @POST("externalHandlerExternalHandlerProcessMap/{id}?action=restore") Call restore(@Path("id") String id); + + } diff --git a/src/main/java/io/rancher/service/ExternalHandlerProcessConfigService.java b/src/main/java/io/rancher/service/ExternalHandlerProcessConfigService.java index af9710f..0b86896 100644 --- a/src/main/java/io/rancher/service/ExternalHandlerProcessConfigService.java +++ b/src/main/java/io/rancher/service/ExternalHandlerProcessConfigService.java @@ -13,6 +13,7 @@ import retrofit2.http.PUT; import retrofit2.http.Path; import retrofit2.http.QueryMap; +import retrofit2.http.Url; public interface ExternalHandlerProcessConfigService { @@ -20,7 +21,7 @@ public interface ExternalHandlerProcessConfigService { Call> list(); @GET("externalHandlerProcessConfig") - Call> list(@QueryMap Filters filters); + Call> list(@QueryMap Filters filters); @GET("externalHandlerProcessConfig/{id}") Call get(@Path("id") String id); @@ -34,4 +35,6 @@ public interface ExternalHandlerProcessConfigService { @DELETE("externalHandlerProcessConfig/{id}") Call delete(@Path("id") String id); + + } diff --git a/src/main/java/io/rancher/service/ExternalHandlerProcessService.java b/src/main/java/io/rancher/service/ExternalHandlerProcessService.java index 883d078..c24c27d 100644 --- a/src/main/java/io/rancher/service/ExternalHandlerProcessService.java +++ b/src/main/java/io/rancher/service/ExternalHandlerProcessService.java @@ -13,6 +13,7 @@ import retrofit2.http.PUT; import retrofit2.http.Path; import retrofit2.http.QueryMap; +import retrofit2.http.Url; public interface ExternalHandlerProcessService { @@ -20,7 +21,7 @@ public interface ExternalHandlerProcessService { Call> list(); @GET("externalHandlerProcess") - Call> list(@QueryMap Filters filters); + Call> list(@QueryMap Filters filters); @GET("externalHandlerProcess/{id}") Call get(@Path("id") String id); @@ -49,4 +50,6 @@ public interface ExternalHandlerProcessService { @POST("externalHandlerProcess/{id}?action=restore") Call restore(@Path("id") String id); + + } diff --git a/src/main/java/io/rancher/service/ExternalHandlerService.java b/src/main/java/io/rancher/service/ExternalHandlerService.java index 449d611..c733ba5 100644 --- a/src/main/java/io/rancher/service/ExternalHandlerService.java +++ b/src/main/java/io/rancher/service/ExternalHandlerService.java @@ -13,6 +13,7 @@ import retrofit2.http.PUT; import retrofit2.http.Path; import retrofit2.http.QueryMap; +import retrofit2.http.Url; public interface ExternalHandlerService { @@ -20,7 +21,7 @@ public interface ExternalHandlerService { Call> list(); @GET("externalHandler") - Call> list(@QueryMap Filters filters); + Call> list(@QueryMap Filters filters); @GET("externalHandler/{id}") Call get(@Path("id") String id); @@ -49,4 +50,6 @@ public interface ExternalHandlerService { @POST("externalHandler/{id}?action=restore") Call restore(@Path("id") String id); + + } diff --git a/src/main/java/io/rancher/service/ExternalHostEventService.java b/src/main/java/io/rancher/service/ExternalHostEventService.java index a13b3db..d857063 100644 --- a/src/main/java/io/rancher/service/ExternalHostEventService.java +++ b/src/main/java/io/rancher/service/ExternalHostEventService.java @@ -3,6 +3,7 @@ import io.rancher.base.Filters; import io.rancher.base.TypeCollection; import io.rancher.type.ExternalHostEvent; +import io.rancher.type.Account; import io.rancher.type.ExternalEvent; import retrofit2.Call; @@ -14,6 +15,7 @@ import retrofit2.http.PUT; import retrofit2.http.Path; import retrofit2.http.QueryMap; +import retrofit2.http.Url; public interface ExternalHostEventService { @@ -21,7 +23,7 @@ public interface ExternalHostEventService { Call> list(); @GET("externalHostEvent") - Call> list(@QueryMap Filters filters); + Call> list(@QueryMap Filters filters); @GET("externalHostEvent/{id}") Call get(@Path("id") String id); @@ -38,4 +40,9 @@ public interface ExternalHostEventService { @POST("externalHostEvent/{id}?action=remove") Call remove(@Path("id") String id); + + + @GET + Call getLinkAccount(@Url String url ); + } diff --git a/src/main/java/io/rancher/service/ExternalServiceEventService.java b/src/main/java/io/rancher/service/ExternalServiceEventService.java index 6091f03..33c9147 100644 --- a/src/main/java/io/rancher/service/ExternalServiceEventService.java +++ b/src/main/java/io/rancher/service/ExternalServiceEventService.java @@ -3,6 +3,7 @@ import io.rancher.base.Filters; import io.rancher.base.TypeCollection; import io.rancher.type.ExternalServiceEvent; +import io.rancher.type.Account; import io.rancher.type.ExternalEvent; import retrofit2.Call; @@ -14,6 +15,7 @@ import retrofit2.http.PUT; import retrofit2.http.Path; import retrofit2.http.QueryMap; +import retrofit2.http.Url; public interface ExternalServiceEventService { @@ -21,7 +23,7 @@ public interface ExternalServiceEventService { Call> list(); @GET("externalServiceEvent") - Call> list(@QueryMap Filters filters); + Call> list(@QueryMap Filters filters); @GET("externalServiceEvent/{id}") Call get(@Path("id") String id); @@ -38,4 +40,9 @@ public interface ExternalServiceEventService { @POST("externalServiceEvent/{id}?action=remove") Call remove(@Path("id") String id); + + + @GET + Call getLinkAccount(@Url String url ); + } diff --git a/src/main/java/io/rancher/service/ExternalServiceService.java b/src/main/java/io/rancher/service/ExternalServiceService.java index 3fe8332..2dc5bbf 100644 --- a/src/main/java/io/rancher/service/ExternalServiceService.java +++ b/src/main/java/io/rancher/service/ExternalServiceService.java @@ -3,8 +3,11 @@ import io.rancher.base.Filters; import io.rancher.base.TypeCollection; import io.rancher.type.ExternalService; -import io.rancher.type.ServiceRestart; +import io.rancher.type.Account; +import io.rancher.type.Environment; +import io.rancher.type.Instance; import io.rancher.type.Service; +import io.rancher.type.ServiceRestart; import io.rancher.type.ServiceUpgrade; import retrofit2.Call; @@ -16,6 +19,7 @@ import retrofit2.http.PUT; import retrofit2.http.Path; import retrofit2.http.QueryMap; +import retrofit2.http.Url; public interface ExternalServiceService { @@ -23,7 +27,7 @@ public interface ExternalServiceService { Call> list(); @GET("externalService") - Call> list(@QueryMap Filters filters); + Call> list(@QueryMap Filters filters); @GET("externalService/{id}") Call get(@Path("id") String id); @@ -64,4 +68,15 @@ public interface ExternalServiceService { @POST("externalService/{id}?action=upgrade") Call upgrade(@Path("id") String id, @Body ServiceUpgrade serviceUpgrade); + + + @GET + Call getLinkAccount(@Url String url ); + + @GET + Call getLinkEnvironment(@Url String url ); + + @GET + Call> getLinkInstances(@Url String url ); + } diff --git a/src/main/java/io/rancher/service/ExternalStoragePoolEventService.java b/src/main/java/io/rancher/service/ExternalStoragePoolEventService.java index 0b19802..9fc1087 100644 --- a/src/main/java/io/rancher/service/ExternalStoragePoolEventService.java +++ b/src/main/java/io/rancher/service/ExternalStoragePoolEventService.java @@ -3,6 +3,7 @@ import io.rancher.base.Filters; import io.rancher.base.TypeCollection; import io.rancher.type.ExternalStoragePoolEvent; +import io.rancher.type.Account; import io.rancher.type.ExternalEvent; import retrofit2.Call; @@ -14,6 +15,7 @@ import retrofit2.http.PUT; import retrofit2.http.Path; import retrofit2.http.QueryMap; +import retrofit2.http.Url; public interface ExternalStoragePoolEventService { @@ -21,7 +23,7 @@ public interface ExternalStoragePoolEventService { Call> list(); @GET("externalStoragePoolEvent") - Call> list(@QueryMap Filters filters); + Call> list(@QueryMap Filters filters); @GET("externalStoragePoolEvent/{id}") Call get(@Path("id") String id); @@ -38,4 +40,9 @@ public interface ExternalStoragePoolEventService { @POST("externalStoragePoolEvent/{id}?action=remove") Call remove(@Path("id") String id); + + + @GET + Call getLinkAccount(@Url String url ); + } diff --git a/src/main/java/io/rancher/service/ExternalVolumeEventService.java b/src/main/java/io/rancher/service/ExternalVolumeEventService.java index 0a70013..26f26cc 100644 --- a/src/main/java/io/rancher/service/ExternalVolumeEventService.java +++ b/src/main/java/io/rancher/service/ExternalVolumeEventService.java @@ -3,6 +3,7 @@ import io.rancher.base.Filters; import io.rancher.base.TypeCollection; import io.rancher.type.ExternalVolumeEvent; +import io.rancher.type.Account; import io.rancher.type.ExternalEvent; import retrofit2.Call; @@ -14,6 +15,7 @@ import retrofit2.http.PUT; import retrofit2.http.Path; import retrofit2.http.QueryMap; +import retrofit2.http.Url; public interface ExternalVolumeEventService { @@ -21,7 +23,7 @@ public interface ExternalVolumeEventService { Call> list(); @GET("externalVolumeEvent") - Call> list(@QueryMap Filters filters); + Call> list(@QueryMap Filters filters); @GET("externalVolumeEvent/{id}") Call get(@Path("id") String id); @@ -38,4 +40,9 @@ public interface ExternalVolumeEventService { @POST("externalVolumeEvent/{id}?action=remove") Call remove(@Path("id") String id); + + + @GET + Call getLinkAccount(@Url String url ); + } diff --git a/src/main/java/io/rancher/service/FieldDocumentationService.java b/src/main/java/io/rancher/service/FieldDocumentationService.java index c57c130..a0b7827 100644 --- a/src/main/java/io/rancher/service/FieldDocumentationService.java +++ b/src/main/java/io/rancher/service/FieldDocumentationService.java @@ -13,6 +13,7 @@ import retrofit2.http.PUT; import retrofit2.http.Path; import retrofit2.http.QueryMap; +import retrofit2.http.Url; public interface FieldDocumentationService { @@ -20,7 +21,7 @@ public interface FieldDocumentationService { Call> list(); @GET("fieldDocumentation") - Call> list(@QueryMap Filters filters); + Call> list(@QueryMap Filters filters); @GET("fieldDocumentation/{id}") Call get(@Path("id") String id); @@ -34,4 +35,6 @@ public interface FieldDocumentationService { @DELETE("fieldDocumentation/{id}") Call delete(@Path("id") String id); + + } diff --git a/src/main/java/io/rancher/service/GithubconfigService.java b/src/main/java/io/rancher/service/GithubconfigService.java index 25616c3..da02017 100644 --- a/src/main/java/io/rancher/service/GithubconfigService.java +++ b/src/main/java/io/rancher/service/GithubconfigService.java @@ -13,6 +13,7 @@ import retrofit2.http.PUT; import retrofit2.http.Path; import retrofit2.http.QueryMap; +import retrofit2.http.Url; public interface GithubconfigService { @@ -20,7 +21,7 @@ public interface GithubconfigService { Call> list(); @GET("githubconfig") - Call> list(@QueryMap Filters filters); + Call> list(@QueryMap Filters filters); @GET("githubconfig/{id}") Call get(@Path("id") String id); @@ -34,4 +35,6 @@ public interface GithubconfigService { @DELETE("githubconfig/{id}") Call delete(@Path("id") String id); + + } diff --git a/src/main/java/io/rancher/service/HaConfigInputService.java b/src/main/java/io/rancher/service/HaConfigInputService.java index 90859e8..b406444 100644 --- a/src/main/java/io/rancher/service/HaConfigInputService.java +++ b/src/main/java/io/rancher/service/HaConfigInputService.java @@ -13,6 +13,7 @@ import retrofit2.http.PUT; import retrofit2.http.Path; import retrofit2.http.QueryMap; +import retrofit2.http.Url; public interface HaConfigInputService { @@ -20,7 +21,7 @@ public interface HaConfigInputService { Call> list(); @GET("haConfigInput") - Call> list(@QueryMap Filters filters); + Call> list(@QueryMap Filters filters); @GET("haConfigInput/{id}") Call get(@Path("id") String id); @@ -34,4 +35,6 @@ public interface HaConfigInputService { @DELETE("haConfigInput/{id}") Call delete(@Path("id") String id); + + } diff --git a/src/main/java/io/rancher/service/HaConfigService.java b/src/main/java/io/rancher/service/HaConfigService.java index 435476d..d7ee30e 100644 --- a/src/main/java/io/rancher/service/HaConfigService.java +++ b/src/main/java/io/rancher/service/HaConfigService.java @@ -13,6 +13,7 @@ import retrofit2.http.PUT; import retrofit2.http.Path; import retrofit2.http.QueryMap; +import retrofit2.http.Url; public interface HaConfigService { @@ -20,7 +21,7 @@ public interface HaConfigService { Call> list(); @GET("haConfig") - Call> list(@QueryMap Filters filters); + Call> list(@QueryMap Filters filters); @GET("haConfig/{id}") Call get(@Path("id") String id); @@ -34,4 +35,6 @@ public interface HaConfigService { @DELETE("haConfig/{id}") Call delete(@Path("id") String id); + + } diff --git a/src/main/java/io/rancher/service/HaproxyConfigService.java b/src/main/java/io/rancher/service/HaproxyConfigService.java index 87066da..2db24eb 100644 --- a/src/main/java/io/rancher/service/HaproxyConfigService.java +++ b/src/main/java/io/rancher/service/HaproxyConfigService.java @@ -13,6 +13,7 @@ import retrofit2.http.PUT; import retrofit2.http.Path; import retrofit2.http.QueryMap; +import retrofit2.http.Url; public interface HaproxyConfigService { @@ -20,7 +21,7 @@ public interface HaproxyConfigService { Call> list(); @GET("haproxyConfig") - Call> list(@QueryMap Filters filters); + Call> list(@QueryMap Filters filters); @GET("haproxyConfig/{id}") Call get(@Path("id") String id); @@ -34,4 +35,6 @@ public interface HaproxyConfigService { @DELETE("haproxyConfig/{id}") Call delete(@Path("id") String id); + + } diff --git a/src/main/java/io/rancher/service/HealthcheckInstanceHostMapService.java b/src/main/java/io/rancher/service/HealthcheckInstanceHostMapService.java index 7756803..938df05 100644 --- a/src/main/java/io/rancher/service/HealthcheckInstanceHostMapService.java +++ b/src/main/java/io/rancher/service/HealthcheckInstanceHostMapService.java @@ -3,6 +3,9 @@ import io.rancher.base.Filters; import io.rancher.base.TypeCollection; import io.rancher.type.HealthcheckInstanceHostMap; +import io.rancher.type.Account; +import io.rancher.type.Host; +import io.rancher.type.Instance; import retrofit2.Call; import retrofit2.Response; @@ -13,6 +16,7 @@ import retrofit2.http.PUT; import retrofit2.http.Path; import retrofit2.http.QueryMap; +import retrofit2.http.Url; public interface HealthcheckInstanceHostMapService { @@ -20,7 +24,7 @@ public interface HealthcheckInstanceHostMapService { Call> list(); @GET("healthcheckInstanceHostMap") - Call> list(@QueryMap Filters filters); + Call> list(@QueryMap Filters filters); @GET("healthcheckInstanceHostMap/{id}") Call get(@Path("id") String id); @@ -37,4 +41,15 @@ public interface HealthcheckInstanceHostMapService { @POST("healthcheckInstanceHostMap/{id}?action=remove") Call remove(@Path("id") String id); + + + @GET + Call getLinkAccount(@Url String url ); + + @GET + Call getLinkHost(@Url String url ); + + @GET + Call getLinkInstance(@Url String url ); + } diff --git a/src/main/java/io/rancher/service/HostAccessService.java b/src/main/java/io/rancher/service/HostAccessService.java index 43c8902..46ebef4 100644 --- a/src/main/java/io/rancher/service/HostAccessService.java +++ b/src/main/java/io/rancher/service/HostAccessService.java @@ -13,6 +13,7 @@ import retrofit2.http.PUT; import retrofit2.http.Path; import retrofit2.http.QueryMap; +import retrofit2.http.Url; public interface HostAccessService { @@ -20,7 +21,7 @@ public interface HostAccessService { Call> list(); @GET("hostAccess") - Call> list(@QueryMap Filters filters); + Call> list(@QueryMap Filters filters); @GET("hostAccess/{id}") Call get(@Path("id") String id); @@ -34,4 +35,6 @@ public interface HostAccessService { @DELETE("hostAccess/{id}") Call delete(@Path("id") String id); + + } diff --git a/src/main/java/io/rancher/service/HostApiProxyTokenService.java b/src/main/java/io/rancher/service/HostApiProxyTokenService.java index e03af1c..ee67f2d 100644 --- a/src/main/java/io/rancher/service/HostApiProxyTokenService.java +++ b/src/main/java/io/rancher/service/HostApiProxyTokenService.java @@ -13,6 +13,7 @@ import retrofit2.http.PUT; import retrofit2.http.Path; import retrofit2.http.QueryMap; +import retrofit2.http.Url; public interface HostApiProxyTokenService { @@ -20,7 +21,7 @@ public interface HostApiProxyTokenService { Call> list(); @GET("hostApiProxyToken") - Call> list(@QueryMap Filters filters); + Call> list(@QueryMap Filters filters); @GET("hostApiProxyToken/{id}") Call get(@Path("id") String id); @@ -34,4 +35,6 @@ public interface HostApiProxyTokenService { @DELETE("hostApiProxyToken/{id}") Call delete(@Path("id") String id); + + } diff --git a/src/main/java/io/rancher/service/HostService.java b/src/main/java/io/rancher/service/HostService.java index e85ce8d..35ef727 100644 --- a/src/main/java/io/rancher/service/HostService.java +++ b/src/main/java/io/rancher/service/HostService.java @@ -3,7 +3,12 @@ import io.rancher.base.Filters; import io.rancher.base.TypeCollection; import io.rancher.type.Host; +import io.rancher.type.Account; +import io.rancher.type.Agent; +import io.rancher.type.Host; import io.rancher.type.HostAccess; +import io.rancher.type.Instance; +import io.rancher.type.Volume; import retrofit2.Call; import retrofit2.Response; @@ -14,6 +19,7 @@ import retrofit2.http.PUT; import retrofit2.http.Path; import retrofit2.http.QueryMap; +import retrofit2.http.Url; public interface HostService { @@ -21,7 +27,7 @@ public interface HostService { Call> list(); @GET("host") - Call> list(@QueryMap Filters filters); + Call> list(@QueryMap Filters filters); @GET("host/{id}") Call get(@Path("id") String id); @@ -53,4 +59,21 @@ public interface HostService { @POST("host/{id}?action=restore") Call restore(@Path("id") String id); + + + @GET + Call getLinkAccount(@Url String url ); + + @GET + Call getLinkAgent(@Url String url ); + + @GET + Call> getLinkHosts(@Url String url ); + + @GET + Call> getLinkInstances(@Url String url ); + + @GET + Call> getLinkVolumes(@Url String url ); + } diff --git a/src/main/java/io/rancher/service/IdentityService.java b/src/main/java/io/rancher/service/IdentityService.java index ec58781..e125f1f 100644 --- a/src/main/java/io/rancher/service/IdentityService.java +++ b/src/main/java/io/rancher/service/IdentityService.java @@ -13,6 +13,7 @@ import retrofit2.http.PUT; import retrofit2.http.Path; import retrofit2.http.QueryMap; +import retrofit2.http.Url; public interface IdentityService { @@ -20,7 +21,7 @@ public interface IdentityService { Call> list(); @GET("identity") - Call> list(@QueryMap Filters filters); + Call> list(@QueryMap Filters filters); @GET("identity/{id}") Call get(@Path("id") String id); @@ -34,4 +35,6 @@ public interface IdentityService { @DELETE("identity/{id}") Call delete(@Path("id") String id); + + } diff --git a/src/main/java/io/rancher/service/ImageService.java b/src/main/java/io/rancher/service/ImageService.java index 9ed3425..150b412 100644 --- a/src/main/java/io/rancher/service/ImageService.java +++ b/src/main/java/io/rancher/service/ImageService.java @@ -3,6 +3,9 @@ import io.rancher.base.Filters; import io.rancher.base.TypeCollection; import io.rancher.type.Image; +import io.rancher.type.Account; +import io.rancher.type.Instance; +import io.rancher.type.Volume; import retrofit2.Call; import retrofit2.Response; @@ -13,6 +16,7 @@ import retrofit2.http.PUT; import retrofit2.http.Path; import retrofit2.http.QueryMap; +import retrofit2.http.Url; public interface ImageService { @@ -20,7 +24,7 @@ public interface ImageService { Call> list(); @GET("image") - Call> list(@QueryMap Filters filters); + Call> list(@QueryMap Filters filters); @GET("image/{id}") Call get(@Path("id") String id); @@ -49,4 +53,15 @@ public interface ImageService { @POST("image/{id}?action=restore") Call restore(@Path("id") String id); + + + @GET + Call getLinkAccount(@Url String url ); + + @GET + Call> getLinkInstances(@Url String url ); + + @GET + Call> getLinkVolumes(@Url String url ); + } diff --git a/src/main/java/io/rancher/service/InServiceUpgradeStrategyService.java b/src/main/java/io/rancher/service/InServiceUpgradeStrategyService.java index f41a9aa..59be033 100644 --- a/src/main/java/io/rancher/service/InServiceUpgradeStrategyService.java +++ b/src/main/java/io/rancher/service/InServiceUpgradeStrategyService.java @@ -13,6 +13,7 @@ import retrofit2.http.PUT; import retrofit2.http.Path; import retrofit2.http.QueryMap; +import retrofit2.http.Url; public interface InServiceUpgradeStrategyService { @@ -20,7 +21,7 @@ public interface InServiceUpgradeStrategyService { Call> list(); @GET("inServiceUpgradeStrategy") - Call> list(@QueryMap Filters filters); + Call> list(@QueryMap Filters filters); @GET("inServiceUpgradeStrategy/{id}") Call get(@Path("id") String id); @@ -34,4 +35,6 @@ public interface InServiceUpgradeStrategyService { @DELETE("inServiceUpgradeStrategy/{id}") Call delete(@Path("id") String id); + + } diff --git a/src/main/java/io/rancher/service/InstanceConsoleInputService.java b/src/main/java/io/rancher/service/InstanceConsoleInputService.java index eef6178..cd9bad2 100644 --- a/src/main/java/io/rancher/service/InstanceConsoleInputService.java +++ b/src/main/java/io/rancher/service/InstanceConsoleInputService.java @@ -13,6 +13,7 @@ import retrofit2.http.PUT; import retrofit2.http.Path; import retrofit2.http.QueryMap; +import retrofit2.http.Url; public interface InstanceConsoleInputService { @@ -20,7 +21,7 @@ public interface InstanceConsoleInputService { Call> list(); @GET("instanceConsoleInput") - Call> list(@QueryMap Filters filters); + Call> list(@QueryMap Filters filters); @GET("instanceConsoleInput/{id}") Call get(@Path("id") String id); @@ -34,4 +35,6 @@ public interface InstanceConsoleInputService { @DELETE("instanceConsoleInput/{id}") Call delete(@Path("id") String id); + + } diff --git a/src/main/java/io/rancher/service/InstanceConsoleService.java b/src/main/java/io/rancher/service/InstanceConsoleService.java index 7768bfb..8be3a2c 100644 --- a/src/main/java/io/rancher/service/InstanceConsoleService.java +++ b/src/main/java/io/rancher/service/InstanceConsoleService.java @@ -13,6 +13,7 @@ import retrofit2.http.PUT; import retrofit2.http.Path; import retrofit2.http.QueryMap; +import retrofit2.http.Url; public interface InstanceConsoleService { @@ -20,7 +21,7 @@ public interface InstanceConsoleService { Call> list(); @GET("instanceConsole") - Call> list(@QueryMap Filters filters); + Call> list(@QueryMap Filters filters); @GET("instanceConsole/{id}") Call get(@Path("id") String id); @@ -34,4 +35,6 @@ public interface InstanceConsoleService { @DELETE("instanceConsole/{id}") Call delete(@Path("id") String id); + + } diff --git a/src/main/java/io/rancher/service/InstanceHealthCheckService.java b/src/main/java/io/rancher/service/InstanceHealthCheckService.java index 6bacc17..de8a213 100644 --- a/src/main/java/io/rancher/service/InstanceHealthCheckService.java +++ b/src/main/java/io/rancher/service/InstanceHealthCheckService.java @@ -13,6 +13,7 @@ import retrofit2.http.PUT; import retrofit2.http.Path; import retrofit2.http.QueryMap; +import retrofit2.http.Url; public interface InstanceHealthCheckService { @@ -20,7 +21,7 @@ public interface InstanceHealthCheckService { Call> list(); @GET("instanceHealthCheck") - Call> list(@QueryMap Filters filters); + Call> list(@QueryMap Filters filters); @GET("instanceHealthCheck/{id}") Call get(@Path("id") String id); @@ -34,4 +35,6 @@ public interface InstanceHealthCheckService { @DELETE("instanceHealthCheck/{id}") Call delete(@Path("id") String id); + + } diff --git a/src/main/java/io/rancher/service/InstanceLinkService.java b/src/main/java/io/rancher/service/InstanceLinkService.java index e939bbb..bf85945 100644 --- a/src/main/java/io/rancher/service/InstanceLinkService.java +++ b/src/main/java/io/rancher/service/InstanceLinkService.java @@ -3,6 +3,8 @@ import io.rancher.base.Filters; import io.rancher.base.TypeCollection; import io.rancher.type.InstanceLink; +import io.rancher.type.Account; +import io.rancher.type.Instance; import retrofit2.Call; import retrofit2.Response; @@ -13,6 +15,7 @@ import retrofit2.http.PUT; import retrofit2.http.Path; import retrofit2.http.QueryMap; +import retrofit2.http.Url; public interface InstanceLinkService { @@ -20,7 +23,7 @@ public interface InstanceLinkService { Call> list(); @GET("instanceLink") - Call> list(@QueryMap Filters filters); + Call> list(@QueryMap Filters filters); @GET("instanceLink/{id}") Call get(@Path("id") String id); @@ -49,4 +52,12 @@ public interface InstanceLinkService { @POST("instanceLink/{id}?action=restore") Call restore(@Path("id") String id); + + + @GET + Call getLinkAccount(@Url String url ); + + @GET + Call getLinkInstance(@Url String url ); + } diff --git a/src/main/java/io/rancher/service/InstanceService.java b/src/main/java/io/rancher/service/InstanceService.java index 6460eb1..9c817d9 100644 --- a/src/main/java/io/rancher/service/InstanceService.java +++ b/src/main/java/io/rancher/service/InstanceService.java @@ -3,9 +3,17 @@ import io.rancher.base.Filters; import io.rancher.base.TypeCollection; import io.rancher.type.Instance; -import io.rancher.type.InstanceStop; -import io.rancher.type.InstanceConsoleInput; +import io.rancher.type.Account; +import io.rancher.type.Credential; +import io.rancher.type.Host; +import io.rancher.type.Instance; import io.rancher.type.InstanceConsole; +import io.rancher.type.InstanceConsoleInput; +import io.rancher.type.InstanceStop; +import io.rancher.type.Mount; +import io.rancher.type.Port; +import io.rancher.type.Service; +import io.rancher.type.Volume; import retrofit2.Call; import retrofit2.Response; @@ -16,6 +24,7 @@ import retrofit2.http.PUT; import retrofit2.http.Path; import retrofit2.http.QueryMap; +import retrofit2.http.Url; public interface InstanceService { @@ -23,7 +32,7 @@ public interface InstanceService { Call> list(); @GET("instance") - Call> list(@QueryMap Filters filters); + Call> list(@QueryMap Filters filters); @GET("instance/{id}") Call get(@Path("id") String id); @@ -79,4 +88,30 @@ public interface InstanceService { @POST("instance/{id}?action=updateunhealthy") Call updateunhealthy(@Path("id") String id); + + + @GET + Call getLinkAccount(@Url String url ); + + @GET + Call> getLinkCredentials(@Url String url ); + + @GET + Call> getLinkHosts(@Url String url ); + + @GET + Call> getLinkInstances(@Url String url ); + + @GET + Call> getLinkMounts(@Url String url ); + + @GET + Call> getLinkPorts(@Url String url ); + + @GET + Call> getLinkServices(@Url String url ); + + @GET + Call> getLinkVolumes(@Url String url ); + } diff --git a/src/main/java/io/rancher/service/InstanceStopService.java b/src/main/java/io/rancher/service/InstanceStopService.java index 9ecab11..c1fb8e2 100644 --- a/src/main/java/io/rancher/service/InstanceStopService.java +++ b/src/main/java/io/rancher/service/InstanceStopService.java @@ -13,6 +13,7 @@ import retrofit2.http.PUT; import retrofit2.http.Path; import retrofit2.http.QueryMap; +import retrofit2.http.Url; public interface InstanceStopService { @@ -20,7 +21,7 @@ public interface InstanceStopService { Call> list(); @GET("instanceStop") - Call> list(@QueryMap Filters filters); + Call> list(@QueryMap Filters filters); @GET("instanceStop/{id}") Call get(@Path("id") String id); @@ -34,4 +35,6 @@ public interface InstanceStopService { @DELETE("instanceStop/{id}") Call delete(@Path("id") String id); + + } diff --git a/src/main/java/io/rancher/service/IpAddressAssociateInputService.java b/src/main/java/io/rancher/service/IpAddressAssociateInputService.java index a4c76a2..9070ed9 100644 --- a/src/main/java/io/rancher/service/IpAddressAssociateInputService.java +++ b/src/main/java/io/rancher/service/IpAddressAssociateInputService.java @@ -13,6 +13,7 @@ import retrofit2.http.PUT; import retrofit2.http.Path; import retrofit2.http.QueryMap; +import retrofit2.http.Url; public interface IpAddressAssociateInputService { @@ -20,7 +21,7 @@ public interface IpAddressAssociateInputService { Call> list(); @GET("ipAddressAssociateInput") - Call> list(@QueryMap Filters filters); + Call> list(@QueryMap Filters filters); @GET("ipAddressAssociateInput/{id}") Call get(@Path("id") String id); @@ -34,4 +35,6 @@ public interface IpAddressAssociateInputService { @DELETE("ipAddressAssociateInput/{id}") Call delete(@Path("id") String id); + + } diff --git a/src/main/java/io/rancher/service/IpAddressService.java b/src/main/java/io/rancher/service/IpAddressService.java index c53e9e3..95576d7 100644 --- a/src/main/java/io/rancher/service/IpAddressService.java +++ b/src/main/java/io/rancher/service/IpAddressService.java @@ -3,6 +3,9 @@ import io.rancher.base.Filters; import io.rancher.base.TypeCollection; import io.rancher.type.IpAddress; +import io.rancher.type.Account; +import io.rancher.type.Host; +import io.rancher.type.Network; import retrofit2.Call; import retrofit2.Response; @@ -13,6 +16,7 @@ import retrofit2.http.PUT; import retrofit2.http.Path; import retrofit2.http.QueryMap; +import retrofit2.http.Url; public interface IpAddressService { @@ -20,7 +24,7 @@ public interface IpAddressService { Call> list(); @GET("ipAddress") - Call> list(@QueryMap Filters filters); + Call> list(@QueryMap Filters filters); @GET("ipAddress/{id}") Call get(@Path("id") String id); @@ -52,4 +56,15 @@ public interface IpAddressService { @POST("ipAddress/{id}?action=restore") Call restore(@Path("id") String id); + + + @GET + Call getLinkAccount(@Url String url ); + + @GET + Call> getLinkHosts(@Url String url ); + + @GET + Call getLinkNetwork(@Url String url ); + } diff --git a/src/main/java/io/rancher/service/KubernetesServiceService.java b/src/main/java/io/rancher/service/KubernetesServiceService.java index 993e177..0445995 100644 --- a/src/main/java/io/rancher/service/KubernetesServiceService.java +++ b/src/main/java/io/rancher/service/KubernetesServiceService.java @@ -3,11 +3,14 @@ import io.rancher.base.Filters; import io.rancher.base.TypeCollection; import io.rancher.type.KubernetesService; -import io.rancher.type.SetServiceLinksInput; -import io.rancher.type.ServiceUpgrade; -import io.rancher.type.ServiceRestart; -import io.rancher.type.Service; +import io.rancher.type.Account; import io.rancher.type.AddRemoveServiceLinkInput; +import io.rancher.type.Environment; +import io.rancher.type.Instance; +import io.rancher.type.Service; +import io.rancher.type.ServiceRestart; +import io.rancher.type.ServiceUpgrade; +import io.rancher.type.SetServiceLinksInput; import retrofit2.Call; import retrofit2.Response; @@ -18,6 +21,7 @@ import retrofit2.http.PUT; import retrofit2.http.Path; import retrofit2.http.QueryMap; +import retrofit2.http.Url; public interface KubernetesServiceService { @@ -25,7 +29,7 @@ public interface KubernetesServiceService { Call> list(); @GET("kubernetesService") - Call> list(@QueryMap Filters filters); + Call> list(@QueryMap Filters filters); @GET("kubernetesService/{id}") Call get(@Path("id") String id); @@ -75,4 +79,15 @@ public interface KubernetesServiceService { @POST("kubernetesService/{id}?action=upgrade") Call upgrade(@Path("id") String id, @Body ServiceUpgrade serviceUpgrade); + + + @GET + Call getLinkAccount(@Url String url ); + + @GET + Call getLinkEnvironment(@Url String url ); + + @GET + Call> getLinkInstances(@Url String url ); + } diff --git a/src/main/java/io/rancher/service/LabelService.java b/src/main/java/io/rancher/service/LabelService.java index 463f4f2..798cc63 100644 --- a/src/main/java/io/rancher/service/LabelService.java +++ b/src/main/java/io/rancher/service/LabelService.java @@ -3,6 +3,9 @@ import io.rancher.base.Filters; import io.rancher.base.TypeCollection; import io.rancher.type.Label; +import io.rancher.type.Account; +import io.rancher.type.Host; +import io.rancher.type.Instance; import retrofit2.Call; import retrofit2.Response; @@ -13,6 +16,7 @@ import retrofit2.http.PUT; import retrofit2.http.Path; import retrofit2.http.QueryMap; +import retrofit2.http.Url; public interface LabelService { @@ -20,7 +24,7 @@ public interface LabelService { Call> list(); @GET("label") - Call> list(@QueryMap Filters filters); + Call> list(@QueryMap Filters filters); @GET("label/{id}") Call