aboutsummaryrefslogtreecommitdiffstats
path: root/controller-api
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@oath.com>2018-03-13 17:28:34 +0100
committerBjørn Christian Seime <bjorncs@oath.com>2018-03-13 17:28:34 +0100
commitd3b0387cedc77dd59fdf47db8be0ce96ac49c552 (patch)
tree06bcb6eb738ab68a569949274190adec5d0316bd /controller-api
parent6efe23abadd6a6c2ed26ae30cee0c87e1c320b1c (diff)
Remove api for migrating tenants to Athenz
Diffstat (limited to 'controller-api')
-rw-r--r--controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/TenantResource.java4
-rw-r--r--controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/TenantMigrateOptions.java22
2 files changed, 0 insertions, 26 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/TenantResource.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/TenantResource.java
index 8db6f982ef6..06a8f8371ab 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/TenantResource.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/TenantResource.java
@@ -3,7 +3,6 @@ package com.yahoo.vespa.hosted.controller.api.application.v4;
import com.yahoo.vespa.hosted.controller.api.application.v4.model.TenantCreateOptions;
import com.yahoo.vespa.hosted.controller.api.application.v4.model.TenantInfo;
-import com.yahoo.vespa.hosted.controller.api.application.v4.model.TenantMigrateOptions;
import com.yahoo.vespa.hosted.controller.api.application.v4.model.TenantUpdateOptions;
import com.yahoo.vespa.hosted.controller.api.application.v4.model.TenantWithApplications;
@@ -41,7 +40,4 @@ public interface TenantResource {
@Path(ApplicationResource.API_PATH)
ApplicationResource application();
- @PUT
- @Path("migrateTenantToAthens")
- TenantInfo migrateTenantToAthens(TenantMigrateOptions tenantOptions);
}
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/TenantMigrateOptions.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/TenantMigrateOptions.java
deleted file mode 100644
index 39561c31ed8..00000000000
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/TenantMigrateOptions.java
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.vespa.hosted.controller.api.application.v4.model;
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.yahoo.vespa.athenz.api.AthenzDomain;
-
-/**
- * @author bjorncs
- */
-@JsonIgnoreProperties(ignoreUnknown = true)
-@JsonInclude(value = JsonInclude.Include.NON_NULL)
-public class TenantMigrateOptions {
-
- public AthenzDomain athensDomain;
-
- public TenantMigrateOptions() {}
-
- public TenantMigrateOptions(AthenzDomain athensDomain) {
- this.athensDomain = athensDomain;
- }
-}