diff options
12 files changed, 388 insertions, 32 deletions
diff --git a/glance-client/src/main/java/com/woorea/openstack/glance/Glance.java b/glance-client/src/main/java/com/woorea/openstack/glance/Glance.java index e9ec800..bef9ce9 100644 --- a/glance-client/src/main/java/com/woorea/openstack/glance/Glance.java +++ b/glance-client/src/main/java/com/woorea/openstack/glance/Glance.java @@ -35,11 +35,11 @@ public class Glance extends OpenStackClient { this(endpoint, null); } - public final ImagesResource images() { + public ImagesResource images() { return images; } - public final SharedImagesResource sharedImages() { + public SharedImagesResource sharedImages() { return sharedImages; } } diff --git a/glance-client/src/main/java/com/woorea/openstack/glance/ImagesResource.java b/glance-client/src/main/java/com/woorea/openstack/glance/ImagesResource.java index 3ff062a..e9e3e5e 100644 --- a/glance-client/src/main/java/com/woorea/openstack/glance/ImagesResource.java +++ b/glance-client/src/main/java/com/woorea/openstack/glance/ImagesResource.java @@ -94,7 +94,7 @@ public class ImagesResource { public class List extends OpenStackRequest<Images> { public List(boolean detail) { - super(client, HttpMethod.GET, detail ? IMAGES + "detail" : "images", null, Images.class); + super(client, HttpMethod.GET, detail ? IMAGES + "detail" : "/images", null, Images.class); } } diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Project.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Project.java index 2f76faf..ef64152 100644 --- a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Project.java +++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Project.java @@ -16,6 +16,7 @@ package com.woorea.openstack.keystone.v3.model; +import java.util.List; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonRootName; @@ -31,6 +32,8 @@ public class Project { private Boolean enabled; + private List<String> tags; + public String getId() { return id; } @@ -63,4 +66,12 @@ public class Project { this.enabled = enabled; } + public List<String> getTags() { + return tags; + } + + public void setTags(List<String> tags) { + this.tags = tags; + } + } diff --git a/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/ProjectsTest.java b/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/ProjectsTest.java index f6a267e..f4d93c8 100644 --- a/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/ProjectsTest.java +++ b/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/ProjectsTest.java @@ -20,15 +20,15 @@ package com.woorea.openstack.keystone.v3.model; -import com.fasterxml.jackson.annotation.JsonInclude.Include; -import com.fasterxml.jackson.databind.DeserializationFeature; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.SerializationFeature; import java.util.List; import org.junit.Assert; import org.junit.Test; import org.skyscreamer.jsonassert.JSONAssert; import org.skyscreamer.jsonassert.JSONCompareMode; +import com.fasterxml.jackson.annotation.JsonInclude.Include; +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationFeature; public class ProjectsTest { @@ -37,7 +37,8 @@ public class ProjectsTest { private static final String JSON_FULL = "{" + EOL + " \"projects\" : [ {" + EOL + " \"id\" : \"id\"," + EOL + " \"name\" : \"name\"," + EOL + " \"enabled\" : false," + EOL + " \"domain_id\" : \"domainid\"" + EOL + " }, {" + EOL + " \"id\" : \"id\"," + EOL + " \"name\" : \"name\"," + EOL - + " \"enabled\" : false," + EOL + " \"domain_id\" : \"domainid\"" + EOL + " } ]" + EOL + "}"; + + " \"enabled\" : false," + EOL + " \"domain_id\" : \"domainid\"," + EOL + + " \"tags\" : [\"someTag\"]" + EOL + " } ]" + EOL + "}"; private ObjectMapper objectMapper = new ObjectMapper().setSerializationInclusion(Include.NON_NULL) .enable(SerializationFeature.INDENT_OUTPUT).enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES) @@ -61,6 +62,7 @@ public class ProjectsTest { List<Project> list = projects.getList(); Assert.assertNotNull(list); Assert.assertEquals(2, list.size()); + Assert.assertEquals("someTag", list.get(1).getTags().get(0)); int cnt = 0; for (@SuppressWarnings("unused") diff --git a/nova-client/src/main/java/com/woorea/openstack/nova/Nova.java b/nova-client/src/main/java/com/woorea/openstack/nova/Nova.java index 908e1e9..4073568 100644 --- a/nova-client/src/main/java/com/woorea/openstack/nova/Nova.java +++ b/nova-client/src/main/java/com/woorea/openstack/nova/Nova.java @@ -19,6 +19,7 @@ package com.woorea.openstack.nova; import com.woorea.openstack.base.client.OpenStackClient; import com.woorea.openstack.base.client.OpenStackClientConnector; +import com.woorea.openstack.nova.api.AvailabilityZoneResource; import com.woorea.openstack.nova.api.ExtensionsResource; import com.woorea.openstack.nova.api.FlavorsResource; import com.woorea.openstack.nova.api.ImagesResource; @@ -61,6 +62,8 @@ public class Nova extends OpenStackClient { private final HypervisorsExtension hypervisor; + private final AvailabilityZoneResource availabilityZones; + public Nova(String endpoint, OpenStackClientConnector connector) { super(endpoint, connector); extensions = new ExtensionsResource(this); @@ -76,6 +79,7 @@ public class Nova extends OpenStackClient { quotaSets = new QuotaSetsResource(this); hosts = new HostsExtension(this); hypervisor = new HypervisorsExtension(this); + availabilityZones = new AvailabilityZoneResource(this); } public Nova(String endpoint) { @@ -133,4 +137,8 @@ public class Nova extends OpenStackClient { public HypervisorsExtension hypervisors() { return hypervisor; } + + public AvailabilityZoneResource availabilityZones() { + return availabilityZones; + } } diff --git a/nova-client/src/main/java/com/woorea/openstack/nova/api/AvailabilityZoneResource.java b/nova-client/src/main/java/com/woorea/openstack/nova/api/AvailabilityZoneResource.java new file mode 100644 index 0000000..e97839e --- /dev/null +++ b/nova-client/src/main/java/com/woorea/openstack/nova/api/AvailabilityZoneResource.java @@ -0,0 +1,45 @@ +/*- + * ============LICENSE_START======================================================= + * Licensed 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. + * ============LICENSE_END========================================================= + */ + +package com.woorea.openstack.nova.api; + + +import com.woorea.openstack.base.client.HttpMethod; +import com.woorea.openstack.base.client.OpenStackClient; +import com.woorea.openstack.base.client.OpenStackRequest; +import com.woorea.openstack.nova.model.AvailabilityZones; + +public class AvailabilityZoneResource { + + private final OpenStackClient client; + + public AvailabilityZoneResource(OpenStackClient client) { + this.client = client; + } + + public List list() { + return new List(false); + } + + public class List extends OpenStackRequest<AvailabilityZones> { + + public List(boolean detail) { + super(client, HttpMethod.GET, detail ? "/os-availability-zone/detail" : "/os-availability-zone", null, + AvailabilityZones.class); + } + } + +} diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/AvailabilityZone.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/AvailabilityZone.java new file mode 100644 index 0000000..9f186f1 --- /dev/null +++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/AvailabilityZone.java @@ -0,0 +1,49 @@ +/*- + * ============LICENSE_START======================================================= + * Licensed 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. + * ============LICENSE_END========================================================= + */ + +package com.woorea.openstack.nova.model; + +import java.io.Serializable; +import com.fasterxml.jackson.annotation.JsonProperty; + + +public class AvailabilityZone implements Serializable { + + private static final long serialVersionUID = 8725482654277645419L; + + @JsonProperty("zoneName") + private String name; + + @JsonProperty("zoneState") + private AvailabilityZoneState state; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public AvailabilityZoneState getState() { + return state; + } + + public void setState(AvailabilityZoneState state) { + this.state = state; + } + +} diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/AvailabilityZoneState.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/AvailabilityZoneState.java new file mode 100644 index 0000000..f3036a9 --- /dev/null +++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/AvailabilityZoneState.java @@ -0,0 +1,37 @@ +/*- + * ============LICENSE_START======================================================= + * Licensed 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. + * ============LICENSE_END========================================================= + */ + +package com.woorea.openstack.nova.model; + +import java.io.Serializable; +import com.fasterxml.jackson.annotation.JsonRootName; + +@JsonRootName("zoneState") +public class AvailabilityZoneState implements Serializable { + + private static final long serialVersionUID = -8796079699189565186L; + + private boolean available; + + public boolean isAvailable() { + return available; + } + + public void setAvailable(boolean available) { + this.available = available; + } + +} diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/AvailabilityZones.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/AvailabilityZones.java new file mode 100644 index 0000000..93df472 --- /dev/null +++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/AvailabilityZones.java @@ -0,0 +1,49 @@ +/*- + * ============LICENSE_START======================================================= + * Licensed 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. + * ============LICENSE_END========================================================= + */ + +package com.woorea.openstack.nova.model; + +import java.io.Serializable; +import java.util.Iterator; +import java.util.List; +import com.fasterxml.jackson.annotation.JsonProperty; + + +public class AvailabilityZones implements Iterable<AvailabilityZone>, Serializable { + + private static final long serialVersionUID = 2497845349603397080L; + + @JsonProperty("availabilityZoneInfo") + private List<AvailabilityZone> list; + + /** + * @return the list + */ + public List<AvailabilityZone> getList() { + return list; + } + + @Override + public Iterator<AvailabilityZone> iterator() { + return list.iterator(); + } + + @Override + public String toString() { + return "AvailabilityZones [list=" + list + "]"; + } + +} diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/AvailabilityZoneTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/AvailabilityZoneTest.java new file mode 100644 index 0000000..930b40f --- /dev/null +++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/AvailabilityZoneTest.java @@ -0,0 +1,59 @@ +/*- + * ============LICENSE_START======================================================= + * ONAP - SO + * ================================================================================ + * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed 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. + * ============LICENSE_END========================================================= + */ + +package com.woorea.openstack.nova.model; + +import org.junit.Assert; +import org.junit.Test; +import org.skyscreamer.jsonassert.JSONAssert; +import org.skyscreamer.jsonassert.JSONCompareMode; +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationFeature; + +public class AvailabilityZoneTest { + + private static final String EOL = System.lineSeparator(); + + private static final String JSON_FULL = "{" + EOL + "\"zoneName\": \"zoneName1\"," + EOL + "\"zoneState\": {" + EOL + + "\"available\": true" + EOL + "}" + EOL + "}"; + + private ObjectMapper objectMapper = new ObjectMapper().enable(SerializationFeature.INDENT_OUTPUT) + .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES) + .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY); + + @Test + public void testSerialization() throws Exception { + System.out.println("CLASS: " + AvailabilityZone.class.getName()); + System.out.println("TEST JSON: " + JSON_FULL); + AvailabilityZone az = objectMapper.readValue(JSON_FULL, AvailabilityZone.class); + String json = objectMapper.writeValueAsString(az); + System.out.println("RE-SERIALIZED OBJECT: " + json); + JSONAssert.assertEquals(JSON_FULL, json, JSONCompareMode.LENIENT); + } + + @Test + public void testMethods() throws Exception { + AvailabilityZone az = objectMapper.readValue(JSON_FULL, AvailabilityZone.class); + + Assert.assertEquals("zoneName1", az.getName()); + Assert.assertTrue(az.getState().isAvailable()); + } +} diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/AvailabilityZonesTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/AvailabilityZonesTest.java new file mode 100644 index 0000000..8b6a533 --- /dev/null +++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/AvailabilityZonesTest.java @@ -0,0 +1,71 @@ +/*- + * ============LICENSE_START======================================================= + * ONAP - SO + * ================================================================================ + * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed 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. + * ============LICENSE_END========================================================= + */ + +package com.woorea.openstack.nova.model; + +import java.util.List; +import org.junit.Assert; +import org.junit.Test; +import org.skyscreamer.jsonassert.JSONAssert; +import org.skyscreamer.jsonassert.JSONCompareMode; +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationFeature; + +public class AvailabilityZonesTest { + + private static final String EOL = System.lineSeparator(); + + private static final String JSON_FULL = "{" + EOL + "\"availabilityZoneInfo\": [" + EOL + "{" + EOL + + "\"zoneName\": \"zoneName1\"," + EOL + "\"zoneState\": {" + EOL + "\"available\": true" + EOL + "}" + EOL + + "}," + EOL + "{" + EOL + "\"zoneName\": \"zoneName2\"," + EOL + "\"zoneState\": {" + EOL + + "\"available\": true" + EOL + "}" + EOL + "}" + EOL + "]" + EOL + "}"; + + private ObjectMapper objectMapper = new ObjectMapper().enable(SerializationFeature.INDENT_OUTPUT) + .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES) + .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY); + + @Test + public void testSerialization() throws Exception { + System.out.println("CLASS: " + AvailabilityZones.class.getName()); + System.out.println("TEST JSON: " + JSON_FULL); + AvailabilityZones az = objectMapper.readValue(JSON_FULL, AvailabilityZones.class); + String json = objectMapper.writeValueAsString(az); + System.out.println("RE-SERIALIZED OBJECT: " + json); + JSONAssert.assertEquals(JSON_FULL, json, JSONCompareMode.LENIENT); + } + + @Test + public void testMethods() throws Exception { + AvailabilityZones azs = objectMapper.readValue(JSON_FULL, AvailabilityZones.class); + + List<AvailabilityZone> list = azs.getList(); + Assert.assertNotNull(list); + Assert.assertEquals(2, list.size()); + Assert.assertEquals("zoneName1", azs.getList().get(0).getName()); + + int cnt = 0; + for (@SuppressWarnings("unused") + AvailabilityZone x : azs) { + ++cnt; + } + Assert.assertEquals(2, cnt); + } +} @@ -167,22 +167,68 @@ <format.skipExecute>false</format.skipExecute> </properties> </profile> + <profile> + <id>java11</id> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>3.8.1</version> + <configuration> + <forceJavacCompilerUse>true</forceJavacCompilerUse> + <source>11</source> + <target>11</target> + <release>11</release> + </configuration> + </plugin> + </plugins> + </build> + </profile> + <profile> + <id>java7</id> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>3.1</version> + <configuration> + <source>1.7</source> + <target>1.7</target> + <encoding>UTF-8</encoding> + </configuration> + </plugin> + </plugins> + </build> + <activation> + <property> + <name>m2e.version</name> + </property> + <activeByDefault>true</activeByDefault> + </activation> + </profile> </profiles> <dependencies> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>2.9.8</version> + <version>2.11.1</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-core</artifactId> - <version>2.9.8</version> + <version>2.11.1</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-annotations</artifactId> - <version>2.9.8</version> + <version>2.11.1</version> + </dependency> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>2.3.1</version> </dependency> </dependencies> <reporting> @@ -234,17 +280,6 @@ <artifactId>maven-surefire-plugin</artifactId> <version>2.19.1</version> </plugin> - <!-- <plugin> - <groupId>org.sonatype.plugins</groupId> - <artifactId>nexus-staging-maven-plugin</artifactId> - <version>1.6.7</version> - <extensions>true</extensions> - <configuration> - <nexusUrl>${nexusproxy}</nexusUrl> - <stagingProfileId>176c31dfe190a</stagingProfileId> - <serverId>ecomp-staging</serverId> - </configuration> - </plugin> --> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-deploy-plugin</artifactId> @@ -255,16 +290,6 @@ </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>3.1</version> - <configuration> - <source>1.7</source> - <target>1.7</target> - <encoding>UTF-8</encoding> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-eclipse-plugin</artifactId> <version>2.9</version> </plugin> |