You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ni...@apache.org on 2014/03/01 09:17:25 UTC
[01/13] git commit: fixing
https://issues.apache.org/jira/browse/STRATOS-486
Repository: incubator-stratos
Updated Branches:
refs/heads/master d926386ca -> 5bd3ffe28
fixing https://issues.apache.org/jira/browse/STRATOS-486
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/aa911d49
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/aa911d49
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/aa911d49
Branch: refs/heads/master
Commit: aa911d490ec9e4bff2a7f0a16667a320c22b39e0
Parents: d926386
Author: Nirmal Fernando <ni...@apache.org>
Authored: Sat Mar 1 13:36:08 2014 +0530
Committer: Nirmal Fernando <ni...@apache.org>
Committed: Sat Mar 1 13:36:08 2014 +0530
----------------------------------------------------------------------
.../exception/InvalidCartridgeDefinitionException.java | 13 ++++++++++++-
.../exception/InvalidCartridgeTypeException.java | 13 ++++++++++++-
.../controller/exception/InvalidClusterException.java | 13 ++++++++++++-
.../controller/exception/InvalidHostException.java | 13 ++++++++++++-
.../exception/InvalidIaasProviderException.java | 13 ++++++++++++-
.../controller/exception/InvalidMemberException.java | 13 ++++++++++++-
.../exception/InvalidPartitionException.java | 11 +++++++++--
.../controller/exception/InvalidRegionException.java | 11 +++++++++++
.../controller/exception/InvalidXMLException.java | 11 +++++++++++
.../controller/exception/InvalidZoneException.java | 11 +++++++++++
.../exception/MalformedConfigurationFileException.java | 10 ++++++++++
.../controller/exception/NoInstanceFoundException.java | 11 +++++++++++
.../controller/exception/SerializationException.java | 11 +++++++++++
.../exception/UnregisteredCartridgeException.java | 11 +++++++++++
.../exception/UnregisteredClusterException.java | 10 ++++++++++
15 files changed, 167 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/aa911d49/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidCartridgeDefinitionException.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidCartridgeDefinitionException.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidCartridgeDefinitionException.java
index 492b94a..148e55e 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidCartridgeDefinitionException.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidCartridgeDefinitionException.java
@@ -21,13 +21,24 @@ package org.apache.stratos.cloud.controller.exception;
public class InvalidCartridgeDefinitionException extends Exception {
private static final long serialVersionUID = -6326227079367867222L;
-
+ private String message;
+
public InvalidCartridgeDefinitionException(String msg) {
super(msg);
+ this.setMessage(msg);
}
public InvalidCartridgeDefinitionException(String msg, Exception ex) {
super(msg, ex);
+ this.setMessage(msg);
}
+ public String getMessage() {
+ return message;
+ }
+
+ public void setMessage(String message) {
+ this.message = message;
+ }
+
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/aa911d49/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidCartridgeTypeException.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidCartridgeTypeException.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidCartridgeTypeException.java
index 47b004a..4b7e1a0 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidCartridgeTypeException.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidCartridgeTypeException.java
@@ -27,12 +27,23 @@ package org.apache.stratos.cloud.controller.exception;
public class InvalidCartridgeTypeException extends Exception {
private static final long serialVersionUID = 8060893118810908075L;
-
+ private String message;
+
public InvalidCartridgeTypeException(String msg) {
super(msg);
+ this.setMessage(msg);
}
public InvalidCartridgeTypeException(String msg, Exception ex) {
super(msg, ex);
+ this.setMessage(msg);
}
+
+ public String getMessage() {
+ return message;
+ }
+
+ public void setMessage(String message) {
+ this.message = message;
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/aa911d49/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidClusterException.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidClusterException.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidClusterException.java
index c003fd0..d72a5bc 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidClusterException.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidClusterException.java
@@ -27,12 +27,23 @@ package org.apache.stratos.cloud.controller.exception;
public class InvalidClusterException extends Exception {
private static final long serialVersionUID = -7883324379272628566L;
-
+ private String message;
+
public InvalidClusterException(String msg) {
super(msg);
+ this.setMessage(msg);
}
public InvalidClusterException(String msg, Exception ex) {
super(msg, ex);
+ this.setMessage(msg);
}
+
+ public String getMessage() {
+ return message;
+ }
+
+ public void setMessage(String message) {
+ this.message = message;
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/aa911d49/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidHostException.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidHostException.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidHostException.java
index 83dfba0..353992a 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidHostException.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidHostException.java
@@ -27,12 +27,23 @@ package org.apache.stratos.cloud.controller.exception;
public class InvalidHostException extends Exception {
private static final long serialVersionUID = 9125466293508957338L;
-
+ private String message;
+
public InvalidHostException(String msg) {
super(msg);
+ this.setMessage(msg);
}
public InvalidHostException(String msg, Exception ex) {
super(msg, ex);
+ this.setMessage(msg);
}
+
+ public String getMessage() {
+ return message;
+ }
+
+ public void setMessage(String message) {
+ this.message = message;
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/aa911d49/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidIaasProviderException.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidIaasProviderException.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidIaasProviderException.java
index be61028..6f7994e 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidIaasProviderException.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidIaasProviderException.java
@@ -28,12 +28,23 @@ import org.apache.stratos.cloud.controller.pojo.IaasProvider;
public class InvalidIaasProviderException extends Exception {
private static final long serialVersionUID = 2453133690565031869L;
-
+ private String message;
+
public InvalidIaasProviderException(String msg) {
super(msg);
+ this.setMessage(msg);
}
public InvalidIaasProviderException(String msg, Exception ex) {
super(msg, ex);
+ this.setMessage(msg);
}
+
+ public String getMessage() {
+ return message;
+ }
+
+ public void setMessage(String message) {
+ this.message = message;
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/aa911d49/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidMemberException.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidMemberException.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidMemberException.java
index 3b6677c..fd39604 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidMemberException.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidMemberException.java
@@ -27,12 +27,23 @@ package org.apache.stratos.cloud.controller.exception;
public class InvalidMemberException extends Exception {
private static final long serialVersionUID = -7883324379272628566L;
-
+ private String message;
+
public InvalidMemberException(String msg) {
super(msg);
+ this.setMessage(msg);
}
public InvalidMemberException(String msg, Exception ex) {
super(msg, ex);
+ this.setMessage(msg);
}
+
+ public String getMessage() {
+ return message;
+ }
+
+ public void setMessage(String message) {
+ this.message = message;
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/aa911d49/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidPartitionException.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidPartitionException.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidPartitionException.java
index 48755c8..8a0f905 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidPartitionException.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidPartitionException.java
@@ -27,16 +27,23 @@ package org.apache.stratos.cloud.controller.exception;
public class InvalidPartitionException extends Exception {
private static final long serialVersionUID = 5403224496111965638L;
+ private String message;
public InvalidPartitionException(String msg) {
super(msg);
+ this.setMessage(msg);
}
public InvalidPartitionException(String msg, Exception ex) {
super(msg, ex);
+ this.setMessage(msg);
}
- public String getMessage() {
- return super.getMessage();
+ private void setMessage(String msg) {
+ this.message = msg;
+ }
+
+ public String getMessage() {
+ return this.message;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/aa911d49/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidRegionException.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidRegionException.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidRegionException.java
index c85502a..c12209e 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidRegionException.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidRegionException.java
@@ -27,12 +27,23 @@ package org.apache.stratos.cloud.controller.exception;
public class InvalidRegionException extends Exception {
private static final long serialVersionUID = -7883324379272628566L;
+ private String message;
public InvalidRegionException(String msg) {
super(msg);
+ this.setMessage(msg);
}
public InvalidRegionException(String msg, Exception ex) {
super(msg, ex);
+ this.setMessage(msg);
+ }
+
+ private void setMessage(String msg) {
+ this.message = msg;
+ }
+
+ public String getMessage() {
+ return this.message;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/aa911d49/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidXMLException.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidXMLException.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidXMLException.java
index 48e91f7..6956f75 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidXMLException.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidXMLException.java
@@ -21,17 +21,28 @@ package org.apache.stratos.cloud.controller.exception;
public class InvalidXMLException extends RuntimeException {
private static final long serialVersionUID = -6326227079367867222L;
+ private String message;
public InvalidXMLException(String msg) {
super(msg);
+ this.setMessage(msg);
}
public InvalidXMLException(String msg, Exception ex) {
super(msg, ex);
+ this.setMessage(msg);
}
public InvalidXMLException(Exception ex) {
super(ex);
}
+
+ private void setMessage(String msg) {
+ this.message = msg;
+ }
+
+ public String getMessage() {
+ return this.message;
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/aa911d49/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidZoneException.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidZoneException.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidZoneException.java
index 435587b..74cab05 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidZoneException.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/InvalidZoneException.java
@@ -27,12 +27,23 @@ package org.apache.stratos.cloud.controller.exception;
public class InvalidZoneException extends Exception {
private static final long serialVersionUID = 1830765777991647319L;
+ private String message;
public InvalidZoneException(String msg) {
super(msg);
+ this.setMessage(msg);
}
public InvalidZoneException(String msg, Exception ex) {
super(msg, ex);
+ this.setMessage(msg);
+ }
+
+ private void setMessage(String msg) {
+ this.message = msg;
+ }
+
+ public String getMessage() {
+ return this.message;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/aa911d49/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/MalformedConfigurationFileException.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/MalformedConfigurationFileException.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/MalformedConfigurationFileException.java
index 6394be8..bfafcab 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/MalformedConfigurationFileException.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/MalformedConfigurationFileException.java
@@ -21,13 +21,23 @@ package org.apache.stratos.cloud.controller.exception;
public class MalformedConfigurationFileException extends RuntimeException {
private static final long serialVersionUID = -1662095377704279326L;
+ private String message;
public MalformedConfigurationFileException(String msg) {
super(msg);
+ this.setMessage(msg);
}
public MalformedConfigurationFileException(String msg, Exception ex) {
super(msg, ex);
+ this.setMessage(msg);
}
+ private void setMessage(String msg) {
+ this.message = msg;
+ }
+
+ public String getMessage() {
+ return this.message;
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/aa911d49/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/NoInstanceFoundException.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/NoInstanceFoundException.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/NoInstanceFoundException.java
index cc65f9b..68a1cd6 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/NoInstanceFoundException.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/NoInstanceFoundException.java
@@ -27,13 +27,24 @@ public class NoInstanceFoundException extends Exception {
* For serializing requirement
*/
private static final long serialVersionUID = -435060299292679892L;
+ private String message;
public NoInstanceFoundException(String msg) {
super(msg);
+ this.setMessage(msg);
}
public NoInstanceFoundException(String msg, Exception ex) {
super(msg, ex);
+ this.setMessage(msg);
+ }
+
+ private void setMessage(String msg) {
+ this.message = msg;
+ }
+
+ public String getMessage() {
+ return this.message;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/aa911d49/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/SerializationException.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/SerializationException.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/SerializationException.java
index e9c9e54..92ed0b9 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/SerializationException.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/SerializationException.java
@@ -21,13 +21,24 @@ package org.apache.stratos.cloud.controller.exception;
public class SerializationException extends RuntimeException {
private static final long serialVersionUID = -3701458642228072331L;
+ private String message;
public SerializationException(String msg) {
super(msg);
+ this.setMessage(msg);
}
public SerializationException(String msg, Exception ex) {
super(msg, ex);
+ this.setMessage(msg);
+ }
+
+ private void setMessage(String msg) {
+ this.message = msg;
+ }
+
+ public String getMessage() {
+ return this.message;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/aa911d49/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/UnregisteredCartridgeException.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/UnregisteredCartridgeException.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/UnregisteredCartridgeException.java
index 86f872f..af7da00 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/UnregisteredCartridgeException.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/UnregisteredCartridgeException.java
@@ -21,13 +21,24 @@ package org.apache.stratos.cloud.controller.exception;
public class UnregisteredCartridgeException extends Exception {
private static final long serialVersionUID = -6326227079367867222L;
+ private String message;
public UnregisteredCartridgeException(String msg) {
super(msg);
+ this.setMessage(msg);
}
public UnregisteredCartridgeException(String msg, Exception ex) {
super(msg, ex);
+ this.setMessage(msg);
+ }
+
+ private void setMessage(String msg) {
+ this.message = msg;
+ }
+
+ public String getMessage() {
+ return this.message;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/aa911d49/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/UnregisteredClusterException.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/UnregisteredClusterException.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/UnregisteredClusterException.java
index 0a17376..c7851e0 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/UnregisteredClusterException.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/UnregisteredClusterException.java
@@ -21,13 +21,23 @@ package org.apache.stratos.cloud.controller.exception;
public class UnregisteredClusterException extends Exception {
private static final long serialVersionUID = -6326227079367867222L;
+ private String message;
public UnregisteredClusterException(String msg) {
super(msg);
+ this.setMessage(msg);
}
public UnregisteredClusterException(String msg, Exception ex) {
super(msg, ex);
+ this.setMessage(msg);
}
+ private void setMessage(String msg) {
+ this.message = msg;
+ }
+
+ public String getMessage() {
+ return this.message;
+ }
}
[06/13] git commit: fixing wsdls for
https://issues.apache.org/jira/browse/STRATOS-486
Posted by ni...@apache.org.
fixing wsdls for https://issues.apache.org/jira/browse/STRATOS-486
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/3e9da00a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/3e9da00a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/3e9da00a
Branch: refs/heads/master
Commit: 3e9da00a68582758edcd33cf6894e7821f6e923d
Parents: 95d2b83
Author: Nirmal Fernando <ni...@apache.org>
Authored: Sat Mar 1 13:39:50 2014 +0530
Committer: Nirmal Fernando <ni...@apache.org>
Committed: Sat Mar 1 13:39:50 2014 +0530
----------------------------------------------------------------------
.../main/resources/CloudControllerService.wsdl | 96 +++++++++++++++-----
1 file changed, 74 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/3e9da00a/service-stubs/org.apache.stratos.cloud.controller.service.stub/src/main/resources/CloudControllerService.wsdl
----------------------------------------------------------------------
diff --git a/service-stubs/org.apache.stratos.cloud.controller.service.stub/src/main/resources/CloudControllerService.wsdl b/service-stubs/org.apache.stratos.cloud.controller.service.stub/src/main/resources/CloudControllerService.wsdl
index 8a59503..0077525 100644
--- a/service-stubs/org.apache.stratos.cloud.controller.service.stub/src/main/resources/CloudControllerService.wsdl
+++ b/service-stubs/org.apache.stratos.cloud.controller.service.stub/src/main/resources/CloudControllerService.wsdl
@@ -8,25 +8,39 @@
</xs:sequence>
</xs:complexType>
<xs:complexType name="InvalidCartridgeTypeException">
- <xs:sequence></xs:sequence>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element>
+ </xs:sequence>
</xs:complexType>
<xs:complexType name="UnregisteredClusterException">
- <xs:sequence></xs:sequence>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element>
+ </xs:sequence>
</xs:complexType>
<xs:complexType name="InvalidMemberException">
- <xs:sequence></xs:sequence>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element>
+ </xs:sequence>
</xs:complexType>
<xs:complexType name="InvalidClusterException">
- <xs:sequence></xs:sequence>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element>
+ </xs:sequence>
</xs:complexType>
<xs:complexType name="UnregisteredCartridgeException">
- <xs:sequence></xs:sequence>
- </xs:complexType>
- <xs:complexType name="InvalidCartridgeDefinitionException">
- <xs:sequence></xs:sequence>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element>
+ </xs:sequence>
</xs:complexType>
<xs:complexType name="InvalidIaasProviderException">
- <xs:sequence></xs:sequence>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="InvalidCartridgeDefinitionException">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element>
+ </xs:sequence>
</xs:complexType>
</xs:schema>
<xs:schema xmlns:ax28="http://partition.deployment.controller.cloud.stratos.apache.org/xsd" xmlns:ax210="http://pojo.controller.cloud.stratos.apache.org/xsd" xmlns:ax24="http://exception.controller.cloud.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://impl.controller.cloud.stratos.apache.org">
@@ -139,6 +153,20 @@
</xs:sequence>
</xs:complexType>
</xs:element>
+ <xs:element name="CloudControllerServiceInvalidIaasProviderException">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="InvalidIaasProviderException" nillable="true" type="ax23:InvalidIaasProviderException"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="CloudControllerServiceIllegalStateException">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="IllegalStateException" nillable="true" type="xs:anyType"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
<xs:element name="startInstance">
<xs:complexType>
<xs:sequence>
@@ -200,13 +228,6 @@
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="CloudControllerServiceInvalidIaasProviderException">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="InvalidIaasProviderException" nillable="true" type="ax23:InvalidIaasProviderException"></xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
<xs:element name="deployCartridgeDefinition">
<xs:complexType>
<xs:sequence>
@@ -437,6 +458,9 @@
<wsdl:message name="startInstanceResponse">
<wsdl:part name="parameters" element="ns:startInstanceResponse"></wsdl:part>
</wsdl:message>
+ <wsdl:message name="CloudControllerServiceIllegalStateException">
+ <wsdl:part name="parameters" element="ns:CloudControllerServiceIllegalStateException"></wsdl:part>
+ </wsdl:message>
<wsdl:portType name="CloudControllerServicePortType">
<wsdl:operation name="validatePartition">
<wsdl:input message="ns:validatePartitionRequest" wsaw:Action="urn:validatePartition"></wsdl:input>
@@ -465,6 +489,7 @@
<wsdl:input message="ns:deployCartridgeDefinitionRequest" wsaw:Action="urn:deployCartridgeDefinition"></wsdl:input>
<wsdl:fault message="ns:CloudControllerServiceInvalidCartridgeDefinitionException" name="CloudControllerServiceInvalidCartridgeDefinitionException" wsaw:Action="urn:deployCartridgeDefinitionCloudControllerServiceInvalidCartridgeDefinitionException"></wsdl:fault>
<wsdl:fault message="ns:CloudControllerServiceInvalidIaasProviderException" name="CloudControllerServiceInvalidIaasProviderException" wsaw:Action="urn:deployCartridgeDefinitionCloudControllerServiceInvalidIaasProviderException"></wsdl:fault>
+ <wsdl:fault message="ns:CloudControllerServiceIllegalArgumentException" name="CloudControllerServiceIllegalArgumentException" wsaw:Action="urn:deployCartridgeDefinitionCloudControllerServiceIllegalArgumentException"></wsdl:fault>
</wsdl:operation>
<wsdl:operation name="getCartridgeInfo">
<wsdl:input message="ns:getCartridgeInfoRequest" wsaw:Action="urn:getCartridgeInfo"></wsdl:input>
@@ -477,6 +502,7 @@
</wsdl:operation>
<wsdl:operation name="undeployCartridgeDefinition">
<wsdl:input message="ns:undeployCartridgeDefinitionRequest" wsaw:Action="urn:undeployCartridgeDefinition"></wsdl:input>
+ <wsdl:fault message="ns:CloudControllerServiceInvalidCartridgeTypeException" name="CloudControllerServiceInvalidCartridgeTypeException" wsaw:Action="urn:undeployCartridgeDefinitionCloudControllerServiceInvalidCartridgeTypeException"></wsdl:fault>
</wsdl:operation>
<wsdl:operation name="terminateAllInstances">
<wsdl:input message="ns:terminateAllInstancesRequest" wsaw:Action="urn:terminateAllInstances"></wsdl:input>
@@ -492,6 +518,8 @@
<wsdl:output message="ns:startInstanceResponse" wsaw:Action="urn:startInstanceResponse"></wsdl:output>
<wsdl:fault message="ns:CloudControllerServiceIllegalArgumentException" name="CloudControllerServiceIllegalArgumentException" wsaw:Action="urn:startInstanceCloudControllerServiceIllegalArgumentException"></wsdl:fault>
<wsdl:fault message="ns:CloudControllerServiceUnregisteredCartridgeException" name="CloudControllerServiceUnregisteredCartridgeException" wsaw:Action="urn:startInstanceCloudControllerServiceUnregisteredCartridgeException"></wsdl:fault>
+ <wsdl:fault message="ns:CloudControllerServiceInvalidIaasProviderException" name="CloudControllerServiceInvalidIaasProviderException" wsaw:Action="urn:startInstanceCloudControllerServiceInvalidIaasProviderException"></wsdl:fault>
+ <wsdl:fault message="ns:CloudControllerServiceIllegalStateException" name="CloudControllerServiceIllegalStateException" wsaw:Action="urn:startInstanceCloudControllerServiceIllegalStateException"></wsdl:fault>
</wsdl:operation>
</wsdl:portType>
<wsdl:binding name="CloudControllerServiceSoap11Binding" type="ns:CloudControllerServicePortType">
@@ -558,6 +586,9 @@
<wsdl:input>
<soap:body use="literal"></soap:body>
</wsdl:input>
+ <wsdl:fault name="CloudControllerServiceIllegalArgumentException">
+ <soap:fault use="literal" name="CloudControllerServiceIllegalArgumentException"></soap:fault>
+ </wsdl:fault>
<wsdl:fault name="CloudControllerServiceInvalidCartridgeDefinitionException">
<soap:fault use="literal" name="CloudControllerServiceInvalidCartridgeDefinitionException"></soap:fault>
</wsdl:fault>
@@ -591,6 +622,9 @@
<wsdl:input>
<soap:body use="literal"></soap:body>
</wsdl:input>
+ <wsdl:fault name="CloudControllerServiceInvalidCartridgeTypeException">
+ <soap:fault use="literal" name="CloudControllerServiceInvalidCartridgeTypeException"></soap:fault>
+ </wsdl:fault>
</wsdl:operation>
<wsdl:operation name="terminateAllInstances">
<soap:operation soapAction="urn:terminateAllInstances" style="document"></soap:operation>
@@ -624,6 +658,12 @@
<wsdl:fault name="CloudControllerServiceIllegalArgumentException">
<soap:fault use="literal" name="CloudControllerServiceIllegalArgumentException"></soap:fault>
</wsdl:fault>
+ <wsdl:fault name="CloudControllerServiceIllegalStateException">
+ <soap:fault use="literal" name="CloudControllerServiceIllegalStateException"></soap:fault>
+ </wsdl:fault>
+ <wsdl:fault name="CloudControllerServiceInvalidIaasProviderException">
+ <soap:fault use="literal" name="CloudControllerServiceInvalidIaasProviderException"></soap:fault>
+ </wsdl:fault>
<wsdl:fault name="CloudControllerServiceUnregisteredCartridgeException">
<soap:fault use="literal" name="CloudControllerServiceUnregisteredCartridgeException"></soap:fault>
</wsdl:fault>
@@ -693,6 +733,9 @@
<wsdl:input>
<soap12:body use="literal"></soap12:body>
</wsdl:input>
+ <wsdl:fault name="CloudControllerServiceIllegalArgumentException">
+ <soap12:fault use="literal" name="CloudControllerServiceIllegalArgumentException"></soap12:fault>
+ </wsdl:fault>
<wsdl:fault name="CloudControllerServiceInvalidCartridgeDefinitionException">
<soap12:fault use="literal" name="CloudControllerServiceInvalidCartridgeDefinitionException"></soap12:fault>
</wsdl:fault>
@@ -726,6 +769,9 @@
<wsdl:input>
<soap12:body use="literal"></soap12:body>
</wsdl:input>
+ <wsdl:fault name="CloudControllerServiceInvalidCartridgeTypeException">
+ <soap12:fault use="literal" name="CloudControllerServiceInvalidCartridgeTypeException"></soap12:fault>
+ </wsdl:fault>
</wsdl:operation>
<wsdl:operation name="terminateAllInstances">
<soap12:operation soapAction="urn:terminateAllInstances" style="document"></soap12:operation>
@@ -759,6 +805,12 @@
<wsdl:fault name="CloudControllerServiceIllegalArgumentException">
<soap12:fault use="literal" name="CloudControllerServiceIllegalArgumentException"></soap12:fault>
</wsdl:fault>
+ <wsdl:fault name="CloudControllerServiceIllegalStateException">
+ <soap12:fault use="literal" name="CloudControllerServiceIllegalStateException"></soap12:fault>
+ </wsdl:fault>
+ <wsdl:fault name="CloudControllerServiceInvalidIaasProviderException">
+ <soap12:fault use="literal" name="CloudControllerServiceInvalidIaasProviderException"></soap12:fault>
+ </wsdl:fault>
<wsdl:fault name="CloudControllerServiceUnregisteredCartridgeException">
<soap12:fault use="literal" name="CloudControllerServiceUnregisteredCartridgeException"></soap12:fault>
</wsdl:fault>
@@ -853,22 +905,22 @@
</wsdl:binding>
<wsdl:service name="CloudControllerService">
<wsdl:port name="CloudControllerServiceHttpSoap11Endpoint" binding="ns:CloudControllerServiceSoap11Binding">
- <soap:address location="http://10.100.1.142:9764/services/CloudControllerService.CloudControllerServiceHttpSoap11Endpoint/"></soap:address>
+ <soap:address location="http://10.128.181.194:9764/services/CloudControllerService.CloudControllerServiceHttpSoap11Endpoint/"></soap:address>
</wsdl:port>
<wsdl:port name="CloudControllerServiceHttpsSoap11Endpoint" binding="ns:CloudControllerServiceSoap11Binding">
- <soap:address location="https://10.100.1.142:9444/services/CloudControllerService.CloudControllerServiceHttpsSoap11Endpoint/"></soap:address>
+ <soap:address location="https://10.128.181.194:9444/services/CloudControllerService.CloudControllerServiceHttpsSoap11Endpoint/"></soap:address>
</wsdl:port>
<wsdl:port name="CloudControllerServiceHttpSoap12Endpoint" binding="ns:CloudControllerServiceSoap12Binding">
- <soap12:address location="http://10.100.1.142:9764/services/CloudControllerService.CloudControllerServiceHttpSoap12Endpoint/"></soap12:address>
+ <soap12:address location="http://10.128.181.194:9764/services/CloudControllerService.CloudControllerServiceHttpSoap12Endpoint/"></soap12:address>
</wsdl:port>
<wsdl:port name="CloudControllerServiceHttpsSoap12Endpoint" binding="ns:CloudControllerServiceSoap12Binding">
- <soap12:address location="https://10.100.1.142:9444/services/CloudControllerService.CloudControllerServiceHttpsSoap12Endpoint/"></soap12:address>
+ <soap12:address location="https://10.128.181.194:9444/services/CloudControllerService.CloudControllerServiceHttpsSoap12Endpoint/"></soap12:address>
</wsdl:port>
<wsdl:port name="CloudControllerServiceHttpEndpoint" binding="ns:CloudControllerServiceHttpBinding">
- <http:address location="http://10.100.1.142:9764/services/CloudControllerService.CloudControllerServiceHttpEndpoint/"></http:address>
+ <http:address location="http://10.128.181.194:9764/services/CloudControllerService.CloudControllerServiceHttpEndpoint/"></http:address>
</wsdl:port>
<wsdl:port name="CloudControllerServiceHttpsEndpoint" binding="ns:CloudControllerServiceHttpBinding">
- <http:address location="https://10.100.1.142:9444/services/CloudControllerService.CloudControllerServiceHttpsEndpoint/"></http:address>
+ <http:address location="https://10.128.181.194:9444/services/CloudControllerService.CloudControllerServiceHttpsEndpoint/"></http:address>
</wsdl:port>
</wsdl:service>
</wsdl:definitions>
\ No newline at end of file
[05/13] git commit: fixing pom.xml exports
Posted by ni...@apache.org.
fixing pom.xml exports
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/95d2b833
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/95d2b833
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/95d2b833
Branch: refs/heads/master
Commit: 95d2b83317cb9be1ab202ab9c60749a046d5a961
Parents: d7206a7
Author: Nirmal Fernando <ni...@apache.org>
Authored: Sat Mar 1 13:39:17 2014 +0530
Committer: Nirmal Fernando <ni...@apache.org>
Committed: Sat Mar 1 13:39:17 2014 +0530
----------------------------------------------------------------------
.../org.apache.stratos.cloud.controller.service.stub/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/95d2b833/service-stubs/org.apache.stratos.cloud.controller.service.stub/pom.xml
----------------------------------------------------------------------
diff --git a/service-stubs/org.apache.stratos.cloud.controller.service.stub/pom.xml b/service-stubs/org.apache.stratos.cloud.controller.service.stub/pom.xml
index dc6fae7..d268c71 100644
--- a/service-stubs/org.apache.stratos.cloud.controller.service.stub/pom.xml
+++ b/service-stubs/org.apache.stratos.cloud.controller.service.stub/pom.xml
@@ -88,9 +88,9 @@
<Bundle-Name>${project.artifactId}</Bundle-Name>
<Export-Package>
org.apache.stratos.cloud.controller.exception.*; version=${project.version},
- org.apache.stratos.cloud.controller.deployment.policy.*; version=${project.version},
org.apache.stratos.cloud.controller.deployment.partition.*; version=${project.version},
org.apache.stratos.cloud.controller.pojo.*; version=${project.version},
+ org.apache.stratos.cloud.controller.impl.*; version=${project.version},
org.apache.stratos.cloud.controller.stub.*; version=${project.version}
</Export-Package>
<Import-Package>
[10/13] git commit: fixing wsdls for
https://issues.apache.org/jira/browse/STRATOS-486
Posted by ni...@apache.org.
fixing wsdls for https://issues.apache.org/jira/browse/STRATOS-486
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/127329dc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/127329dc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/127329dc
Branch: refs/heads/master
Commit: 127329dc46c34c060c6753e3ac316a550db57d5b
Parents: 91f14f3
Author: Nirmal Fernando <ni...@apache.org>
Authored: Sat Mar 1 13:41:46 2014 +0530
Committer: Nirmal Fernando <ni...@apache.org>
Committed: Sat Mar 1 13:41:46 2014 +0530
----------------------------------------------------------------------
.../src/main/resources/AutoScalerService.wsdl | 678 ++++++++++---------
1 file changed, 342 insertions(+), 336 deletions(-)
----------------------------------------------------------------------
[12/13] git commit: fixing rest service back-end for
https://issues.apache.org/jira/browse/STRATOS-486
Posted by ni...@apache.org.
fixing rest service back-end for https://issues.apache.org/jira/browse/STRATOS-486
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/096e96be
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/096e96be
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/096e96be
Branch: refs/heads/master
Commit: 096e96bed6c108b39380a8cfaa74caa2c52fd8bd
Parents: ffe1bc6
Author: Nirmal Fernando <ni...@apache.org>
Authored: Sat Mar 1 13:43:32 2014 +0530
Committer: Nirmal Fernando <ni...@apache.org>
Committed: Sat Mar 1 13:43:32 2014 +0530
----------------------------------------------------------------------
.../rest/endpoint/services/ServiceUtils.java | 405 ++++++++++++-------
1 file changed, 266 insertions(+), 139 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/096e96be/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java
index f882461..f95d935 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java
@@ -23,8 +23,15 @@ import org.apache.axis2.context.ConfigurationContext;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.stratos.autoscaler.deployment.policy.DeploymentPolicy;
+import org.apache.stratos.autoscaler.stub.AutoScalerServiceInvalidPartitionExceptionException;
+import org.apache.stratos.autoscaler.stub.AutoScalerServiceInvalidPolicyExceptionException;
import org.apache.stratos.cloud.controller.pojo.*;
import org.apache.stratos.cloud.controller.pojo.Properties;
+import org.apache.stratos.cloud.controller.stub.CloudControllerServiceIllegalArgumentExceptionException;
+import org.apache.stratos.cloud.controller.stub.CloudControllerServiceInvalidCartridgeDefinitionExceptionException;
+import org.apache.stratos.cloud.controller.stub.CloudControllerServiceInvalidCartridgeTypeExceptionException;
+import org.apache.stratos.cloud.controller.stub.CloudControllerServiceInvalidIaasProviderExceptionException;
+import org.apache.stratos.cloud.controller.stub.CloudControllerServiceUnregisteredCartridgeExceptionException;
import org.apache.stratos.manager.client.AutoscalerServiceClient;
import org.apache.stratos.manager.client.CloudControllerServiceClient;
import org.apache.stratos.manager.deploy.service.Service;
@@ -56,6 +63,8 @@ import org.apache.stratos.rest.endpoint.bean.util.converter.PojoConverter;
import org.apache.stratos.rest.endpoint.exception.RestAPIException;
import javax.ws.rs.core.Response;
+
+import java.rmi.RemoteException;
import java.util.*;
import java.util.regex.Pattern;
@@ -84,18 +93,30 @@ public class ServiceUtils {
throw new RestAPIException("Populated CartridgeConfig instance is null, cartridge deployment aborted");
}
- try {
- // call CC
- cloudControllerServiceClient.deployCartridgeDefinition(cartridgeConfig);
+ // call CC
+ try {
+ cloudControllerServiceClient
+ .deployCartridgeDefinition(cartridgeConfig);
+ } catch (RemoteException e) {
+ log.error(e.getMessage(), e);
+ throw new RestAPIException(e.getMessage(), e);
+ } catch (CloudControllerServiceInvalidCartridgeDefinitionExceptionException e) {
+ String message = e.getFaultMessage().getInvalidCartridgeDefinitionException().getMessage();
+ log.error(message, e);
+ throw new RestAPIException(message, e);
+ } catch (CloudControllerServiceInvalidIaasProviderExceptionException e) {
+ String message = e.getFaultMessage().getInvalidIaasProviderException().getMessage();
+ log.error(message, e);
+ throw new RestAPIException(message, e);
+ } catch (CloudControllerServiceIllegalArgumentExceptionException e) {
+ String msg = e.getMessage();
+ log.error(msg, e);
+ throw new RestAPIException(msg, e);
+ }
- log.info("Successfully deployed Cartridge [type] "+cartridgeDefinitionBean.type);
+ log.info("Successfully deployed Cartridge [type] "+cartridgeDefinitionBean.type);
- } catch (Exception e) {
- String errorMsg = "Error while deploying cartridge definition";
- log.error(errorMsg, e);
- throw new RestAPIException(errorMsg);
- }
}
StratosAdminResponse stratosAdminResponse = new StratosAdminResponse();
@@ -127,14 +148,17 @@ public class ServiceUtils {
CloudControllerServiceClient cloudControllerServiceClient = getCloudControllerServiceClient();
if (cloudControllerServiceClient != null) {
- try {
- cloudControllerServiceClient.unDeployCartridgeDefinition(cartridgeType);
+ try {
+ cloudControllerServiceClient.unDeployCartridgeDefinition(cartridgeType);
+ } catch (RemoteException e) {
+ log.error(e.getMessage(), e);
+ throw new RestAPIException(e.getMessage(), e);
+ } catch (CloudControllerServiceInvalidCartridgeTypeExceptionException e) {
+ String msg = e.getFaultMessage().getInvalidCartridgeTypeException().getMessage();
+ log.error(msg, e);
+ throw new RestAPIException(msg, e);
+ }
- } catch (Exception e) {
- String errorMsg = "Error while undeploying cartridge definition for type " + cartridgeType;
- log.error(errorMsg, e);
- throw new RestAPIException(errorMsg);
- }
}
StratosAdminResponse stratosAdminResponse = new StratosAdminResponse();
@@ -153,14 +177,17 @@ public class ServiceUtils {
org.apache.stratos.cloud.controller.deployment.partition.Partition partition =
PojoConverter.convertToCCPartitionPojo(partitionBean);
- try {
- autoscalerServiceClient.deployPartition(partition);
+ try {
+ autoscalerServiceClient.deployPartition(partition);
+ } catch (RemoteException e) {
+ log.error(e.getMessage(), e);
+ throw new RestAPIException(e.getMessage(), e);
+ } catch (AutoScalerServiceInvalidPartitionExceptionException e) {
+ String message = e.getFaultMessage().getInvalidPartitionException().getMessage();
+ log.error(message, e);
+ throw new RestAPIException(message, e);
+ }
- } catch (Exception e) {
- String errorMsg = "Error in deploying partition definition";
- log.error(errorMsg, e);
- throw new RestAPIException(errorMsg);
- }
}
StratosAdminResponse stratosAdminResponse = new StratosAdminResponse();
@@ -178,14 +205,19 @@ public class ServiceUtils {
org.apache.stratos.autoscaler.policy.model.AutoscalePolicy autoscalePolicy = PojoConverter.
convertToCCAutoscalerPojo(autoscalePolicyBean);
- try {
- autoscalerServiceClient.deployAutoscalingPolicy(autoscalePolicy);
+ try {
+ autoscalerServiceClient
+ .deployAutoscalingPolicy(autoscalePolicy);
+ } catch (RemoteException e) {
+ log.error(e.getMessage(), e);
+ throw new RestAPIException(e.getMessage(), e);
+ } catch (AutoScalerServiceInvalidPolicyExceptionException e) {
+ String message = e.getFaultMessage()
+ .getInvalidPolicyException().getMessage();
+ log.error(message, e);
+ throw new RestAPIException(message, e);
+ }
- } catch (Exception e) {
- String errorMsg = "Error in deploying autoscaling policy definition";
- log.error(errorMsg, e);
- throw new RestAPIException(errorMsg);
- }
}
StratosAdminResponse stratosAdminResponse = new StratosAdminResponse();
@@ -205,14 +237,18 @@ public class ServiceUtils {
org.apache.stratos.autoscaler.deployment.policy.DeploymentPolicy deploymentPolicy =
PojoConverter.convetToCCDeploymentPolicyPojo(deploymentPolicyBean);
- try {
- autoscalerServiceClient.deployDeploymentPolicy(deploymentPolicy);
+ try {
+ autoscalerServiceClient
+ .deployDeploymentPolicy(deploymentPolicy);
+ } catch (RemoteException e) {
+ log.error(e.getMessage(), e);
+ throw new RestAPIException(e.getMessage(), e);
+ } catch (AutoScalerServiceInvalidPolicyExceptionException e) {
+ String message = e.getFaultMessage().getInvalidPolicyException().getMessage();
+ log.error(message, e);
+ throw new RestAPIException(message, e);
+ }
- } catch (Exception e) {
- String errorMsg = "Error in deploying deployment policy definition";
- log.error(errorMsg, e);
- throw new RestAPIException(errorMsg);
- }
}
StratosAdminResponse stratosAdminResponse = new StratosAdminResponse();
@@ -226,9 +262,10 @@ public class ServiceUtils {
return CloudControllerServiceClient.getServiceClient();
} catch (AxisFault axisFault) {
- String errorMsg = "Error in getting CloudControllerServiceClient instance to connect to the Cloud Controller";
+ String errorMsg = "Error while getting CloudControllerServiceClient instance to connect to the "
+ + "Cloud Controller. Cause: "+axisFault.getMessage();
log.error(errorMsg, axisFault);
- throw new RestAPIException(errorMsg);
+ throw new RestAPIException(errorMsg, axisFault);
}
}
@@ -240,10 +277,10 @@ public class ServiceUtils {
try {
partitions = autoscalerServiceClient.getAvailablePartitions();
- } catch (Exception e) {
- String errorMsg = "Error getting available partitions. Backend error is : " + e.getMessage();
+ } catch (RemoteException e) {
+ String errorMsg = "Error while getting available partitions. Cause : " + e.getMessage();
log.error(errorMsg, e);
- throw new RestAPIException(errorMsg);
+ throw new RestAPIException(errorMsg, e);
}
}
@@ -260,10 +297,11 @@ public class ServiceUtils {
partitions =
autoscalerServiceClient.getPartitionsOfDeploymentPolicy(deploymentPolicyId);
- } catch (Exception e) {
- String errorMsg = "Error getting available partitions for deployment policy id " + deploymentPolicyId;
+ } catch (RemoteException e) {
+ String errorMsg = "Error while getting available partitions for deployment policy id " +
+ deploymentPolicyId+". Cause: "+e.getMessage();
log.error(errorMsg, e);
- throw new RestAPIException(errorMsg);
+ throw new RestAPIException(errorMsg, e);
}
}
@@ -280,11 +318,11 @@ public class ServiceUtils {
partitions =
autoscalerServiceClient.getPartitionsOfGroup(deploymentPolicyId, groupId);
- } catch (Exception e) {
- String errorMsg = "Error getting available partitions for deployment policy id " + deploymentPolicyId +
- ", group id " + groupId;
+ } catch (RemoteException e) {
+ String errorMsg = "Error while getting available partitions for deployment policy id " + deploymentPolicyId +
+ ", group id " + groupId+". Cause: "+e.getMessage();
log.error(errorMsg, e);
- throw new RestAPIException(errorMsg);
+ throw new RestAPIException(errorMsg, e);
}
}
@@ -299,10 +337,10 @@ public class ServiceUtils {
try {
partition = autoscalerServiceClient.getPartition(partitionId);
- } catch (Exception e) {
- String errorMsg = "Error getting partition for id " + partitionId;
+ } catch (RemoteException e) {
+ String errorMsg = "Error while getting partition for id " + partitionId+". Cause: "+e.getMessage();
log.error(errorMsg, e);
- throw new RestAPIException(errorMsg);
+ throw new RestAPIException(errorMsg, e);
}
}
@@ -315,9 +353,10 @@ public class ServiceUtils {
return AutoscalerServiceClient.getServiceClient();
} catch (AxisFault axisFault) {
- String errorMsg = "Error in getting AutoscalerServiceClient instance to connect to the Autoscaler";
+ String errorMsg = "Error while getting AutoscalerServiceClient instance to connect to the "
+ + "Autoscaler. Cause: "+axisFault.getMessage();
log.error(errorMsg, axisFault);
- throw new RestAPIException(errorMsg);
+ throw new RestAPIException(errorMsg, axisFault);
}
}
@@ -329,12 +368,18 @@ public class ServiceUtils {
try {
autoscalePolicies = autoscalerServiceClient.getAutoScalePolicies();
- } catch (Exception e) {
- String errorMsg = "Error getting available autoscaling policies. Backend error is : " + e.getMessage();
+ } catch (RemoteException e) {
+ String errorMsg = "Error while getting available autoscaling policies. Cause : " + e.getMessage();
log.error(errorMsg, e);
- throw new RestAPIException(errorMsg);
+ throw new RestAPIException(errorMsg, e);
}
}
+
+ if(autoscalePolicies.length == 0) {
+ String errorMsg = "Cannot find any auto-scaling policy.";
+ log.error(errorMsg);
+ throw new RestAPIException(errorMsg);
+ }
return PojoConverter.populateAutoscalePojos(autoscalePolicies);
}
@@ -347,13 +392,20 @@ public class ServiceUtils {
try {
autoscalePolicy = autoscalerServiceClient.getAutoScalePolicy(autoscalePolicyId);
- } catch (Exception e) {
- String errorMsg = "Error getting information for autoscaling policy with id " + autoscalePolicyId;
+ } catch (RemoteException e) {
+ String errorMsg = "Error while getting information for autoscaling policy with id " +
+ autoscalePolicyId+". Cause: "+e.getMessage();
log.error(errorMsg, e);
- throw new RestAPIException(errorMsg);
+ throw new RestAPIException(errorMsg, e);
}
}
+ if(autoscalePolicy == null) {
+ String errorMsg = "Cannot find a matching auto-scaling policy for [id] "+autoscalePolicyId;
+ log.error(errorMsg);
+ throw new RestAPIException(errorMsg);
+ }
+
return PojoConverter.populateAutoscalePojo(autoscalePolicy);
}
@@ -366,12 +418,18 @@ public class ServiceUtils {
try {
deploymentPolicies = autoscalerServiceClient.getDeploymentPolicies();
- } catch (Exception e) {
- String errorMsg = "Error getting available deployment policies. Backend error is : " + e.getMessage();
+ } catch (RemoteException e) {
+ String errorMsg = "Error getting available deployment policies. Cause : " + e.getMessage();
log.error(errorMsg, e);
- throw new RestAPIException(errorMsg);
+ throw new RestAPIException(errorMsg, e);
}
}
+
+ if(deploymentPolicies.length == 0) {
+ String errorMsg = "Cannot find any deployment policy.";
+ log.error(errorMsg);
+ throw new RestAPIException(errorMsg);
+ }
return PojoConverter.populateDeploymentPolicyPojos(deploymentPolicies);
}
@@ -385,12 +443,19 @@ public class ServiceUtils {
try {
deploymentPolicies = autoscalerServiceClient.getDeploymentPolicies(cartridgeType);
- } catch (Exception e) {
- String errorMsg = "Error getting available deployment policies for cartridge type " + cartridgeType;
+ } catch (RemoteException e) {
+ String errorMsg = "Error while getting available deployment policies for cartridge type " +
+ cartridgeType+". Cause: "+e.getMessage();;
log.error(errorMsg, e);
- throw new RestAPIException(errorMsg);
+ throw new RestAPIException(errorMsg, e);
}
}
+
+ if(deploymentPolicies.length == 0) {
+ String errorMsg = "Cannot find any matching deployment policy for Cartridge [type] "+cartridgeType;
+ log.error(errorMsg);
+ throw new RestAPIException(errorMsg);
+ }
return PojoConverter.populateDeploymentPolicyPojos(deploymentPolicies);
}
@@ -404,12 +469,19 @@ public class ServiceUtils {
try {
deploymentPolicy = autoscalerServiceClient.getDeploymentPolicy(deploymentPolicyId);
- } catch (Exception e) {
- String errorMsg = "Error getting deployment policy with id " + deploymentPolicyId;
+ } catch (RemoteException e) {
+ String errorMsg = "Error while getting deployment policy with id " +
+ deploymentPolicyId+". Cause: "+e.getMessage();
log.error(errorMsg, e);
- throw new RestAPIException(errorMsg);
+ throw new RestAPIException(errorMsg, e);
}
}
+
+ if(deploymentPolicy == null) {
+ String errorMsg = "Cannot find a matching deployment policy for [id] "+deploymentPolicyId;
+ log.error(errorMsg);
+ throw new RestAPIException(errorMsg);
+ }
return PojoConverter.populateDeploymentPolicyPojo(deploymentPolicy);
}
@@ -423,10 +495,11 @@ public class ServiceUtils {
try {
partitionGroups = autoscalerServiceClient.getPartitionGroups(deploymentPolicyId);
- } catch (Exception e) {
- String errorMsg = "Error getting available partition groups for deployment policy id " + deploymentPolicyId;
+ } catch (RemoteException e) {
+ String errorMsg = "Error getting available partition groups for deployment policy id "
+ + deploymentPolicyId+". Cause: "+e.getMessage();
log.error(errorMsg, e);
- throw new RestAPIException(errorMsg);
+ throw new RestAPIException(errorMsg, e);
}
}
@@ -446,19 +519,29 @@ public class ServiceUtils {
return cartridge;
}
}
- throw new RestAPIException("cannot find the required cartridge type " + cartridgeType) ;
+ String msg = "Unavailable cartridge type: " + cartridgeType;
+ log.error(msg);
+ throw new RestAPIException(msg) ;
}
- static List<Cartridge> getAvailableLbCartridges(Boolean multiTenant, ConfigurationContext configurationContext) throws RestAPIException {
- List<Cartridge> cartridges = getAvailableCartridges(null, multiTenant, configurationContext);
- List<Cartridge> lbCartridges = new ArrayList<Cartridge>();
- for(Cartridge cartridge : cartridges) {
- if(cartridge.isLoadBalancer()) {
- lbCartridges.add(cartridge);
- }
- }
- return lbCartridges;
- }
+ static List<Cartridge> getAvailableLbCartridges(Boolean multiTenant,
+ ConfigurationContext configurationContext) throws RestAPIException {
+ List<Cartridge> cartridges = getAvailableCartridges(null, multiTenant,
+ configurationContext);
+ List<Cartridge> lbCartridges = new ArrayList<Cartridge>();
+ for (Cartridge cartridge : cartridges) {
+ if (cartridge.isLoadBalancer()) {
+ lbCartridges.add(cartridge);
+ }
+ }
+
+ if(lbCartridges.isEmpty()) {
+ String msg = "Load balancer Cartridges are not available.";
+ log.error(msg);
+ throw new RestAPIException(msg) ;
+ }
+ return lbCartridges;
+ }
static List<Cartridge> getAvailableCartridges(String cartridgeSearchString, Boolean multiTenant, ConfigurationContext configurationContext) throws RestAPIException {
List<Cartridge> cartridges = new ArrayList<Cartridge>();
@@ -550,9 +633,9 @@ public class ServiceUtils {
}
}
} catch (Exception e) {
- String msg = "Error when getting available cartridges";
+ String msg = "Error while getting available cartridges. Cause: "+e.getMessage();
log.error(msg, e);
- throw new RestAPIException(msg);
+ throw new RestAPIException(msg, e);
}
Collections.sort(cartridges);
@@ -583,9 +666,9 @@ public class ServiceUtils {
services = serviceDeploymentManager.getServices();
} catch (ADCException e) {
- String msg = "Error in getting deployed service information ";
+ String msg = "Unable to get deployed service information. Cause: "+e.getMessage();
log.error(msg, e);
- throw new RestAPIException(msg);
+ throw new RestAPIException(msg, e);
}
if (services != null && !services.isEmpty()) {
@@ -603,9 +686,9 @@ public class ServiceUtils {
service = serviceDeploymentManager.getService(type);
} catch (ADCException e) {
- String msg = "Error in getting deployed service cluster definition " + type;
+ String msg = "Unable to get deployed service information for [type]: " + type+". Cause: "+e.getMessage();
log.error(msg, e);
- throw new RestAPIException(msg);
+ throw new RestAPIException(msg, e);
}
if (service != null) {
@@ -623,9 +706,9 @@ public class ServiceUtils {
services = serviceDeploymentManager.getServices();
} catch (ADCException e) {
- String msg = "Error in getting deployed service cluster definition ";
+ String msg = "Unable to get deployed service information. Cause: "+e.getMessage();
log.error(msg, e);
- throw new RestAPIException(msg);
+ throw new RestAPIException(msg, e);
}
List<Cartridge> availableMultitenantCartridges = new ArrayList<Cartridge>();
@@ -652,6 +735,12 @@ public class ServiceUtils {
//TODO have to check for the serivces which has correct tenant range
}
}
+
+ if (availableMultitenantCartridges.isEmpty()) {
+ String msg = "Cannot find any active deployed service for tenant [id] "+tenantId;
+ log.error(msg);
+ throw new RestAPIException(msg);
+ }
return availableMultitenantCartridges;
}
@@ -704,9 +793,9 @@ public class ServiceUtils {
}
}
} catch (Exception e) {
- String msg = "Error when getting subscribed cartridges";
+ String msg = "Error while getting subscribed cartridges. Cause: "+e.getMessage();
log.error(msg, e);
- throw new RestAPIException(msg);
+ throw new RestAPIException(msg, e);
}
Collections.sort(cartridges);
@@ -714,6 +803,12 @@ public class ServiceUtils {
if (log.isDebugEnabled()) {
log.debug("Returning subscribed cartridges " + cartridges.size());
}
+
+ if(cartridges.isEmpty()) {
+ String msg = "Cannot find any subscribed Cartridge, matching the given string: "+cartridgeSearchString;
+ log.error(msg);
+ throw new RestAPIException(msg);
+ }
return cartridges;
}
@@ -725,7 +820,9 @@ public class ServiceUtils {
getTenantId(configurationContext), cartridgeAlias));
if (cartridge == null) {
- throw new RestAPIException(Response.Status.NOT_FOUND, "Unregistered [alias]: "+cartridgeAlias+"! Please enter a valid alias.");
+ String message = "Unregistered [alias]: "+cartridgeAlias+"! Please enter a valid alias.";
+ log.error(message);
+ throw new RestAPIException(Response.Status.NOT_FOUND, message);
}
Cluster cluster = TopologyClusterInformationModel.getInstance().getCluster(ApplicationManagementUtil.getTenantId(configurationContext)
,cartridge.getCartridgeType(), cartridge.getCartridgeAlias());
@@ -748,6 +845,13 @@ public class ServiceUtils {
int noOfActiveInstances = 0;
Cluster cluster = TopologyClusterInformationModel.getInstance().getCluster(ApplicationManagementUtil.getTenantId(configurationContext)
,cartridgeType , cartridgeAlias);
+
+ if(cluster == null) {
+ String message = "No Cluster found for cartridge [type] "+cartridgeType+", [alias] "+cartridgeAlias;
+ log.error(message);
+ throw new RestAPIException(message);
+ }
+
for(Member member : cluster.getMembers()) {
if(member.getStatus().toString().equals(MemberStatus.Activated)) {
noOfActiveInstances ++;
@@ -756,41 +860,59 @@ public class ServiceUtils {
return noOfActiveInstances;
}
- private static Cartridge getCartridgeFromSubscription (CartridgeSubscription subscription) throws RestAPIException {
+ private static Cartridge getCartridgeFromSubscription(
+ CartridgeSubscription subscription) throws RestAPIException {
- if (subscription == null) {
- return null;
- }
-
- Cartridge cartridge = new Cartridge();
- cartridge.setCartridgeType(subscription.getCartridgeInfo().getType());
- cartridge.setMultiTenant(subscription.getCartridgeInfo().getMultiTenant());
- cartridge.setProvider(subscription.getCartridgeInfo().getProvider());
- cartridge.setVersion(subscription.getCartridgeInfo().getVersion());
- cartridge.setDescription(subscription.getCartridgeInfo().getDescription());
- cartridge.setDisplayName(subscription.getCartridgeInfo().getDisplayName());
- cartridge.setCartridgeAlias(subscription.getAlias());
- cartridge.setHostName(subscription.getHostName());
- cartridge.setMappedDomain(subscription.getMappedDomain());
- if (subscription.getRepository() != null) {
- cartridge.setRepoURL(subscription.getRepository().getUrl());
- }
+ if (subscription == null) {
+ return null;
+ }
+ try {
+ Cartridge cartridge = new Cartridge();
+ cartridge.setCartridgeType(subscription.getCartridgeInfo()
+ .getType());
+ cartridge.setMultiTenant(subscription.getCartridgeInfo()
+ .getMultiTenant());
+ cartridge
+ .setProvider(subscription.getCartridgeInfo().getProvider());
+ cartridge.setVersion(subscription.getCartridgeInfo().getVersion());
+ cartridge.setDescription(subscription.getCartridgeInfo()
+ .getDescription());
+ cartridge.setDisplayName(subscription.getCartridgeInfo()
+ .getDisplayName());
+ cartridge.setCartridgeAlias(subscription.getAlias());
+ cartridge.setHostName(subscription.getHostName());
+ cartridge.setMappedDomain(subscription.getMappedDomain());
+ if (subscription.getRepository() != null) {
+ cartridge.setRepoURL(subscription.getRepository().getUrl());
+ }
- if (subscription instanceof DataCartridgeSubscription) {
- DataCartridgeSubscription dataCartridgeSubscription = (DataCartridgeSubscription) subscription;
- cartridge.setDbHost(dataCartridgeSubscription.getDBHost());
- cartridge.setDbUserName(dataCartridgeSubscription.getDBUsername());
- cartridge.setPassword(dataCartridgeSubscription.getDBPassword());
- }
+ if (subscription instanceof DataCartridgeSubscription) {
+ DataCartridgeSubscription dataCartridgeSubscription = (DataCartridgeSubscription) subscription;
+ cartridge.setDbHost(dataCartridgeSubscription.getDBHost());
+ cartridge.setDbUserName(dataCartridgeSubscription
+ .getDBUsername());
+ cartridge
+ .setPassword(dataCartridgeSubscription.getDBPassword());
+ }
- if (subscription.getLbClusterId() != null && !subscription.getLbClusterId().isEmpty()) {
- cartridge.setLbClusterId(subscription.getLbClusterId());
- }
+ if (subscription.getLbClusterId() != null
+ && !subscription.getLbClusterId().isEmpty()) {
+ cartridge.setLbClusterId(subscription.getLbClusterId());
+ }
- cartridge.setStatus(subscription.getSubscriptionStatus());
- cartridge.setPortMappings(subscription.getCartridgeInfo().getPortMappings());
- return cartridge;
- }
+ cartridge.setStatus(subscription.getSubscriptionStatus());
+ cartridge.setPortMappings(subscription.getCartridgeInfo()
+ .getPortMappings());
+
+ return cartridge;
+
+ } catch (Exception e) {
+ String msg = "Unable to extract the Cartridge from subscription. Cause: "+e.getMessage();
+ log.error(msg);
+ throw new RestAPIException(msg);
+ }
+
+ }
static Pattern getSearchStringPattern(String searchString) {
if (log.isDebugEnabled()) {
@@ -851,7 +973,7 @@ public class ServiceUtils {
return subscribe(cartridgeInfoBean, configurationContext, tenantUsername, tenantDomain);
} catch (Exception e) {
- throw new RestAPIException(e.getMessage());
+ throw new RestAPIException(e.getMessage(), e);
}
}
@@ -873,11 +995,15 @@ public class ServiceUtils {
try {
cartridgeInfo = cloudControllerServiceClient.getCartridgeInfo(cartridgeInfoBean.getCartridgeType());
- } catch (Exception e) {
- String msg = "Cannot get cartridge info: " + cartridgeInfoBean.getCartridgeType();
+ } catch (RemoteException e) {
+ String msg = "Cannot get cartridge info: " + cartridgeInfoBean.getCartridgeType()+". Cause: "+e.getMessage();
log.error(msg, e);
throw new ADCException(msg, e);
- }
+ } catch (CloudControllerServiceUnregisteredCartridgeExceptionException e) {
+ String msg = e.getFaultMessage().getUnregisteredCartridgeException().getMessage();
+ log.error(msg, e);
+ throw new UnregisteredCartridgeException(msg, e);
+ }
String cartridgeType = cartridgeInfoBean.getCartridgeType();
String deploymentPolicy = cartridgeInfoBean.getDeploymentPolicy();
@@ -1078,7 +1204,7 @@ public class ServiceUtils {
lbCartridgeInfo = cloudControllerServiceClient.getCartridgeInfo(lbCartridgeType);
}
} catch (Exception e) {
- String msg = "Cannot get cartridge info: " + cartridgeType;
+ String msg = "Cannot get cartridge info: " + cartridgeType+". Cause: "+e.getMessage();
log.error(msg, e);
throw new ADCException(msg, e);
}
@@ -1281,7 +1407,7 @@ public class ServiceUtils {
log.debug("Successfully subscribed to a load balancer [cartridge] "+cartridgeType+" [alias] "+lbAlias);
}
} catch (Exception e) {
- String msg = "Error while subscribing to load balancer cartridge [type] "+cartridgeType;
+ String msg = "Error while subscribing to load balancer cartridge [type] "+cartridgeType+". Cause: "+e.getMessage();
log.error(msg, e);
throw new ADCException(msg, e);
}
@@ -1295,12 +1421,13 @@ public class ServiceUtils {
cartridgeSubsciptionManager.unsubscribeFromCartridge(tenantDomain, alias);
} catch (ADCException e) {
- throw new RestAPIException(e.getMessage(), e);
+ String msg = "Failed to unsubscribe from [alias] "+alias+". Cause: "+ e.getMessage();
+ log.error(msg, e);
+ throw new RestAPIException(msg, e);
} catch (NotSubscribedException e) {
- String msg = "Error in terminating subscription with alias "+ alias;
- log.error(msg, e);
- throw new RestAPIException(msg);
+ log.error(e.getMessage(), e);
+ throw new RestAPIException(e.getMessage(), e);
}
StratosAdminResponse stratosAdminResponse = new StratosAdminResponse();
@@ -1324,9 +1451,9 @@ public class ServiceUtils {
serviceDeploymentManager.deployService(cartridgeType, autoscalingPolicy, deploymentPolicy, tenantId, tenantRange, tenantDomain, tenantUsername);
} catch (Exception e) {
- String msg = "Error in deploying service cluster definition";
+ String msg = String.format("Failed to deploy the Service [Cartridge type] %s [alias] %s . Cause: %s", cartridgeType, alias, e.getMessage());
log.error(msg, e);
- throw new RestAPIException(msg);
+ throw new RestAPIException(msg, e);
}
StratosAdminResponse stratosAdminResponse = new StratosAdminResponse();
@@ -1340,9 +1467,9 @@ public class ServiceUtils {
serviceDeploymentManager.undeployService(serviceType);
} catch (Exception e) {
- String msg = "Error in undeploying service cluster definition for type " + serviceType;
+ String msg = "Failed to undeploy service cluster definition of type " + serviceType+" Cause: "+e.getMessage();
log.error(msg, e);
- throw new RestAPIException(msg);
+ throw new RestAPIException(msg, e);
}
StratosAdminResponse stratosAdminResponse = new StratosAdminResponse();
[03/13] git commit: appending root cause to the exception
Posted by ni...@apache.org.
appending root cause to the exception
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/846034d7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/846034d7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/846034d7
Branch: refs/heads/master
Commit: 846034d76aa3e4733864ab35babaae40478edb4f
Parents: 4ec710b
Author: Nirmal Fernando <ni...@apache.org>
Authored: Sat Mar 1 13:37:38 2014 +0530
Committer: Nirmal Fernando <ni...@apache.org>
Committed: Sat Mar 1 13:37:38 2014 +0530
----------------------------------------------------------------------
.../cloud/controller/validate/AWSEC2PartitionValidator.java | 2 +-
.../cloud/controller/validate/OpenstackNovaPartitionValidator.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/846034d7/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/validate/AWSEC2PartitionValidator.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/validate/AWSEC2PartitionValidator.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/validate/AWSEC2PartitionValidator.java
index 191d1da..0a251a6 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/validate/AWSEC2PartitionValidator.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/validate/AWSEC2PartitionValidator.java
@@ -80,7 +80,7 @@ public class AWSEC2PartitionValidator implements PartitionValidator {
return iaasProvider;
}
} catch (Exception ex) {
- String msg = "Invalid Partition Detected : "+partitionId;
+ String msg = "Invalid Partition Detected : "+partitionId+". Cause: "+ex.getMessage();
log.error(msg, ex);
throw new InvalidPartitionException(msg, ex);
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/846034d7/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/validate/OpenstackNovaPartitionValidator.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/validate/OpenstackNovaPartitionValidator.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/validate/OpenstackNovaPartitionValidator.java
index 13a459c..920d02c 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/validate/OpenstackNovaPartitionValidator.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/validate/OpenstackNovaPartitionValidator.java
@@ -81,7 +81,7 @@ public class OpenstackNovaPartitionValidator implements PartitionValidator {
return iaasProvider;
}
} catch (Exception ex) {
- String msg = "Invalid Partition Detected : "+partitionId;
+ String msg = "Invalid Partition Detected : "+partitionId+". Cause: "+ex.getMessage();
log.error(msg, ex);
throw new InvalidPartitionException(msg, ex);
}
[04/13] git commit: fixing implementation code for
https://issues.apache.org/jira/browse/STRATOS-486
Posted by ni...@apache.org.
fixing implementation code for https://issues.apache.org/jira/browse/STRATOS-486
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/d7206a75
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/d7206a75
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/d7206a75
Branch: refs/heads/master
Commit: d7206a752a5c9b40ba13c1eda82364c492ef3e1d
Parents: 846034d
Author: Nirmal Fernando <ni...@apache.org>
Authored: Sat Mar 1 13:38:19 2014 +0530
Committer: Nirmal Fernando <ni...@apache.org>
Committed: Sat Mar 1 13:38:19 2014 +0530
----------------------------------------------------------------------
.../impl/CloudControllerServiceImpl.java | 233 +++----------------
.../interfaces/CloudControllerService.java | 21 +-
.../util/CloudControllerConstants.java | 1 +
3 files changed, 52 insertions(+), 203 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/d7206a75/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java
index 1d773d0..e274d4e 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java
@@ -102,7 +102,8 @@ public class CloudControllerServiceImpl implements CloudControllerService {
}
}
- public void deployCartridgeDefinition(CartridgeConfig cartridgeConfig) throws InvalidCartridgeDefinitionException, InvalidIaasProviderException {
+ public void deployCartridgeDefinition(CartridgeConfig cartridgeConfig) throws InvalidCartridgeDefinitionException,
+ InvalidIaasProviderException, IllegalArgumentException {
if (cartridgeConfig == null) {
String msg = "Invalid Cartridge Definition: Definition is null.";
@@ -122,7 +123,7 @@ public class CloudControllerServiceImpl implements CloudControllerService {
String msg =
"Invalid Cartridge Definition: Cartridge Type: " +
cartridgeConfig.getType()+
- ". Cause: Cannot instantiate a Cartridge Instance with the given Config.";
+ ". Cause: Cannot instantiate a Cartridge Instance with the given Config. "+e.getMessage();
log.error(msg, e);
throw new InvalidCartridgeDefinitionException(msg, e);
}
@@ -164,7 +165,7 @@ public class CloudControllerServiceImpl implements CloudControllerService {
log.info("Successfully deployed the Cartridge definition: " + cartridgeType);
}
- public void undeployCartridgeDefinition(String cartridgeType) {
+ public void undeployCartridgeDefinition(String cartridgeType) throws InvalidCartridgeTypeException {
Cartridge cartridge = null;
if((cartridge = dataHolder.getCartridge(cartridgeType)) != null) {
@@ -173,11 +174,14 @@ public class CloudControllerServiceImpl implements CloudControllerService {
log.info("Successfully undeployed the Cartridge definition: " + cartridgeType);
}
}
+ String msg = "Cartridge [type] "+cartridgeType+" is not a deployed Cartridge type.";
+ log.error(msg);
+ throw new InvalidCartridgeTypeException(msg);
}
@Override
public MemberContext startInstance(MemberContext memberContext) throws IllegalArgumentException,
- UnregisteredCartridgeException {
+ UnregisteredCartridgeException, InvalidIaasProviderException, IllegalStateException {
if (memberContext == null) {
String msg = "Instance start-up failed. Member is null.";
@@ -216,7 +220,7 @@ public class CloudControllerServiceImpl implements CloudControllerService {
if (cartridge == null) {
String msg =
- "Instance start-up failed. No valid Cartridge found. " +
+ "Instance start-up failed. No matching Cartridge found [type] "+cartridgeType +". "+
memberContext.toString();
log.error(msg);
throw new UnregisteredCartridgeException(msg);
@@ -233,7 +237,7 @@ public class CloudControllerServiceImpl implements CloudControllerService {
+ "partitions can be found in this Cartridge: "
+cartridge.getPartitionToIaasProvider().keySet().toString()+ memberContext.toString() + ". ";
log.fatal(msg);
- throw new CloudControllerException(msg);
+ throw new InvalidIaasProviderException(msg);
}
String type = iaasProvider.getType();
try {
@@ -266,9 +270,9 @@ public class CloudControllerServiceImpl implements CloudControllerService {
iaas = CloudControllerUtil.getIaas(iaasProvider);
} catch (InvalidIaasProviderException e) {
String msg ="Instance start up failed. "+memberContext.toString()+
- "Unable to build Iaas of this IaasProvider [Provider] : " + type;
+ "Unable to build Iaas of this IaasProvider [Provider] : " + type+". Cause: "+e.getMessage();
log.error(msg, e);
- throw new CloudControllerException(msg, e);
+ throw new InvalidIaasProviderException(msg, e);
}
}
@@ -282,11 +286,9 @@ public class CloudControllerServiceImpl implements CloudControllerService {
String msg =
"Failed to start an instance. " +
memberContext.toString() +
- ". Reason : Template is null. You have not specify a matching service " +
- "element in the configuration file of Autoscaler.\n Hence, will try to " +
- "start in another IaaS if available.";
+ ". Reason : Jclouds Template is null for iaas provider [type]: "+iaasProvider.getType();
log.error(msg);
- throw new CloudControllerException(msg);
+ throw new InvalidIaasProviderException(msg);
}
// generate the group id from domain name and sub domain
@@ -327,7 +329,7 @@ public class CloudControllerServiceImpl implements CloudControllerService {
if (nodeId == null) {
String msg = "Node id of the starting instance is null.\n" + memberContext.toString();
log.fatal(msg);
- throw new CloudControllerException(msg);
+ throw new IllegalStateException(msg);
}
memberContext.setNodeId(nodeId);
if(log.isDebugEnabled()) {
@@ -342,14 +344,17 @@ public class CloudControllerServiceImpl implements CloudControllerService {
: nodeId;
memberContext.setInstanceId(instanceId);
if (!ctxt.getListOfVolumes().isEmpty()) {
- for (Volume volume : ctxt.getListOfVolumes()) {
- try {
- iaas.attachVolume(instanceId, volume.getId(), volume.getDevice());
+ for (Volume volume : ctxt.getListOfVolumes()) {
+ try {
+ iaas.attachVolume(instanceId, volume.getId(),
+ volume.getDevice());
} catch (Exception e) {
- //continue without throwing an exception, since there is an instance already running
- log.error("Attaching Volume to Instance [ " + instanceId + " ] failed!", e);
- }
- }
+ // continue without throwing an exception, since
+ // there is an instance already running
+ log.error("Attaching Volume to Instance [ "
+ + instanceId + " ] failed!", e);
+ }
+ }
}
}
@@ -358,9 +363,9 @@ public class CloudControllerServiceImpl implements CloudControllerService {
return memberContext;
} catch (Exception e) {
- String msg = "Failed to start an instance. " + memberContext.toString();
+ String msg = "Failed to start an instance. " + memberContext.toString()+" Cause: "+e.getMessage();
log.error(msg, e);
- throw new CloudControllerException(msg, e);
+ throw new IllegalStateException(msg, e);
}
}
@@ -368,17 +373,9 @@ public class CloudControllerServiceImpl implements CloudControllerService {
private void createVolumeAndSetInClusterContext(Volume volume,
IaasProvider iaasProvider) {
+ // iaas cannot be null at this state #startInstance method
Iaas iaas = iaasProvider.getIaas();
- if(iaas == null) {
- try {
- iaas = CloudControllerUtil.getIaas(iaasProvider);
- } catch (InvalidIaasProviderException e) {
- String msg = "Iaas could not be loaded from : "+iaasProvider;
- log.fatal(msg, e);
- throw new CloudControllerException(msg, e);
- }
- }
int sizeGB = volume.getSize();
String volumeId = iaas.createVolume(sizeGB);
volume.setId(volumeId);
@@ -616,105 +613,6 @@ public class CloudControllerServiceImpl implements CloudControllerService {
}
}
-// private
-// void
-// terminateInstance(MemberContext ctxt) throws InvalidCartridgeTypeException,
-// InvalidMemberException {
-// // these will never be null, since we do not add null values for these.
-// String memberId = ctxt.getMemberId();
-// String clusterId = ctxt.getClusterId();
-// String partitionId = ctxt.getPartitionId();
-// String cartridgeType = ctxt.getCartridgeType();
-// String nodeId = ctxt.getNodeId();
-//
-// Cartridge cartridge = dataHolder.getCartridge(cartridgeType);
-//
-// log.info("Starting to terminate an instance with member id : " + memberId+
-// " in partition id: "+partitionId+" of cluster id: "+clusterId+ " and of cartridge type: "+cartridgeType);
-//
-// if(cartridge == null) {
-// String msg = "Termination of Member Id: "+memberId+" failed. " +
-// "Cannot find a matching Cartridge for type: "+cartridgeType;
-// log.error(msg);
-// throw new InvalidCartridgeTypeException(msg);
-// }
-//
-//// Scope scope = partition.getScope();
-//// String provider = partition.getProperty("provider");
-//
-// // if no matching node id can be found.
-// if (nodeId == null) {
-//
-// String msg = "Termination failed. Cannot find a node id for Member Id: "+memberId;
-// log.error(msg);
-// throw new InvalidMemberException(msg);
-// }
-//// ServiceContext serviceCtxt = dataHolder
-//// .getServiceContextFromDomain(clusterId);
-////
-//// if (serviceCtxt == null) {
-//// String msg = "Not a registered service: domain - " + clusterId;
-//// log.fatal(msg);
-//// throw new CloudControllerException(msg);
-//// }
-////
-//// // load Cartridge, if null
-//// //if (serviceCtxt.getCartridge() == null) {
-//// serviceCtxt.setCartridge(loadCartridge(
-//// serviceCtxt.getCartridgeType(),
-//// dataHolder.getCartridges()));
-//// //}
-////
-//// // if still, Cartridge is null
-//// if (serviceCtxt.getCartridge() == null) {
-//// String msg = "There's no registered Cartridge found. Domain - "
-//// + clusterId;
-//// log.fatal(msg);
-//// throw new CloudControllerException(msg);
-//// }
-//
-//// for (IaasProvider iaas : serviceCtxt.getCartridge().getIaases()) {
-//
-// IaasProvider iaas = cartridge.getIaasProviderOfPartition(partitionId);
-//
-//// String msg = "Failed to terminate an instance in "
-//// + iaas.getType()
-//// + ". Hence, will try to terminate an instance in another IaaS if possible.";
-//// //TODO adding more locations and retrieve it from the request received
-//// String nodeId = null;
-//
-//// IaasContext ctxt = serviceCtxt.getIaasContext(iaas.getType());
-//
-//// // terminate the last instance first
-//// for (String id : Lists.reverse(ctxt.getNodeIds())) {
-//// if (id != null) {
-//// nodeId = id;
-//// break;
-//// }
-//// }
-//
-//
-//
-// // terminate it!
-// terminate(iaas, nodeId, ctxt);
-//
-// // log information
-// logTermination(nodeId, ctxt);
-// }
-
-// @Override
-// public boolean terminateInstances(String[] memberIds) throws IllegalArgumentException, InvalidMemberException, InvalidCartridgeTypeException {
-// for (String memberId : memberIds) {
-// terminateInstance(memberId);
-// }
-// }
-
-// @Override
-// public boolean terminateUnhealthyInstances(List<String> instancesToBeTerminated) {
-// log.info("vvvvvvvvvvdddvvvvvvv");
-// return false; //TODO
-// }
-
@Override
public void terminateAllInstances(String clusterId) throws IllegalArgumentException, InvalidClusterException {
@@ -739,70 +637,6 @@ public class CloudControllerServiceImpl implements CloudControllerService {
for (MemberContext memberContext : ctxts) {
exec.execute(new InstanceTerminator(memberContext));
}
-
-
-// ServiceContext serviceCtxt = dataHolder
-// .getServiceContextFromDomain(clusterId);
-//
-// if (serviceCtxt == null) {
-// String msg = "Not a registered service: domain - " + clusterId;
-// log.fatal(msg);
-// throw new CloudControllerException(msg);
-// }
-//
-// // load Cartridge, if null
-// serviceCtxt.setCartridge(loadCartridge(
-// serviceCtxt.getCartridgeType(),
-// dataHolder.getCartridges()));
-// //}
-//
-// if (serviceCtxt.getCartridge() == null) {
-// String msg = "There's no registered Cartridge found. Domain - "
-// + clusterId;
-// log.fatal(msg);
-// throw new CloudControllerException(msg);
-// }
-
-// for (IaasProvider iaas : serviceCtxt.getCartridge().getIaases()) {
-//
-// IaasContext ctxt = serviceCtxt.getIaasContext(iaas.getType());
-//
-// if (ctxt == null) {
-// log.error("Iaas Context for " + iaas.getType()
-// + " not found. Cannot terminate instances");
-// continue;
-// }
-//
-// ArrayList<String> temp = new ArrayList<String>(ctxt.getNodeIds());
-// for (String id : temp) {
-// if (id != null) {
-// // terminate it!
-// //TODO need to enable once partition added to the topology
-// /*Collection<Member> members = TopologyManager.getInstance().getTopology().
-// getService(serviceCtxt.getCartridgeType()).
-// getCluster(serviceCtxt.getClusterId()).getMembers();
-// for (Iterator iterator = members.iterator(); iterator.hasNext();) {
-// Member member = (Member) iterator.next();
-// terminate(iaas, ctxt, member.getIaasNodeId(), member.getPartition());
-// }*/
-//
-// // log information
-// logTermination(id, ctxt, serviceCtxt);
-//
-// isAtLeastOneTerminated = true;
-// }
-// }
-// }
-//
-// if (isAtLeastOneTerminated) {
-// return true;
-// }
-//
-// log.info("Termination of an instance which is belong to domain '"
-// + clusterId + "', failed! Reason: No matching "
-// + "running instance found in lastly used IaaS.");
-//
-// return false;
}
@@ -842,9 +676,6 @@ public class CloudControllerServiceImpl implements CloudControllerService {
iaas.releaseAddress(ctxt.getAllocatedIpAddress());
}
- // publish data to BAM
-// CartridgeInstanceDataPublisher.publish();
-
log.info("Member is terminated: "+ctxt.toString());
return iaasProvider;
}
@@ -874,7 +705,9 @@ public class CloudControllerServiceImpl implements CloudControllerService {
private void logTermination(MemberContext memberContext) {
//updating the topology
- TopologyBuilder.handleMemberTerminated(memberContext.getCartridgeType(), memberContext.getClusterId(), memberContext.getNetworkPartitionId(), memberContext.getPartition().getId(), memberContext.getMemberId());
+ TopologyBuilder.handleMemberTerminated(memberContext.getCartridgeType(),
+ memberContext.getClusterId(), memberContext.getNetworkPartitionId(),
+ memberContext.getPartition().getId(), memberContext.getMemberId());
//publishing data
CartridgeInstanceDataPublisher.publish(memberContext.getMemberId(),
@@ -1156,7 +989,7 @@ public class CloudControllerServiceImpl implements CloudControllerService {
} catch (InvalidIaasProviderException e) {
String msg =
"Invalid Partition - " + partition.toString() +
- ". Cause: Unable to build Iaas of this IaasProvider [Provider] : " + provider;
+ ". Cause: Unable to build Iaas of this IaasProvider [Provider] : " + provider+". "+e.getMessage();
log.error(msg, e);
throw new InvalidPartitionException(msg, e);
}
@@ -1213,7 +1046,7 @@ public class CloudControllerServiceImpl implements CloudControllerService {
} catch (InvalidIaasProviderException e) {
String msg =
"Invalid Partition - " + partition.toString() +
- ". Cause: Unable to build Iaas of this IaasProvider [Provider] : " + provider;
+ ". Cause: Unable to build Iaas of this IaasProvider [Provider] : " + provider+". "+e.getMessage();
log.error(msg, e);
throw new InvalidPartitionException(msg, e);
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/d7206a75/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/interfaces/CloudControllerService.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/interfaces/CloudControllerService.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/interfaces/CloudControllerService.java
index 30a3d82..ebd2980 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/interfaces/CloudControllerService.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/interfaces/CloudControllerService.java
@@ -39,10 +39,22 @@ import org.apache.stratos.cloud.controller.pojo.Registrant;
*/
public interface CloudControllerService {
+ /**
+ * Deploys a Cartridge configuration
+ * @param cartridgeConfig cartridge configuration to be deployed
+ * @throws InvalidCartridgeDefinitionException if the cartridge configuration is not valid.
+ * @throws InvalidIaasProviderException if the iaas providers configured are not valid.
+ * @throws IllegalArgumentException if the provided argument is not valid.
+ */
public void deployCartridgeDefinition(CartridgeConfig cartridgeConfig)
- throws InvalidCartridgeDefinitionException, InvalidIaasProviderException;
+ throws InvalidCartridgeDefinitionException, InvalidIaasProviderException, IllegalArgumentException;
- public void undeployCartridgeDefinition(String cartridgeType);
+ /**
+ * Undeploys a Cartridge configuration which is already deployed.
+ * @param cartridgeType type of the cartridge to be undeployed.
+ * @throws InvalidCartridgeTypeException if the cartridge type specified is not a deployed cartridge.
+ */
+ public void undeployCartridgeDefinition(String cartridgeType) throws InvalidCartridgeTypeException;
/**
* Validate a given {@link Partition} for basic property existence.
@@ -91,8 +103,11 @@ public interface CloudControllerService {
* It contains the region, zone, network and host of a IaaS where
* an instance need to be started.
* @return public IP which is associated with the newly started instance.
+ * @throws IllegalArgumentException if the provided member is not valid.
+ * @throws UnregisteredCartridgeException if the requested Cartridge type is not a registered one.
+ * @throws InvalidIaasProviderException if the iaas requested is not valid.
*/
- public MemberContext startInstance(MemberContext member) throws IllegalArgumentException, UnregisteredCartridgeException;
+ public MemberContext startInstance(MemberContext member) throws IllegalArgumentException, UnregisteredCartridgeException, InvalidIaasProviderException;
/**
* Calling this method will spawn more than one instances in the
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/d7206a75/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java
index e1a4353..fb035cf 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java
@@ -245,6 +245,7 @@ public final class CloudControllerConstants {
public static final String SECURITY_GROUP_IDS = "securityGroupIds";
public static final String SECURITY_GROUPS = "securityGroups";
public static final String SUBNET_ID = "subnetId";
+ public static final String TAGS = "tags";
public static final String AUTO_ASSIGN_IP = "autoAssignIp";
public static final String INSTANCE_TYPE = "instanceType";
[11/13] git commit: fixing service implementations for
https://issues.apache.org/jira/browse/STRATOS-486
Posted by ni...@apache.org.
fixing service implementations for https://issues.apache.org/jira/browse/STRATOS-486
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/ffe1bc63
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/ffe1bc63
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/ffe1bc63
Branch: refs/heads/master
Commit: ffe1bc63c570ba04ffd8df290f2d4f9bb1de7822
Parents: 127329d
Author: Nirmal Fernando <ni...@apache.org>
Authored: Sat Mar 1 13:42:42 2014 +0530
Committer: Nirmal Fernando <ni...@apache.org>
Committed: Sat Mar 1 13:42:42 2014 +0530
----------------------------------------------------------------------
.../manager/client/AutoscalerServiceClient.java | 268 ++++++-------------
.../client/CloudControllerServiceClient.java | 61 ++---
.../service/ServiceDeploymentManager.java | 5 +-
.../UnregisteredCartridgeException.java | 6 +
.../manager/CartridgeSubscriptionManager.java | 7 +-
5 files changed, 115 insertions(+), 232 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ffe1bc63/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/client/AutoscalerServiceClient.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/client/AutoscalerServiceClient.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/client/AutoscalerServiceClient.java
index a43f39c..beb04fe 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/client/AutoscalerServiceClient.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/client/AutoscalerServiceClient.java
@@ -29,6 +29,8 @@ import org.apache.stratos.manager.internal.DataHolder;
import org.apache.stratos.manager.utils.CartridgeConstants;
import org.apache.stratos.autoscaler.deployment.policy.DeploymentPolicy;
import org.apache.stratos.autoscaler.policy.model.AutoscalePolicy;
+import org.apache.stratos.autoscaler.stub.AutoScalerServiceInvalidPartitionExceptionException;
+import org.apache.stratos.autoscaler.stub.AutoScalerServiceInvalidPolicyExceptionException;
import org.apache.stratos.autoscaler.stub.AutoScalerServiceNonExistingLBExceptionException;
import org.apache.stratos.autoscaler.stub.AutoScalerServiceStub;
import org.apache.stratos.cloud.controller.deployment.partition.Partition;
@@ -75,246 +77,130 @@ public class AutoscalerServiceClient {
return serviceClient;
}
- public org.apache.stratos.cloud.controller.deployment.partition.Partition[] getAvailablePartitions ()
- throws Exception {
+ public org.apache.stratos.cloud.controller.deployment.partition.Partition[] getAvailablePartitions () throws RemoteException {
- org.apache.stratos.cloud.controller.deployment.partition.Partition[] partitions;
- try {
- partitions = stub.getAllAvailablePartitions();
-
- } catch (AxisFault e) {
- String errorMsg = e.getMessage();
- log.error(errorMsg, e);
- throw new Exception(errorMsg, e);
- } catch (RemoteException e) {
- String errorMsg = "Error in getting available partitions";
- log.error(errorMsg, e);
- throw new Exception(errorMsg, e);
- }
+ org.apache.stratos.cloud.controller.deployment.partition.Partition[] partitions;
+ partitions = stub.getAllAvailablePartitions();
- return partitions;
- }
+ return partitions;
+ }
- public org.apache.stratos.cloud.controller.deployment.partition.Partition getPartition (String partitionId)
- throws Exception{
+ public org.apache.stratos.cloud.controller.deployment.partition.Partition getPartition(
+ String partitionId) throws RemoteException {
- org.apache.stratos.cloud.controller.deployment.partition.Partition partition;
- try {
- partition = stub.getPartition(partitionId);
+ org.apache.stratos.cloud.controller.deployment.partition.Partition partition;
+ partition = stub.getPartition(partitionId);
- } catch (RemoteException e) {
- String errorMsg = "Error in getting available partitions";
- log.error(errorMsg, e);
- throw new Exception(errorMsg, e);
- }
+ return partition;
+ }
- return partition;
- }
+ public org.apache.stratos.cloud.controller.deployment.partition.Partition[] getPartitionsOfGroup(
+ String deploymentPolicyId, String partitionGroupId)
+ throws RemoteException {
- public org.apache.stratos.cloud.controller.deployment.partition.Partition [] getPartitionsOfGroup (String deploymentPolicyId,
- String partitionGroupId)
- throws Exception{
+ org.apache.stratos.cloud.controller.deployment.partition.Partition[] partitions;
+ partitions = stub.getPartitionsOfGroup(deploymentPolicyId,
+ partitionGroupId);
- org.apache.stratos.cloud.controller.deployment.partition.Partition[] partitions;
- try {
- partitions = stub.getPartitionsOfGroup(deploymentPolicyId, partitionGroupId);
-
- } catch (RemoteException e) {
- String errorMsg = "Error in getting available partitions";
- log.error(errorMsg, e);
- throw new Exception(errorMsg, e);
- }
-
- return partitions;
- }
+ return partitions;
+ }
public org.apache.stratos.cloud.controller.deployment.partition.Partition[]
- getPartitionsOfDeploymentPolicy(String deploymentPolicyId) throws Exception {
+ getPartitionsOfDeploymentPolicy(
+ String deploymentPolicyId) throws RemoteException {
- org.apache.stratos.cloud.controller.deployment.partition.Partition[] partitions;
- try {
- partitions = stub.getPartitionsOfDeploymentPolicy(deploymentPolicyId);
+ org.apache.stratos.cloud.controller.deployment.partition.Partition[] partitions;
+ partitions = stub.getPartitionsOfDeploymentPolicy(deploymentPolicyId);
- } catch (RemoteException e) {
- String errorMsg = "Error in getting available partitions";
- log.error(errorMsg, e);
- throw new Exception(errorMsg, e);
- }
+ return partitions;
+ }
- return partitions;
- }
+ public org.apache.stratos.autoscaler.partition.PartitionGroup[] getPartitionGroups(
+ String deploymentPolicyId) throws RemoteException {
- public org.apache.stratos.autoscaler.partition.PartitionGroup [] getPartitionGroups (String deploymentPolicyId)
- throws Exception{
+ org.apache.stratos.autoscaler.partition.PartitionGroup[] partitionGroups;
+ partitionGroups = stub.getPartitionGroups(deploymentPolicyId);
- org.apache.stratos.autoscaler.partition.PartitionGroup [] partitionGroups;
- try {
- partitionGroups = stub.getPartitionGroups(deploymentPolicyId);
+ return partitionGroups;
+ }
- } catch (RemoteException e) {
- String errorMsg = "Error in getting available partitions";
- log.error(errorMsg, e);
- throw new Exception(errorMsg, e);
- }
+ public org.apache.stratos.autoscaler.policy.model.AutoscalePolicy[] getAutoScalePolicies()
+ throws RemoteException {
- return partitionGroups;
- }
+ org.apache.stratos.autoscaler.policy.model.AutoscalePolicy[] autoscalePolicies;
+ autoscalePolicies = stub.getAllAutoScalingPolicy();
- public org.apache.stratos.autoscaler.policy.model.AutoscalePolicy[] getAutoScalePolicies ()
- throws Exception {
+ return autoscalePolicies;
+ }
- org.apache.stratos.autoscaler.policy.model.AutoscalePolicy[] autoscalePolicies;
- try {
- autoscalePolicies = stub.getAllAutoScalingPolicy();
-
- } catch (AxisFault e) {
- String errorMsg = e.getMessage();
- log.error(errorMsg, e);
- throw new Exception(errorMsg, e);
- } catch (RemoteException e) {
- String errorMsg = "Error in getting available partitions";
- log.error(errorMsg, e);
- throw new Exception(errorMsg, e);
- }
+ public org.apache.stratos.autoscaler.policy.model.AutoscalePolicy getAutoScalePolicy(
+ String autoscalingPolicyId) throws RemoteException {
- return autoscalePolicies;
- }
+ org.apache.stratos.autoscaler.policy.model.AutoscalePolicy autoscalePolicy;
+ autoscalePolicy = stub.getAutoscalingPolicy(autoscalingPolicyId);
- public org.apache.stratos.autoscaler.policy.model.AutoscalePolicy getAutoScalePolicy (String autoscalingPolicyId)
- throws Exception {
+ return autoscalePolicy;
+ }
- org.apache.stratos.autoscaler.policy.model.AutoscalePolicy autoscalePolicy;
- try {
- autoscalePolicy = stub.getAutoscalingPolicy(autoscalingPolicyId);
+ public org.apache.stratos.autoscaler.deployment.policy.DeploymentPolicy[] getDeploymentPolicies()
+ throws RemoteException {
- } catch (RemoteException e) {
- String errorMsg = "Error in getting available partitions";
- log.error(errorMsg, e);
- throw new Exception(errorMsg, e);
- }
+ org.apache.stratos.autoscaler.deployment.policy.DeploymentPolicy[] deploymentPolicies;
+ deploymentPolicies = stub.getAllDeploymentPolicies();
- return autoscalePolicy;
- }
+ return deploymentPolicies;
+ }
- public org.apache.stratos.autoscaler.deployment.policy.DeploymentPolicy [] getDeploymentPolicies()
- throws Exception {
+ public org.apache.stratos.autoscaler.deployment.policy.DeploymentPolicy[] getDeploymentPolicies(
+ String cartridgeType) throws RemoteException {
- org.apache.stratos.autoscaler.deployment.policy.DeploymentPolicy[] deploymentPolicies;
- try {
- deploymentPolicies = stub.getAllDeploymentPolicies();
-
- } catch (AxisFault e) {
- String errorMsg = e.getMessage();
- log.error(errorMsg, e);
- throw new Exception(errorMsg, e);
- } catch (RemoteException e) {
- String errorMsg = "Error in getting available deployment policies";
- log.error(errorMsg, e);
- throw new Exception(errorMsg, e);
- }
+ org.apache.stratos.autoscaler.deployment.policy.DeploymentPolicy[] deploymentPolicies;
+ deploymentPolicies = stub
+ .getValidDeploymentPoliciesforCartridge(cartridgeType);
- return deploymentPolicies;
- }
-
- public org.apache.stratos.autoscaler.deployment.policy.DeploymentPolicy [] getDeploymentPolicies(String cartridgeType)
- throws Exception {
-
- org.apache.stratos.autoscaler.deployment.policy.DeploymentPolicy[] deploymentPolicies;
- try {
- deploymentPolicies = stub.getValidDeploymentPoliciesforCartridge(cartridgeType);
-
- } catch (RemoteException e) {
- String errorMsg = "Error in getting available deployment policies";
- log.error(errorMsg, e);
- throw new Exception(errorMsg, e);
- }
-
- return deploymentPolicies;
- }
+ return deploymentPolicies;
+ }
- public void checkLBExistenceAgainstPolicy(String clusterId, String deploymentPolicyId) throws ADCException {
- try {
+ public void checkLBExistenceAgainstPolicy(String clusterId, String deploymentPolicyId) throws RemoteException,
+ AutoScalerServiceNonExistingLBExceptionException {
stub.checkLBExistenceAgainstPolicy(clusterId, deploymentPolicyId);
- } catch (RemoteException e) {
- String errorMsg = "Error connecting to Auto-scaler Service.";
- log.error(errorMsg, e);
- throw new ADCException(errorMsg, e);
- } catch (AutoScalerServiceNonExistingLBExceptionException e) {
- String errorMsg = "LB Cluster doesn't exist. Cluster id: "+clusterId;
- log.error(errorMsg, e);
- throw new ADCException(errorMsg, e);
- }
- }
-
- public boolean checkDefaultLBExistenceAgainstPolicy(String deploymentPolicyId) throws ADCException {
- try {
- return stub.checkDefaultLBExistenceAgainstPolicy(deploymentPolicyId);
- } catch (RemoteException e) {
- String errorMsg = "Error connecting to Auto-scaler Service.";
- log.error(errorMsg, e);
- throw new ADCException(errorMsg, e);
- }
}
- public boolean checkServiceLBExistenceAgainstPolicy(String serviceName, String deploymentPolicyId) throws ADCException {
- try {
+ public boolean checkDefaultLBExistenceAgainstPolicy(
+ String deploymentPolicyId) throws RemoteException {
+ return stub.checkDefaultLBExistenceAgainstPolicy(deploymentPolicyId);
+ }
+
+ public boolean checkServiceLBExistenceAgainstPolicy(String serviceName, String deploymentPolicyId) throws RemoteException {
return stub.checkServiceLBExistenceAgainstPolicy(serviceName, deploymentPolicyId);
- } catch (RemoteException e) {
- String errorMsg = "Error connecting to Auto-scaler Service.";
- log.error(errorMsg, e);
- throw new ADCException(errorMsg, e);
- }
}
- public org.apache.stratos.autoscaler.deployment.policy.DeploymentPolicy getDeploymentPolicy (String deploymentPolicyId)
- throws Exception {
-
- org.apache.stratos.autoscaler.deployment.policy.DeploymentPolicy deploymentPolicy;
- try {
- deploymentPolicy = stub.getDeploymentPolicy(deploymentPolicyId);
+ public org.apache.stratos.autoscaler.deployment.policy.DeploymentPolicy getDeploymentPolicy (String deploymentPolicyId) throws RemoteException {
- } catch (RemoteException e) {
- String errorMsg = "Error in getting available deployment policies";
- log.error(errorMsg, e);
- throw new Exception(errorMsg, e);
- }
+ org.apache.stratos.autoscaler.deployment.policy.DeploymentPolicy deploymentPolicy;
+ deploymentPolicy = stub.getDeploymentPolicy(deploymentPolicyId);
- return deploymentPolicy;
- }
+ return deploymentPolicy;
+ }
- public boolean deployDeploymentPolicy (DeploymentPolicy deploymentPolicy) throws Exception {
+ public boolean deployDeploymentPolicy (DeploymentPolicy deploymentPolicy) throws RemoteException,
+ AutoScalerServiceInvalidPolicyExceptionException {
- try {
return stub.addDeploymentPolicy(deploymentPolicy);
- } catch (RemoteException e) {
- String errorMsg = "Error in deploying new deployment policy definition";
- log.error(errorMsg, e);
- throw new Exception(errorMsg, e);
- }
}
- public boolean deployAutoscalingPolicy (AutoscalePolicy autoScalePolicy) throws Exception {
+ public boolean deployAutoscalingPolicy (AutoscalePolicy autoScalePolicy) throws RemoteException,
+ AutoScalerServiceInvalidPolicyExceptionException {
- try {
return stub.addAutoScalingPolicy(autoScalePolicy);
- } catch (RemoteException e) {
- String errorMsg = "Error in deploying new autoscaling policy definition";
- log.error(errorMsg, e);
- throw new Exception(errorMsg, e);
- }
}
- public boolean deployPartition (Partition partition) throws Exception {
+ public boolean deployPartition (Partition partition) throws RemoteException,
+ AutoScalerServiceInvalidPartitionExceptionException {
- try {
return stub.addPartition(partition);
- } catch (RemoteException e) {
- String errorMsg = "Error in deploying new partition definition";
- log.error(errorMsg, e);
- throw new Exception(e.getMessage(), e);
- }
}
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ffe1bc63/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/client/CloudControllerServiceClient.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/client/CloudControllerServiceClient.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/client/CloudControllerServiceClient.java
index 1344d35..9167f6f 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/client/CloudControllerServiceClient.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/client/CloudControllerServiceClient.java
@@ -25,12 +25,16 @@ import org.apache.axis2.transport.http.HTTPConstants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.stratos.cloud.controller.pojo.*;
-import org.apache.stratos.manager.exception.UnregisteredCartridgeException;
import org.apache.stratos.manager.internal.DataHolder;
import org.apache.stratos.manager.utils.CartridgeConstants;
import org.apache.stratos.cloud.controller.stub.CloudControllerServiceIllegalArgumentExceptionException;
+import org.apache.stratos.cloud.controller.stub.CloudControllerServiceInvalidCartridgeDefinitionExceptionException;
+import org.apache.stratos.cloud.controller.stub.CloudControllerServiceInvalidCartridgeTypeExceptionException;
+import org.apache.stratos.cloud.controller.stub.CloudControllerServiceInvalidClusterExceptionException;
+import org.apache.stratos.cloud.controller.stub.CloudControllerServiceInvalidIaasProviderExceptionException;
import org.apache.stratos.cloud.controller.stub.CloudControllerServiceStub;
import org.apache.stratos.cloud.controller.stub.CloudControllerServiceUnregisteredCartridgeExceptionException;
+import org.apache.stratos.cloud.controller.stub.CloudControllerServiceUnregisteredClusterExceptionException;
import java.rmi.RemoteException;
import java.util.Iterator;
@@ -75,38 +79,26 @@ public class CloudControllerServiceClient {
return serviceClient;
}
- public void deployCartridgeDefinition (CartridgeConfig cartridgeConfig)
- throws Exception {
+ public void deployCartridgeDefinition (CartridgeConfig cartridgeConfig)
+ throws RemoteException, CloudControllerServiceInvalidCartridgeDefinitionExceptionException,
+ CloudControllerServiceInvalidIaasProviderExceptionException, CloudControllerServiceIllegalArgumentExceptionException {
- try {
- stub.deployCartridgeDefinition(cartridgeConfig);
+ stub.deployCartridgeDefinition(cartridgeConfig);
- } catch (RemoteException e) {
- String errorMsg = "Error in deploying cartridge definition";
- log.error(errorMsg, e);
- throw new Exception(errorMsg, e);
- }
- }
+ }
- public void unDeployCartridgeDefinition (String cartridgeType)
- throws Exception {
+ public void unDeployCartridgeDefinition (String cartridgeType) throws RemoteException, CloudControllerServiceInvalidCartridgeTypeExceptionException{
- try {
- stub.undeployCartridgeDefinition(cartridgeType);
+ stub.undeployCartridgeDefinition(cartridgeType);
- } catch (RemoteException e) {
- String errorMsg = "Error in deploying cartridge definition";
- log.error(errorMsg, e);
- throw new Exception(errorMsg, e);
- }
- }
+ }
public boolean register(String clusterId, String cartridgeType,
String payload, String tenantRange,
String hostName, Properties properties,
- String autoscalorPolicyName, String deploymentPolicyName) throws RemoteException,
- CloudControllerServiceUnregisteredCartridgeExceptionException,
- CloudControllerServiceIllegalArgumentExceptionException {
+ String autoscalorPolicyName, String deploymentPolicyName) throws RemoteException,
+ CloudControllerServiceIllegalArgumentExceptionException,
+ CloudControllerServiceUnregisteredCartridgeExceptionException {
Registrant registrant = new Registrant();
registrant.setClusterId(clusterId);
registrant.setCartridgeType(cartridgeType);
@@ -127,7 +119,7 @@ public class CloudControllerServiceClient {
new org.apache.stratos.cloud.controller.pojo.Properties();
if (properties != null) {
- for (Iterator iterator = properties.keySet().iterator(); iterator.hasNext();) {
+ for (Iterator<Object> iterator = properties.keySet().iterator(); iterator.hasNext();) {
String key = (String) iterator.next();
String value = properties.getProperty(key);
@@ -142,25 +134,22 @@ public class CloudControllerServiceClient {
return props;
}
- public void terminateAllInstances(String clusterId) throws Exception {
+ public void terminateAllInstances(String clusterId) throws RemoteException,
+ CloudControllerServiceInvalidClusterExceptionException, CloudControllerServiceIllegalArgumentExceptionException {
stub.terminateAllInstances(clusterId);
}
- public String[] getRegisteredCartridges() throws Exception {
+ public String[] getRegisteredCartridges() throws RemoteException {
return stub.getRegisteredCartridges();
}
- public CartridgeInfo getCartridgeInfo(String cartridgeType) throws UnregisteredCartridgeException, Exception {
- try {
- return stub.getCartridgeInfo(cartridgeType);
- } catch (RemoteException e) {
- throw e;
- } catch (CloudControllerServiceUnregisteredCartridgeExceptionException e) {
- throw new UnregisteredCartridgeException("Not a registered cartridge " + cartridgeType, cartridgeType, e);
- }
+ public CartridgeInfo getCartridgeInfo(String cartridgeType) throws RemoteException,
+ CloudControllerServiceUnregisteredCartridgeExceptionException {
+ return stub.getCartridgeInfo(cartridgeType);
}
- public void unregisterService(String clusterId) throws Exception {
+ public void unregisterService(String clusterId) throws RemoteException,
+ CloudControllerServiceUnregisteredClusterExceptionException {
stub.unregisterService(clusterId);
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ffe1bc63/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/ServiceDeploymentManager.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/ServiceDeploymentManager.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/ServiceDeploymentManager.java
index b5e3889..11e57a1 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/ServiceDeploymentManager.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/ServiceDeploymentManager.java
@@ -26,6 +26,7 @@ import org.apache.stratos.cloud.controller.pojo.CartridgeInfo;
import org.apache.stratos.cloud.controller.pojo.LoadbalancerConfig;
import org.apache.stratos.cloud.controller.pojo.Properties;
import org.apache.stratos.cloud.controller.pojo.Property;
+import org.apache.stratos.cloud.controller.stub.CloudControllerServiceUnregisteredCartridgeExceptionException;
import org.apache.stratos.manager.client.AutoscalerServiceClient;
import org.apache.stratos.manager.client.CloudControllerServiceClient;
import org.apache.stratos.manager.deploy.service.multitenant.MultiTenantService;
@@ -74,10 +75,10 @@ public class ServiceDeploymentManager {
try {
cartridgeInfo = CloudControllerServiceClient.getServiceClient().getCartridgeInfo(type);
- } catch (UnregisteredCartridgeException e) {
+ } catch (CloudControllerServiceUnregisteredCartridgeExceptionException e) {
String message = type + " is not a valid cartridgeSubscription type. Please try again with a valid cartridgeSubscription type.";
log.error(message);
- throw e;
+ throw new ADCException(message, e);
} catch (Exception e) {
String message = "Error getting info for " + type;
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ffe1bc63/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/exception/UnregisteredCartridgeException.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/exception/UnregisteredCartridgeException.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/exception/UnregisteredCartridgeException.java
index be33d21..a53f318 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/exception/UnregisteredCartridgeException.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/exception/UnregisteredCartridgeException.java
@@ -37,6 +37,12 @@ public class UnregisteredCartridgeException extends Exception {
this.message = message;
this.cartridgeType = cartridgeType;
}
+
+ public UnregisteredCartridgeException(String message, Throwable cause) {
+ super(message, cause);
+ this.cartridgeType = null;
+ this.message = message;
+ }
public String getMessage() {
return message;
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ffe1bc63/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java
index ac4d8e6..cb27159 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java
@@ -24,6 +24,7 @@ import org.apache.commons.logging.LogFactory;
import org.apache.stratos.cloud.controller.pojo.CartridgeInfo;
import org.apache.stratos.cloud.controller.pojo.Properties;
import org.apache.stratos.cloud.controller.pojo.Property;
+import org.apache.stratos.cloud.controller.stub.CloudControllerServiceUnregisteredCartridgeExceptionException;
import org.apache.stratos.manager.client.CloudControllerServiceClient;
import org.apache.stratos.manager.dao.CartridgeSubscriptionInfo;
import org.apache.stratos.manager.dto.SubscriptionInfo;
@@ -102,12 +103,12 @@ public class CartridgeSubscriptionManager {
}
*/
- } catch (UnregisteredCartridgeException e) {
+ } catch (CloudControllerServiceUnregisteredCartridgeExceptionException e) {
String message =
cartridgeType +
" is not a valid cartridgeSubscription type. Please try again with a valid cartridgeSubscription type.";
log.error(message);
- throw e;
+ throw new ADCException(message, e);
} catch (Exception e) {
String message = "Error getting info for " + cartridgeType;
@@ -252,7 +253,7 @@ public class CartridgeSubscriptionManager {
cartridgeSubscription.getCartridgeInfo().getType());
}
else {
- String errorMsg = "No cartridge subscription found with alias " + alias + " for tenant " + tenantDomain;
+ String errorMsg = "No cartridge subscription found with [alias] " + alias + " for [tenant] " + tenantDomain;
log.error(errorMsg);
throw new NotSubscribedException(errorMsg, alias);
}
[13/13] git commit: fixing to CLI for
https://issues.apache.org/jira/browse/STRATOS-486
Posted by ni...@apache.org.
fixing to CLI for https://issues.apache.org/jira/browse/STRATOS-486
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/5bd3ffe2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/5bd3ffe2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/5bd3ffe2
Branch: refs/heads/master
Commit: 5bd3ffe28eab2e78bae3983ef0538802ff12195e
Parents: 096e96b
Author: Nirmal Fernando <ni...@apache.org>
Authored: Sat Mar 1 13:44:14 2014 +0530
Committer: Nirmal Fernando <ni...@apache.org>
Committed: Sat Mar 1 13:44:14 2014 +0530
----------------------------------------------------------------------
.../stratos/cli/RestCommandLineService.java | 44 +++++++++++++-------
1 file changed, 29 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/5bd3ffe2/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java
index 2acc576..aad5efa 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java
@@ -20,6 +20,7 @@ package org.apache.stratos.cli;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
+
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.ConfigurationContextFactory;
@@ -48,6 +49,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.net.ssl.*;
+
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
@@ -260,10 +262,12 @@ public class RestCommandLineService {
};
if (multiTenetCartridge.size() == 0) {
+ String message = "Cannot find any deployed multi-tenant Cartridge. "
+ + "Please deploy a Cartridge using ["+CliConstants.CARTRIDGE_DEPLOYMENT+"] command.";
if (logger.isDebugEnabled()) {
- logger.debug("No multi-tenant cartridges available");
+ logger.debug(message);
}
- System.out.println("There are no multi-tenant cartridges available");
+ System.out.println(message);
}
else {
Cartridge[] cartridges = new Cartridge[multiTelentCartridgeList.getCartridge().size()];
@@ -275,10 +279,12 @@ public class RestCommandLineService {
}
if (singleTentCartridge.size() == 0) {
+ String message = "Cannot find any deployed single-tenant Cartridge. "
+ + "Please deploy a Cartridge using ["+CliConstants.CARTRIDGE_DEPLOYMENT+"] command.";
if (logger.isDebugEnabled()) {
- logger.debug("No single-tenant cartridges available");
+ logger.debug(message);
}
- System.out.println("There are no single-tenant cartridges available");
+ System.out.println(message);
}
else {
Cartridge[] cartridges1 = new Cartridge[singleTeneCartridgetList.getCartridge().size()];
@@ -331,7 +337,7 @@ public class RestCommandLineService {
return;
}
}
- System.out.println("No matching cartridge found...");
+ System.out.println("Cannot find a matching Cartridge for [type] "+type);
} catch (Exception e) {
handleException("Exception in listing available cartridges", e);
} finally {
@@ -1028,10 +1034,12 @@ public class RestCommandLineService {
tenants = tenantInfoList.getTenantInfoBean().toArray(tenants);
if (tenants.length == 0) {
+ String message = "Cannot find any Tenant. "
+ + "Please create a new tenant using ["+CliConstants.ADD_TENANT+"] command.";
if (logger.isDebugEnabled()) {
- logger.debug("No tenants found");
+ logger.debug(message);
}
- System.out.println("There are no available tenants");
+ System.out.println(message);
return;
}
@@ -1401,10 +1409,12 @@ public class RestCommandLineService {
partitions = partitionList.getPartition().toArray(partitions);
if (partitions.length == 0) {
+ String message = "Cannot find any deployed Partition. "
+ + "Please deploy a Partition using ["+CliConstants.PARTITION_DEPLOYMENT+"] command.";
if (logger.isDebugEnabled()) {
- logger.debug("No partitions found");
+ logger.debug(message);
}
- System.out.println("There are no available partitions");
+ System.out.println(message);
return;
}
@@ -1465,14 +1475,16 @@ public class RestCommandLineService {
policyArry = policyList.getAutoscalePolicy().toArray(policyArry);
if (policyArry.length == 0) {
+ String message = "Cannot find any deployed auto-scaling policy. "
+ + "Please deploy a policy using ["+CliConstants.AUTOSCALING_POLICY_DEPLOYMENT+"] command.";
if (logger.isDebugEnabled()) {
- logger.debug("No autoscale policies found");
+ logger.debug(message);
}
- System.out.println("There are no autoscale policies");
+ System.out.println(message);
return;
}
- System.out.println("Available Autoscale Policies:");
+ System.out.println("Available Auto-scaling Policies:");
CommandLineUtils.printTable(policyArry, partitionMapper, "ID");
} catch (Exception e) {
@@ -1527,10 +1539,12 @@ public class RestCommandLineService {
policyArry = policyList.getDeploymentPolicy().toArray(policyArry);
if (policyArry.length == 0) {
+ String message = "Cannot find any deployed deployment policy. "
+ + "Please deploy a policy using ["+CliConstants.DEPLOYMENT_POLICY_DEPLOYMENT+"] command.";
if (logger.isDebugEnabled()) {
- logger.debug("No deployment policies found");
+ logger.debug(message);
}
- System.out.println("There are no deployment policies");
+ System.out.println(message);
return;
}
@@ -1627,7 +1641,7 @@ public class RestCommandLineService {
return;
}
}
- System.out.println("No matching partition found...");
+ System.out.println("Cannot find a matching Partition for [id] "+id);
} catch (Exception e) {
handleException("Exception in listing deployment polices", e);
} finally {
[07/13] git commit: fixing
https://issues.apache.org/jira/browse/STRATOS-486
Posted by ni...@apache.org.
fixing https://issues.apache.org/jira/browse/STRATOS-486
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/016f8eda
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/016f8eda
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/016f8eda
Branch: refs/heads/master
Commit: 016f8eda4b9ace22feca9f7e50e9fb7c030398fb
Parents: 3e9da00
Author: Nirmal Fernando <ni...@apache.org>
Authored: Sat Mar 1 13:40:36 2014 +0530
Committer: Nirmal Fernando <ni...@apache.org>
Committed: Sat Mar 1 13:40:36 2014 +0530
----------------------------------------------------------------------
.../exception/InvalidPartitionException.java | 8 ++++++++
.../exception/InvalidPolicyException.java | 8 +++++++-
.../exception/NonExistingLBException.java | 13 ++++++++++++-
.../exception/PartitionValidationException.java | 18 ++++++++++++++++--
.../exception/PolicyValidationException.java | 14 +++++++++++++-
.../autoscaler/exception/SpawningException.java | 13 ++++++++++++-
.../exception/TerminationException.java | 12 +++++++++++-
7 files changed, 79 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/016f8eda/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/InvalidPartitionException.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/InvalidPartitionException.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/InvalidPartitionException.java
index 2e7013b..9a8cc68 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/InvalidPartitionException.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/InvalidPartitionException.java
@@ -6,9 +6,11 @@ package org.apache.stratos.autoscaler.exception;
public class InvalidPartitionException extends Exception {
private static final long serialVersionUID = -7521673271244696906L;
+ private String message;
public InvalidPartitionException(String message, Exception exception){
super(message, exception);
+ this.message = message;
}
@@ -18,5 +20,11 @@ public class InvalidPartitionException extends Exception {
public InvalidPartitionException(String msg){
super(msg);
+ this.message = msg;
+ }
+
+ @Override
+ public String getMessage() {
+ return this.message;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/016f8eda/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/InvalidPolicyException.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/InvalidPolicyException.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/InvalidPolicyException.java
index a131f05..d0f2814 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/InvalidPolicyException.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/InvalidPolicyException.java
@@ -22,19 +22,25 @@ package org.apache.stratos.autoscaler.exception;
public class InvalidPolicyException extends Exception {
private static final long serialVersionUID = -4914522749282514366L;
+ private String message;
public InvalidPolicyException(String message) {
super(message);
+ this.message = message;
}
public InvalidPolicyException(String message,Throwable e) {
super(message,e);
+ this.message = message;
}
public InvalidPolicyException(Throwable e) {
super(e);
}
-
+ @Override
+ public String getMessage() {
+ return message;
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/016f8eda/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/NonExistingLBException.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/NonExistingLBException.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/NonExistingLBException.java
index 471156b..159c52b 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/NonExistingLBException.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/NonExistingLBException.java
@@ -21,10 +21,12 @@ package org.apache.stratos.autoscaler.exception;
public class NonExistingLBException extends Exception {
private static final long serialVersionUID = -9163807860189126883L;
-
+ private String message;
+
public NonExistingLBException(final String message, final Exception exception) {
super(message, exception);
+ this.setMessage(message);
}
@@ -37,7 +39,16 @@ public class NonExistingLBException extends Exception {
public NonExistingLBException(final String msg) {
super(msg);
+ this.setMessage(msg);
}
+ public String getMessage() {
+ return message;
+ }
+
+ public void setMessage(String message) {
+ this.message = message;
+ }
+
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/016f8eda/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/PartitionValidationException.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/PartitionValidationException.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/PartitionValidationException.java
index 4245dd7..f4e20b1 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/PartitionValidationException.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/PartitionValidationException.java
@@ -6,14 +6,28 @@ package org.apache.stratos.autoscaler.exception;
public class PartitionValidationException extends Exception {
private static final long serialVersionUID = -3904452358279522141L;
-
+ private String message;
public PartitionValidationException(String message, Exception exception){
super(message, exception);
+ this.setMessage(message);
}
-
+ public PartitionValidationException(String msg) {
+ super(msg);
+ this.message = msg;
+ }
public PartitionValidationException(Exception exception){
super(exception);
}
+
+
+ public String getMessage() {
+ return message;
+ }
+
+
+ public void setMessage(String message) {
+ this.message = message;
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/016f8eda/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/PolicyValidationException.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/PolicyValidationException.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/PolicyValidationException.java
index f3a30c8..4cf9592 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/PolicyValidationException.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/PolicyValidationException.java
@@ -6,10 +6,11 @@ package org.apache.stratos.autoscaler.exception;
public class PolicyValidationException extends Exception {
private static final long serialVersionUID = -7423800138697480115L;
-
+ private String message;
public PolicyValidationException(String message, Exception exception){
super(message, exception);
+ this.setMessage(message);
}
@@ -19,5 +20,16 @@ public class PolicyValidationException extends Exception {
public PolicyValidationException(String msg){
super(msg);
+ this.setMessage(msg);
}
+
+
+ public String getMessage() {
+ return message;
+ }
+
+
+ public void setMessage(String message) {
+ this.message = message;
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/016f8eda/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/SpawningException.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/SpawningException.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/SpawningException.java
index 6b228b9..952f299 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/SpawningException.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/SpawningException.java
@@ -6,14 +6,25 @@ package org.apache.stratos.autoscaler.exception;
public class SpawningException extends Exception {
private static final long serialVersionUID = 4761501174753405374L;
-
+ private String message;
public SpawningException(String message, Exception exception){
super(message, exception);
+ this.setMessage(message);
}
public SpawningException(Exception exception){
super(exception);
}
+
+
+ public String getMessage() {
+ return message;
+ }
+
+
+ public void setMessage(String message) {
+ this.message = message;
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/016f8eda/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/TerminationException.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/TerminationException.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/TerminationException.java
index e368379..356ec34 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/TerminationException.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/exception/TerminationException.java
@@ -3,12 +3,22 @@ package org.apache.stratos.autoscaler.exception;
public class TerminationException extends Throwable {
private static final long serialVersionUID = -6038793010380236971L;
-
+ private String message;
+
public TerminationException(String s, Exception e) {
super(s, e);
+ this.setMessage(s);
}
public TerminationException(Exception e) {
super(e);
}
+
+ public String getMessage() {
+ return message;
+ }
+
+ public void setMessage(String message) {
+ this.message = message;
+ }
}
[08/13] git commit: fixing service implementations for
https://issues.apache.org/jira/browse/STRATOS-486
Posted by ni...@apache.org.
fixing service implementations for https://issues.apache.org/jira/browse/STRATOS-486
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/91f14f39
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/91f14f39
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/91f14f39
Branch: refs/heads/master
Commit: 91f14f39b9c406d178116b90e8dc769b89237756
Parents: 016f8ed
Author: Nirmal Fernando <ni...@apache.org>
Authored: Sat Mar 1 13:41:19 2014 +0530
Committer: Nirmal Fernando <ni...@apache.org>
Committed: Sat Mar 1 13:41:19 2014 +0530
----------------------------------------------------------------------
.../cloud/controller/CloudControllerClient.java | 69 +++++++++++++-------
.../autoscaler/partition/PartitionManager.java | 8 +--
2 files changed, 50 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/91f14f39/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/cloud/controller/CloudControllerClient.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/cloud/controller/CloudControllerClient.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/cloud/controller/CloudControllerClient.java
index e231362..d5da490 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/cloud/controller/CloudControllerClient.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/cloud/controller/CloudControllerClient.java
@@ -88,14 +88,14 @@ public class CloudControllerClient {
}
return result;
} catch (RemoteException e) {
- log.error(e.getMessage());
- throw new PartitionValidationException(e);
+ log.error(e.getMessage(), e);
+ throw new PartitionValidationException(e.getMessage(), e);
} catch (CloudControllerServiceInvalidPartitionExceptionException e) {
- log.error(e.getMessage());
- throw new PartitionValidationException(e);
+ log.error(e.getFaultMessage().getInvalidPartitionException().getMessage(), e);
+ throw new PartitionValidationException(e.getFaultMessage().getInvalidPartitionException().getMessage());
} catch (CloudControllerServiceInvalidCartridgeTypeExceptionException e) {
- log.error(e.getMessage());
- throw new PartitionValidationException(e);
+ log.error(e.getFaultMessage().getInvalidCartridgeTypeException().getMessage(), e);
+ throw new PartitionValidationException(e.getFaultMessage().getInvalidCartridgeTypeException().getMessage());
}
}
@@ -117,14 +117,17 @@ public class CloudControllerClient {
}
return result;
} catch (RemoteException e) {
- throw new PartitionValidationException(e);
+ log.error(e.getMessage(), e);
+ throw new PartitionValidationException(e.getMessage(), e);
} catch (CloudControllerServiceInvalidPartitionExceptionException e) {
- throw new PartitionValidationException(e.getMessage(),e);
+ log.error(e.getFaultMessage().getInvalidPartitionException().getMessage(), e);
+ throw new PartitionValidationException(e.getFaultMessage().getInvalidPartitionException().getMessage(), e);
}
}
- public org.apache.stratos.cloud.controller.pojo.MemberContext spawnAnInstance(Partition partition, String clusterId, String lbClusterId, String networkPartitionId) throws SpawningException {
+ public org.apache.stratos.cloud.controller.pojo.MemberContext spawnAnInstance(Partition partition,
+ String clusterId, String lbClusterId, String networkPartitionId) throws SpawningException {
try {
if(log.isInfoEnabled()) {
log.info(String.format("Trying to spawn an instance via cloud controller: [cluster] %s [partition] %s [lb-cluster] %s [network-partition-id] %s",
@@ -146,13 +149,23 @@ public class CloudControllerClient {
}
return memberContext;
} catch (CloudControllerServiceIllegalArgumentExceptionException e) {
- throw new SpawningException(e);
+ log.error(e.getMessage(), e);
+ throw new SpawningException(e.getMessage(), e);
} catch (CloudControllerServiceUnregisteredCartridgeExceptionException e) {
- throw new SpawningException(e);
+ String message = e.getFaultMessage().getUnregisteredCartridgeException().getMessage();
+ log.error(message, e);
+ throw new SpawningException(message, e);
} catch (RemoteException e) {
- throw new SpawningException(String.format("Error occurred in cloud controller while spawning instance: [cluster] %s [partition] %s [lb-cluster] %s [network-partition-id] %s",
- clusterId, partition.getId(), lbClusterId, networkPartitionId), e);
- }
+ log.error(e.getMessage(), e);
+ throw new SpawningException(e.getMessage(), e);
+ } catch (CloudControllerServiceIllegalStateExceptionException e) {
+ log.error(e.getMessage(), e);
+ throw new SpawningException(e.getMessage(), e);
+ } catch (CloudControllerServiceInvalidIaasProviderExceptionException e) {
+ String message = e.getFaultMessage().getInvalidIaasProviderException().getMessage();
+ log.error(message, e);
+ throw new SpawningException(message, e);
+ }
}
public void terminateAllInstances(String clusterId) throws TerminationException {
@@ -167,16 +180,18 @@ public class CloudControllerClient {
log.debug(String.format("Service call terminateAllInstances() returned in %dms", (endTime - startTime)));
}
} catch (RemoteException e) {
- String msg = "Error occurred in cloud controller side while terminating instance";
+ String msg = e.getMessage();
log.error(msg, e);
throw new TerminationException(msg, e);
} catch (CloudControllerServiceInvalidClusterExceptionException e) {
- log.error(e.getMessage());
- throw new TerminationException(e);
+ String message = e.getFaultMessage().getInvalidClusterException().getMessage();
+ log.error(message, e);
+ throw new TerminationException(message, e);
} catch (CloudControllerServiceIllegalArgumentExceptionException e) {
- log.error(e.getMessage());
- throw new TerminationException(e);
+ String msg = e.getMessage();
+ log.error(msg, e);
+ throw new TerminationException(msg, e);
}
}
@@ -192,13 +207,21 @@ public class CloudControllerClient {
log.debug(String.format("Service call terminateInstance() returned in %dms", (endTime - startTime)));
}
} catch (RemoteException e) {
- throw new TerminationException("Could not terminate instance", e);
+ String msg = e.getMessage();
+ log.error(msg, e);
+ throw new TerminationException(msg, e);
} catch (CloudControllerServiceIllegalArgumentExceptionException e) {
- throw new TerminationException(e);
+ String msg = e.getMessage();
+ log.error(msg, e);
+ throw new TerminationException(msg, e);
} catch (CloudControllerServiceInvalidMemberExceptionException e) {
- throw new TerminationException(e);
+ String msg = e.getFaultMessage().getInvalidMemberException().getMessage();
+ log.error(msg, e);
+ throw new TerminationException(msg, e);
} catch (CloudControllerServiceInvalidCartridgeTypeExceptionException e) {
- throw new TerminationException(e);
+ String msg = e.getFaultMessage().getInvalidCartridgeTypeException().getMessage();
+ log.error(msg, e);
+ throw new TerminationException(msg, e);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/91f14f39/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/partition/PartitionManager.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/partition/PartitionManager.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/partition/PartitionManager.java
index 98aaffc..ff09ab0 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/partition/PartitionManager.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/partition/PartitionManager.java
@@ -72,12 +72,12 @@ private static final Log log = LogFactory.getLog(PartitionManager.class);
/*
* Deploy a new partition to Auto Scaler.
*/
- public boolean addNewPartition(Partition partition) throws AutoScalerException, InvalidPartitionException {
+ public boolean addNewPartition(Partition partition) throws InvalidPartitionException {
if (StringUtils.isEmpty(partition.getId())){
- throw new AutoScalerException("Partition id can not be empty");
+ throw new InvalidPartitionException("Partition id can not be empty");
}
if (this.partitionExist(partition.getId())) {
- throw new AutoScalerException(String.format("Partition already exist in partition manager: [id] %s", partition.getId()));
+ throw new InvalidPartitionException(String.format("Partition already exist in partition manager: [id] %s", partition.getId()));
}
if (null == partition.getProvider()) {
throw new InvalidPartitionException("Mandatory field provider has not be set for partition " + partition.getId());
@@ -91,7 +91,7 @@ private static final Log log = LogFactory.getLog(PartitionManager.class);
}
return true;
} catch (Exception e) {
- throw new AutoScalerException(e);
+ throw new InvalidPartitionException(e.getMessage(), e);
}
}
[02/13] git commit: adding tagging instances support in AWSEC2
Posted by ni...@apache.org.
adding tagging instances support in AWSEC2
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/4ec710bd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/4ec710bd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/4ec710bd
Branch: refs/heads/master
Commit: 4ec710bd4c789a1e2247f569ad52c3eeaf9a0336
Parents: aa911d4
Author: Nirmal Fernando <ni...@apache.org>
Authored: Sat Mar 1 13:36:42 2014 +0530
Committer: Nirmal Fernando <ni...@apache.org>
Committed: Sat Mar 1 13:36:42 2014 +0530
----------------------------------------------------------------------
.../stratos/cloud/controller/iaases/AWSEC2Iaas.java | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/4ec710bd/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/AWSEC2Iaas.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/AWSEC2Iaas.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/AWSEC2Iaas.java
index b359abb..0924471 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/AWSEC2Iaas.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/AWSEC2Iaas.java
@@ -164,7 +164,15 @@ public class AWSEC2Iaas extends Iaas {
}
- // security group ids
+ // ability to define tags
+ if (iaasInfo.getProperty(CloudControllerConstants.TAGS) != null) {
+ template.getOptions()
+ .as(AWSEC2TemplateOptions.class)
+ .tags(Arrays.asList(iaasInfo.getProperty(CloudControllerConstants.TAGS)
+ .split(CloudControllerConstants.ENTRY_SEPARATOR)));
+
+ }
+
if (iaasInfo.getProperty(CloudControllerConstants.SECURITY_GROUP_IDS) != null) {
template.getOptions()
.as(AWSEC2TemplateOptions.class)
[09/13] fixing wsdls for
https://issues.apache.org/jira/browse/STRATOS-486
Posted by ni...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/127329dc/service-stubs/org.apache.stratos.autoscaler.service.stub/src/main/resources/AutoScalerService.wsdl
----------------------------------------------------------------------
diff --git a/service-stubs/org.apache.stratos.autoscaler.service.stub/src/main/resources/AutoScalerService.wsdl b/service-stubs/org.apache.stratos.autoscaler.service.stub/src/main/resources/AutoScalerService.wsdl
index e7ee212..36c347f 100644
--- a/service-stubs/org.apache.stratos.autoscaler.service.stub/src/main/resources/AutoScalerService.wsdl
+++ b/service-stubs/org.apache.stratos.autoscaler.service.stub/src/main/resources/AutoScalerService.wsdl
@@ -3,1053 +3,1059 @@
<wsdl:types>
<xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://exception.autoscaler.stratos.apache.org/xsd">
<xs:complexType name="NonExistingLBException">
- <xs:sequence/>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element>
+ </xs:sequence>
</xs:complexType>
<xs:complexType name="InvalidPartitionException">
- <xs:sequence/>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element>
+ </xs:sequence>
</xs:complexType>
<xs:complexType name="InvalidPolicyException">
- <xs:sequence/>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element>
+ </xs:sequence>
</xs:complexType>
</xs:schema>
<xs:schema xmlns:ax217="http://exception.autoscaler.stratos.apache.org/xsd" xmlns:ax215="http://model.policy.autoscaler.stratos.apache.org/xsd" xmlns:ax212="http://partition.deployment.controller.cloud.stratos.apache.org/xsd" xmlns:ax213="http://partition.autoscaler.stratos.apache.org/xsd" xmlns:ax211="http://policy.deployment.autoscaler.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://api.autoscaler.stratos.apache.org">
- <xs:import namespace="http://policy.deployment.autoscaler.stratos.apache.org/xsd"/>
- <xs:import namespace="http://partition.deployment.controller.cloud.stratos.apache.org/xsd"/>
- <xs:import namespace="http://partition.autoscaler.stratos.apache.org/xsd"/>
- <xs:import namespace="http://model.policy.autoscaler.stratos.apache.org/xsd"/>
- <xs:import namespace="http://exception.autoscaler.stratos.apache.org/xsd"/>
+ <xs:import namespace="http://policy.deployment.autoscaler.stratos.apache.org/xsd"></xs:import>
+ <xs:import namespace="http://partition.deployment.controller.cloud.stratos.apache.org/xsd"></xs:import>
+ <xs:import namespace="http://partition.autoscaler.stratos.apache.org/xsd"></xs:import>
+ <xs:import namespace="http://model.policy.autoscaler.stratos.apache.org/xsd"></xs:import>
+ <xs:import namespace="http://exception.autoscaler.stratos.apache.org/xsd"></xs:import>
<xs:element name="getValidDeploymentPoliciesforCartridge">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"></xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="getValidDeploymentPoliciesforCartridgeResponse">
<xs:complexType>
<xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax23:DeploymentPolicy"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax23:DeploymentPolicy"></xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="getPartitionsOfGroup">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="deploymentPolicyId" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="groupId" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="deploymentPolicyId" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="groupId" nillable="true" type="xs:string"></xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="getPartitionsOfGroupResponse">
<xs:complexType>
<xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax24:Partition"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax24:Partition"></xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="getPartitionsOfDeploymentPolicy">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="deploymentPolicyId" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="deploymentPolicyId" nillable="true" type="xs:string"></xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="getPartitionsOfDeploymentPolicyResponse">
<xs:complexType>
<xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax24:Partition"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax24:Partition"></xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="getPartitionGroups">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="deploymentPolicyId" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="deploymentPolicyId" nillable="true" type="xs:string"></xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="getPartitionGroupsResponse">
<xs:complexType>
<xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax28:PartitionGroup"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax28:PartitionGroup"></xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="getPartition">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="partitionId" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="partitionId" nillable="true" type="xs:string"></xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="getPartitionResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" nillable="true" type="ax24:Partition"/>
+ <xs:element minOccurs="0" name="return" nillable="true" type="ax24:Partition"></xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="getDeploymentPolicy">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="deploymentPolicyId" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="deploymentPolicyId" nillable="true" type="xs:string"></xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="getDeploymentPolicyResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" nillable="true" type="ax23:DeploymentPolicy"/>
+ <xs:element minOccurs="0" name="return" nillable="true" type="ax23:DeploymentPolicy"></xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="getAutoscalingPolicy">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="autoscalingPolicyId" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="autoscalingPolicyId" nillable="true" type="xs:string"></xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="getAutoscalingPolicyResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" nillable="true" type="ax214:AutoscalePolicy"/>
+ <xs:element minOccurs="0" name="return" nillable="true" type="ax214:AutoscalePolicy"></xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="getAllDeploymentPolicies">
<xs:complexType>
- <xs:sequence/>
+ <xs:sequence></xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="getAllDeploymentPoliciesResponse">
<xs:complexType>
<xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax23:DeploymentPolicy"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax23:DeploymentPolicy"></xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="getAllAvailablePartitions">
<xs:complexType>
- <xs:sequence/>
+ <xs:sequence></xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="getAllAvailablePartitionsResponse">
<xs:complexType>
<xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax24:Partition"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax24:Partition"></xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="getAllAutoScalingPolicy">
<xs:complexType>
- <xs:sequence/>
+ <xs:sequence></xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="getAllAutoScalingPolicyResponse">
<xs:complexType>
<xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax214:AutoscalePolicy"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax214:AutoscalePolicy"></xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="checkServiceLBExistenceAgainstPolicy">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="serviceName" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="deploymentPolicyId" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="serviceName" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="deploymentPolicyId" nillable="true" type="xs:string"></xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="checkServiceLBExistenceAgainstPolicyResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" type="xs:boolean"/>
+ <xs:element minOccurs="0" name="return" type="xs:boolean"></xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="AutoScalerServiceNonExistingLBException">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="NonExistingLBException" nillable="true" type="ax217:NonExistingLBException"/>
+ <xs:element minOccurs="0" name="NonExistingLBException" nillable="true" type="ax217:NonExistingLBException"></xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="checkLBExistenceAgainstPolicy">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="lbClusterId" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="deploymentPolicyId" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="lbClusterId" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="deploymentPolicyId" nillable="true" type="xs:string"></xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="checkDefaultLBExistenceAgainstPolicy">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="deploymentPolicyId" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="deploymentPolicyId" nillable="true" type="xs:string"></xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="checkDefaultLBExistenceAgainstPolicyResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" type="xs:boolean"/>
+ <xs:element minOccurs="0" name="return" type="xs:boolean"></xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="checkClusterLBExistenceAgainstPolicy">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="deploymentPolicyId" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="deploymentPolicyId" nillable="true" type="xs:string"></xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="checkClusterLBExistenceAgainstPolicyResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" type="xs:boolean"/>
+ <xs:element minOccurs="0" name="return" type="xs:boolean"></xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="AutoScalerServiceInvalidPartitionException">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="InvalidPartitionException" nillable="true" type="ax217:InvalidPartitionException"/>
+ <xs:element minOccurs="0" name="InvalidPartitionException" nillable="true" type="ax217:InvalidPartitionException"></xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="addPartition">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="partition" nillable="true" type="ax24:Partition"/>
+ <xs:element minOccurs="0" name="partition" nillable="true" type="ax24:Partition"></xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="addPartitionResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" type="xs:boolean"/>
+ <xs:element minOccurs="0" name="return" type="xs:boolean"></xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="AutoScalerServiceInvalidPolicyException">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="InvalidPolicyException" nillable="true" type="ax217:InvalidPolicyException"/>
+ <xs:element minOccurs="0" name="InvalidPolicyException" nillable="true" type="ax217:InvalidPolicyException"></xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="addDeploymentPolicy">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="depPolicy" nillable="true" type="ax23:DeploymentPolicy"/>
+ <xs:element minOccurs="0" name="depPolicy" nillable="true" type="ax23:DeploymentPolicy"></xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="addDeploymentPolicyResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" type="xs:boolean"/>
+ <xs:element minOccurs="0" name="return" type="xs:boolean"></xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="addAutoScalingPolicy">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="aspolicy" nillable="true" type="ax214:AutoscalePolicy"/>
+ <xs:element minOccurs="0" name="aspolicy" nillable="true" type="ax214:AutoscalePolicy"></xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="addAutoScalingPolicyResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" type="xs:boolean"/>
+ <xs:element minOccurs="0" name="return" type="xs:boolean"></xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
</xs:schema>
<xs:schema xmlns:ax29="http://partition.deployment.controller.cloud.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://partition.autoscaler.stratos.apache.org/xsd">
- <xs:import namespace="http://partition.deployment.controller.cloud.stratos.apache.org/xsd"/>
+ <xs:import namespace="http://partition.deployment.controller.cloud.stratos.apache.org/xsd"></xs:import>
<xs:complexType name="PartitionGroup">
<xs:sequence>
- <xs:element minOccurs="0" name="id" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="partitionAlgo" nillable="true" type="xs:string"/>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="partitions" nillable="true" type="ax29:Partition"/>
+ <xs:element minOccurs="0" name="id" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="partitionAlgo" nillable="true" type="xs:string"></xs:element>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="partitions" nillable="true" type="ax29:Partition"></xs:element>
</xs:sequence>
</xs:complexType>
</xs:schema>
<xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://model.policy.autoscaler.stratos.apache.org/xsd">
<xs:complexType name="AutoscalePolicy">
<xs:sequence>
- <xs:element minOccurs="0" name="description" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="displayName" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="id" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="loadThresholds" nillable="true" type="ax214:LoadThresholds"/>
+ <xs:element minOccurs="0" name="description" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="displayName" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="id" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="loadThresholds" nillable="true" type="ax214:LoadThresholds"></xs:element>
</xs:sequence>
</xs:complexType>
<xs:complexType name="LoadThresholds">
<xs:sequence>
- <xs:element minOccurs="0" name="loadAverage" nillable="true" type="ax214:LoadAverage"/>
- <xs:element minOccurs="0" name="memoryConsumption" nillable="true" type="ax214:MemoryConsumption"/>
- <xs:element minOccurs="0" name="requestsInFlight" nillable="true" type="ax214:RequestsInFlight"/>
+ <xs:element minOccurs="0" name="loadAverage" nillable="true" type="ax214:LoadAverage"></xs:element>
+ <xs:element minOccurs="0" name="memoryConsumption" nillable="true" type="ax214:MemoryConsumption"></xs:element>
+ <xs:element minOccurs="0" name="requestsInFlight" nillable="true" type="ax214:RequestsInFlight"></xs:element>
</xs:sequence>
</xs:complexType>
<xs:complexType name="LoadAverage">
<xs:sequence>
- <xs:element minOccurs="0" name="average" type="xs:float"/>
- <xs:element minOccurs="0" name="gradient" type="xs:float"/>
- <xs:element minOccurs="0" name="scaleDownMarginOfGradient" type="xs:float"/>
- <xs:element minOccurs="0" name="scaleDownMarginOfSecondDerivative" type="xs:float"/>
- <xs:element minOccurs="0" name="secondDerivative" type="xs:float"/>
+ <xs:element minOccurs="0" name="average" type="xs:float"></xs:element>
+ <xs:element minOccurs="0" name="gradient" type="xs:float"></xs:element>
+ <xs:element minOccurs="0" name="scaleDownMarginOfGradient" type="xs:float"></xs:element>
+ <xs:element minOccurs="0" name="scaleDownMarginOfSecondDerivative" type="xs:float"></xs:element>
+ <xs:element minOccurs="0" name="secondDerivative" type="xs:float"></xs:element>
</xs:sequence>
</xs:complexType>
<xs:complexType name="MemoryConsumption">
<xs:sequence>
- <xs:element minOccurs="0" name="average" type="xs:float"/>
- <xs:element minOccurs="0" name="gradient" type="xs:float"/>
- <xs:element minOccurs="0" name="scaleDownMarginOfGradient" type="xs:float"/>
- <xs:element minOccurs="0" name="scaleDownMarginOfSecondDerivative" type="xs:float"/>
- <xs:element minOccurs="0" name="secondDerivative" type="xs:float"/>
+ <xs:element minOccurs="0" name="average" type="xs:float"></xs:element>
+ <xs:element minOccurs="0" name="gradient" type="xs:float"></xs:element>
+ <xs:element minOccurs="0" name="scaleDownMarginOfGradient" type="xs:float"></xs:element>
+ <xs:element minOccurs="0" name="scaleDownMarginOfSecondDerivative" type="xs:float"></xs:element>
+ <xs:element minOccurs="0" name="secondDerivative" type="xs:float"></xs:element>
</xs:sequence>
</xs:complexType>
<xs:complexType name="RequestsInFlight">
<xs:sequence>
- <xs:element minOccurs="0" name="average" type="xs:float"/>
- <xs:element minOccurs="0" name="gradient" type="xs:float"/>
- <xs:element minOccurs="0" name="scaleDownMarginOfGradient" type="xs:float"/>
- <xs:element minOccurs="0" name="scaleDownMarginOfSecondDerivative" type="xs:float"/>
- <xs:element minOccurs="0" name="secondDerivative" type="xs:float"/>
+ <xs:element minOccurs="0" name="average" type="xs:float"></xs:element>
+ <xs:element minOccurs="0" name="gradient" type="xs:float"></xs:element>
+ <xs:element minOccurs="0" name="scaleDownMarginOfGradient" type="xs:float"></xs:element>
+ <xs:element minOccurs="0" name="scaleDownMarginOfSecondDerivative" type="xs:float"></xs:element>
+ <xs:element minOccurs="0" name="secondDerivative" type="xs:float"></xs:element>
</xs:sequence>
</xs:complexType>
</xs:schema>
<xs:schema xmlns:ax27="http://partition.deployment.controller.cloud.stratos.apache.org/xsd" xmlns:ax210="http://partition.autoscaler.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://policy.deployment.autoscaler.stratos.apache.org/xsd">
- <xs:import namespace="http://partition.deployment.controller.cloud.stratos.apache.org/xsd"/>
- <xs:import namespace="http://partition.autoscaler.stratos.apache.org/xsd"/>
+ <xs:import namespace="http://partition.deployment.controller.cloud.stratos.apache.org/xsd"></xs:import>
+ <xs:import namespace="http://partition.autoscaler.stratos.apache.org/xsd"></xs:import>
<xs:complexType name="DeploymentPolicy">
<xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="allPartitions" nillable="true" type="ax27:Partition"/>
- <xs:element minOccurs="0" name="id" nillable="true" type="xs:string"/>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="partitionGroups" nillable="true" type="ax28:PartitionGroup"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="allPartitions" nillable="true" type="ax27:Partition"></xs:element>
+ <xs:element minOccurs="0" name="id" nillable="true" type="xs:string"></xs:element>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="partitionGroups" nillable="true" type="ax28:PartitionGroup"></xs:element>
</xs:sequence>
</xs:complexType>
</xs:schema>
<xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://pojo.controller.cloud.stratos.apache.org/xsd">
<xs:complexType name="Properties">
<xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="properties" nillable="true" type="ax25:Property"/>
- <xs:element minOccurs="0" name="propertiesSpecified" type="xs:boolean"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="properties" nillable="true" type="ax25:Property"></xs:element>
+ <xs:element minOccurs="0" name="propertiesSpecified" type="xs:boolean"></xs:element>
</xs:sequence>
</xs:complexType>
<xs:complexType name="Property">
<xs:sequence>
- <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="nameSpecified" type="xs:boolean"/>
- <xs:element minOccurs="0" name="value" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="valueSpecified" type="xs:boolean"/>
+ <xs:element minOccurs="0" name="name" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="nameSpecified" type="xs:boolean"></xs:element>
+ <xs:element minOccurs="0" name="value" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="valueSpecified" type="xs:boolean"></xs:element>
</xs:sequence>
</xs:complexType>
</xs:schema>
<xs:schema xmlns:ax26="http://pojo.controller.cloud.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://partition.deployment.controller.cloud.stratos.apache.org/xsd">
- <xs:import namespace="http://pojo.controller.cloud.stratos.apache.org/xsd"/>
+ <xs:import namespace="http://pojo.controller.cloud.stratos.apache.org/xsd"></xs:import>
<xs:complexType name="Partition">
<xs:sequence>
- <xs:element minOccurs="0" name="id" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="idSpecified" type="xs:boolean"/>
- <xs:element minOccurs="0" name="partitionMax" type="xs:int"/>
- <xs:element minOccurs="0" name="partitionMaxSpecified" type="xs:boolean"/>
- <xs:element minOccurs="0" name="partitionMin" type="xs:int"/>
- <xs:element minOccurs="0" name="partitionMinSpecified" type="xs:boolean"/>
- <xs:element minOccurs="0" name="properties" nillable="true" type="ax25:Properties"/>
- <xs:element minOccurs="0" name="propertiesSpecified" type="xs:boolean"/>
- <xs:element minOccurs="0" name="provider" nillable="true" type="xs:string"/>
- <xs:element minOccurs="0" name="providerSpecified" type="xs:boolean"/>
+ <xs:element minOccurs="0" name="id" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="idSpecified" type="xs:boolean"></xs:element>
+ <xs:element minOccurs="0" name="partitionMax" type="xs:int"></xs:element>
+ <xs:element minOccurs="0" name="partitionMaxSpecified" type="xs:boolean"></xs:element>
+ <xs:element minOccurs="0" name="partitionMin" type="xs:int"></xs:element>
+ <xs:element minOccurs="0" name="partitionMinSpecified" type="xs:boolean"></xs:element>
+ <xs:element minOccurs="0" name="properties" nillable="true" type="ax25:Properties"></xs:element>
+ <xs:element minOccurs="0" name="propertiesSpecified" type="xs:boolean"></xs:element>
+ <xs:element minOccurs="0" name="provider" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="providerSpecified" type="xs:boolean"></xs:element>
</xs:sequence>
</xs:complexType>
</xs:schema>
</wsdl:types>
<wsdl:message name="getPartitionsOfDeploymentPolicyRequest">
- <wsdl:part name="parameters" element="ns:getPartitionsOfDeploymentPolicy"/>
+ <wsdl:part name="parameters" element="ns:getPartitionsOfDeploymentPolicy"></wsdl:part>
</wsdl:message>
<wsdl:message name="getPartitionsOfDeploymentPolicyResponse">
- <wsdl:part name="parameters" element="ns:getPartitionsOfDeploymentPolicyResponse"/>
+ <wsdl:part name="parameters" element="ns:getPartitionsOfDeploymentPolicyResponse"></wsdl:part>
</wsdl:message>
<wsdl:message name="getPartitionsOfGroupRequest">
- <wsdl:part name="parameters" element="ns:getPartitionsOfGroup"/>
+ <wsdl:part name="parameters" element="ns:getPartitionsOfGroup"></wsdl:part>
</wsdl:message>
<wsdl:message name="getPartitionsOfGroupResponse">
- <wsdl:part name="parameters" element="ns:getPartitionsOfGroupResponse"/>
+ <wsdl:part name="parameters" element="ns:getPartitionsOfGroupResponse"></wsdl:part>
</wsdl:message>
<wsdl:message name="getAllAutoScalingPolicyRequest">
- <wsdl:part name="parameters" element="ns:getAllAutoScalingPolicy"/>
+ <wsdl:part name="parameters" element="ns:getAllAutoScalingPolicy"></wsdl:part>
</wsdl:message>
<wsdl:message name="getAllAutoScalingPolicyResponse">
- <wsdl:part name="parameters" element="ns:getAllAutoScalingPolicyResponse"/>
+ <wsdl:part name="parameters" element="ns:getAllAutoScalingPolicyResponse"></wsdl:part>
</wsdl:message>
<wsdl:message name="getDeploymentPolicyRequest">
- <wsdl:part name="parameters" element="ns:getDeploymentPolicy"/>
+ <wsdl:part name="parameters" element="ns:getDeploymentPolicy"></wsdl:part>
</wsdl:message>
<wsdl:message name="getDeploymentPolicyResponse">
- <wsdl:part name="parameters" element="ns:getDeploymentPolicyResponse"/>
+ <wsdl:part name="parameters" element="ns:getDeploymentPolicyResponse"></wsdl:part>
</wsdl:message>
<wsdl:message name="addAutoScalingPolicyRequest">
- <wsdl:part name="parameters" element="ns:addAutoScalingPolicy"/>
+ <wsdl:part name="parameters" element="ns:addAutoScalingPolicy"></wsdl:part>
</wsdl:message>
<wsdl:message name="addAutoScalingPolicyResponse">
- <wsdl:part name="parameters" element="ns:addAutoScalingPolicyResponse"/>
+ <wsdl:part name="parameters" element="ns:addAutoScalingPolicyResponse"></wsdl:part>
</wsdl:message>
<wsdl:message name="AutoScalerServiceInvalidPolicyException">
- <wsdl:part name="parameters" element="ns:AutoScalerServiceInvalidPolicyException"/>
+ <wsdl:part name="parameters" element="ns:AutoScalerServiceInvalidPolicyException"></wsdl:part>
</wsdl:message>
<wsdl:message name="getAllDeploymentPoliciesRequest">
- <wsdl:part name="parameters" element="ns:getAllDeploymentPolicies"/>
+ <wsdl:part name="parameters" element="ns:getAllDeploymentPolicies"></wsdl:part>
</wsdl:message>
<wsdl:message name="getAllDeploymentPoliciesResponse">
- <wsdl:part name="parameters" element="ns:getAllDeploymentPoliciesResponse"/>
+ <wsdl:part name="parameters" element="ns:getAllDeploymentPoliciesResponse"></wsdl:part>
</wsdl:message>
<wsdl:message name="getValidDeploymentPoliciesforCartridgeRequest">
- <wsdl:part name="parameters" element="ns:getValidDeploymentPoliciesforCartridge"/>
+ <wsdl:part name="parameters" element="ns:getValidDeploymentPoliciesforCartridge"></wsdl:part>
</wsdl:message>
<wsdl:message name="getValidDeploymentPoliciesforCartridgeResponse">
- <wsdl:part name="parameters" element="ns:getValidDeploymentPoliciesforCartridgeResponse"/>
+ <wsdl:part name="parameters" element="ns:getValidDeploymentPoliciesforCartridgeResponse"></wsdl:part>
</wsdl:message>
<wsdl:message name="getAllAvailablePartitionsRequest">
- <wsdl:part name="parameters" element="ns:getAllAvailablePartitions"/>
+ <wsdl:part name="parameters" element="ns:getAllAvailablePartitions"></wsdl:part>
</wsdl:message>
<wsdl:message name="getAllAvailablePartitionsResponse">
- <wsdl:part name="parameters" element="ns:getAllAvailablePartitionsResponse"/>
+ <wsdl:part name="parameters" element="ns:getAllAvailablePartitionsResponse"></wsdl:part>
</wsdl:message>
<wsdl:message name="getAutoscalingPolicyRequest">
- <wsdl:part name="parameters" element="ns:getAutoscalingPolicy"/>
+ <wsdl:part name="parameters" element="ns:getAutoscalingPolicy"></wsdl:part>
</wsdl:message>
<wsdl:message name="getAutoscalingPolicyResponse">
- <wsdl:part name="parameters" element="ns:getAutoscalingPolicyResponse"/>
+ <wsdl:part name="parameters" element="ns:getAutoscalingPolicyResponse"></wsdl:part>
</wsdl:message>
<wsdl:message name="checkClusterLBExistenceAgainstPolicyRequest">
- <wsdl:part name="parameters" element="ns:checkClusterLBExistenceAgainstPolicy"/>
+ <wsdl:part name="parameters" element="ns:checkClusterLBExistenceAgainstPolicy"></wsdl:part>
</wsdl:message>
<wsdl:message name="checkClusterLBExistenceAgainstPolicyResponse">
- <wsdl:part name="parameters" element="ns:checkClusterLBExistenceAgainstPolicyResponse"/>
+ <wsdl:part name="parameters" element="ns:checkClusterLBExistenceAgainstPolicyResponse"></wsdl:part>
</wsdl:message>
<wsdl:message name="checkDefaultLBExistenceAgainstPolicyRequest">
- <wsdl:part name="parameters" element="ns:checkDefaultLBExistenceAgainstPolicy"/>
+ <wsdl:part name="parameters" element="ns:checkDefaultLBExistenceAgainstPolicy"></wsdl:part>
</wsdl:message>
<wsdl:message name="checkDefaultLBExistenceAgainstPolicyResponse">
- <wsdl:part name="parameters" element="ns:checkDefaultLBExistenceAgainstPolicyResponse"/>
+ <wsdl:part name="parameters" element="ns:checkDefaultLBExistenceAgainstPolicyResponse"></wsdl:part>
</wsdl:message>
<wsdl:message name="getPartitionRequest">
- <wsdl:part name="parameters" element="ns:getPartition"/>
+ <wsdl:part name="parameters" element="ns:getPartition"></wsdl:part>
</wsdl:message>
<wsdl:message name="getPartitionResponse">
- <wsdl:part name="parameters" element="ns:getPartitionResponse"/>
+ <wsdl:part name="parameters" element="ns:getPartitionResponse"></wsdl:part>
</wsdl:message>
<wsdl:message name="addPartitionRequest">
- <wsdl:part name="parameters" element="ns:addPartition"/>
+ <wsdl:part name="parameters" element="ns:addPartition"></wsdl:part>
</wsdl:message>
<wsdl:message name="addPartitionResponse">
- <wsdl:part name="parameters" element="ns:addPartitionResponse"/>
+ <wsdl:part name="parameters" element="ns:addPartitionResponse"></wsdl:part>
</wsdl:message>
<wsdl:message name="AutoScalerServiceInvalidPartitionException">
- <wsdl:part name="parameters" element="ns:AutoScalerServiceInvalidPartitionException"/>
+ <wsdl:part name="parameters" element="ns:AutoScalerServiceInvalidPartitionException"></wsdl:part>
</wsdl:message>
<wsdl:message name="checkServiceLBExistenceAgainstPolicyRequest">
- <wsdl:part name="parameters" element="ns:checkServiceLBExistenceAgainstPolicy"/>
+ <wsdl:part name="parameters" element="ns:checkServiceLBExistenceAgainstPolicy"></wsdl:part>
</wsdl:message>
<wsdl:message name="checkServiceLBExistenceAgainstPolicyResponse">
- <wsdl:part name="parameters" element="ns:checkServiceLBExistenceAgainstPolicyResponse"/>
+ <wsdl:part name="parameters" element="ns:checkServiceLBExistenceAgainstPolicyResponse"></wsdl:part>
</wsdl:message>
<wsdl:message name="addDeploymentPolicyRequest">
- <wsdl:part name="parameters" element="ns:addDeploymentPolicy"/>
+ <wsdl:part name="parameters" element="ns:addDeploymentPolicy"></wsdl:part>
</wsdl:message>
<wsdl:message name="addDeploymentPolicyResponse">
- <wsdl:part name="parameters" element="ns:addDeploymentPolicyResponse"/>
+ <wsdl:part name="parameters" element="ns:addDeploymentPolicyResponse"></wsdl:part>
</wsdl:message>
<wsdl:message name="getPartitionGroupsRequest">
- <wsdl:part name="parameters" element="ns:getPartitionGroups"/>
+ <wsdl:part name="parameters" element="ns:getPartitionGroups"></wsdl:part>
</wsdl:message>
<wsdl:message name="getPartitionGroupsResponse">
- <wsdl:part name="parameters" element="ns:getPartitionGroupsResponse"/>
+ <wsdl:part name="parameters" element="ns:getPartitionGroupsResponse"></wsdl:part>
</wsdl:message>
<wsdl:message name="checkLBExistenceAgainstPolicyRequest">
- <wsdl:part name="parameters" element="ns:checkLBExistenceAgainstPolicy"/>
+ <wsdl:part name="parameters" element="ns:checkLBExistenceAgainstPolicy"></wsdl:part>
</wsdl:message>
<wsdl:message name="AutoScalerServiceNonExistingLBException">
- <wsdl:part name="parameters" element="ns:AutoScalerServiceNonExistingLBException"/>
+ <wsdl:part name="parameters" element="ns:AutoScalerServiceNonExistingLBException"></wsdl:part>
</wsdl:message>
<wsdl:portType name="AutoScalerServicePortType">
<wsdl:operation name="getPartitionsOfDeploymentPolicy">
- <wsdl:input message="ns:getPartitionsOfDeploymentPolicyRequest" wsaw:Action="urn:getPartitionsOfDeploymentPolicy"/>
- <wsdl:output message="ns:getPartitionsOfDeploymentPolicyResponse" wsaw:Action="urn:getPartitionsOfDeploymentPolicyResponse"/>
+ <wsdl:input message="ns:getPartitionsOfDeploymentPolicyRequest" wsaw:Action="urn:getPartitionsOfDeploymentPolicy"></wsdl:input>
+ <wsdl:output message="ns:getPartitionsOfDeploymentPolicyResponse" wsaw:Action="urn:getPartitionsOfDeploymentPolicyResponse"></wsdl:output>
</wsdl:operation>
<wsdl:operation name="getPartitionsOfGroup">
- <wsdl:input message="ns:getPartitionsOfGroupRequest" wsaw:Action="urn:getPartitionsOfGroup"/>
- <wsdl:output message="ns:getPartitionsOfGroupResponse" wsaw:Action="urn:getPartitionsOfGroupResponse"/>
+ <wsdl:input message="ns:getPartitionsOfGroupRequest" wsaw:Action="urn:getPartitionsOfGroup"></wsdl:input>
+ <wsdl:output message="ns:getPartitionsOfGroupResponse" wsaw:Action="urn:getPartitionsOfGroupResponse"></wsdl:output>
</wsdl:operation>
<wsdl:operation name="getAllAutoScalingPolicy">
- <wsdl:input message="ns:getAllAutoScalingPolicyRequest" wsaw:Action="urn:getAllAutoScalingPolicy"/>
- <wsdl:output message="ns:getAllAutoScalingPolicyResponse" wsaw:Action="urn:getAllAutoScalingPolicyResponse"/>
+ <wsdl:input message="ns:getAllAutoScalingPolicyRequest" wsaw:Action="urn:getAllAutoScalingPolicy"></wsdl:input>
+ <wsdl:output message="ns:getAllAutoScalingPolicyResponse" wsaw:Action="urn:getAllAutoScalingPolicyResponse"></wsdl:output>
</wsdl:operation>
<wsdl:operation name="getDeploymentPolicy">
- <wsdl:input message="ns:getDeploymentPolicyRequest" wsaw:Action="urn:getDeploymentPolicy"/>
- <wsdl:output message="ns:getDeploymentPolicyResponse" wsaw:Action="urn:getDeploymentPolicyResponse"/>
+ <wsdl:input message="ns:getDeploymentPolicyRequest" wsaw:Action="urn:getDeploymentPolicy"></wsdl:input>
+ <wsdl:output message="ns:getDeploymentPolicyResponse" wsaw:Action="urn:getDeploymentPolicyResponse"></wsdl:output>
</wsdl:operation>
<wsdl:operation name="addAutoScalingPolicy">
- <wsdl:input message="ns:addAutoScalingPolicyRequest" wsaw:Action="urn:addAutoScalingPolicy"/>
- <wsdl:output message="ns:addAutoScalingPolicyResponse" wsaw:Action="urn:addAutoScalingPolicyResponse"/>
- <wsdl:fault message="ns:AutoScalerServiceInvalidPolicyException" name="AutoScalerServiceInvalidPolicyException" wsaw:Action="urn:addAutoScalingPolicyAutoScalerServiceInvalidPolicyException"/>
+ <wsdl:input message="ns:addAutoScalingPolicyRequest" wsaw:Action="urn:addAutoScalingPolicy"></wsdl:input>
+ <wsdl:output message="ns:addAutoScalingPolicyResponse" wsaw:Action="urn:addAutoScalingPolicyResponse"></wsdl:output>
+ <wsdl:fault message="ns:AutoScalerServiceInvalidPolicyException" name="AutoScalerServiceInvalidPolicyException" wsaw:Action="urn:addAutoScalingPolicyAutoScalerServiceInvalidPolicyException"></wsdl:fault>
</wsdl:operation>
<wsdl:operation name="getAllDeploymentPolicies">
- <wsdl:input message="ns:getAllDeploymentPoliciesRequest" wsaw:Action="urn:getAllDeploymentPolicies"/>
- <wsdl:output message="ns:getAllDeploymentPoliciesResponse" wsaw:Action="urn:getAllDeploymentPoliciesResponse"/>
+ <wsdl:input message="ns:getAllDeploymentPoliciesRequest" wsaw:Action="urn:getAllDeploymentPolicies"></wsdl:input>
+ <wsdl:output message="ns:getAllDeploymentPoliciesResponse" wsaw:Action="urn:getAllDeploymentPoliciesResponse"></wsdl:output>
</wsdl:operation>
<wsdl:operation name="getValidDeploymentPoliciesforCartridge">
- <wsdl:input message="ns:getValidDeploymentPoliciesforCartridgeRequest" wsaw:Action="urn:getValidDeploymentPoliciesforCartridge"/>
- <wsdl:output message="ns:getValidDeploymentPoliciesforCartridgeResponse" wsaw:Action="urn:getValidDeploymentPoliciesforCartridgeResponse"/>
+ <wsdl:input message="ns:getValidDeploymentPoliciesforCartridgeRequest" wsaw:Action="urn:getValidDeploymentPoliciesforCartridge"></wsdl:input>
+ <wsdl:output message="ns:getValidDeploymentPoliciesforCartridgeResponse" wsaw:Action="urn:getValidDeploymentPoliciesforCartridgeResponse"></wsdl:output>
</wsdl:operation>
<wsdl:operation name="getAllAvailablePartitions">
- <wsdl:input message="ns:getAllAvailablePartitionsRequest" wsaw:Action="urn:getAllAvailablePartitions"/>
- <wsdl:output message="ns:getAllAvailablePartitionsResponse" wsaw:Action="urn:getAllAvailablePartitionsResponse"/>
+ <wsdl:input message="ns:getAllAvailablePartitionsRequest" wsaw:Action="urn:getAllAvailablePartitions"></wsdl:input>
+ <wsdl:output message="ns:getAllAvailablePartitionsResponse" wsaw:Action="urn:getAllAvailablePartitionsResponse"></wsdl:output>
</wsdl:operation>
<wsdl:operation name="getAutoscalingPolicy">
- <wsdl:input message="ns:getAutoscalingPolicyRequest" wsaw:Action="urn:getAutoscalingPolicy"/>
- <wsdl:output message="ns:getAutoscalingPolicyResponse" wsaw:Action="urn:getAutoscalingPolicyResponse"/>
+ <wsdl:input message="ns:getAutoscalingPolicyRequest" wsaw:Action="urn:getAutoscalingPolicy"></wsdl:input>
+ <wsdl:output message="ns:getAutoscalingPolicyResponse" wsaw:Action="urn:getAutoscalingPolicyResponse"></wsdl:output>
</wsdl:operation>
<wsdl:operation name="checkClusterLBExistenceAgainstPolicy">
- <wsdl:input message="ns:checkClusterLBExistenceAgainstPolicyRequest" wsaw:Action="urn:checkClusterLBExistenceAgainstPolicy"/>
- <wsdl:output message="ns:checkClusterLBExistenceAgainstPolicyResponse" wsaw:Action="urn:checkClusterLBExistenceAgainstPolicyResponse"/>
+ <wsdl:input message="ns:checkClusterLBExistenceAgainstPolicyRequest" wsaw:Action="urn:checkClusterLBExistenceAgainstPolicy"></wsdl:input>
+ <wsdl:output message="ns:checkClusterLBExistenceAgainstPolicyResponse" wsaw:Action="urn:checkClusterLBExistenceAgainstPolicyResponse"></wsdl:output>
</wsdl:operation>
<wsdl:operation name="checkDefaultLBExistenceAgainstPolicy">
- <wsdl:input message="ns:checkDefaultLBExistenceAgainstPolicyRequest" wsaw:Action="urn:checkDefaultLBExistenceAgainstPolicy"/>
- <wsdl:output message="ns:checkDefaultLBExistenceAgainstPolicyResponse" wsaw:Action="urn:checkDefaultLBExistenceAgainstPolicyResponse"/>
+ <wsdl:input message="ns:checkDefaultLBExistenceAgainstPolicyRequest" wsaw:Action="urn:checkDefaultLBExistenceAgainstPolicy"></wsdl:input>
+ <wsdl:output message="ns:checkDefaultLBExistenceAgainstPolicyResponse" wsaw:Action="urn:checkDefaultLBExistenceAgainstPolicyResponse"></wsdl:output>
</wsdl:operation>
<wsdl:operation name="getPartition">
- <wsdl:input message="ns:getPartitionRequest" wsaw:Action="urn:getPartition"/>
- <wsdl:output message="ns:getPartitionResponse" wsaw:Action="urn:getPartitionResponse"/>
+ <wsdl:input message="ns:getPartitionRequest" wsaw:Action="urn:getPartition"></wsdl:input>
+ <wsdl:output message="ns:getPartitionResponse" wsaw:Action="urn:getPartitionResponse"></wsdl:output>
</wsdl:operation>
<wsdl:operation name="addPartition">
- <wsdl:input message="ns:addPartitionRequest" wsaw:Action="urn:addPartition"/>
- <wsdl:output message="ns:addPartitionResponse" wsaw:Action="urn:addPartitionResponse"/>
- <wsdl:fault message="ns:AutoScalerServiceInvalidPartitionException" name="AutoScalerServiceInvalidPartitionException" wsaw:Action="urn:addPartitionAutoScalerServiceInvalidPartitionException"/>
+ <wsdl:input message="ns:addPartitionRequest" wsaw:Action="urn:addPartition"></wsdl:input>
+ <wsdl:output message="ns:addPartitionResponse" wsaw:Action="urn:addPartitionResponse"></wsdl:output>
+ <wsdl:fault message="ns:AutoScalerServiceInvalidPartitionException" name="AutoScalerServiceInvalidPartitionException" wsaw:Action="urn:addPartitionAutoScalerServiceInvalidPartitionException"></wsdl:fault>
</wsdl:operation>
<wsdl:operation name="checkServiceLBExistenceAgainstPolicy">
- <wsdl:input message="ns:checkServiceLBExistenceAgainstPolicyRequest" wsaw:Action="urn:checkServiceLBExistenceAgainstPolicy"/>
- <wsdl:output message="ns:checkServiceLBExistenceAgainstPolicyResponse" wsaw:Action="urn:checkServiceLBExistenceAgainstPolicyResponse"/>
+ <wsdl:input message="ns:checkServiceLBExistenceAgainstPolicyRequest" wsaw:Action="urn:checkServiceLBExistenceAgainstPolicy"></wsdl:input>
+ <wsdl:output message="ns:checkServiceLBExistenceAgainstPolicyResponse" wsaw:Action="urn:checkServiceLBExistenceAgainstPolicyResponse"></wsdl:output>
</wsdl:operation>
<wsdl:operation name="addDeploymentPolicy">
- <wsdl:input message="ns:addDeploymentPolicyRequest" wsaw:Action="urn:addDeploymentPolicy"/>
- <wsdl:output message="ns:addDeploymentPolicyResponse" wsaw:Action="urn:addDeploymentPolicyResponse"/>
- <wsdl:fault message="ns:AutoScalerServiceInvalidPolicyException" name="AutoScalerServiceInvalidPolicyException" wsaw:Action="urn:addDeploymentPolicyAutoScalerServiceInvalidPolicyException"/>
+ <wsdl:input message="ns:addDeploymentPolicyRequest" wsaw:Action="urn:addDeploymentPolicy"></wsdl:input>
+ <wsdl:output message="ns:addDeploymentPolicyResponse" wsaw:Action="urn:addDeploymentPolicyResponse"></wsdl:output>
+ <wsdl:fault message="ns:AutoScalerServiceInvalidPolicyException" name="AutoScalerServiceInvalidPolicyException" wsaw:Action="urn:addDeploymentPolicyAutoScalerServiceInvalidPolicyException"></wsdl:fault>
</wsdl:operation>
<wsdl:operation name="getPartitionGroups">
- <wsdl:input message="ns:getPartitionGroupsRequest" wsaw:Action="urn:getPartitionGroups"/>
- <wsdl:output message="ns:getPartitionGroupsResponse" wsaw:Action="urn:getPartitionGroupsResponse"/>
+ <wsdl:input message="ns:getPartitionGroupsRequest" wsaw:Action="urn:getPartitionGroups"></wsdl:input>
+ <wsdl:output message="ns:getPartitionGroupsResponse" wsaw:Action="urn:getPartitionGroupsResponse"></wsdl:output>
</wsdl:operation>
<wsdl:operation name="checkLBExistenceAgainstPolicy">
- <wsdl:input message="ns:checkLBExistenceAgainstPolicyRequest" wsaw:Action="urn:checkLBExistenceAgainstPolicy"/>
- <wsdl:fault message="ns:AutoScalerServiceNonExistingLBException" name="AutoScalerServiceNonExistingLBException" wsaw:Action="urn:checkLBExistenceAgainstPolicyAutoScalerServiceNonExistingLBException"/>
+ <wsdl:input message="ns:checkLBExistenceAgainstPolicyRequest" wsaw:Action="urn:checkLBExistenceAgainstPolicy"></wsdl:input>
+ <wsdl:fault message="ns:AutoScalerServiceNonExistingLBException" name="AutoScalerServiceNonExistingLBException" wsaw:Action="urn:checkLBExistenceAgainstPolicyAutoScalerServiceNonExistingLBException"></wsdl:fault>
</wsdl:operation>
</wsdl:portType>
<wsdl:binding name="AutoScalerServiceSoap11Binding" type="ns:AutoScalerServicePortType">
- <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
+ <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"></soap:binding>
<wsdl:operation name="getPartitionsOfDeploymentPolicy">
- <soap:operation soapAction="urn:getPartitionsOfDeploymentPolicy" style="document"/>
+ <soap:operation soapAction="urn:getPartitionsOfDeploymentPolicy" style="document"></soap:operation>
<wsdl:input>
- <soap:body use="literal"/>
+ <soap:body use="literal"></soap:body>
</wsdl:input>
<wsdl:output>
- <soap:body use="literal"/>
+ <soap:body use="literal"></soap:body>
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="getAllAutoScalingPolicy">
- <soap:operation soapAction="urn:getAllAutoScalingPolicy" style="document"/>
+ <soap:operation soapAction="urn:getAllAutoScalingPolicy" style="document"></soap:operation>
<wsdl:input>
- <soap:body use="literal"/>
+ <soap:body use="literal"></soap:body>
</wsdl:input>
<wsdl:output>
- <soap:body use="literal"/>
+ <soap:body use="literal"></soap:body>
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="getPartitionsOfGroup">
- <soap:operation soapAction="urn:getPartitionsOfGroup" style="document"/>
+ <soap:operation soapAction="urn:getPartitionsOfGroup" style="document"></soap:operation>
<wsdl:input>
- <soap:body use="literal"/>
+ <soap:body use="literal"></soap:body>
</wsdl:input>
<wsdl:output>
- <soap:body use="literal"/>
+ <soap:body use="literal"></soap:body>
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="getDeploymentPolicy">
- <soap:operation soapAction="urn:getDeploymentPolicy" style="document"/>
+ <soap:operation soapAction="urn:getDeploymentPolicy" style="document"></soap:operation>
<wsdl:input>
- <soap:body use="literal"/>
+ <soap:body use="literal"></soap:body>
</wsdl:input>
<wsdl:output>
- <soap:body use="literal"/>
+ <soap:body use="literal"></soap:body>
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="addAutoScalingPolicy">
- <soap:operation soapAction="urn:addAutoScalingPolicy" style="document"/>
+ <soap:operation soapAction="urn:addAutoScalingPolicy" style="document"></soap:operation>
<wsdl:input>
- <soap:body use="literal"/>
+ <soap:body use="literal"></soap:body>
</wsdl:input>
<wsdl:output>
- <soap:body use="literal"/>
+ <soap:body use="literal"></soap:body>
</wsdl:output>
<wsdl:fault name="AutoScalerServiceInvalidPolicyException">
- <soap:fault use="literal" name="AutoScalerServiceInvalidPolicyException"/>
+ <soap:fault use="literal" name="AutoScalerServiceInvalidPolicyException"></soap:fault>
</wsdl:fault>
</wsdl:operation>
<wsdl:operation name="getAllDeploymentPolicies">
- <soap:operation soapAction="urn:getAllDeploymentPolicies" style="document"/>
+ <soap:operation soapAction="urn:getAllDeploymentPolicies" style="document"></soap:operation>
<wsdl:input>
- <soap:body use="literal"/>
+ <soap:body use="literal"></soap:body>
</wsdl:input>
<wsdl:output>
- <soap:body use="literal"/>
+ <soap:body use="literal"></soap:body>
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="getValidDeploymentPoliciesforCartridge">
- <soap:operation soapAction="urn:getValidDeploymentPoliciesforCartridge" style="document"/>
+ <soap:operation soapAction="urn:getValidDeploymentPoliciesforCartridge" style="document"></soap:operation>
<wsdl:input>
- <soap:body use="literal"/>
+ <soap:body use="literal"></soap:body>
</wsdl:input>
<wsdl:output>
- <soap:body use="literal"/>
+ <soap:body use="literal"></soap:body>
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="getAllAvailablePartitions">
- <soap:operation soapAction="urn:getAllAvailablePartitions" style="document"/>
+ <soap:operation soapAction="urn:getAllAvailablePartitions" style="document"></soap:operation>
<wsdl:input>
- <soap:body use="literal"/>
+ <soap:body use="literal"></soap:body>
</wsdl:input>
<wsdl:output>
- <soap:body use="literal"/>
+ <soap:body use="literal"></soap:body>
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="getAutoscalingPolicy">
- <soap:operation soapAction="urn:getAutoscalingPolicy" style="document"/>
+ <soap:operation soapAction="urn:getAutoscalingPolicy" style="document"></soap:operation>
<wsdl:input>
- <soap:body use="literal"/>
+ <soap:body use="literal"></soap:body>
</wsdl:input>
<wsdl:output>
- <soap:body use="literal"/>
+ <soap:body use="literal"></soap:body>
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="checkDefaultLBExistenceAgainstPolicy">
- <soap:operation soapAction="urn:checkDefaultLBExistenceAgainstPolicy" style="document"/>
+ <soap:operation soapAction="urn:checkDefaultLBExistenceAgainstPolicy" style="document"></soap:operation>
<wsdl:input>
- <soap:body use="literal"/>
+ <soap:body use="literal"></soap:body>
</wsdl:input>
<wsdl:output>
- <soap:body use="literal"/>
+ <soap:body use="literal"></soap:body>
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="checkClusterLBExistenceAgainstPolicy">
- <soap:operation soapAction="urn:checkClusterLBExistenceAgainstPolicy" style="document"/>
+ <soap:operation soapAction="urn:checkClusterLBExistenceAgainstPolicy" style="document"></soap:operation>
<wsdl:input>
- <soap:body use="literal"/>
+ <soap:body use="literal"></soap:body>
</wsdl:input>
<wsdl:output>
- <soap:body use="literal"/>
+ <soap:body use="literal"></soap:body>
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="getPartition">
- <soap:operation soapAction="urn:getPartition" style="document"/>
+ <soap:operation soapAction="urn:getPartition" style="document"></soap:operation>
<wsdl:input>
- <soap:body use="literal"/>
+ <soap:body use="literal"></soap:body>
</wsdl:input>
<wsdl:output>
- <soap:body use="literal"/>
+ <soap:body use="literal"></soap:body>
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="addPartition">
- <soap:operation soapAction="urn:addPartition" style="document"/>
+ <soap:operation soapAction="urn:addPartition" style="document"></soap:operation>
<wsdl:input>
- <soap:body use="literal"/>
+ <soap:body use="literal"></soap:body>
</wsdl:input>
<wsdl:output>
- <soap:body use="literal"/>
+ <soap:body use="literal"></soap:body>
</wsdl:output>
<wsdl:fault name="AutoScalerServiceInvalidPartitionException">
- <soap:fault use="literal" name="AutoScalerServiceInvalidPartitionException"/>
+ <soap:fault use="literal" name="AutoScalerServiceInvalidPartitionException"></soap:fault>
</wsdl:fault>
</wsdl:operation>
<wsdl:operation name="checkServiceLBExistenceAgainstPolicy">
- <soap:operation soapAction="urn:checkServiceLBExistenceAgainstPolicy" style="document"/>
+ <soap:operation soapAction="urn:checkServiceLBExistenceAgainstPolicy" style="document"></soap:operation>
<wsdl:input>
- <soap:body use="literal"/>
+ <soap:body use="literal"></soap:body>
</wsdl:input>
<wsdl:output>
- <soap:body use="literal"/>
+ <soap:body use="literal"></soap:body>
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="addDeploymentPolicy">
- <soap:operation soapAction="urn:addDeploymentPolicy" style="document"/>
+ <soap:operation soapAction="urn:addDeploymentPolicy" style="document"></soap:operation>
<wsdl:input>
- <soap:body use="literal"/>
+ <soap:body use="literal"></soap:body>
</wsdl:input>
<wsdl:output>
- <soap:body use="literal"/>
+ <soap:body use="literal"></soap:body>
</wsdl:output>
<wsdl:fault name="AutoScalerServiceInvalidPolicyException">
- <soap:fault use="literal" name="AutoScalerServiceInvalidPolicyException"/>
+ <soap:fault use="literal" name="AutoScalerServiceInvalidPolicyException"></soap:fault>
</wsdl:fault>
</wsdl:operation>
<wsdl:operation name="getPartitionGroups">
- <soap:operation soapAction="urn:getPartitionGroups" style="document"/>
+ <soap:operation soapAction="urn:getPartitionGroups" style="document"></soap:operation>
<wsdl:input>
- <soap:body use="literal"/>
+ <soap:body use="literal"></soap:body>
</wsdl:input>
<wsdl:output>
- <soap:body use="literal"/>
+ <soap:body use="literal"></soap:body>
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="checkLBExistenceAgainstPolicy">
- <soap:operation soapAction="urn:checkLBExistenceAgainstPolicy" style="document"/>
+ <soap:operation soapAction="urn:checkLBExistenceAgainstPolicy" style="document"></soap:operation>
<wsdl:input>
- <soap:body use="literal"/>
+ <soap:body use="literal"></soap:body>
</wsdl:input>
<wsdl:fault name="AutoScalerServiceNonExistingLBException">
- <soap:fault use="literal" name="AutoScalerServiceNonExistingLBException"/>
+ <soap:fault use="literal" name="AutoScalerServiceNonExistingLBException"></soap:fault>
</wsdl:fault>
</wsdl:operation>
</wsdl:binding>
<wsdl:binding name="AutoScalerServiceSoap12Binding" type="ns:AutoScalerServicePortType">
- <soap12:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
+ <soap12:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"></soap12:binding>
<wsdl:operation name="getPartitionsOfDeploymentPolicy">
- <soap12:operation soapAction="urn:getPartitionsOfDeploymentPolicy" style="document"/>
+ <soap12:operation soapAction="urn:getPartitionsOfDeploymentPolicy" style="document"></soap12:operation>
<wsdl:input>
- <soap12:body use="literal"/>
+ <soap12:body use="literal"></soap12:body>
</wsdl:input>
<wsdl:output>
- <soap12:body use="literal"/>
+ <soap12:body use="literal"></soap12:body>
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="getAllAutoScalingPolicy">
- <soap12:operation soapAction="urn:getAllAutoScalingPolicy" style="document"/>
+ <soap12:operation soapAction="urn:getAllAutoScalingPolicy" style="document"></soap12:operation>
<wsdl:input>
- <soap12:body use="literal"/>
+ <soap12:body use="literal"></soap12:body>
</wsdl:input>
<wsdl:output>
- <soap12:body use="literal"/>
+ <soap12:body use="literal"></soap12:body>
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="getPartitionsOfGroup">
- <soap12:operation soapAction="urn:getPartitionsOfGroup" style="document"/>
+ <soap12:operation soapAction="urn:getPartitionsOfGroup" style="document"></soap12:operation>
<wsdl:input>
- <soap12:body use="literal"/>
+ <soap12:body use="literal"></soap12:body>
</wsdl:input>
<wsdl:output>
- <soap12:body use="literal"/>
+ <soap12:body use="literal"></soap12:body>
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="getDeploymentPolicy">
- <soap12:operation soapAction="urn:getDeploymentPolicy" style="document"/>
+ <soap12:operation soapAction="urn:getDeploymentPolicy" style="document"></soap12:operation>
<wsdl:input>
- <soap12:body use="literal"/>
+ <soap12:body use="literal"></soap12:body>
</wsdl:input>
<wsdl:output>
- <soap12:body use="literal"/>
+ <soap12:body use="literal"></soap12:body>
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="addAutoScalingPolicy">
- <soap12:operation soapAction="urn:addAutoScalingPolicy" style="document"/>
+ <soap12:operation soapAction="urn:addAutoScalingPolicy" style="document"></soap12:operation>
<wsdl:input>
- <soap12:body use="literal"/>
+ <soap12:body use="literal"></soap12:body>
</wsdl:input>
<wsdl:output>
- <soap12:body use="literal"/>
+ <soap12:body use="literal"></soap12:body>
</wsdl:output>
<wsdl:fault name="AutoScalerServiceInvalidPolicyException">
- <soap12:fault use="literal" name="AutoScalerServiceInvalidPolicyException"/>
+ <soap12:fault use="literal" name="AutoScalerServiceInvalidPolicyException"></soap12:fault>
</wsdl:fault>
</wsdl:operation>
<wsdl:operation name="getAllDeploymentPolicies">
- <soap12:operation soapAction="urn:getAllDeploymentPolicies" style="document"/>
+ <soap12:operation soapAction="urn:getAllDeploymentPolicies" style="document"></soap12:operation>
<wsdl:input>
- <soap12:body use="literal"/>
+ <soap12:body use="literal"></soap12:body>
</wsdl:input>
<wsdl:output>
- <soap12:body use="literal"/>
+ <soap12:body use="literal"></soap12:body>
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="getValidDeploymentPoliciesforCartridge">
- <soap12:operation soapAction="urn:getValidDeploymentPoliciesforCartridge" style="document"/>
+ <soap12:operation soapAction="urn:getValidDeploymentPoliciesforCartridge" style="document"></soap12:operation>
<wsdl:input>
- <soap12:body use="literal"/>
+ <soap12:body use="literal"></soap12:body>
</wsdl:input>
<wsdl:output>
- <soap12:body use="literal"/>
+ <soap12:body use="literal"></soap12:body>
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="getAllAvailablePartitions">
- <soap12:operation soapAction="urn:getAllAvailablePartitions" style="document"/>
+ <soap12:operation soapAction="urn:getAllAvailablePartitions" style="document"></soap12:operation>
<wsdl:input>
- <soap12:body use="literal"/>
+ <soap12:body use="literal"></soap12:body>
</wsdl:input>
<wsdl:output>
- <soap12:body use="literal"/>
+ <soap12:body use="literal"></soap12:body>
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="getAutoscalingPolicy">
- <soap12:operation soapAction="urn:getAutoscalingPolicy" style="document"/>
+ <soap12:operation soapAction="urn:getAutoscalingPolicy" style="document"></soap12:operation>
<wsdl:input>
- <soap12:body use="literal"/>
+ <soap12:body use="literal"></soap12:body>
</wsdl:input>
<wsdl:output>
- <soap12:body use="literal"/>
+ <soap12:body use="literal"></soap12:body>
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="checkDefaultLBExistenceAgainstPolicy">
- <soap12:operation soapAction="urn:checkDefaultLBExistenceAgainstPolicy" style="document"/>
+ <soap12:operation soapAction="urn:checkDefaultLBExistenceAgainstPolicy" style="document"></soap12:operation>
<wsdl:input>
- <soap12:body use="literal"/>
+ <soap12:body use="literal"></soap12:body>
</wsdl:input>
<wsdl:output>
- <soap12:body use="literal"/>
+ <soap12:body use="literal"></soap12:body>
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="checkClusterLBExistenceAgainstPolicy">
- <soap12:operation soapAction="urn:checkClusterLBExistenceAgainstPolicy" style="document"/>
+ <soap12:operation soapAction="urn:checkClusterLBExistenceAgainstPolicy" style="document"></soap12:operation>
<wsdl:input>
- <soap12:body use="literal"/>
+ <soap12:body use="literal"></soap12:body>
</wsdl:input>
<wsdl:output>
- <soap12:body use="literal"/>
+ <soap12:body use="literal"></soap12:body>
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="getPartition">
- <soap12:operation soapAction="urn:getPartition" style="document"/>
+ <soap12:operation soapAction="urn:getPartition" style="document"></soap12:operation>
<wsdl:input>
- <soap12:body use="literal"/>
+ <soap12:body use="literal"></soap12:body>
</wsdl:input>
<wsdl:output>
- <soap12:body use="literal"/>
+ <soap12:body use="literal"></soap12:body>
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="addPartition">
- <soap12:operation soapAction="urn:addPartition" style="document"/>
+ <soap12:operation soapAction="urn:addPartition" style="document"></soap12:operation>
<wsdl:input>
- <soap12:body use="literal"/>
+ <soap12:body use="literal"></soap12:body>
</wsdl:input>
<wsdl:output>
- <soap12:body use="literal"/>
+ <soap12:body use="literal"></soap12:body>
</wsdl:output>
<wsdl:fault name="AutoScalerServiceInvalidPartitionException">
- <soap12:fault use="literal" name="AutoScalerServiceInvalidPartitionException"/>
+ <soap12:fault use="literal" name="AutoScalerServiceInvalidPartitionException"></soap12:fault>
</wsdl:fault>
</wsdl:operation>
<wsdl:operation name="checkServiceLBExistenceAgainstPolicy">
- <soap12:operation soapAction="urn:checkServiceLBExistenceAgainstPolicy" style="document"/>
+ <soap12:operation soapAction="urn:checkServiceLBExistenceAgainstPolicy" style="document"></soap12:operation>
<wsdl:input>
- <soap12:body use="literal"/>
+ <soap12:body use="literal"></soap12:body>
</wsdl:input>
<wsdl:output>
- <soap12:body use="literal"/>
+ <soap12:body use="literal"></soap12:body>
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="addDeploymentPolicy">
- <soap12:operation soapAction="urn:addDeploymentPolicy" style="document"/>
+ <soap12:operation soapAction="urn:addDeploymentPolicy" style="document"></soap12:operation>
<wsdl:input>
- <soap12:body use="literal"/>
+ <soap12:body use="literal"></soap12:body>
</wsdl:input>
<wsdl:output>
- <soap12:body use="literal"/>
+ <soap12:body use="literal"></soap12:body>
</wsdl:output>
<wsdl:fault name="AutoScalerServiceInvalidPolicyException">
- <soap12:fault use="literal" name="AutoScalerServiceInvalidPolicyException"/>
+ <soap12:fault use="literal" name="AutoScalerServiceInvalidPolicyException"></soap12:fault>
</wsdl:fault>
</wsdl:operation>
<wsdl:operation name="getPartitionGroups">
- <soap12:operation soapAction="urn:getPartitionGroups" style="document"/>
+ <soap12:operation soapAction="urn:getPartitionGroups" style="document"></soap12:operation>
<wsdl:input>
- <soap12:body use="literal"/>
+ <soap12:body use="literal"></soap12:body>
</wsdl:input>
<wsdl:output>
- <soap12:body use="literal"/>
+ <soap12:body use="literal"></soap12:body>
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="checkLBExistenceAgainstPolicy">
- <soap12:operation soapAction="urn:checkLBExistenceAgainstPolicy" style="document"/>
+ <soap12:operation soapAction="urn:checkLBExistenceAgainstPolicy" style="document"></soap12:operation>
<wsdl:input>
- <soap12:body use="literal"/>
+ <soap12:body use="literal"></soap12:body>
</wsdl:input>
<wsdl:fault name="AutoScalerServiceNonExistingLBException">
- <soap12:fault use="literal" name="AutoScalerServiceNonExistingLBException"/>
+ <soap12:fault use="literal" name="AutoScalerServiceNonExistingLBException"></soap12:fault>
</wsdl:fault>
</wsdl:operation>
</wsdl:binding>
<wsdl:binding name="AutoScalerServiceHttpBinding" type="ns:AutoScalerServicePortType">
- <http:binding verb="POST"/>
+ <http:binding verb="POST"></http:binding>
<wsdl:operation name="getPartitionsOfDeploymentPolicy">
- <http:operation location="getPartitionsOfDeploymentPolicy"/>
+ <http:operation location="getPartitionsOfDeploymentPolicy"></http:operation>
<wsdl:input>
- <mime:content type="text/xml" part="parameters"/>
+ <mime:content type="text/xml" part="parameters"></mime:content>
</wsdl:input>
<wsdl:output>
- <mime:content type="text/xml" part="parameters"/>
+ <mime:content type="text/xml" part="parameters"></mime:content>
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="getAllAutoScalingPolicy">
- <http:operation location="getAllAutoScalingPolicy"/>
+ <http:operation location="getAllAutoScalingPolicy"></http:operation>
<wsdl:input>
- <mime:content type="text/xml" part="parameters"/>
+ <mime:content type="text/xml" part="parameters"></mime:content>
</wsdl:input>
<wsdl:output>
- <mime:content type="text/xml" part="parameters"/>
+ <mime:content type="text/xml" part="parameters"></mime:content>
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="getPartitionsOfGroup">
- <http:operation location="getPartitionsOfGroup"/>
+ <http:operation location="getPartitionsOfGroup"></http:operation>
<wsdl:input>
- <mime:content type="text/xml" part="parameters"/>
+ <mime:content type="text/xml" part="parameters"></mime:content>
</wsdl:input>
<wsdl:output>
- <mime:content type="text/xml" part="parameters"/>
+ <mime:content type="text/xml" part="parameters"></mime:content>
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="getDeploymentPolicy">
- <http:operation location="getDeploymentPolicy"/>
+ <http:operation location="getDeploymentPolicy"></http:operation>
<wsdl:input>
- <mime:content type="text/xml" part="parameters"/>
+ <mime:content type="text/xml" part="parameters"></mime:content>
</wsdl:input>
<wsdl:output>
- <mime:content type="text/xml" part="parameters"/>
+ <mime:content type="text/xml" part="parameters"></mime:content>
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="addAutoScalingPolicy">
- <http:operation location="addAutoScalingPolicy"/>
+ <http:operation location="addAutoScalingPolicy"></http:operation>
<wsdl:input>
- <mime:content type="text/xml" part="parameters"/>
+ <mime:content type="text/xml" part="parameters"></mime:content>
</wsdl:input>
<wsdl:output>
- <mime:content type="text/xml" part="parameters"/>
+ <mime:content type="text/xml" part="parameters"></mime:content>
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="getAllDeploymentPolicies">
- <http:operation location="getAllDeploymentPolicies"/>
+ <http:operation location="getAllDeploymentPolicies"></http:operation>
<wsdl:input>
- <mime:content type="text/xml" part="parameters"/>
+ <mime:content type="text/xml" part="parameters"></mime:content>
</wsdl:input>
<wsdl:output>
- <mime:content type="text/xml" part="parameters"/>
+ <mime:content type="text/xml" part="parameters"></mime:content>
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="getValidDeploymentPoliciesforCartridge">
- <http:operation location="getValidDeploymentPoliciesforCartridge"/>
+ <http:operation location="getValidDeploymentPoliciesforCartridge"></http:operation>
<wsdl:input>
- <mime:content type="text/xml" part="parameters"/>
+ <mime:content type="text/xml" part="parameters"></mime:content>
</wsdl:input>
<wsdl:output>
- <mime:content type="text/xml" part="parameters"/>
+ <mime:content type="text/xml" part="parameters"></mime:content>
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="getAllAvailablePartitions">
- <http:operation location="getAllAvailablePartitions"/>
+ <http:operation location="getAllAvailablePartitions"></http:operation>
<wsdl:input>
- <mime:content type="text/xml" part="parameters"/>
+ <mime:content type="text/xml" part="parameters"></mime:content>
</wsdl:input>
<wsdl:output>
- <mime:content type="text/xml" part="parameters"/>
+ <mime:content type="text/xml" part="parameters"></mime:content>
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="getAutoscalingPolicy">
- <http:operation location="getAutoscalingPolicy"/>
+ <http:operation location="getAutoscalingPolicy"></http:operation>
<wsdl:input>
- <mime:content type="text/xml" part="parameters"/>
+ <mime:content type="text/xml" part="parameters"></mime:content>
</wsdl:input>
<wsdl:output>
- <mime:content type="text/xml" part="parameters"/>
+ <mime:content type="text/xml" part="parameters"></mime:content>
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="checkDefaultLBExistenceAgainstPolicy">
- <http:operation location="checkDefaultLBExistenceAgainstPolicy"/>
+ <http:operation location="checkDefaultLBExistenceAgainstPolicy"></http:operation>
<wsdl:input>
- <mime:content type="text/xml" part="parameters"/>
+ <mime:content type="text/xml" part="parameters"></mime:content>
</wsdl:input>
<wsdl:output>
- <mime:content type="text/xml" part="parameters"/>
+ <mime:content type="text/xml" part="parameters"></mime:content>
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="checkClusterLBExistenceAgainstPolicy">
- <http:operation location="checkClusterLBExistenceAgainstPolicy"/>
+ <http:operation location="checkClusterLBExistenceAgainstPolicy"></http:operation>
<wsdl:input>
- <mime:content type="text/xml" part="parameters"/>
+ <mime:content type="text/xml" part="parameters"></mime:content>
</wsdl:input>
<wsdl:output>
- <mime:content type="text/xml" part="parameters"/>
+ <mime:content type="text/xml" part="parameters"></mime:content>
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="getPartition">
- <http:operation location="getPartition"/>
+ <http:operation location="getPartition"></http:operation>
<wsdl:input>
- <mime:content type="text/xml" part="parameters"/>
+ <mime:content type="text/xml" part="parameters"></mime:content>
</wsdl:input>
<wsdl:output>
- <mime:content type="text/xml" part="parameters"/>
+ <mime:content type="text/xml" part="parameters"></mime:content>
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="addPartition">
- <http:operation location="addPartition"/>
+ <http:operation location="addPartition"></http:operation>
<wsdl:input>
- <mime:content type="text/xml" part="parameters"/>
+ <mime:content type="text/xml" part="parameters"></mime:content>
</wsdl:input>
<wsdl:output>
- <mime:content type="text/xml" part="parameters"/>
+ <mime:content type="text/xml" part="parameters"></mime:content>
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="checkServiceLBExistenceAgainstPolicy">
- <http:operation location="checkServiceLBExistenceAgainstPolicy"/>
+ <http:operation location="checkServiceLBExistenceAgainstPolicy"></http:operation>
<wsdl:input>
- <mime:content type="text/xml" part="parameters"/>
+ <mime:content type="text/xml" part="parameters"></mime:content>
</wsdl:input>
<wsdl:output>
- <mime:content type="text/xml" part="parameters"/>
+ <mime:content type="text/xml" part="parameters"></mime:content>
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="addDeploymentPolicy">
- <http:operation location="addDeploymentPolicy"/>
+ <http:operation location="addDeploymentPolicy"></http:operation>
<wsdl:input>
- <mime:content type="text/xml" part="parameters"/>
+ <mime:content type="text/xml" part="parameters"></mime:content>
</wsdl:input>
<wsdl:output>
- <mime:content type="text/xml" part="parameters"/>
+ <mime:content type="text/xml" part="parameters"></mime:content>
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="getPartitionGroups">
- <http:operation location="getPartitionGroups"/>
+ <http:operation location="getPartitionGroups"></http:operation>
<wsdl:input>
- <mime:content type="text/xml" part="parameters"/>
+ <mime:content type="text/xml" part="parameters"></mime:content>
</wsdl:input>
<wsdl:output>
- <mime:content type="text/xml" part="parameters"/>
+ <mime:content type="text/xml" part="parameters"></mime:content>
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="checkLBExistenceAgainstPolicy">
- <http:operation location="checkLBExistenceAgainstPolicy"/>
+ <http:operation location="checkLBExistenceAgainstPolicy"></http:operation>
<wsdl:input>
- <mime:content type="text/xml" part="parameters"/>
+ <mime:content type="text/xml" part="parameters"></mime:content>
</wsdl:input>
</wsdl:operation>
</wsdl:binding>
<wsdl:service name="AutoScalerService">
<wsdl:port name="AutoScalerServiceHttpSoap11Endpoint" binding="ns:AutoScalerServiceSoap11Binding">
- <soap:address location="http://192.168.1.4:9766/services/AutoScalerService.AutoScalerServiceHttpSoap11Endpoint/"/>
+ <soap:address location="http://10.128.181.194:9766/services/AutoScalerService.AutoScalerServiceHttpSoap11Endpoint/"></soap:address>
</wsdl:port>
<wsdl:port name="AutoScalerServiceHttpsSoap11Endpoint" binding="ns:AutoScalerServiceSoap11Binding">
- <soap:address location="https://192.168.1.4:9446/services/AutoScalerService.AutoScalerServiceHttpsSoap11Endpoint/"/>
+ <soap:address location="https://10.128.181.194:9446/services/AutoScalerService.AutoScalerServiceHttpsSoap11Endpoint/"></soap:address>
</wsdl:port>
<wsdl:port name="AutoScalerServiceHttpsSoap12Endpoint" binding="ns:AutoScalerServiceSoap12Binding">
- <soap12:address location="https://192.168.1.4:9446/services/AutoScalerService.AutoScalerServiceHttpsSoap12Endpoint/"/>
+ <soap12:address location="https://10.128.181.194:9446/services/AutoScalerService.AutoScalerServiceHttpsSoap12Endpoint/"></soap12:address>
</wsdl:port>
<wsdl:port name="AutoScalerServiceHttpSoap12Endpoint" binding="ns:AutoScalerServiceSoap12Binding">
- <soap12:address location="http://192.168.1.4:9766/services/AutoScalerService.AutoScalerServiceHttpSoap12Endpoint/"/>
+ <soap12:address location="http://10.128.181.194:9766/servi
<TRUNCATED>