diff options
| author | Martin Polden <mpolden@mpolden.no> | 2018-12-18 11:37:30 +0100 |
|---|---|---|
| committer | Martin Polden <mpolden@mpolden.no> | 2019-01-02 09:52:06 +0100 |
| commit | fd8a127ca3aa050aad7b55ebe17a3c656f09871a (patch) | |
| tree | 17303557daf889700f4e97934fdfe00cb3e5a588 /athenz-identity-provider-service | |
| parent | 0270ccff73718d7786aae5aa7bdb0e3eb653e7c2 (diff) | |
Rename field openStackId -> id
Diffstat (limited to 'athenz-identity-provider-service')
2 files changed, 2 insertions, 3 deletions
diff --git a/athenz-identity-provider-service/src/test/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/identitydocument/IdentityDocumentGeneratorTest.java b/athenz-identity-provider-service/src/test/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/identitydocument/IdentityDocumentGeneratorTest.java index 48e85f6047e..735de107b32 100644 --- a/athenz-identity-provider-service/src/test/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/identitydocument/IdentityDocumentGeneratorTest.java +++ b/athenz-identity-provider-service/src/test/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/identitydocument/IdentityDocumentGeneratorTest.java @@ -63,8 +63,7 @@ public class IdentityDocumentGeneratorTest { Optional.empty(), new MockNodeFlavors().getFlavorOrThrow("default"), NodeType.host); - Node containerNode = Node.createDockerNode("docker-1", - ImmutableSet.of("::1"), + Node containerNode = Node.createDockerNode(ImmutableSet.of("::1"), new HashSet<>(), containerHostname, Optional.of(parentHostname), diff --git a/athenz-identity-provider-service/src/test/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/instanceconfirmation/InstanceValidatorTest.java b/athenz-identity-provider-service/src/test/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/instanceconfirmation/InstanceValidatorTest.java index bb70a5981b8..d9346369462 100644 --- a/athenz-identity-provider-service/src/test/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/instanceconfirmation/InstanceValidatorTest.java +++ b/athenz-identity-provider-service/src/test/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/instanceconfirmation/InstanceValidatorTest.java @@ -226,7 +226,7 @@ public class InstanceValidatorTest { } private List<Node> allocateNode(List<Node> nodeList, Node node, ApplicationId applicationId) { - nodeList.removeIf(n -> n.openStackId().equals(node.openStackId())); + nodeList.removeIf(n -> n.id().equals(node.id())); nodeList.add(node.allocate(applicationId, ClusterMembership.from("container/default/0/0", Version.fromString("6.123.4")), Instant.now())); return nodeList; } |