Merge branch 'master' into bjormel/aws-main-controllerbjormel/aws-main-controller

1 files changed, 4 insertions, 1 deletions

diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/resource/ResourceDatabaseClientMock.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/resource/ResourceDatabaseClientMock.java
index 570ca87e538..81dfdf4656c 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/resource/ResourceDatabaseClientMock.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/resource/ResourceDatabaseClientMock.java
@@ -1,4 +1,4 @@
-// Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.hosted.controller.api.integration.resource;
 
 import com.yahoo.config.provision.ApplicationId;
@@ -80,6 +80,7 @@ public class ResourceDatabaseClientMock implements ResourceDatabaseClient {
                             plan,
                             a.resources().architecture(),
                             a.getMajorVersion(),
+                            a.getAccount(),
                             BigDecimal.valueOf(a.resources().vcpu()).multiply(d),
                             BigDecimal.valueOf(a.resources().memoryGb()).multiply(d),
                             BigDecimal.valueOf(a.resources().diskGb()).multiply(d),
@@ -93,12 +94,14 @@ public class ResourceDatabaseClientMock implements ResourceDatabaseClient {
         assert a.getZoneId().equals(b.getZoneId());
         assert a.getPlan().equals(b.getPlan());
         assert a.getArchitecture().equals(b.getArchitecture());
+        assert a.getCloudAccount().equals(b.getCloudAccount());
         return new ResourceUsage(
                 a.getApplicationId(),
                 a.getZoneId(),
                 a.getPlan(),
                 a.getArchitecture(),
                 a.getMajorVersion(),
+                a.getCloudAccount(),
                 a.getCpuMillis().add(b.getCpuMillis()),
                 a.getMemoryMillis().add(b.getMemoryMillis()),
                 a.getDiskMillis().add(b.getDiskMillis()),