Remove support for OpsDb tenants

5 files changed, 2 insertions, 25 deletions

diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/TenantCreateOptions.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/TenantCreateOptions.java
index aaa80ad73a2..b99c3182f03 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/TenantCreateOptions.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/TenantCreateOptions.java
@@ -6,7 +6,6 @@ import com.fasterxml.jackson.annotation.JsonInclude;
 import com.yahoo.vespa.athenz.api.AthenzDomain;
 import com.yahoo.vespa.hosted.controller.api.identifiers.Property;
 import com.yahoo.vespa.hosted.controller.api.identifiers.PropertyId;
-import com.yahoo.vespa.hosted.controller.api.identifiers.UserGroup;
 
 /**
  * @author bjorncs
@@ -17,16 +16,9 @@ public class TenantCreateOptions {
     public AthenzDomain athensDomain;
     public Property property;
     public PropertyId propertyId;
-    public UserGroup userGroup;
 
     public TenantCreateOptions() {}
 
-    public TenantCreateOptions(UserGroup userGroup, Property property, PropertyId propertyId) {
-        this.userGroup = userGroup;
-        this.property = property;
-        this.propertyId = propertyId;
-    }
-
     public TenantCreateOptions(AthenzDomain athensDomain, Property property, PropertyId propertyId) {
         this.athensDomain = athensDomain;
         this.property = property;
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/TenantMetaData.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/TenantMetaData.java
index da088c76fda..a8bda2e5f10 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/TenantMetaData.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/TenantMetaData.java
@@ -6,7 +6,6 @@ import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.yahoo.vespa.athenz.api.AthenzDomain;
 import com.yahoo.vespa.hosted.controller.api.identifiers.Property;
-import com.yahoo.vespa.hosted.controller.api.identifiers.UserGroup;
 
 import java.util.Optional;
 
@@ -19,18 +18,15 @@ public class TenantMetaData {
     public TenantType type;
     public Optional<AthenzDomain> athensDomain;
     public Optional<Property> property;
-    public Optional<UserGroup> userGroup;
 
     // Required for Jackson deserialization
     public TenantMetaData() {}
 
     public TenantMetaData(TenantType type,
                           Optional<AthenzDomain> athensDomain,
-                          Optional<Property> property,
-                          Optional<UserGroup> userGroup) {
+                          Optional<Property> property) {
         this.type = type;
         this.athensDomain = athensDomain;
         this.property = property;
-        this.userGroup = userGroup;
     }
 }
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/TenantType.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/TenantType.java
index 2c543af7bf8..9f89da717be 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/TenantType.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/TenantType.java
@@ -5,7 +5,6 @@ package com.yahoo.vespa.hosted.controller.api.application.v4.model;
  * @author bjorncs
  */
 public enum TenantType {
-    OPSDB,
     USER,
     ATHENS
 }
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/TenantUpdateOptions.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/TenantUpdateOptions.java
index f441fdd6ec5..4e8c164a64d 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/TenantUpdateOptions.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/TenantUpdateOptions.java
@@ -7,7 +7,6 @@ import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yahoo.vespa.athenz.api.AthenzDomain;
 import com.yahoo.vespa.hosted.controller.api.identifiers.Property;
-import com.yahoo.vespa.hosted.controller.api.identifiers.UserGroup;
 
 import java.util.Objects;
 import java.util.Optional;
@@ -20,14 +19,11 @@ import java.util.Optional;
 @JsonInclude(value = JsonInclude.Include.NON_ABSENT)
 public class TenantUpdateOptions {
     public final Property property;
-    public final Optional<UserGroup> userGroup;
     public final Optional<AthenzDomain> athensDomain;
 
     @JsonCreator
     public TenantUpdateOptions(@JsonProperty("property") Property property,
-                               @JsonProperty("userGroup") Optional<UserGroup> userGroup,
                                @JsonProperty("athensDomain") Optional<AthenzDomain> athensDomain) {
-        this.userGroup = userGroup;
         this.property = property;
         this.athensDomain = athensDomain;
     }
@@ -38,20 +34,18 @@ public class TenantUpdateOptions {
         if (o == null || getClass() != o.getClass()) return false;
         TenantUpdateOptions that = (TenantUpdateOptions) o;
         return Objects.equals(property, that.property) &&
-                Objects.equals(userGroup, that.userGroup) &&
                 Objects.equals(athensDomain, that.athensDomain);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(property, userGroup, athensDomain);
+        return Objects.hash(property, athensDomain);
     }
 
     @Override
     public String toString() {
         return "TenantUpdateOptions{" +
                 "property=" + property +
-                ", userGroup=" + userGroup +
                 ", athensDomain=" + athensDomain +
                 '}';
     }
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/TenantWithApplications.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/TenantWithApplications.java
index 633547cfaca..0c40e8192d6 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/TenantWithApplications.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/TenantWithApplications.java
@@ -5,7 +5,6 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.yahoo.vespa.athenz.api.AthenzDomain;
 import com.yahoo.vespa.hosted.controller.api.identifiers.Property;
-import com.yahoo.vespa.hosted.controller.api.identifiers.UserGroup;
 
 import java.util.List;
 
@@ -19,7 +18,6 @@ public class TenantWithApplications {
     public TenantType type;
     public AthenzDomain athensDomain;
     public Property property;
-    public UserGroup userGroup;
     public List<ApplicationReference> applications;
 
     public TenantWithApplications() {}
@@ -28,12 +26,10 @@ public class TenantWithApplications {
             TenantType type,
             AthenzDomain athensDomain,
             Property property,
-            UserGroup userGroup,
             List<ApplicationReference> applications) {
         this.type = type;
         this.athensDomain = athensDomain;
         this.property = property;
-        this.userGroup = userGroup;
         this.applications = applications;
     }
 }