Repository: jclouds Updated Branches: refs/heads/1.8.x 4c765b188 -> f6d3aa481
http://git-wip-us.apache.org/repos/asf/jclouds/blob/01dac643/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListSecurityGroupsResponseTest.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListSecurityGroupsResponseTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListSecurityGroupsResponseTest.java index 54d06b9..cac6017 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListSecurityGroupsResponseTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListSecurityGroupsResponseTest.java @@ -20,6 +20,7 @@ import java.util.Set; import org.jclouds.cloudstack.domain.IngressRule; import org.jclouds.cloudstack.domain.SecurityGroup; +import org.jclouds.cloudstack.domain.Tag; import org.jclouds.json.BaseSetParserTest; import org.jclouds.rest.annotations.SelectJson; import org.testng.annotations.Test; @@ -54,7 +55,9 @@ public class ListSecurityGroupsResponseTest extends BaseSetParserTest<SecurityGr .securityGroupName("adriancole").account("adrian").build(), IngressRule.builder().id("6").protocol("udp").startPort(11).endPort(11).CIDR("1.1.1.1/24") - .build())).build()) + .build() + ) + ).build()) .add(SecurityGroup.builder().id("12").name("adriancole").account("adrian").domainId("1").domain("ROOT").build()) .add(SecurityGroup.builder().id("15").name("2").description("description").account("adrian").domainId("1") .domain("ROOT").build()) @@ -62,9 +65,9 @@ public class ListSecurityGroupsResponseTest extends BaseSetParserTest<SecurityGr .add(SecurityGroup.builder().id("14").name("1").description("description").account("adrian").domainId("1") .domain("ROOT").ingressRules(ImmutableSet.of( - IngressRule.builder().id("7").protocol("tcp").startPort(10).endPort(10).CIDR("1.1.1.1/24").build(), + IngressRule.builder().id("7").protocol("tcp").startPort(10).endPort(10).CIDR("1.1.1.1/24").build(), - IngressRule.builder().id("8").protocol("tcp").startPort(10).endPort(10).CIDR("2.2.2.2/16").build())) + IngressRule.builder().id("8").protocol("tcp").startPort(10).endPort(10).CIDR("2.2.2.2/16").build())) .build()) .add(SecurityGroup .builder() @@ -76,13 +79,25 @@ public class ListSecurityGroupsResponseTest extends BaseSetParserTest<SecurityGr .domain("ROOT") .ingressRules( ImmutableSet.of(IngressRule.builder().id("9").protocol("icmp").ICMPType(-1).ICMPCode(-1) - .securityGroupName("1").account("adrian").build(), + .securityGroupName("1").account("adrian").build(), - IngressRule.builder().id("10").protocol("tcp").startPort(22).endPort(22).securityGroupName("1") - .account("adrian").build(), + IngressRule.builder().id("10").protocol("tcp").startPort(22).endPort(22).securityGroupName("1") + .account("adrian").build(), - IngressRule.builder().id("11").protocol("tcp").startPort(22).endPort(22).securityGroupName("2") - .account("adrian").build())).build()).build(); + IngressRule.builder().id("11").protocol("tcp").startPort(22).endPort(22).securityGroupName("2") + .account("adrian").build() + ) + ) + .tags(Tag.builder() + .account("adrian") + .domain("ROOT") + .domainId("1") + .key("some-tag") + .resourceId("16") + .resourceType(Tag.ResourceType.SECURITY_GROUP) + .value("some-value") + .build()) + .build()).build(); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/01dac643/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListTagsResponseTest.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListTagsResponseTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListTagsResponseTest.java new file mode 100644 index 0000000..decc2f0 --- /dev/null +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListTagsResponseTest.java @@ -0,0 +1,66 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jclouds.cloudstack.parse; + +import java.util.Set; + +import com.google.common.collect.ImmutableSet; +import com.google.inject.Guice; +import com.google.inject.Injector; +import org.jclouds.cloudstack.domain.Tag; +import org.jclouds.json.BaseSetParserTest; +import org.jclouds.json.config.GsonModule; +import org.jclouds.rest.annotations.SelectJson; +import org.testng.annotations.Test; + +@Test(groups = "unit") +public class ListTagsResponseTest extends BaseSetParserTest<Tag> { + + @Override + protected Injector injector() { + return Guice.createInjector(new GsonModule() { + + @Override + protected void configure() { + bind(DateAdapter.class).to(Iso8601DateAdapter.class); + super.configure(); + } + + }); + } + + @Override + public String resource() { + return "/listtagsresponse.json"; + } + + @Override + @SelectJson("tag") + public Set<Tag> expected() { + return ImmutableSet.<Tag>of( + Tag.builder() + .account("admin") + .domain("ROOT") + .domainId("79dc06c4-4432-11e4-b70d-000c29e19aa0") + .key("test-tag") + .resourceId("54fe1d53-5d73-4184-8b62-948b9d8e08fb") + .resourceType(Tag.ResourceType.TEMPLATE) + .value("true").build() + ); + } + +} http://git-wip-us.apache.org/repos/asf/jclouds/blob/01dac643/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListTemplatesResponseTest.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListTemplatesResponseTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListTemplatesResponseTest.java index bd5980e..d33a206 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListTemplatesResponseTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListTemplatesResponseTest.java @@ -18,6 +18,7 @@ package org.jclouds.cloudstack.parse; import java.util.Set; +import org.jclouds.cloudstack.domain.Tag; import org.jclouds.cloudstack.domain.Template; import org.jclouds.cloudstack.domain.Template.Format; import org.jclouds.cloudstack.domain.Template.Type; @@ -72,6 +73,8 @@ public class ListTemplatesResponseTest extends BaseSetParserTest<Template> { .ready(true).passwordEnabled(false).format(Format.QCOW2).featured(false).crossZones(false) .OSTypeId("14").OSType("CentOS 5.4 (64-bit)").account("rs3").zoneId("2").zone("Chicago") .size(10737418240l).type(Type.USER).hypervisor("KVM").domain("ROOT").domainId("1").extractable(false) + .tags(ImmutableSet.of(Tag.builder().account("rs3").domain("ROOT").domainId("1").key("some-tag") + .resourceId("241").resourceType(Tag.ResourceType.TEMPLATE).value("some-value").build())) .build()); } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/01dac643/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListVirtualMachinesResponse3xTest.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListVirtualMachinesResponse3xTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListVirtualMachinesResponse3xTest.java index a891f4c..28f4bbd 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListVirtualMachinesResponse3xTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListVirtualMachinesResponse3xTest.java @@ -20,6 +20,7 @@ import java.util.Set; import org.jclouds.cloudstack.domain.GuestIPType; import org.jclouds.cloudstack.domain.NIC; +import org.jclouds.cloudstack.domain.Tag; import org.jclouds.cloudstack.domain.TrafficType; import org.jclouds.cloudstack.domain.VirtualMachine; import org.jclouds.date.internal.SimpleDateFormatDateService; @@ -68,9 +69,19 @@ public class ListVirtualMachinesResponse3xTest extends BaseSetParserTest<Virtual .publicIP("72.52.126.110") .publicIPId("e202aafb-ab41-4dc0-80e9-9fcd64fbf45c") .nics(ImmutableSet.of(NIC.builder().id("48640c5e-90f3-45bd-abd2-a108ca8957ac"). - networkId("c0d5db5b-f7d5-44e1-b854-21ecd1a09dbf").netmask("255.255.255.0").gateway("10.1.1.1") - .IPAddress("10.1.1.227").trafficType(TrafficType.GUEST).guestIPType(GuestIPType.ISOLATED) - .isDefault(true).build())).build()); + networkId("c0d5db5b-f7d5-44e1-b854-21ecd1a09dbf").netmask("255.255.255.0").gateway("10.1.1.1") + .IPAddress("10.1.1.227").trafficType(TrafficType.GUEST).guestIPType(GuestIPType.ISOLATED) + .isDefault(true).build())) + .tags(Tag.builder() + .account("jcloud2") + .domain("jCloud") + .domainId("ea66e3a5-d007-42e8-a0de-ec5ce778a1d7") + .key("some-tag") + .resourceId("fee2ccb3-c1f2-4e7b-8465-42b390e10dff") + .resourceType(Tag.ResourceType.USER_VM) + .value("some-value") + .build()) + .build()); } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/01dac643/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListZonesResponseTest.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListZonesResponseTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListZonesResponseTest.java index f69213d..644fea6 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListZonesResponseTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListZonesResponseTest.java @@ -19,6 +19,7 @@ package org.jclouds.cloudstack.parse; import java.util.Set; import org.jclouds.cloudstack.domain.NetworkType; +import org.jclouds.cloudstack.domain.Tag; import org.jclouds.cloudstack.domain.Zone; import org.jclouds.json.BaseSetParserTest; import org.jclouds.rest.annotations.SelectJson; @@ -37,8 +38,26 @@ public class ListZonesResponseTest extends BaseSetParserTest<Zone> { @Override @SelectJson("zone") public Set<Zone> expected() { - return ImmutableSet.of(Zone.builder().id("1").name("San Jose 1").networkType(NetworkType.ADVANCED) - .securityGroupsEnabled(false).build(), - Zone.builder().id("2").name("Chicago").networkType(NetworkType.ADVANCED).securityGroupsEnabled(true).build()); + return ImmutableSet.of( + Zone.builder() + .id("1") + .name("San Jose 1") + .networkType(NetworkType.ADVANCED) + .securityGroupsEnabled(false).build(), + Zone.builder() + .id("2") + .name("Chicago") + .networkType(NetworkType.ADVANCED) + .securityGroupsEnabled(true) + .tags(Tag.builder() + .account("1") + .domain("ROOT") + .domainId("1") + .key("some-tag") + .resourceId("2") + .resourceType(Tag.ResourceType.ZONE) + .value("some-value") + .build()) + .build()); } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/01dac643/apis/cloudstack/src/test/resources/createtagsresponse.json ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/test/resources/createtagsresponse.json b/apis/cloudstack/src/test/resources/createtagsresponse.json new file mode 100644 index 0000000..e930368 --- /dev/null +++ b/apis/cloudstack/src/test/resources/createtagsresponse.json @@ -0,0 +1 @@ +{ "createtagsresponse" : {"jobid":"32cfab73-f221-4b2b-a728-a73e924ac95d"} } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/jclouds/blob/01dac643/apis/cloudstack/src/test/resources/deletetagsresponse.json ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/test/resources/deletetagsresponse.json b/apis/cloudstack/src/test/resources/deletetagsresponse.json new file mode 100644 index 0000000..9603f95 --- /dev/null +++ b/apis/cloudstack/src/test/resources/deletetagsresponse.json @@ -0,0 +1 @@ +{ "deletetagsresponse" : {"jobid":"32cfab73-f221-4b2b-a728-a73e924ac95d"} } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/jclouds/blob/01dac643/apis/cloudstack/src/test/resources/getportforwardingrulesresponse.json ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/test/resources/getportforwardingrulesresponse.json b/apis/cloudstack/src/test/resources/getportforwardingrulesresponse.json index 3ea044d..ee677b6 100644 --- a/apis/cloudstack/src/test/resources/getportforwardingrulesresponse.json +++ b/apis/cloudstack/src/test/resources/getportforwardingrulesresponse.json @@ -1,2 +1,17 @@ -{ "listportforwardingrulesresponse" : { "portforwardingrule" : [ - {"id":15,"privateport":"22","protocol":"tcp","publicport":"2022","virtualmachineid":3,"virtualmachinename":"i-3-3-VM","ipaddressid":3,"ipaddress":"72.52.126.32","state":"Active","cidrlist":"0.0.0.0/1,128.0.0.0/1"} ] } } \ No newline at end of file +{ "listportforwardingrulesresponse": { + "portforwardingrule": [ + { + "id": 15, + "privateport": "22", + "protocol": "tcp", + "publicport": "2022", + "virtualmachineid": 3, + "virtualmachinename": "i-3-3-VM", + "ipaddressid": 3, + "ipaddress": "72.52.126.32", + "state": "Active", + "cidrlist": "0.0.0.0/1,128.0.0.0/1", + "tags":[{"account":1,"domain":"ROOT","domainid":1,"key":"some-tag","resourceid":15, "resourcetype":"PortForwardingRule", "value":"some-value"}] + } + ] +} } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/jclouds/blob/01dac643/apis/cloudstack/src/test/resources/listegressfirewallrulesresponse.json ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/test/resources/listegressfirewallrulesresponse.json b/apis/cloudstack/src/test/resources/listegressfirewallrulesresponse.json index c76b216..0e610ef 100644 --- a/apis/cloudstack/src/test/resources/listegressfirewallrulesresponse.json +++ b/apis/cloudstack/src/test/resources/listegressfirewallrulesresponse.json @@ -1,4 +1,5 @@ { "listegressfirewallrulesresponse" : { "count":3 ,"firewallrule" : [ - {"id":2017,"protocol":"tcp","startport":"30","endport":"35","ipaddressid":2,"ipaddress":"10.27.27.51","state":"Active","cidrlist":"0.0.0.0/0"}, + {"id":2017,"protocol":"tcp","startport":"30","endport":"35","ipaddressid":2,"ipaddress":"10.27.27.51","state":"Active","cidrlist":"0.0.0.0/0", "tags":[]}, {"id":2016,"protocol":"tcp","startport":"22","endport":"22","ipaddressid":2,"ipaddress":"10.27.27.51","state":"Active","cidrlist":"0.0.0.0/0"}, - {"id":10,"protocol":"tcp","startport":"22","endport":"22","ipaddressid":8,"ipaddress":"10.27.27.57","state":"Active","cidrlist":"0.0.0.0/0"} ] } } \ No newline at end of file + {"id":10,"protocol":"tcp","startport":"22","endport":"22","ipaddressid":8,"ipaddress":"10.27.27.57","state":"Active","cidrlist":"0.0.0.0/0", + "tags":[{"account":1,"domain":"ROOT","domainid":1,"key":"some-tag","resourceid":10, "resourcetype":"FirewallRule", "value":"some-value"}]} ] } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/jclouds/blob/01dac643/apis/cloudstack/src/test/resources/listfirewallrulesresponse.json ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/test/resources/listfirewallrulesresponse.json b/apis/cloudstack/src/test/resources/listfirewallrulesresponse.json index e93d76e..3acaf19 100644 --- a/apis/cloudstack/src/test/resources/listfirewallrulesresponse.json +++ b/apis/cloudstack/src/test/resources/listfirewallrulesresponse.json @@ -1,4 +1,5 @@ { "listfirewallrulesresponse" : { "count":3 ,"firewallrule" : [ - {"id":2017,"protocol":"tcp","startport":"30","endport":"35","ipaddressid":2,"ipaddress":"10.27.27.51","state":"Active","cidrlist":"0.0.0.0/0"}, + {"id":2017,"protocol":"tcp","startport":"30","endport":"35","ipaddressid":2,"ipaddress":"10.27.27.51","state":"Active","cidrlist":"0.0.0.0/0", "tags":[]}, {"id":2016,"protocol":"tcp","startport":"22","endport":"22","ipaddressid":2,"ipaddress":"10.27.27.51","state":"Active","cidrlist":"0.0.0.0/0"}, - {"id":10,"protocol":"tcp","startport":"22","endport":"22","ipaddressid":8,"ipaddress":"10.27.27.57","state":"Active","cidrlist":"0.0.0.0/0"} ] } } \ No newline at end of file + {"id":10,"protocol":"tcp","startport":"22","endport":"22","ipaddressid":8,"ipaddress":"10.27.27.57","state":"Active","cidrlist":"0.0.0.0/0", + "tags":[{"account":1,"domain":"ROOT","domainid":1,"key":"some-tag","resourceid":10, "resourcetype":"FirewallRule", "value":"some-value"}]} ] } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/jclouds/blob/01dac643/apis/cloudstack/src/test/resources/listipforwardingrulesresponse.json ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/test/resources/listipforwardingrulesresponse.json b/apis/cloudstack/src/test/resources/listipforwardingrulesresponse.json index 984f6ee..e26059e 100644 --- a/apis/cloudstack/src/test/resources/listipforwardingrulesresponse.json +++ b/apis/cloudstack/src/test/resources/listipforwardingrulesresponse.json @@ -11,7 +11,8 @@ "ipaddress": "10.27.27.64", "startport": 22, "endport": 22, - "state": "Active" + "state": "Active", + "tags":[{"account":1,"domain":"ROOT","domainid":1,"key":"some-tag","resourceid":66, "resourcetype":"PortForwardingRule", "value":"some-value"}] }] } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/01dac643/apis/cloudstack/src/test/resources/listnetworksresponse.json ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/test/resources/listnetworksresponse.json b/apis/cloudstack/src/test/resources/listnetworksresponse.json index 1e5fa8d..1a4a6d8 100644 --- a/apis/cloudstack/src/test/resources/listnetworksresponse.json +++ b/apis/cloudstack/src/test/resources/listnetworksresponse.json @@ -1 +1,95 @@ -{ "listnetworksresponse" : { "network" : [ {"id":204,"name":"Virtual Network","displaytext":"A dedicated virtualized network for your account. The broadcast domain is contained within a VLAN and all public network access is routed out by a virtual router.","broadcastdomaintype":"Vlan","traffictype":"Guest","zoneid":1,"networkofferingid":6,"networkofferingname":"DefaultVirtualizedNetworkOffering","networkofferingdisplaytext":"Virtual Vlan","networkofferingavailability":"Required","isshared":false,"issystem":false,"state":"Implemented","related":204,"broadcasturi":"vlan://240","dns1":"8.8.8.8","type":"Virtual","account":"adrian","domainid":1,"domain":"ROOT","isdefault":true,"service":[{"name":"Vpn","capability":[{"name":"SupportedVpnTypes","value":"pptp,l2tp,ipsec"}]},{"name":"Gateway"},{"name":"UserData"},{"name":"Dhcp"},{"name":"Firewall","capability":[{"name":"SupportedSourceNatTypes","value":"per account"},{"name":"StaticNat","value":"true"},{"name":"TrafficStatistics","value":" per public ip"},{"name":"PortForwarding","value":"true"},{"name":"MultipleIps","value":"true"},{"name":"SupportedProtocols","value":"tcp,udp"}]},{"name":"Dns"},{"name":"Lb","capability":[{"name":"SupportedLbAlgorithms","value":"roundrobin,leastconn,source"},{"name":"SupportedProtocols","value":"tcp, udp"}]}],"networkdomain":"cs3cloud.internal"} ] } } \ No newline at end of file +{ "listnetworksresponse": { + "network": [ + { + "id": 204, + "name": "Virtual Network", + "displaytext": "A dedicated virtualized network for your account. The broadcast domain is contained within a VLAN and all public network access is routed out by a virtual router.", + "broadcastdomaintype": "Vlan", + "traffictype": "Guest", + "zoneid": 1, + "networkofferingid": 6, + "networkofferingname": "DefaultVirtualizedNetworkOffering", + "networkofferingdisplaytext": "Virtual Vlan", + "networkofferingavailability": "Required", + "isshared": false, + "issystem": false, + "state": "Implemented", + "related": 204, + "broadcasturi": "vlan://240", + "dns1": "8.8.8.8", + "type": "Virtual", + "account": "adrian", + "domainid": 1, + "domain": "ROOT", + "isdefault": true, + "service": [ + { + "name": "Vpn", + "capability": [ + { + "name": "SupportedVpnTypes", + "value": "pptp,l2tp,ipsec" + } + ] + }, + { + "name": "Gateway" + }, + { + "name": "UserData" + }, + { + "name": "Dhcp" + }, + { + "name": "Firewall", + "capability": [ + { + "name": "SupportedSourceNatTypes", + "value": "per account" + }, + { + "name": "StaticNat", + "value": "true" + }, + { + "name": "TrafficStatistics", + "value": "per public ip" + }, + { + "name": "PortForwarding", + "value": "true" + }, + { + "name": "MultipleIps", + "value": "true" + }, + { + "name": "SupportedProtocols", + "value": "tcp,udp" + } + ] + }, + { + "name": "Dns" + }, + { + "name": "Lb", + "capability": [ + { + "name": "SupportedLbAlgorithms", + "value": "roundrobin,leastconn,source" + }, + { + "name": "SupportedProtocols", + "value": "tcp, udp" + } + ] + } + ], + "networkdomain": "cs3cloud.internal", + "tags":[{"account":1,"domain":"ROOT","domainid":1,"key":"some-tag","resourceid":204, "resourcetype":"Network", "value":"some-value"}] + + } + ] +} } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/jclouds/blob/01dac643/apis/cloudstack/src/test/resources/listportforwardingrulesresponse.json ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/test/resources/listportforwardingrulesresponse.json b/apis/cloudstack/src/test/resources/listportforwardingrulesresponse.json index c385f7e..6681bcc 100644 --- a/apis/cloudstack/src/test/resources/listportforwardingrulesresponse.json +++ b/apis/cloudstack/src/test/resources/listportforwardingrulesresponse.json @@ -1 +1,29 @@ -{ "listportforwardingrulesresponse" : { "portforwardingrule" : [ {"id":18,"privateport":"22","protocol":"tcp","publicport":"22","virtualmachineid":89,"virtualmachinename":"i-3-89-VM","ipaddressid":34,"ipaddress":"72.52.126.63","state":"Active"}, {"id":15,"privateport":"22","protocol":"tcp","publicport":"2022","virtualmachineid":3,"virtualmachinename":"i-3-3-VM","ipaddressid":3,"ipaddress":"72.52.126.32","state":"Active","cidrlist":"0.0.0.0/1,128.0.0.0/1"} ] } } \ No newline at end of file +{ "listportforwardingrulesresponse": { + "portforwardingrule": [ + { + "id": 18, + "privateport": "22", + "protocol": "tcp", + "publicport": "22", + "virtualmachineid": 89, + "virtualmachinename": "i-3-89-VM", + "ipaddressid": 34, + "ipaddress": "72.52.126.63", + "state": "Active", + "tags": [] + }, + { + "id": 15, + "privateport": "22", + "protocol": "tcp", + "publicport": "2022", + "virtualmachineid": 3, + "virtualmachinename": "i-3-3-VM", + "ipaddressid": 3, + "ipaddress": "72.52.126.32", + "state": "Active", + "cidrlist": "0.0.0.0/1,128.0.0.0/1", + "tags":[{"account":1,"domain":"ROOT","domainid":1,"key":"some-tag","resourceid":15, "resourcetype":"PortForwardingRule", "value":"some-value"}] + } + ] +} } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/jclouds/blob/01dac643/apis/cloudstack/src/test/resources/listprojectsresponse.json ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/test/resources/listprojectsresponse.json b/apis/cloudstack/src/test/resources/listprojectsresponse.json index 33273ef..f2562c6 100644 --- a/apis/cloudstack/src/test/resources/listprojectsresponse.json +++ b/apis/cloudstack/src/test/resources/listprojectsresponse.json @@ -1 +1,35 @@ -{ "listprojectsresponse" : { "count":2 ,"project" : [ {"id":"489da162-0b77-489d-b044-ce39aa018b1f","name":"NN-HA-T1","displaytext":"","domainid":"41a4917b-7952-499d-ba7f-4c57464d3dc8","domain":"ROOT","account":"thyde","state":"Active"}, {"id":"1c11f22c-15ac-4fa7-b833-4d748df317b7","name":"hive","displaytext":"Hive","domainid":"41a4917b-7952-499d-ba7f-4c57464d3dc8","domain":"ROOT","account":"prasadm","state":"Active"} ] } } \ No newline at end of file +{ "listprojectsresponse": { + "count": 2, + "project": [ + { + "id": "489da162-0b77-489d-b044-ce39aa018b1f", + "name": "NN-HA-T1", + "displaytext": "", + "domainid": "41a4917b-7952-499d-ba7f-4c57464d3dc8", + "domain": "ROOT", + "account": "thyde", + "state": "Active", + "tags": [] + }, + { + "id": "1c11f22c-15ac-4fa7-b833-4d748df317b7", + "name": "hive", + "displaytext": "Hive", + "domainid": "41a4917b-7952-499d-ba7f-4c57464d3dc8", + "domain": "ROOT", + "account": "prasadm", + "state": "Active", + "tags": [ + { + "account": "prasadm", + "domain": "ROOT", + "domainid": "41a4917b-7952-499d-ba7f-4c57464d3dc8", + "key": "some-tag", + "resourceid": "1c11f22c-15ac-4fa7-b833-4d748df317b7", + "resourcetype": "Project", + "value": "some-value" + } + ] + } + ] +} } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/jclouds/blob/01dac643/apis/cloudstack/src/test/resources/listpublicipaddressesresponse.json ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/test/resources/listpublicipaddressesresponse.json b/apis/cloudstack/src/test/resources/listpublicipaddressesresponse.json index 914c95a..41f0a6d 100644 --- a/apis/cloudstack/src/test/resources/listpublicipaddressesresponse.json +++ b/apis/cloudstack/src/test/resources/listpublicipaddressesresponse.json @@ -1 +1,31 @@ -{ "listpublicipaddressesresponse" : { "publicipaddress" : [ {"id":30,"ipaddress":"72.52.126.59","allocated":"2011-02-19T21:15:01-0800","zoneid":1,"zonename":"San Jose 1","issourcenat":false,"account":"adrian","domainid":1,"domain":"ROOT","forvirtualnetwork":true,"isstaticnat":false,"associatednetworkid":204,"networkid":200,"state":"Allocated"} ] } } \ No newline at end of file +{ "listpublicipaddressesresponse": { + "publicipaddress": [ + { + "id": 30, + "ipaddress": "72.52.126.59", + "allocated": "2011-02-19T21:15:01-0800", + "zoneid": 1, + "zonename": "San Jose 1", + "issourcenat": false, + "account": "adrian", + "domainid": 1, + "domain": "ROOT", + "forvirtualnetwork": true, + "isstaticnat": false, + "associatednetworkid": 204, + "networkid": 200, + "state": "Allocated", + "tags": [ + { + "account": "adrian", + "domain": "ROOT", + "domainid": 1, + "key": "some-tag", + "resourceid": 30, + "resourcetype": "PublicIpAddress", + "value": "some-value" + } + ] + } + ] +} } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/jclouds/blob/01dac643/apis/cloudstack/src/test/resources/listsecuritygroupsresponse.json ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/test/resources/listsecuritygroupsresponse.json b/apis/cloudstack/src/test/resources/listsecuritygroupsresponse.json index 25136a3..1dfbdbd 100644 --- a/apis/cloudstack/src/test/resources/listsecuritygroupsresponse.json +++ b/apis/cloudstack/src/test/resources/listsecuritygroupsresponse.json @@ -1 +1,117 @@ -{ "listsecuritygroupsresponse" : { "securitygroup" : [ {"id":12,"name":"adriancole","account":"adrian","domainid":1,"domain":"ROOT"}, {"id":13,"name":"default","description":"description","account":"adrian","domainid":1,"domain":"ROOT","ingressrule":[{"ruleid":5,"protocol":"tcp","startport":22,"endport":22,"securitygroupname":"adriancole","account":"adrian"},{"ruleid":6,"protocol":"udp","startport":11,"endport":11,"cidr":"1.1.1.1/24"}]}, {"id":14,"name":"1","description":"description","account":"adrian","domainid":1,"domain":"ROOT","ingressrule":[{"ruleid":7,"protocol":"tcp","startport":10,"endport":10,"cidr":"1.1.1.1/24"},{"ruleid":8,"protocol":"tcp","startport":10,"endport":10,"cidr":"2.2.2.2/16"}]}, {"id":15,"name":"2","description":"description","account":"adrian","domainid":1,"domain":"ROOT"}, {"id":16,"name":"with1and2","description":"description","account":"adrian","domainid":1,"domain":"ROOT","ingressrule":[{"ruleid":9,"protocol":"icmp","icmptype":-1,"icmpcode":-1,"security groupname":"1","account":"adrian"},{"ruleid":10,"protocol":"tcp","startport":22,"endport":22,"securitygroupname":"1","account":"adrian"},{"ruleid":11,"protocol":"tcp","startport":22,"endport":22,"securitygroupname":"2","account":"adrian"}]} ] } } \ No newline at end of file +{ "listsecuritygroupsresponse": { + "securitygroup": [ + { + "id": 12, + "name": "adriancole", + "account": "adrian", + "domainid": 1, + "domain": "ROOT", + "tags":[] + }, + { + "id": 13, + "name": "default", + "description": "description", + "account": "adrian", + "domainid": 1, + "domain": "ROOT", + "ingressrule": [ + { + "ruleid": 5, + "protocol": "tcp", + "startport": 22, + "endport": 22, + "securitygroupname": "adriancole", + "account": "adrian" + }, + { + "ruleid": 6, + "protocol": "udp", + "startport": 11, + "endport": 11, + "cidr": "1.1.1.1/24" + } + ], + "tags": [] + }, + { + "id": 14, + "name": "1", + "description": "description", + "account": "adrian", + "domainid": 1, + "domain": "ROOT", + "ingressrule": [ + { + "ruleid": 7, + "protocol": "tcp", + "startport": 10, + "endport": 10, + "cidr": "1.1.1.1/24" + }, + { + "ruleid": 8, + "protocol": "tcp", + "startport": 10, + "endport": 10, + "cidr": "2.2.2.2/16" + } + ], + "tags": [] + }, + { + "id": 15, + "name": "2", + "description": "description", + "account": "adrian", + "domainid": 1, + "domain": "ROOT", + "tags": [] + }, + { + "id": 16, + "name": "with1and2", + "description": "description", + "account": "adrian", + "domainid": 1, + "domain": "ROOT", + "ingressrule": [ + { + "ruleid": 9, + "protocol": "icmp", + "icmptype": -1, + "icmpcode": -1, + "securitygroupname": "1", + "account": "adrian" + }, + { + "ruleid": 10, + "protocol": "tcp", + "startport": 22, + "endport": 22, + "securitygroupname": "1", + "account": "adrian" + }, + { + "ruleid": 11, + "protocol": "tcp", + "startport": 22, + "endport": 22, + "securitygroupname": "2", + "account": "adrian" + } + ], + "tags": [ + { + "account": "adrian", + "domain": "ROOT", + "domainid": 1, + "key": "some-tag", + "resourceid": 16, + "resourcetype": "SecurityGroup", + "value": "some-value" + } + ] + } + ] +} } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/jclouds/blob/01dac643/apis/cloudstack/src/test/resources/listtagsresponse.json ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/test/resources/listtagsresponse.json b/apis/cloudstack/src/test/resources/listtagsresponse.json new file mode 100644 index 0000000..535cc13 --- /dev/null +++ b/apis/cloudstack/src/test/resources/listtagsresponse.json @@ -0,0 +1,16 @@ +{ + "listtagsresponse": { + "count": 1, + "tag": [ + { + "key": "test-tag", + "value": "true", + "resourcetype": "Template", + "resourceid": "54fe1d53-5d73-4184-8b62-948b9d8e08fb", + "account": "admin", + "domainid": "79dc06c4-4432-11e4-b70d-000c29e19aa0", + "domain": "ROOT" + } + ] + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/jclouds/blob/01dac643/apis/cloudstack/src/test/resources/listtemplatesresponse.json ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/test/resources/listtemplatesresponse.json b/apis/cloudstack/src/test/resources/listtemplatesresponse.json index 140e8ca..928d2f8 100644 --- a/apis/cloudstack/src/test/resources/listtemplatesresponse.json +++ b/apis/cloudstack/src/test/resources/listtemplatesresponse.json @@ -1 +1,129 @@ -{ "listtemplatesresponse" : { "template" : [ {"id":2,"name":"CentOS 5.3(64-bit) no GUI (XenServer)","displaytext":"CentOS 5.3(64-bit) no GUI (XenServer)","ispublic":true,"created":"2011-03-20T19:17:48-0700","isready":false,"passwordenabled":false,"format":"VHD","isfeatured":true,"crossZones":true,"ostypeid":11,"ostypename":"CentOS 5.3 (32-bit)","account":"system","zoneid":2,"zonename":"Chicago","templatetype":"BUILTIN","hypervisor":"XenServer","domain":"ROOT","domainid":1,"isextractable":true}, {"id":4,"name":"CentOS 5.5(64-bit) no GUI (KVM)","displaytext":"CentOS 5.5(64-bit) no GUI (KVM)","ispublic":true,"created":"2011-03-20T19:17:48-0700","isready":true,"passwordenabled":false,"format":"QCOW2","isfeatured":true,"crossZones":true,"ostypeid":112,"ostypename":"CentOS 5.5 (64-bit)","account":"system","zoneid":2,"zonename":"Chicago","size":8589934592,"templatetype":"BUILTIN","hypervisor":"KVM","domain":"ROOT","domainid":1,"isextractable":true}, {"id":203,"name":"Windows 7 KVM","displ aytext":"Windows 7 KVM","ispublic":true,"created":"2011-03-20T22:02:18-0700","isready":true,"passwordenabled":false,"format":"QCOW2","isfeatured":true,"crossZones":false,"ostypeid":48,"ostypename":"Windows 7 (32-bit)","account":"admin","zoneid":2,"zonename":"Chicago","size":17179869184,"templatetype":"USER","hypervisor":"KVM","domain":"ROOT","domainid":1,"isextractable":false}, {"id":7,"name":"CentOS 5.3(64-bit) no GUI (vSphere)","displaytext":"CentOS 5.3(64-bit) no GUI (vSphere)","ispublic":true,"created":"2011-03-20T19:17:48-0700","isready":false,"passwordenabled":false,"format":"OVA","isfeatured":true,"crossZones":true,"ostypeid":12,"ostypename":"CentOS 5.3 (64-bit)","account":"system","zoneid":2,"zonename":"Chicago","templatetype":"BUILTIN","hypervisor":"VMware","domain":"ROOT","domainid":1,"isextractable":true}, {"id":241,"name":"kvmdev4","displaytext":"v5.6.28_Dev4","ispublic":true,"created":"2011-04-21T09:43:25-0700","isready":true,"passwordenabled":false,"format":"QCOW2","is featured":false,"crossZones":false,"ostypeid":14,"ostypename":"CentOS 5.4 (64-bit)","account":"rs3","zoneid":2,"zonename":"Chicago","size":10737418240,"templatetype":"USER","hypervisor":"KVM","domain":"ROOT","domainid":1,"isextractable":false} ] } } \ No newline at end of file +{ "listtemplatesresponse": { + "template": [ + { + "id": 2, + "name": "CentOS 5.3(64-bit) no GUI (XenServer)", + "displaytext": "CentOS 5.3(64-bit) no GUI (XenServer)", + "ispublic": true, + "created": "2011-03-20T19:17:48-0700", + "isready": false, + "passwordenabled": false, + "format": "VHD", + "isfeatured": true, + "crossZones": true, + "ostypeid": 11, + "ostypename": "CentOS 5.3 (32-bit)", + "account": "system", + "zoneid": 2, + "zonename": "Chicago", + "templatetype": "BUILTIN", + "hypervisor": "XenServer", + "domain": "ROOT", + "domainid": 1, + "isextractable": true, + "tags": [] + }, + { + "id": 4, + "name": "CentOS 5.5(64-bit) no GUI (KVM)", + "displaytext": "CentOS 5.5(64-bit) no GUI (KVM)", + "ispublic": true, + "created": "2011-03-20T19:17:48-0700", + "isready": true, + "passwordenabled": false, + "format": "QCOW2", + "isfeatured": true, + "crossZones": true, + "ostypeid": 112, + "ostypename": "CentOS 5.5 (64-bit)", + "account": "system", + "zoneid": 2, + "zonename": "Chicago", + "size": 8589934592, + "templatetype": "BUILTIN", + "hypervisor": "KVM", + "domain": "ROOT", + "domainid": 1, + "isextractable": true + }, + { + "id": 203, + "name": "Windows 7 KVM", + "displaytext": "Windows 7 KVM", + "ispublic": true, + "created": "2011-03-20T22:02:18-0700", + "isready": true, + "passwordenabled": false, + "format": "QCOW2", + "isfeatured": true, + "crossZones": false, + "ostypeid": 48, + "ostypename": "Windows 7 (32-bit)", + "account": "admin", + "zoneid": 2, + "zonename": "Chicago", + "size": 17179869184, + "templatetype": "USER", + "hypervisor": "KVM", + "domain": "ROOT", + "domainid": 1, + "isextractable": false + }, + { + "id": 7, + "name": "CentOS 5.3(64-bit) no GUI (vSphere)", + "displaytext": "CentOS 5.3(64-bit) no GUI (vSphere)", + "ispublic": true, + "created": "2011-03-20T19:17:48-0700", + "isready": false, + "passwordenabled": false, + "format": "OVA", + "isfeatured": true, + "crossZones": true, + "ostypeid": 12, + "ostypename": "CentOS 5.3 (64-bit)", + "account": "system", + "zoneid": 2, + "zonename": "Chicago", + "templatetype": "BUILTIN", + "hypervisor": "VMware", + "domain": "ROOT", + "domainid": 1, + "isextractable": true + }, + { + "id": 241, + "name": "kvmdev4", + "displaytext": "v5.6.28_Dev4", + "ispublic": true, + "created": "2011-04-21T09:43:25-0700", + "isready": true, + "passwordenabled": false, + "format": "QCOW2", + "isfeatured": false, + "crossZones": false, + "ostypeid": 14, + "ostypename": "CentOS 5.4 (64-bit)", + "account": "rs3", + "zoneid": 2, + "zonename": "Chicago", + "size": 10737418240, + "templatetype": "USER", + "hypervisor": "KVM", + "domain": "ROOT", + "domainid": 1, + "isextractable": false, + "tags": [ + { + "account": "rs3", + "domain": "ROOT", + "domainid": 1, + "key": "some-tag", + "resourceid": 241, + "resourcetype": "Template", + "value": "some-value" + } + ] + } + ] +} } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/jclouds/blob/01dac643/apis/cloudstack/src/test/resources/listvirtualmachinesresponse3x.json ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/test/resources/listvirtualmachinesresponse3x.json b/apis/cloudstack/src/test/resources/listvirtualmachinesresponse3x.json index 5a41ac6..b6d4dde 100644 --- a/apis/cloudstack/src/test/resources/listvirtualmachinesresponse3x.json +++ b/apis/cloudstack/src/test/resources/listvirtualmachinesresponse3x.json @@ -1 +1,56 @@ -{ "listvirtualmachinesresponse" : { "count":1 ,"virtualmachine" : [ {"id":"fee2ccb3-c1f2-4e7b-8465-42b390e10dff","name":"cloudstack-r-611","displayname":"cloudstack-r-611","account":"jcloud2","domainid":"ea66e3a5-d007-42e8-a0de-ec5ce778a1d7","domain":"jCloud","created":"2012-05-22T09:18:28-0700","state":"Running","haenable":false,"zoneid":"1","zonename":"Santa Clara Zone","templateid":"5c65f152-a4bc-4405-a756-fd10841a9aa7","templatename":"jclouds-6d4bdc29","templatedisplaytext":"jclouds live testCreateTemplate","passwordenabled":false,"serviceofferingid":"5305750d-df71-4da9-8cd0-e23c2236a6e2","serviceofferingname":"Micro Instance","cpunumber":1,"cpuspeed":500,"memory":256,"guestosid":"6dcd58ce-1ec6-432c-af0b-9ab4ca9207d9","rootdeviceid":0,"rootdevicetype":"IscsiLUN","securitygroup":[],"nic":[{"id":"48640c5e-90f3-45bd-abd2-a108ca8957ac","networkid":"c0d5db5b-f7d5-44e1-b854-21ecd1a09dbf","netmask":"255.255.255.0","gateway":"10.1.1.1","ipaddress":"10.1.1.227","traffictype":"Guest","ty pe":"Isolated","isdefault":true}],"publicipid":"e202aafb-ab41-4dc0-80e9-9fcd64fbf45c","publicip":"72.52.126.110"} ] } }" +{ "listvirtualmachinesresponse": { + "count": 1, + "virtualmachine": [ + { + "id": "fee2ccb3-c1f2-4e7b-8465-42b390e10dff", + "name": "cloudstack-r-611", + "displayname": "cloudstack-r-611", + "account": "jcloud2", + "domainid": "ea66e3a5-d007-42e8-a0de-ec5ce778a1d7", + "domain": "jCloud", + "created": "2012-05-22T09:18:28-0700", + "state": "Running", + "haenable": false, + "zoneid": "1", + "zonename": "Santa Clara Zone", + "templateid": "5c65f152-a4bc-4405-a756-fd10841a9aa7", + "templatename": "jclouds-6d4bdc29", + "templatedisplaytext": "jclouds live testCreateTemplate", + "passwordenabled": false, + "serviceofferingid": "5305750d-df71-4da9-8cd0-e23c2236a6e2", + "serviceofferingname": "Micro Instance", + "cpunumber": 1, + "cpuspeed": 500, + "memory": 256, + "guestosid": "6dcd58ce-1ec6-432c-af0b-9ab4ca9207d9", + "rootdeviceid": 0, + "rootdevicetype": "IscsiLUN", + "securitygroup": [], + "nic": [ + { + "id": "48640c5e-90f3-45bd-abd2-a108ca8957ac", + "networkid": "c0d5db5b-f7d5-44e1-b854-21ecd1a09dbf", + "netmask": "255.255.255.0", + "gateway": "10.1.1.1", + "ipaddress": "10.1.1.227", + "traffictype": "Guest", + "type": "Isolated", + "isdefault": true + } + ], + "publicipid": "e202aafb-ab41-4dc0-80e9-9fcd64fbf45c", + "publicip": "72.52.126.110", + "tags": [ + { + "account": "jcloud2", + "domain": "jCloud", + "domainid": "ea66e3a5-d007-42e8-a0de-ec5ce778a1d7", + "key": "some-tag", + "resourceid": "fee2ccb3-c1f2-4e7b-8465-42b390e10dff", + "resourcetype": "UserVm", + "value": "some-value" + } + ] + } + ] +} } http://git-wip-us.apache.org/repos/asf/jclouds/blob/01dac643/apis/cloudstack/src/test/resources/listvolumesreponse-imageextension.json ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/test/resources/listvolumesreponse-imageextension.json b/apis/cloudstack/src/test/resources/listvolumesreponse-imageextension.json deleted file mode 100644 index 420f365..0000000 --- a/apis/cloudstack/src/test/resources/listvolumesreponse-imageextension.json +++ /dev/null @@ -1,2 +0,0 @@ -{ "listvolumesresponse" : { "count":1 ,"volume" : [ -{"id":"fe1ada16-57a0-40ae-b577-01a153690fb4","name":"ROOT-69942","zoneid":"1","zonename":"San Jose 1","type":"ROOT","deviceid":0,"virtualmachineid":"3239ade9-fd25-405c-8eda-59f0313a3fb0","vmname":"apb-cent32-bld","vmdisplayname":"apb-cent32-bld","vmstate":"Stopped","size":139264,"created":"2013-04-16T16:25:57-0700","state":"Ready","account":"andrew","domainid":"41a4917b-7952-499d-ba7f-4c57464d3dc8","domain":"ROOT","storagetype":"local","hypervisor":"KVM","storage":"c2422.halxg.cloudera.com","destroyed":false,"serviceofferingid":"7cc4f8c3-7c56-4155-9916-9f42072ea712","serviceofferingname":"Tiny","serviceofferingdisplaytext":"Tiny (1 core, 1GB RAM)","isextractable":false} ] } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/01dac643/apis/cloudstack/src/test/resources/listzonesresponse.json ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/test/resources/listzonesresponse.json b/apis/cloudstack/src/test/resources/listzonesresponse.json index 4714b86..bf05a8c 100644 --- a/apis/cloudstack/src/test/resources/listzonesresponse.json +++ b/apis/cloudstack/src/test/resources/listzonesresponse.json @@ -1 +1,29 @@ -{ "listzonesresponse" : { "zone" : [ {"id":1,"name":"San Jose 1","networktype":"Advanced","securitygroupsenabled":false}, {"id":2,"name":"Chicago","networktype":"Advanced","securitygroupsenabled":true} ] } } \ No newline at end of file +{ "listzonesresponse": { + "zone": [ + { + "id": 1, + "name": "San Jose 1", + "networktype": "Advanced", + "securitygroupsenabled": false, + "tags": [] + }, + { + "id": 2, + "name": "Chicago", + "networktype": "Advanced", + "securitygroupsenabled": true, + "tags": [ + { + "account": 1, + "domain": "ROOT", + "domainid": 1, + "key": "some-tag", + "resourceid": 2, + "resourcetype": "Zone", + "value": "some-value" + } + ] + + } + ] +} } \ No newline at end of file
