Move files to correct module

2 files changed, 116 insertions, 0 deletions

diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/LogStore.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/LogStore.java
new file mode 100644
index 00000000000..0a7bacefffb
--- /dev/null
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/LogStore.java
@@ -0,0 +1,19 @@
+package com.yahoo.vespa.hosted.controller.api.integration;
+
+import com.yahoo.config.provision.ApplicationId;
+import com.yahoo.vespa.hosted.controller.api.integration.deployment.JobType;
+import com.yahoo.vespa.hosted.controller.api.integration.zone.ZoneId;
+
+// TODO jvenstad: Change most of this.
+public interface LogStore {
+
+    /** Returns the log of the given deployment job. */
+    String getTestLog(ApplicationId application, JobType jobType, int build);
+
+    /** Stores the given log for the given deployment job. */
+    void setTestLog(ApplicationId application, JobType jobType, int build, String log);
+
+    /** Deletes the log for the given deployment job. */
+    void deleteTestLog(ApplicationId application, JobType jobType, int build);
+
+}
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/JobType.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/JobType.java
new file mode 100644
index 00000000000..c9c73c3844a
--- /dev/null
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/JobType.java
@@ -0,0 +1,97 @@
+package com.yahoo.vespa.hosted.controller.api.integration.deployment;
+
+import com.google.common.collect.ImmutableMap;
+import com.yahoo.config.provision.Environment;
+import com.yahoo.config.provision.RegionName;
+import com.yahoo.config.provision.SystemName;
+import com.yahoo.vespa.hosted.controller.api.integration.zone.ZoneId;
+
+import java.util.Optional;
+import java.util.stream.Stream;
+
+/** Job types that exist in the build system */
+public enum JobType {
+//     | enum name ------------| job name ------------------| Zone in main system ---------------------------------------| Zone in CD system -------------------------------------------
+    component              ("component"                   , null                                                       , null                                                          ),
+    systemTest             ("system-test"                 , ZoneId.from("test"   , "us-east-1")      , ZoneId.from("test"   , "cd-us-central-1")  ),
+    stagingTest            ("staging-test"                , ZoneId.from("staging", "us-east-3")      , ZoneId.from("staging", "cd-us-central-1")  ),
+    productionCorpUsEast1  ("production-corp-us-east-1"   , ZoneId.from("prod"   , "corp-us-east-1") , null                                                          ),
+    productionUsEast3      ("production-us-east-3"        , ZoneId.from("prod"   , "us-east-3")      , null                                                          ),
+    productionUsWest1      ("production-us-west-1"        , ZoneId.from("prod"   , "us-west-1")      , null                                                          ),
+    productionUsCentral1   ("production-us-central-1"     , ZoneId.from("prod"   , "us-central-1")   , null                                                          ),
+    productionApNortheast1 ("production-ap-northeast-1"   , ZoneId.from("prod"   , "ap-northeast-1") , null                                                          ),
+    productionApNortheast2 ("production-ap-northeast-2"   , ZoneId.from("prod"   , "ap-northeast-2") , null                                                          ),
+    productionApSoutheast1 ("production-ap-southeast-1"   , ZoneId.from("prod"   , "ap-southeast-1") , null                                                          ),
+    productionEuWest1      ("production-eu-west-1"        , ZoneId.from("prod"   , "eu-west-1")      , null                                                          ),
+    productionAwsUsEast1a  ("production-aws-us-east-1a"   , ZoneId.from("prod"   , "aws-us-east-1a") , null                                                          ),
+    productionCdAwsUsEast1a("production-cd-aws-us-east-1a", null                                                       , ZoneId.from("prod"    , "cd-aws-us-east-1a")),
+    productionCdUsCentral1 ("production-cd-us-central-1"  , null                                                       , ZoneId.from("prod"    , "cd-us-central-1")  ),
+    productionCdUsCentral2 ("production-cd-us-central-2"  , null                                                       , ZoneId.from("prod"    , "cd-us-central-2")  );
+
+    private final String jobName;
+    private final ImmutableMap<SystemName, ZoneId> zones;
+
+    JobType(String jobName, ZoneId mainZone, ZoneId cdZone) {
+        this.jobName = jobName;
+        ImmutableMap.Builder<SystemName, ZoneId> builder = ImmutableMap.builder();
+        if (mainZone != null) builder.put(SystemName.main, mainZone);
+        if (cdZone != null) builder.put(SystemName.cd, cdZone);
+        this.zones = builder.build();
+    }
+
+    public String jobName() { return jobName; }
+
+    /** Returns the zone for this job in the given system, or empty if this job does not have a zone */
+    public Optional<ZoneId> zone(SystemName system) {
+        return Optional.ofNullable(zones.get(system));
+    }
+
+    /** Returns whether this is a production job */
+    public boolean isProduction() { return environment() == Environment.prod; }
+
+    /** Returns whether this is an automated test job */
+    public boolean isTest() { return environment() != null && environment().isTest(); }
+
+    /** Returns the environment of this job type, or null if it does not have an environment */
+    public Environment environment() {
+        switch (this) {
+            case component: return null;
+            case systemTest: return Environment.test;
+            case stagingTest: return Environment.staging;
+            default: return Environment.prod;
+        }
+    }
+
+    /** Returns the region of this job type, or null if it does not have a region */
+    public Optional<RegionName> region(SystemName system) {
+        return zone(system).map(ZoneId::region);
+    }
+
+    public static Optional<JobType> fromOptionalJobName(String jobName) {
+        return Stream.of(values())
+                     .filter(jobType -> jobType.jobName.equals(jobName))
+                     .findAny();
+    }
+
+    public static JobType fromJobName(String jobName) {
+        return fromOptionalJobName(jobName)
+                .orElseThrow(() -> new IllegalArgumentException("Unknown job name '" + jobName + "'"));
+    }
+
+    /** Returns the job type for the given zone */
+    public static Optional<JobType> from(SystemName system, ZoneId zone) {
+        return Stream.of(values())
+                .filter(job -> job.zone(system).filter(zone::equals).isPresent())
+                .findAny();
+    }
+
+    /** Returns the job job type for the given environment and region or null if none */
+    public static Optional<JobType> from(SystemName system, Environment environment, RegionName region) {
+        switch (environment) {
+            case test: return Optional.of(systemTest);
+            case staging: return Optional.of(stagingTest);
+        }
+        return from(system, ZoneId.from(environment, region));
+    }
+
+}