diff options
| author | Håkon Hallingstad <hakon@yahooinc.com> | 2023-07-31 09:44:01 +0200 |
|---|---|---|
| committer | Håkon Hallingstad <hakon@yahooinc.com> | 2023-07-31 09:44:01 +0200 |
| commit | e32a2809bfc1a1302b2f66b5104d77f6d475c5dc (patch) | |
| tree | 46edac18e9a2183bd4063257472ec44e0bf2dc59 /controller-server | |
| parent | 717770ad688112b372e113bd6e266e07e25f710a (diff) | |
Remove put-controller-2.json
Diffstat (limited to 'controller-server')
2 files changed, 1 insertions, 16 deletions
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/systemflags/SystemFlagsDeployerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/systemflags/SystemFlagsDeployerTest.java index 14e37853191..8ad64a08244 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/systemflags/SystemFlagsDeployerTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/systemflags/SystemFlagsDeployerTest.java @@ -87,7 +87,7 @@ public class SystemFlagsDeployerTest { // has the CLOUD dimension set. deployFlags(Optional.empty(), "partial/default.json", Optional.of("partial/put-controller.json"), true, PutType.CREATE, FetchVector.Dimension.CLOUD); deployFlags(Optional.empty(), "partial/default.json", Optional.empty(), false, PutType.NONE, FetchVector.Dimension.CLOUD); - deployFlags(Optional.of("partial/initial.json"), "partial/default.json", Optional.of("partial/put-controller-2.json"), true, PutType.UPDATE, FetchVector.Dimension.CLOUD); + deployFlags(Optional.of("partial/initial.json"), "partial/default.json", Optional.of("partial/put-controller.json"), true, PutType.UPDATE, FetchVector.Dimension.CLOUD); deployFlags(Optional.of("partial/initial.json"), "partial/default.json", Optional.empty(), false, PutType.DELETE, FetchVector.Dimension.CLOUD); // When the CLOUD dimension is NOT set on the dimension, the controller target will also resolve that dimension, and diff --git a/controller-server/src/test/resources/system-flags/partial/put-controller-2.json b/controller-server/src/test/resources/system-flags/partial/put-controller-2.json deleted file mode 100644 index 47aa0af47ce..00000000000 --- a/controller-server/src/test/resources/system-flags/partial/put-controller-2.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "id" : "my-flag", - "rules" : [ - { - "conditions": [ - { - "type": "whitelist", - "dimension": "cloud", - "values": [ "aws" ] - } - ], - "value" : "foo-value" - } - ] -}
\ No newline at end of file |