diff options
author | Jon Marius Venstad <venstad@gmail.com> | 2020-02-21 09:45:05 +0100 |
---|---|---|
committer | Jon Marius Venstad <venstad@gmail.com> | 2020-02-21 09:45:05 +0100 |
commit | cca6019344fcbc03fd84007059f73c2ea7c6cbce (patch) | |
tree | 861a0350984b51cabd850f831c425754c406baeb /controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/TenantSerializerTest.java | |
parent | 0d75af12ebee18203e176cbdfa98a8c10fffca66 (diff) |
Remove user tenants
@mpolden please review. @tokle FYI.
This removes all traces of user tenants from our controllers.
Existing deployments (there are none right now) are deactivated,
and applications deleted on restart of the controller, for all
applications under a user tenant.
Existing user tenants are deleted on restart of the controller.
APIs pretends creating user tenants is OK, and that any user
tenant already exists, for the purposes of dashboard compatibility.
Diffstat (limited to 'controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/TenantSerializerTest.java')
-rw-r--r-- | controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/TenantSerializerTest.java | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/TenantSerializerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/TenantSerializerTest.java index ff1c952c2a5..9c085bb72f7 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/TenantSerializerTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/TenantSerializerTest.java @@ -12,7 +12,6 @@ import com.yahoo.vespa.hosted.controller.api.integration.organization.Contact; import com.yahoo.vespa.hosted.controller.api.role.SimplePrincipal; import com.yahoo.vespa.hosted.controller.tenant.AthenzTenant; import com.yahoo.vespa.hosted.controller.tenant.CloudTenant; -import com.yahoo.vespa.hosted.controller.tenant.UserTenant; import org.junit.Test; import java.net.URI; @@ -77,14 +76,6 @@ public class TenantSerializerTest { } @Test - public void user_tenant() { - UserTenant tenant = UserTenant.create("by-foo", Optional.of(contact())); - UserTenant serialized = (UserTenant) serializer.tenantFrom(serializer.toSlime(tenant)); - assertEquals(tenant.name(), serialized.name()); - assertEquals(contact(), serialized.contact().get()); - } - - @Test public void cloud_tenant() { CloudTenant tenant = new CloudTenant(TenantName.from("elderly-lady"), new BillingInfo("old cat lady", "vespa"), |