Refactored startContainer to startContainers, since here we could start multiple containers using number of replicas.
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/dccbedd5 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/dccbedd5 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/dccbedd5 Branch: refs/heads/master Commit: dccbedd57b2f14f4eb03b281cb3847d59fdf611b Parents: af1af67 Author: Nirmal Fernando <[email protected]> Authored: Wed Sep 24 15:33:47 2014 +0530 Committer: Nirmal Fernando <[email protected]> Committed: Wed Sep 24 15:36:02 2014 +0530 ---------------------------------------------------------------------- .../cloud/controller/CloudControllerClient.java | 2 +- .../impl/CloudControllerServiceImpl.java | 2 +- .../interfaces/CloudControllerService.java | 4 +- .../main/resources/CloudControllerService.wsdl | 143 +++++++++---------- 4 files changed, 75 insertions(+), 76 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/dccbedd5/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 3f900b6..5d93b40 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 @@ -257,7 +257,7 @@ public class CloudControllerClient { memberContextProps.addProperties(kubernetesClusterPortRangeProps); member.setProperties(memberContextProps); long startTime = System.currentTimeMillis(); - MemberContext memberContext = stub.startContainer(member); + MemberContext memberContext = stub.startContainers(member); if(log.isDebugEnabled()) { long endTime = System.currentTimeMillis(); http://git-wip-us.apache.org/repos/asf/stratos/blob/dccbedd5/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 c8b10aa..0cbbcd7 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 @@ -1316,7 +1316,7 @@ public class CloudControllerServiceImpl implements CloudControllerService { } @Override - public MemberContext startContainer(MemberContext memberContext) + public MemberContext startContainers(MemberContext memberContext) throws UnregisteredCartridgeException { if(log.isDebugEnabled()) { http://git-wip-us.apache.org/repos/asf/stratos/blob/dccbedd5/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 b3cec3a..caef034 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 @@ -100,12 +100,12 @@ public interface CloudControllerService { public MemberContext startInstance(MemberContext member) throws UnregisteredCartridgeException, InvalidIaasProviderException; /** - * Create a new Container via Kubernetes API. + * Create containers. * @param Member Context with cluster id, and host cluster details. * @return updated {@link MemberContext} * @throws UnregisteredCartridgeException if the requested Cartridge type is not a registered one. */ - public MemberContext startContainer(MemberContext member) throws UnregisteredCartridgeException; + public MemberContext startContainers(MemberContext member) throws UnregisteredCartridgeException; /** * Calling this method will result in termination of the instance with given member id in the given Partition. http://git-wip-us.apache.org/repos/asf/stratos/blob/dccbedd5/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 a13d1eb..56844ee 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 @@ -186,14 +186,14 @@ </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="startContainer"> + <xs:element name="startContainers"> <xs:complexType> <xs:sequence> <xs:element minOccurs="0" name="memberContext" nillable="true" type="ax223:MemberContext"/> </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="startContainerResponse"> + <xs:element name="startContainersResponse"> <xs:complexType> <xs:sequence> <xs:element minOccurs="0" name="return" nillable="true" type="ax223:MemberContext"/> @@ -336,7 +336,6 @@ <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="hostName" nillable="true" type="xs:string"/> - <xs:element minOccurs="0" name="kubernetesCluster" type="xs:boolean"/> <xs:element minOccurs="0" name="lbCluster" type="xs:boolean"/> <xs:element minOccurs="0" name="payload" nillable="true" type="xs:string"/> <xs:element minOccurs="0" name="properties" nillable="true" type="ax229:Properties"/> @@ -475,6 +474,15 @@ <wsdl:message name="CloudControllerServiceInvalidCartridgeTypeException"> <wsdl:part name="parameters" element="ns:CloudControllerServiceInvalidCartridgeTypeException"/> </wsdl:message> + <wsdl:message name="startContainersRequest"> + <wsdl:part name="parameters" element="ns:startContainers"/> + </wsdl:message> + <wsdl:message name="startContainersResponse"> + <wsdl:part name="parameters" element="ns:startContainersResponse"/> + </wsdl:message> + <wsdl:message name="CloudControllerServiceUnregisteredCartridgeException"> + <wsdl:part name="parameters" element="ns:CloudControllerServiceUnregisteredCartridgeException"/> + </wsdl:message> <wsdl:message name="terminateInstanceRequest"> <wsdl:part name="parameters" element="ns:terminateInstance"/> </wsdl:message> @@ -487,9 +495,6 @@ <wsdl:message name="registerServiceResponse"> <wsdl:part name="parameters" element="ns:registerServiceResponse"/> </wsdl:message> - <wsdl:message name="CloudControllerServiceUnregisteredCartridgeException"> - <wsdl:part name="parameters" element="ns:CloudControllerServiceUnregisteredCartridgeException"/> - </wsdl:message> <wsdl:message name="deployCartridgeDefinitionRequest"> <wsdl:part name="parameters" element="ns:deployCartridgeDefinition"/> </wsdl:message> @@ -547,12 +552,6 @@ <wsdl:message name="getClusterContextResponse"> <wsdl:part name="parameters" element="ns:getClusterContextResponse"/> </wsdl:message> - <wsdl:message name="startContainerRequest"> - <wsdl:part name="parameters" element="ns:startContainer"/> - </wsdl:message> - <wsdl:message name="startContainerResponse"> - <wsdl:part name="parameters" element="ns:startContainerResponse"/> - </wsdl:message> <wsdl:portType name="CloudControllerServicePortType"> <wsdl:operation name="validatePartition"> <wsdl:input message="ns:validatePartitionRequest" wsaw:Action="urn:validatePartition"/> @@ -565,6 +564,11 @@ <wsdl:fault message="ns:CloudControllerServiceInvalidPartitionException" name="CloudControllerServiceInvalidPartitionException" wsaw:Action="urn:validateDeploymentPolicyCloudControllerServiceInvalidPartitionException"/> <wsdl:fault message="ns:CloudControllerServiceInvalidCartridgeTypeException" name="CloudControllerServiceInvalidCartridgeTypeException" wsaw:Action="urn:validateDeploymentPolicyCloudControllerServiceInvalidCartridgeTypeException"/> </wsdl:operation> + <wsdl:operation name="startContainers"> + <wsdl:input message="ns:startContainersRequest" wsaw:Action="urn:startContainers"/> + <wsdl:output message="ns:startContainersResponse" wsaw:Action="urn:startContainersResponse"/> + <wsdl:fault message="ns:CloudControllerServiceUnregisteredCartridgeException" name="CloudControllerServiceUnregisteredCartridgeException" wsaw:Action="urn:startContainersCloudControllerServiceUnregisteredCartridgeException"/> + </wsdl:operation> <wsdl:operation name="terminateInstance"> <wsdl:input message="ns:terminateInstanceRequest" wsaw:Action="urn:terminateInstance"/> <wsdl:fault message="ns:CloudControllerServiceInvalidMemberException" name="CloudControllerServiceInvalidMemberException" wsaw:Action="urn:terminateInstanceCloudControllerServiceInvalidMemberException"/> @@ -622,11 +626,6 @@ <wsdl:input message="ns:getClusterContextRequest" wsaw:Action="urn:getClusterContext"/> <wsdl:output message="ns:getClusterContextResponse" wsaw:Action="urn:getClusterContextResponse"/> </wsdl:operation> - <wsdl:operation name="startContainer"> - <wsdl:input message="ns:startContainerRequest" wsaw:Action="urn:startContainer"/> - <wsdl:output message="ns:startContainerResponse" wsaw:Action="urn:startContainerResponse"/> - <wsdl:fault message="ns:CloudControllerServiceUnregisteredCartridgeException" name="CloudControllerServiceUnregisteredCartridgeException" wsaw:Action="urn:startContainerCloudControllerServiceUnregisteredCartridgeException"/> - </wsdl:operation> </wsdl:portType> <wsdl:binding name="CloudControllerServiceSoap11Binding" type="ns:CloudControllerServicePortType"> <soap:binding transport="http://schemas.xmlsoap.org/soap/http"; style="document"/> @@ -657,8 +656,20 @@ <soap:fault use="literal" name="CloudControllerServiceInvalidCartridgeTypeException"/> </wsdl:fault> </wsdl:operation> - <wsdl:operation name="registerService"> - <soap:operation soapAction="urn:registerService" style="document"/> + <wsdl:operation name="terminateInstance"> + <soap:operation soapAction="urn:terminateInstance" style="document"/> + <wsdl:input> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:fault name="CloudControllerServiceInvalidMemberException"> + <soap:fault use="literal" name="CloudControllerServiceInvalidMemberException"/> + </wsdl:fault> + <wsdl:fault name="CloudControllerServiceInvalidCartridgeTypeException"> + <soap:fault use="literal" name="CloudControllerServiceInvalidCartridgeTypeException"/> + </wsdl:fault> + </wsdl:operation> + <wsdl:operation name="startContainers"> + <soap:operation soapAction="urn:startContainers" style="document"/> <wsdl:input> <soap:body use="literal"/> </wsdl:input> @@ -669,16 +680,16 @@ <soap:fault use="literal" name="CloudControllerServiceUnregisteredCartridgeException"/> </wsdl:fault> </wsdl:operation> - <wsdl:operation name="terminateInstance"> - <soap:operation soapAction="urn:terminateInstance" style="document"/> + <wsdl:operation name="registerService"> + <soap:operation soapAction="urn:registerService" style="document"/> <wsdl:input> <soap:body use="literal"/> </wsdl:input> - <wsdl:fault name="CloudControllerServiceInvalidMemberException"> - <soap:fault use="literal" name="CloudControllerServiceInvalidMemberException"/> - </wsdl:fault> - <wsdl:fault name="CloudControllerServiceInvalidCartridgeTypeException"> - <soap:fault use="literal" name="CloudControllerServiceInvalidCartridgeTypeException"/> + <wsdl:output> + <soap:body use="literal"/> + </wsdl:output> + <wsdl:fault name="CloudControllerServiceUnregisteredCartridgeException"> + <soap:fault use="literal" name="CloudControllerServiceUnregisteredCartridgeException"/> </wsdl:fault> </wsdl:operation> <wsdl:operation name="deployCartridgeDefinition"> @@ -792,18 +803,6 @@ <soap:body use="literal"/> </wsdl:output> </wsdl:operation> - <wsdl:operation name="startContainer"> - <soap:operation soapAction="urn:startContainer" style="document"/> - <wsdl:input> - <soap:body use="literal"/> - </wsdl:input> - <wsdl:output> - <soap:body use="literal"/> - </wsdl:output> - <wsdl:fault name="CloudControllerServiceUnregisteredCartridgeException"> - <soap:fault use="literal" name="CloudControllerServiceUnregisteredCartridgeException"/> - </wsdl:fault> - </wsdl:operation> </wsdl:binding> <wsdl:binding name="CloudControllerServiceSoap12Binding" type="ns:CloudControllerServicePortType"> <soap12:binding transport="http://schemas.xmlsoap.org/soap/http"; style="document"/> @@ -834,8 +833,20 @@ <soap12:fault use="literal" name="CloudControllerServiceInvalidCartridgeTypeException"/> </wsdl:fault> </wsdl:operation> - <wsdl:operation name="registerService"> - <soap12:operation soapAction="urn:registerService" style="document"/> + <wsdl:operation name="terminateInstance"> + <soap12:operation soapAction="urn:terminateInstance" style="document"/> + <wsdl:input> + <soap12:body use="literal"/> + </wsdl:input> + <wsdl:fault name="CloudControllerServiceInvalidMemberException"> + <soap12:fault use="literal" name="CloudControllerServiceInvalidMemberException"/> + </wsdl:fault> + <wsdl:fault name="CloudControllerServiceInvalidCartridgeTypeException"> + <soap12:fault use="literal" name="CloudControllerServiceInvalidCartridgeTypeException"/> + </wsdl:fault> + </wsdl:operation> + <wsdl:operation name="startContainers"> + <soap12:operation soapAction="urn:startContainers" style="document"/> <wsdl:input> <soap12:body use="literal"/> </wsdl:input> @@ -846,16 +857,16 @@ <soap12:fault use="literal" name="CloudControllerServiceUnregisteredCartridgeException"/> </wsdl:fault> </wsdl:operation> - <wsdl:operation name="terminateInstance"> - <soap12:operation soapAction="urn:terminateInstance" style="document"/> + <wsdl:operation name="registerService"> + <soap12:operation soapAction="urn:registerService" style="document"/> <wsdl:input> <soap12:body use="literal"/> </wsdl:input> - <wsdl:fault name="CloudControllerServiceInvalidMemberException"> - <soap12:fault use="literal" name="CloudControllerServiceInvalidMemberException"/> - </wsdl:fault> - <wsdl:fault name="CloudControllerServiceInvalidCartridgeTypeException"> - <soap12:fault use="literal" name="CloudControllerServiceInvalidCartridgeTypeException"/> + <wsdl:output> + <soap12:body use="literal"/> + </wsdl:output> + <wsdl:fault name="CloudControllerServiceUnregisteredCartridgeException"> + <soap12:fault use="literal" name="CloudControllerServiceUnregisteredCartridgeException"/> </wsdl:fault> </wsdl:operation> <wsdl:operation name="deployCartridgeDefinition"> @@ -969,18 +980,6 @@ <soap12:body use="literal"/> </wsdl:output> </wsdl:operation> - <wsdl:operation name="startContainer"> - <soap12:operation soapAction="urn:startContainer" style="document"/> - <wsdl:input> - <soap12:body use="literal"/> - </wsdl:input> - <wsdl:output> - <soap12:body use="literal"/> - </wsdl:output> - <wsdl:fault name="CloudControllerServiceUnregisteredCartridgeException"> - <soap12:fault use="literal" name="CloudControllerServiceUnregisteredCartridgeException"/> - </wsdl:fault> - </wsdl:operation> </wsdl:binding> <wsdl:binding name="CloudControllerServiceHttpBinding" type="ns:CloudControllerServicePortType"> <http:binding verb="POST"/> @@ -1002,8 +1001,14 @@ <mime:content type="text/xml" part="parameters"/> </wsdl:output> </wsdl:operation> - <wsdl:operation name="registerService"> - <http:operation location="registerService"/> + <wsdl:operation name="terminateInstance"> + <http:operation location="terminateInstance"/> + <wsdl:input> + <mime:content type="text/xml" part="parameters"/> + </wsdl:input> + </wsdl:operation> + <wsdl:operation name="startContainers"> + <http:operation location="startContainers"/> <wsdl:input> <mime:content type="text/xml" part="parameters"/> </wsdl:input> @@ -1011,11 +1016,14 @@ <mime:content type="text/xml" part="parameters"/> </wsdl:output> </wsdl:operation> - <wsdl:operation name="terminateInstance"> - <http:operation location="terminateInstance"/> + <wsdl:operation name="registerService"> + <http:operation location="registerService"/> <wsdl:input> <mime:content type="text/xml" part="parameters"/> </wsdl:input> + <wsdl:output> + <mime:content type="text/xml" part="parameters"/> + </wsdl:output> </wsdl:operation> <wsdl:operation name="deployCartridgeDefinition"> <http:operation location="deployCartridgeDefinition"/> @@ -1098,15 +1106,6 @@ <mime:content type="text/xml" part="parameters"/> </wsdl:output> </wsdl:operation> - <wsdl:operation name="startContainer"> - <http:operation location="startContainer"/> - <wsdl:input> - <mime:content type="text/xml" part="parameters"/> - </wsdl:input> - <wsdl:output> - <mime:content type="text/xml" part="parameters"/> - </wsdl:output> - </wsdl:operation> </wsdl:binding> <wsdl:service name="CloudControllerService"> <wsdl:port name="CloudControllerServiceHttpSoap11Endpoint" binding="ns:CloudControllerServiceSoap11Binding">
