diff options
37 files changed, 840 insertions, 23 deletions
diff --git a/.readthedocs.yaml b/.readthedocs.yaml new file mode 100644 index 0000000..3797dc8 --- /dev/null +++ b/.readthedocs.yaml @@ -0,0 +1,20 @@ +--- +# .readthedocs.yml +# Read the Docs configuration file +# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details +# Required +version: 2 + +formats: + - htmlzip + +build: + image: latest + +python: + version: 3.7 + install: + - requirements: docs/requirements-docs.txt + +sphinx: + configuration: docs/conf.py diff --git a/ceilometer-client/pom.xml b/ceilometer-client/pom.xml index 2801d96..d51cfc5 100644 --- a/ceilometer-client/pom.xml +++ b/ceilometer-client/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.onap.so.libs</groupId> <artifactId>openstack-java-sdk</artifactId> - <version>1.5.0-SNAPSHOT</version> + <version>1.5.2-SNAPSHOT</version> </parent> <groupId>org.onap.so.libs.openstack-java-sdk</groupId> <artifactId>ceilometer-client</artifactId> diff --git a/ceilometer-model/pom.xml b/ceilometer-model/pom.xml index a3e4139..093ba43 100644 --- a/ceilometer-model/pom.xml +++ b/ceilometer-model/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.onap.so.libs</groupId> <artifactId>openstack-java-sdk</artifactId> - <version>1.5.0-SNAPSHOT</version> + <version>1.5.2-SNAPSHOT</version> </parent> <groupId>org.onap.so.libs.openstack-java-sdk</groupId> <artifactId>ceilometer-model</artifactId> diff --git a/cinder-client/pom.xml b/cinder-client/pom.xml index 0971270..21a7fbb 100755 --- a/cinder-client/pom.xml +++ b/cinder-client/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.onap.so.libs</groupId> <artifactId>openstack-java-sdk</artifactId> - <version>1.5.0-SNAPSHOT</version> + <version>1.5.2-SNAPSHOT</version> </parent> <artifactId>cinder-client</artifactId> <name>OpenStack Cinder Client</name> diff --git a/cinder-model/pom.xml b/cinder-model/pom.xml index 6376fe2..36a66d9 100755 --- a/cinder-model/pom.xml +++ b/cinder-model/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.onap.so.libs</groupId> <artifactId>openstack-java-sdk</artifactId> - <version>1.5.0-SNAPSHOT</version> + <version>1.5.2-SNAPSHOT</version> </parent> <groupId>org.onap.so.libs.openstack-java-sdk</groupId> <artifactId>cinder-model</artifactId> diff --git a/docs/.gitignore b/docs/.gitignore new file mode 100644 index 0000000..43ca5b6 --- /dev/null +++ b/docs/.gitignore @@ -0,0 +1,3 @@ +/.tox +/_build/* +/__pycache__/* diff --git a/docs/_static/css/ribbon.css b/docs/_static/css/ribbon.css new file mode 100644 index 0000000..6008cb1 --- /dev/null +++ b/docs/_static/css/ribbon.css @@ -0,0 +1,63 @@ +.ribbon { + z-index: 1000; + background-color: #a00; + overflow: hidden; + white-space: nowrap; + position: fixed; + top: 25px; + right: -50px; + -webkit-transform: rotate(45deg); + -moz-transform: rotate(45deg); + -ms-transform: rotate(45deg); + -o-transform: rotate(45deg); + transform: rotate(45deg); + -webkit-box-shadow: 0 0 10px #888; + -moz-box-shadow: 0 0 10px #888; + box-shadow: 0 0 10px #888; + +} + +.ribbon a { + border: 1px solid #faa; + color: #fff; + display: block; + font: bold 81.25% 'Helvetica Neue', Helvetica, Arial, sans-serif; + margin: 1px 0; + padding: 10px 50px; + text-align: center; + text-decoration: none; + text-shadow: 0 0 5px #444; + transition: 0.5s; +} + +.ribbon a:hover { + background: #c11; + color: #fff; +} + + +/* override table width restrictions */ +@media screen and (min-width: 767px) { + + .wy-table-responsive table td, .wy-table-responsive table th { + /* !important prevents the common CSS stylesheets from overriding + this as on RTD they are loaded after this stylesheet */ + white-space: normal !important; + } + + .wy-table-responsive { + overflow: visible !important; + } +} + +@media screen and (max-width: 767px) { + .wy-table-responsive table td { + white-space: nowrap; + } +} + +/* fix width of the screen */ + +.wy-nav-content { + max-width: none; +} diff --git a/docs/_static/favicon.ico b/docs/_static/favicon.ico Binary files differnew file mode 100755 index 0000000..cb712eb --- /dev/null +++ b/docs/_static/favicon.ico diff --git a/docs/_static/logo_onap_2017.png b/docs/_static/logo_onap_2017.png Binary files differnew file mode 100644 index 0000000..5d064f4 --- /dev/null +++ b/docs/_static/logo_onap_2017.png diff --git a/docs/conf.py b/docs/conf.py new file mode 100644 index 0000000..8f40e8b --- /dev/null +++ b/docs/conf.py @@ -0,0 +1,15 @@ +from docs_conf.conf import * + +branch = 'latest' +master_doc = 'index' + +linkcheck_ignore = [ + 'http://localhost', +] + +intersphinx_mapping = {} + +html_last_updated_fmt = '%d-%b-%y %H:%M' + +def setup(app): + app.add_stylesheet("css/ribbon_onap.css") diff --git a/docs/conf.yaml b/docs/conf.yaml new file mode 100644 index 0000000..ab59281 --- /dev/null +++ b/docs/conf.yaml @@ -0,0 +1,7 @@ +--- +project_cfg: onap +project: onap + +# Change this to ReleaseBranchName to modify the header +default-version: latest +# diff --git a/docs/requirements-docs.txt b/docs/requirements-docs.txt new file mode 100644 index 0000000..b3188dd --- /dev/null +++ b/docs/requirements-docs.txt @@ -0,0 +1,15 @@ +tox +Sphinx +doc8 +docutils +setuptools +six +sphinx_rtd_theme>=0.4.3 +sphinxcontrib-blockdiag +sphinxcontrib-needs>=0.2.3 +sphinxcontrib-nwdiag +sphinxcontrib-seqdiag +sphinxcontrib-swaggerdoc +sphinxcontrib-plantuml +sphinx_bootstrap_theme +lfdocs-conf diff --git a/docs/tox.ini b/docs/tox.ini new file mode 100644 index 0000000..edac8c3 --- /dev/null +++ b/docs/tox.ini @@ -0,0 +1,22 @@ +[tox] +minversion = 1.6 +envlist = docs, +skipsdist = true + +[testenv:docs] +basepython = python3 +deps = -r{toxinidir}/requirements-docs.txt +commands = + sphinx-build -b html -n -d {envtmpdir}/doctrees ./ {toxinidir}/_build/html + echo "Generated docs available in {toxinidir}/_build/html" +whitelist_externals = + echo + git + sh + +[testenv:docs-linkcheck] +basepython = python3 +#deps = -r{toxinidir}/requirements-docs.txt +commands = echo "Link Checking not enforced" +#commands = sphinx-build -b linkcheck -d {envtmpdir}/doctrees ./ {toxinidir}/_build/linkcheck +whitelist_externals = echo diff --git a/glance-client/pom.xml b/glance-client/pom.xml index aee714f..9acbbc2 100644 --- a/glance-client/pom.xml +++ b/glance-client/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.onap.so.libs</groupId> <artifactId>openstack-java-sdk</artifactId> - <version>1.5.0-SNAPSHOT</version> + <version>1.5.2-SNAPSHOT</version> </parent> <groupId>org.onap.so.libs.openstack-java-sdk</groupId> <artifactId>glance-client</artifactId> diff --git a/glance-model/pom.xml b/glance-model/pom.xml index fbe5428..16e0f00 100644 --- a/glance-model/pom.xml +++ b/glance-model/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.onap.so.libs</groupId> <artifactId>openstack-java-sdk</artifactId> - <version>1.5.0-SNAPSHOT</version> + <version>1.5.2-SNAPSHOT</version> </parent> <groupId>org.onap.so.libs.openstack-java-sdk</groupId> <artifactId>glance-model</artifactId> diff --git a/heat-client/pom.xml b/heat-client/pom.xml index eab2a14..6c4030d 100644 --- a/heat-client/pom.xml +++ b/heat-client/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.onap.so.libs</groupId> <artifactId>openstack-java-sdk</artifactId> - <version>1.5.0-SNAPSHOT</version> + <version>1.5.2-SNAPSHOT</version> </parent> <groupId>org.onap.so.libs.openstack-java-sdk</groupId> <artifactId>heat-client</artifactId> diff --git a/heat-model/pom.xml b/heat-model/pom.xml index 3b43228..7163b4d 100644 --- a/heat-model/pom.xml +++ b/heat-model/pom.xml @@ -16,7 +16,7 @@ <parent> <groupId>org.onap.so.libs</groupId> <artifactId>openstack-java-sdk</artifactId> - <version>1.5.0-SNAPSHOT</version> + <version>1.5.2-SNAPSHOT</version> </parent> <groupId>org.onap.so.libs.openstack-java-sdk</groupId> <artifactId>heat-model</artifactId> diff --git a/keystone-client/pom.xml b/keystone-client/pom.xml index 08b1f6e..935d6e2 100644 --- a/keystone-client/pom.xml +++ b/keystone-client/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.onap.so.libs</groupId> <artifactId>openstack-java-sdk</artifactId> - <version>1.5.0-SNAPSHOT</version> + <version>1.5.2-SNAPSHOT</version> </parent> <groupId>org.onap.so.libs.openstack-java-sdk</groupId> <artifactId>keystone-client</artifactId> diff --git a/keystone-model/pom.xml b/keystone-model/pom.xml index 5586c34..4177225 100644 --- a/keystone-model/pom.xml +++ b/keystone-model/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.onap.so.libs</groupId> <artifactId>openstack-java-sdk</artifactId> - <version>1.5.0-SNAPSHOT</version> + <version>1.5.2-SNAPSHOT</version> </parent> <groupId>org.onap.so.libs.openstack-java-sdk</groupId> <artifactId>keystone-model</artifactId> diff --git a/nova-client/pom.xml b/nova-client/pom.xml index 3077d6c..4ffa06c 100644 --- a/nova-client/pom.xml +++ b/nova-client/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.onap.so.libs</groupId> <artifactId>openstack-java-sdk</artifactId> - <version>1.5.0-SNAPSHOT</version> + <version>1.5.2-SNAPSHOT</version> </parent> <groupId>org.onap.so.libs.openstack-java-sdk</groupId> <artifactId>nova-client</artifactId> 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 0125179..908e1e9 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 @@ -27,6 +27,7 @@ import com.woorea.openstack.nova.api.ServersResource; import com.woorea.openstack.nova.api.extensions.AggregatesExtension; import com.woorea.openstack.nova.api.extensions.FloatingIpsExtension; import com.woorea.openstack.nova.api.extensions.HostsExtension; +import com.woorea.openstack.nova.api.extensions.HypervisorsExtension; import com.woorea.openstack.nova.api.extensions.KeyPairsExtension; import com.woorea.openstack.nova.api.extensions.SecurityGroupsExtension; import com.woorea.openstack.nova.api.extensions.SnapshotsExtension; @@ -58,6 +59,8 @@ public class Nova extends OpenStackClient { private final HostsExtension hosts; + private final HypervisorsExtension hypervisor; + public Nova(String endpoint, OpenStackClientConnector connector) { super(endpoint, connector); extensions = new ExtensionsResource(this); @@ -72,6 +75,7 @@ public class Nova extends OpenStackClient { aggregates = new AggregatesExtension(this); quotaSets = new QuotaSetsResource(this); hosts = new HostsExtension(this); + hypervisor = new HypervisorsExtension(this); } public Nova(String endpoint) { @@ -125,4 +129,8 @@ public class Nova extends OpenStackClient { public HostsExtension hosts() { return hosts; } + + public HypervisorsExtension hypervisors() { + return hypervisor; + } } diff --git a/nova-client/src/main/java/com/woorea/openstack/nova/api/extensions/HypervisorsExtension.java b/nova-client/src/main/java/com/woorea/openstack/nova/api/extensions/HypervisorsExtension.java index b092b0c..a785971 100644 --- a/nova-client/src/main/java/com/woorea/openstack/nova/api/extensions/HypervisorsExtension.java +++ b/nova-client/src/main/java/com/woorea/openstack/nova/api/extensions/HypervisorsExtension.java @@ -16,6 +16,48 @@ package com.woorea.openstack.nova.api.extensions; -public interface HypervisorsExtension { +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.Hypervisor; +import com.woorea.openstack.nova.model.Hypervisors; +public class HypervisorsExtension { + + private final OpenStackClient client; + + public HypervisorsExtension(OpenStackClient client) { + this.client = client; + } + + public List list() { + return new List(); + } + + public ListDetail listDetail() { + return new ListDetail(); + } + + public Show show(String id) { + return new Show(id); + } + + public class List extends OpenStackRequest<Hypervisors> { + public List() { + super(client, HttpMethod.GET, "/os-hypervisors", null, Hypervisors.class); + } + } + + public class ListDetail extends OpenStackRequest<Hypervisors> { + public ListDetail() { + super(client, HttpMethod.GET, "/os-hypervisors/detail", null, Hypervisors.class); + } + } + + public class Show extends OpenStackRequest<Hypervisor> { + public Show(String id) { + super(client, HttpMethod.GET, new StringBuffer("/hypervisors").append(id).toString(), null, + Hypervisor.class); + } + } } diff --git a/nova-model/pom.xml b/nova-model/pom.xml index d78fde6..94f1bb5 100644 --- a/nova-model/pom.xml +++ b/nova-model/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.onap.so.libs</groupId> <artifactId>openstack-java-sdk</artifactId> - <version>1.5.0-SNAPSHOT</version> + <version>1.5.2-SNAPSHOT</version> </parent> <groupId>org.onap.so.libs.openstack-java-sdk</groupId> <artifactId>nova-model</artifactId> diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/CpuInfo.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/CpuInfo.java new file mode 100644 index 0000000..bf52fb7 --- /dev/null +++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/CpuInfo.java @@ -0,0 +1,104 @@ +/*- + * ============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.util.HashMap; +import java.util.List; +import java.util.Map; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; + +@JsonInclude(JsonInclude.Include.NON_NULL) +public class CpuInfo { + + @JsonProperty("arch") + private String arch; + @JsonProperty("model") + private String model; + @JsonProperty("vendor") + private String vendor; + @JsonProperty("features") + private List<String> features = null; + @JsonProperty("topology") + private Topology topology; + @JsonIgnore + private Map<String, Object> additionalProperties = new HashMap<String, Object>(); + + @JsonProperty("arch") + public String getArch() { + return arch; + } + + @JsonProperty("arch") + public void setArch(String arch) { + this.arch = arch; + } + + @JsonProperty("model") + public String getModel() { + return model; + } + + @JsonProperty("model") + public void setModel(String model) { + this.model = model; + } + + @JsonProperty("vendor") + public String getVendor() { + return vendor; + } + + @JsonProperty("vendor") + public void setVendor(String vendor) { + this.vendor = vendor; + } + + @JsonProperty("features") + public List<String> getFeatures() { + return features; + } + + @JsonProperty("features") + public void setFeatures(List<String> features) { + this.features = features; + } + + @JsonProperty("topology") + public Topology getTopology() { + return topology; + } + + @JsonProperty("topology") + public void setTopology(Topology topology) { + this.topology = topology; + } + + @JsonAnyGetter + public Map<String, Object> getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + +} diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Hypervisor.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Hypervisor.java new file mode 100644 index 0000000..fb5d9d2 --- /dev/null +++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Hypervisor.java @@ -0,0 +1,265 @@ +/*- + * ============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 com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; + +@JsonInclude(JsonInclude.Include.NON_NULL) +public class Hypervisor { + + @JsonProperty("cpu_info") + private CpuInfo cpuInfo; + @JsonProperty("current_workload") + private Integer currentWorkload; + @JsonProperty("status") + private String status; + @JsonProperty("state") + private String state; + @JsonProperty("disk_available_least") + private Integer diskAvailableLeast; + @JsonProperty("host_ip") + private String hostIp; + @JsonProperty("free_disk_gb") + private Integer freeDiskGb; + @JsonProperty("free_ram_mb") + private Integer freeRamMb; + @JsonProperty("hypervisor_hostname") + private String hypervisorHostname; + @JsonProperty("hypervisor_type") + private String hypervisorType; + @JsonProperty("hypervisor_version") + private Integer hypervisorVersion; + @JsonProperty("id") + private Integer id; + @JsonProperty("local_gb") + private Integer localGb; + @JsonProperty("local_gb_used") + private Integer localGbUsed; + @JsonProperty("memory_mb") + private Integer memoryMb; + @JsonProperty("memory_mb_used") + private Integer memoryMbUsed; + @JsonProperty("running_vms") + private Integer runningVms; + @JsonProperty("service") + private Service service; + @JsonProperty("vcpus") + private Integer vcpus; + @JsonProperty("vcpus_used") + private Integer vcpusUsed; + + @JsonProperty("cpu_info") + public CpuInfo getCpuInfo() { + return cpuInfo; + } + + @JsonProperty("cpu_info") + public void setCpuInfo(CpuInfo cpuInfo) { + this.cpuInfo = cpuInfo; + } + + @JsonProperty("current_workload") + public Integer getCurrentWorkload() { + return currentWorkload; + } + + @JsonProperty("current_workload") + public void setCurrentWorkload(Integer currentWorkload) { + this.currentWorkload = currentWorkload; + } + + @JsonProperty("status") + public String getStatus() { + return status; + } + + @JsonProperty("status") + public void setStatus(String status) { + this.status = status; + } + + @JsonProperty("state") + public String getState() { + return state; + } + + @JsonProperty("state") + public void setState(String state) { + this.state = state; + } + + @JsonProperty("disk_available_least") + public Integer getDiskAvailableLeast() { + return diskAvailableLeast; + } + + @JsonProperty("disk_available_least") + public void setDiskAvailableLeast(Integer diskAvailableLeast) { + this.diskAvailableLeast = diskAvailableLeast; + } + + @JsonProperty("host_ip") + public String getHostIp() { + return hostIp; + } + + @JsonProperty("host_ip") + public void setHostIp(String hostIp) { + this.hostIp = hostIp; + } + + @JsonProperty("free_disk_gb") + public Integer getFreeDiskGb() { + return freeDiskGb; + } + + @JsonProperty("free_disk_gb") + public void setFreeDiskGb(Integer freeDiskGb) { + this.freeDiskGb = freeDiskGb; + } + + @JsonProperty("free_ram_mb") + public Integer getFreeRamMb() { + return freeRamMb; + } + + @JsonProperty("free_ram_mb") + public void setFreeRamMb(Integer freeRamMb) { + this.freeRamMb = freeRamMb; + } + + @JsonProperty("hypervisor_hostname") + public String getHypervisorHostname() { + return hypervisorHostname; + } + + @JsonProperty("hypervisor_hostname") + public void setHypervisorHostname(String hypervisorHostname) { + this.hypervisorHostname = hypervisorHostname; + } + + @JsonProperty("hypervisor_type") + public String getHypervisorType() { + return hypervisorType; + } + + @JsonProperty("hypervisor_type") + public void setHypervisorType(String hypervisorType) { + this.hypervisorType = hypervisorType; + } + + @JsonProperty("hypervisor_version") + public Integer getHypervisorVersion() { + return hypervisorVersion; + } + + @JsonProperty("hypervisor_version") + public void setHypervisorVersion(Integer hypervisorVersion) { + this.hypervisorVersion = hypervisorVersion; + } + + @JsonProperty("id") + public Integer getId() { + return id; + } + + @JsonProperty("id") + public void setId(Integer id) { + this.id = id; + } + + @JsonProperty("local_gb") + public Integer getLocalGb() { + return localGb; + } + + @JsonProperty("local_gb") + public void setLocalGb(Integer localGb) { + this.localGb = localGb; + } + + @JsonProperty("local_gb_used") + public Integer getLocalGbUsed() { + return localGbUsed; + } + + @JsonProperty("local_gb_used") + public void setLocalGbUsed(Integer localGbUsed) { + this.localGbUsed = localGbUsed; + } + + @JsonProperty("memory_mb") + public Integer getMemoryMb() { + return memoryMb; + } + + @JsonProperty("memory_mb") + public void setMemoryMb(Integer memoryMb) { + this.memoryMb = memoryMb; + } + + @JsonProperty("memory_mb_used") + public Integer getMemoryMbUsed() { + return memoryMbUsed; + } + + @JsonProperty("memory_mb_used") + public void setMemoryMbUsed(Integer memoryMbUsed) { + this.memoryMbUsed = memoryMbUsed; + } + + @JsonProperty("running_vms") + public Integer getRunningVms() { + return runningVms; + } + + @JsonProperty("running_vms") + public void setRunningVms(Integer runningVms) { + this.runningVms = runningVms; + } + + @JsonProperty("service") + public Service getService() { + return service; + } + + @JsonProperty("service") + public void setService(Service service) { + this.service = service; + } + + @JsonProperty("vcpus") + public Integer getVcpus() { + return vcpus; + } + + @JsonProperty("vcpus") + public void setVcpus(Integer vcpus) { + this.vcpus = vcpus; + } + + @JsonProperty("vcpus_used") + public Integer getVcpusUsed() { + return vcpusUsed; + } + + @JsonProperty("vcpus_used") + public void setVcpusUsed(Integer vcpusUsed) { + this.vcpusUsed = vcpusUsed; + } +} diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Hypervisors.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Hypervisors.java new file mode 100644 index 0000000..c75d871 --- /dev/null +++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Hypervisors.java @@ -0,0 +1,60 @@ +/*- + * ============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 Hypervisors implements Iterable<Hypervisor>, Serializable { + + /** + * + */ + private static final long serialVersionUID = 3609243147419561496L; + + @JsonProperty("hypervisors") + private List<Hypervisor> list; + + @JsonProperty("hypervisors_links") + private List<Link> links; + + /** + * @return the list + */ + public List<Hypervisor> getList() { + return list; + } + + @Override + public Iterator<Hypervisor> iterator() { + return list.iterator(); + } + + /* + * (non-Javadoc) + * + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + return "Hypervisor [list=" + list + "]"; + } + +} diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Service.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Service.java new file mode 100644 index 0000000..f1aeb14 --- /dev/null +++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Service.java @@ -0,0 +1,79 @@ +/*- + * ============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.util.HashMap; +import java.util.Map; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; + +@JsonInclude(JsonInclude.Include.NON_NULL) +public class Service { + + @JsonProperty("host") + private String host; + @JsonProperty("id") + private Integer id; + @JsonProperty("disabled_reason") + private Object disabledReason; + @JsonIgnore + private Map<String, Object> additionalProperties = new HashMap<String, Object>(); + + @JsonProperty("host") + public String getHost() { + return host; + } + + @JsonProperty("host") + public void setHost(String host) { + this.host = host; + } + + @JsonProperty("id") + public Integer getId() { + return id; + } + + @JsonProperty("id") + public void setId(Integer id) { + this.id = id; + } + + @JsonProperty("disabled_reason") + public Object getDisabledReason() { + return disabledReason; + } + + @JsonProperty("disabled_reason") + public void setDisabledReason(Object disabledReason) { + this.disabledReason = disabledReason; + } + + @JsonAnyGetter + public Map<String, Object> getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + +} diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Topology.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Topology.java new file mode 100644 index 0000000..c083357 --- /dev/null +++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Topology.java @@ -0,0 +1,79 @@ +/*- + * ============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.util.HashMap; +import java.util.Map; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; + +@JsonInclude(JsonInclude.Include.NON_NULL) +public class Topology { + + @JsonProperty("cores") + private Integer cores; + @JsonProperty("threads") + private Integer threads; + @JsonProperty("sockets") + private Integer sockets; + @JsonIgnore + private Map<String, Object> additionalProperties = new HashMap<String, Object>(); + + @JsonProperty("cores") + public Integer getCores() { + return cores; + } + + @JsonProperty("cores") + public void setCores(Integer cores) { + this.cores = cores; + } + + @JsonProperty("threads") + public Integer getThreads() { + return threads; + } + + @JsonProperty("threads") + public void setThreads(Integer threads) { + this.threads = threads; + } + + @JsonProperty("sockets") + public Integer getSockets() { + return sockets; + } + + @JsonProperty("sockets") + public void setSockets(Integer sockets) { + this.sockets = sockets; + } + + @JsonAnyGetter + public Map<String, Object> getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + +} diff --git a/openstack-client-connectors/http-connector/pom.xml b/openstack-client-connectors/http-connector/pom.xml index 86a4b6b..253d2e7 100644 --- a/openstack-client-connectors/http-connector/pom.xml +++ b/openstack-client-connectors/http-connector/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.onap.so.libs.openstack-java-sdk</groupId> <artifactId>client-connectors</artifactId> - <version>1.5.0-SNAPSHOT</version> + <version>1.5.2-SNAPSHOT</version> </parent> <groupId>org.onap.so.libs.openstack-java-sdk.client-connectors</groupId> diff --git a/openstack-client-connectors/pom.xml b/openstack-client-connectors/pom.xml index 76d4bd1..6091462 100644 --- a/openstack-client-connectors/pom.xml +++ b/openstack-client-connectors/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.onap.so.libs</groupId> <artifactId>openstack-java-sdk</artifactId> - <version>1.5.0-SNAPSHOT</version> + <version>1.5.2-SNAPSHOT</version> </parent> <groupId>org.onap.so.libs.openstack-java-sdk</groupId> <artifactId>client-connectors</artifactId> diff --git a/openstack-client/pom.xml b/openstack-client/pom.xml index e07191c..2764a64 100644 --- a/openstack-client/pom.xml +++ b/openstack-client/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.onap.so.libs</groupId> <artifactId>openstack-java-sdk</artifactId> - <version>1.5.0-SNAPSHOT</version> + <version>1.5.2-SNAPSHOT</version> </parent> <groupId>org.onap.so.libs.openstack-java-sdk</groupId> <artifactId>openstack-client</artifactId> @@ -12,7 +12,7 @@ <groupId>org.onap.so.libs</groupId> <artifactId>openstack-java-sdk</artifactId> - <version>1.5.0-SNAPSHOT</version> + <version>1.5.2-SNAPSHOT</version> <packaging>pom</packaging> <name>so-libs</name> <description>OpenStack Java SDK</description> @@ -24,6 +24,8 @@ <siteNexusPath>/content/sites/site/org/onap/so/libs/${project.version}</siteNexusPath> <format.skipValidate>false</format.skipValidate> <format.skipExecute>true</format.skipExecute> + <sonar.coverage.jacoco.xmlReportPaths>${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths> + <jacoco.version>0.8.5</jacoco.version> </properties> <distributionManagement> <repository> @@ -172,6 +174,16 @@ <artifactId>jackson-databind</artifactId> <version>2.9.8</version> </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> + <version>2.9.8</version> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-annotations</artifactId> + <version>2.9.8</version> + </dependency> </dependencies> <reporting> <plugins> @@ -379,6 +391,29 @@ <version>2.9.8</version> </dependency> </dependencies> + </plugin> + <plugin> + <groupId>org.jacoco</groupId> + <artifactId>jacoco-maven-plugin</artifactId> + <version>${jacoco.version}</version> + <executions> + <execution> + <id>prepare-agent</id> + <goals> + <goal>prepare-agent</goal> + </goals> + </execution> + <execution> + <id>report</id> + <goals> + <goal>report</goal> + </goals> + <configuration> + <dataFile>${project.build.directory}/code-coverage/jacoco.exec</dataFile> + <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory> + </configuration> + </execution> + </executions> </plugin> </plugins> </build> diff --git a/quantum-client/pom.xml b/quantum-client/pom.xml index 64ec666..5ca2ddc 100644 --- a/quantum-client/pom.xml +++ b/quantum-client/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.onap.so.libs</groupId> <artifactId>openstack-java-sdk</artifactId> - <version>1.5.0-SNAPSHOT</version> + <version>1.5.2-SNAPSHOT</version> </parent> <groupId>org.onap.so.libs.openstack-java-sdk</groupId> <artifactId>quantum-client</artifactId> diff --git a/quantum-model/pom.xml b/quantum-model/pom.xml index b232949..c7ba132 100644 --- a/quantum-model/pom.xml +++ b/quantum-model/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.onap.so.libs</groupId> <artifactId>openstack-java-sdk</artifactId> - <version>1.5.0-SNAPSHOT</version> + <version>1.5.2-SNAPSHOT</version> </parent> <groupId>org.onap.so.libs.openstack-java-sdk</groupId> <artifactId>quantum-model</artifactId> diff --git a/swift-client/pom.xml b/swift-client/pom.xml index 6f883fb..def1bb4 100644 --- a/swift-client/pom.xml +++ b/swift-client/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.onap.so.libs</groupId> <artifactId>openstack-java-sdk</artifactId> - <version>1.5.0-SNAPSHOT</version> + <version>1.5.2-SNAPSHOT</version> </parent> <groupId>org.onap.so.libs.openstack-java-sdk</groupId> <artifactId>swift-client</artifactId> diff --git a/swift-model/pom.xml b/swift-model/pom.xml index b4da372..ca70858 100644 --- a/swift-model/pom.xml +++ b/swift-model/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.onap.so.libs</groupId> <artifactId>openstack-java-sdk</artifactId> - <version>1.5.0-SNAPSHOT</version> + <version>1.5.2-SNAPSHOT</version> </parent> <groupId>org.onap.so.libs.openstack-java-sdk</groupId> <artifactId>swift-model</artifactId> diff --git a/version.properties b/version.properties index 825dd23..871bd2e 100644 --- a/version.properties +++ b/version.properties @@ -4,8 +4,8 @@ # because they are used in Jenkins, whose plug-in doesn't support major_version=1 -minor_version=5 -sprint_number=1 +minor_version=6 +sprint_number=0 base_version=${major_version}.${minor_version}.${sprint_number} |
