diff options
8 files changed, 5 insertions, 51 deletions
diff --git a/keystone-client/src/main/java/com/woorea/openstack/keystone/v3/api/PoliciesResource.java b/keystone-client/src/main/java/com/woorea/openstack/keystone/v3/api/PoliciesResource.java index 594974d..d22416d 100644 --- a/keystone-client/src/main/java/com/woorea/openstack/keystone/v3/api/PoliciesResource.java +++ b/keystone-client/src/main/java/com/woorea/openstack/keystone/v3/api/PoliciesResource.java @@ -17,8 +17,7 @@ package com.woorea.openstack.keystone.v3.api; import com.woorea.openstack.base.client.OpenStackClient; -import com.woorea.openstack.keystone.model.Role; -import com.woorea.openstack.keystone.model.Roles; + import com.woorea.openstack.keystone.v3.model.Policies; import com.woorea.openstack.keystone.v3.model.Policy; diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/ServerAction.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/ServerAction.java index 76acc20..c536372 100644 --- a/nova-model/src/main/java/com/woorea/openstack/nova/model/ServerAction.java +++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/ServerAction.java @@ -34,7 +34,6 @@ public interface ServerAction extends Serializable { public ChangePassword() { super(); - // TODO Auto-generated constructor stub } public ChangePassword(String adminPass) { @@ -423,7 +422,6 @@ public interface ServerAction extends Serializable { public GetVncConsole() { super(); - // TODO Auto-generated constructor stub } @@ -498,7 +496,6 @@ public interface ServerAction extends Serializable { public AssociateFloatingIp() { super(); - // TODO Auto-generated constructor stub } public AssociateFloatingIp(String address) { @@ -529,7 +526,6 @@ public interface ServerAction extends Serializable { public DisassociateFloatingIp() { super(); - // TODO Auto-generated constructor stub } public DisassociateFloatingIp(String address) { diff --git a/openstack-client-connectors/http-connector/src/main/java/com/woorea/openstack/connector/HttpClientConnector.java b/openstack-client-connectors/http-connector/src/main/java/com/woorea/openstack/connector/HttpClientConnector.java index d43e6c9..27bbe87 100644 --- a/openstack-client-connectors/http-connector/src/main/java/com/woorea/openstack/connector/HttpClientConnector.java +++ b/openstack-client-connectors/http-connector/src/main/java/com/woorea/openstack/connector/HttpClientConnector.java @@ -168,12 +168,15 @@ public class HttpClientConnector implements OpenStackClientConnector { catch (HttpResponseException e) { // What exactly does this mean? It does not appear to get thrown for // non-2XX responses as documented. + logger.error ("HttpResponseException: " +e.getMessage()); throw new OpenStackResponseException(e.getMessage(), e.getStatusCode()); } catch (UnknownHostException e) { + logger.error ("Unknown Host: " +e.getMessage()); throw new OpenStackConnectException("Unknown Host: " + e.getMessage()); } catch (IOException e) { + logger.error ("IOException: " +e.getMessage()); // Catch all other IOExceptions and throw as OpenStackConnectException throw new OpenStackConnectException(e.getMessage()); } diff --git a/quantum-client/src/main/java/com/woorea/openstack/quantum/api/NetworksResource.java b/quantum-client/src/main/java/com/woorea/openstack/quantum/api/NetworksResource.java index e22487a..8b5ee25 100644 --- a/quantum-client/src/main/java/com/woorea/openstack/quantum/api/NetworksResource.java +++ b/quantum-client/src/main/java/com/woorea/openstack/quantum/api/NetworksResource.java @@ -62,10 +62,7 @@ public class NetworksResource { public class Query extends OpenStackRequest<Networks> { public Query(Network network) { - //super(network); -// target = target.path("v2.0").path("networks"); -// target = queryParam(target); -// return target.request(MediaType.APPLICATION_JSON).get(Networks.class); + } } diff --git a/quantum-client/src/main/java/com/woorea/openstack/quantum/api/RoutersResource.java b/quantum-client/src/main/java/com/woorea/openstack/quantum/api/RoutersResource.java index e158e5f..774e44a 100644 --- a/quantum-client/src/main/java/com/woorea/openstack/quantum/api/RoutersResource.java +++ b/quantum-client/src/main/java/com/woorea/openstack/quantum/api/RoutersResource.java @@ -60,10 +60,6 @@ public class RoutersResource { public class Query extends OpenStackRequest<Routers> { public Query(Router router) { - //super(network); -// target = target.path("v2.0").path("networks"); -// target = queryParam(target); -// return target.request(MediaType.APPLICATION_JSON).get(Networks.class); } } public class Create extends OpenStackRequest<Router> { diff --git a/quantum-client/src/main/java/com/woorea/openstack/quantum/api/SubnetsResource.java b/quantum-client/src/main/java/com/woorea/openstack/quantum/api/SubnetsResource.java index 81f3750..bee3743 100644 --- a/quantum-client/src/main/java/com/woorea/openstack/quantum/api/SubnetsResource.java +++ b/quantum-client/src/main/java/com/woorea/openstack/quantum/api/SubnetsResource.java @@ -62,10 +62,6 @@ public class SubnetsResource { public class Query extends OpenStackRequest<Subnets> { public Query(Subnet subnet) { - //super(subnet); -// target = target.path("v2.0").path("subnets"); -// target = queryParam(target); -// return target.request(MediaType.APPLICATION_JSON).get(Subnets.class); } } diff --git a/quantum-client/src/main/java/com/woorea/openstack/quantum/api/query/AbsOpenStackCmd.java b/quantum-client/src/main/java/com/woorea/openstack/quantum/api/query/AbsOpenStackCmd.java index 900a3d2..8914ab0 100644 --- a/quantum-client/src/main/java/com/woorea/openstack/quantum/api/query/AbsOpenStackCmd.java +++ b/quantum-client/src/main/java/com/woorea/openstack/quantum/api/query/AbsOpenStackCmd.java @@ -82,14 +82,4 @@ public class AbsOpenStackCmd<T> extends OpenStackRequest<T> { return resultMap; } - /* - public WebTarget queryParam(WebTarget target) { - Map<String, String> map = getObjectParamMap(this.query); - for (String fieldName : map.keySet()) { - target = target.queryParam(fieldName, map.get(fieldName)); - } - return target; - } - */ - } diff --git a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/NeutronError.java b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/NeutronError.java index 9335737..fda8da1 100644 --- a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/NeutronError.java +++ b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/NeutronError.java @@ -14,29 +14,6 @@ * ============LICENSE_END========================================================= */ -/* - * ============LICENSE_START========================================== - * =================================================================== - * Copyright (c) 2017 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============================================ - * - * ECOMP and OpenECOMP are trademarks - * and service marks of AT&T Intellectual Property. - * - */ - package com.woorea.openstack.quantum.model; import java.io.Serializable; |