You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by is...@apache.org on 2014/03/07 13:26:43 UTC
[11/12] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos into
lb_logic_refactoring
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos into lb_logic_refactoring
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/5e99f2a0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/5e99f2a0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/5e99f2a0
Branch: refs/heads/master
Commit: 5e99f2a099f721faa7537740a1835b79245eaca0
Parents: e9104e0 4577515
Author: Isuru <is...@wso2.com>
Authored: Thu Mar 6 14:27:10 2014 +0530
Committer: Isuru <is...@wso2.com>
Committed: Thu Mar 6 14:27:10 2014 +0530
----------------------------------------------------------------------
.../config/CartridgeAgentConfiguration.java | 47 +-
.../stratos/cli/RestCommandLineService.java | 19 +-
.../org.apache.stratos.cloud.controller/pom.xml | 2 +-
.../partials/configure_stratos_wizard.hbs | 12 +-
.../console/themes/theme1/renderers/index.js | 3 +
.../console/util/utility.jag | 4 -
.../CompleteTopologyMessageProcessor.java | 27 +-
.../rest/endpoint/services/ServiceUtils.java | 28 +-
.../jclouds/vcloud/1.7.1-stratos/README.txt | 6 +
.../jclouds/vcloud/1.7.1-stratos/pom.xml | 129 +++
.../vcloud/TaskInErrorStateException.java | 39 +
.../vcloud/TaskStillRunningException.java | 39 +
.../main/java/org/jclouds/vcloud/VCloudApi.java | 91 ++
.../org/jclouds/vcloud/VCloudApiMetadata.java | 103 +++
.../org/jclouds/vcloud/VCloudMediaType.java | 221 +++++
.../jclouds/vcloud/VCloudResponseException.java | 69 ++
.../java/org/jclouds/vcloud/VCloudToken.java | 37 +
.../org/jclouds/vcloud/VCloudVersionsApi.java | 38 +
.../binders/BindCPUCountToXmlPayload.java | 79 ++
.../BindCaptureVAppParamsToXmlPayload.java | 124 +++
.../binders/BindCatalogItemToXmlPayload.java | 126 +++
.../binders/BindCloneParamsToXmlPayload.java | 133 +++
.../BindCloneVAppParamsToXmlPayload.java | 65 ++
...BindCloneVAppTemplateParamsToXmlPayload.java | 60 ++
.../BindDeployVAppParamsToXmlPayload.java | 42 +
...ndGuestCustomizationSectionToXmlPayload.java | 112 +++
...stantiateVAppTemplateParamsToXmlPayload.java | 221 +++++
.../vcloud/binders/BindMemoryToXmlPayload.java | 80 ++
...indNetworkConnectionSectionToXmlPayload.java | 106 +++
.../vcloud/binders/BindParamsToXmlPayload.java | 81 ++
.../BindUndeployVAppParamsToXmlPayload.java | 42 +
.../OrgNameAndCatalogNameToEndpoint.java | 79 ++
.../binders/OrgNameAndVDCNameToEndpoint.java | 78 ++
.../OrgNameCatalogNameItemNameToEndpoint.java | 77 ++
...meCatalogNameVAppTemplateNameToEndpoint.java | 90 ++
.../OrgNameVDCNameNetworkNameToEndpoint.java | 54 ++
...NameVDCNameResourceEntityNameToEndpoint.java | 54 ++
.../OrgNameVDCNameResourceNameToEndpoint.java | 81 ++
.../VCloudComputeServiceContextModule.java | 39 +
.../VCloudComputeServiceDependenciesModule.java | 154 ++++
.../functions/FindLocationForResource.java | 69 ++
.../compute/functions/HardwareForVApp.java | 71 ++
.../functions/HardwareForVAppTemplate.java | 84 ++
.../compute/functions/ImageForVAppTemplate.java | 82 ++
.../compute/functions/VAppToNodeMetadata.java | 112 +++
...dHardwareBuilderFromResourceAllocations.java | 43 +
...EnvelopeOrThrowIllegalArgumentException.java | 77 ++
.../internal/VCloudTemplateBuilderImpl.java | 48 +
.../compute/options/VCloudTemplateOptions.java | 350 +++++++
...edIntoNameThenCustomizeDeployAndPowerOn.java | 302 +++++++
...etworkConfigurationForNetworkAndOptions.java | 80 ++
.../strategy/VCloudComputeServiceAdapter.java | 263 ++++++
.../vcloud/compute/util/VCloudComputeUtils.java | 116 +++
.../vcloud/config/DefaultCatalogForOrg.java | 63 ++
.../vcloud/config/DefaultNetworkForVDC.java | 65 ++
.../vcloud/config/DefaultOrgForUser.java | 58 ++
.../vcloud/config/DefaultTasksListForOrg.java | 53 ++
.../config/DefaultVCloudReferencesModule.java | 165 ++++
.../jclouds/vcloud/config/DefaultVDCForOrg.java | 63 ++
.../vcloud/config/VCloudHttpApiModule.java | 538 +++++++++++
.../jclouds/vcloud/domain/AllocationModel.java | 70 ++
.../org/jclouds/vcloud/domain/Capacity.java | 108 +++
.../java/org/jclouds/vcloud/domain/Catalog.java | 69 ++
.../org/jclouds/vcloud/domain/CatalogItem.java | 37 +
.../domain/GuestCustomizationSection.java | 440 +++++++++
.../domain/InstantiateVAppTemplateParams.java | 96 ++
.../vcloud/domain/NetworkConnection.java | 233 +++++
.../vcloud/domain/NetworkConnectionSection.java | 218 +++++
.../java/org/jclouds/vcloud/domain/Org.java | 86 ++
.../jclouds/vcloud/domain/ReferenceType.java | 55 ++
.../java/org/jclouds/vcloud/domain/Status.java | 246 +++++
.../java/org/jclouds/vcloud/domain/Task.java | 72 ++
.../org/jclouds/vcloud/domain/TaskStatus.java | 71 ++
.../org/jclouds/vcloud/domain/TasksList.java | 37 +
.../java/org/jclouds/vcloud/domain/VApp.java | 87 ++
.../org/jclouds/vcloud/domain/VAppTemplate.java | 97 ++
.../org/jclouds/vcloud/domain/VCloudError.java | 123 +++
.../jclouds/vcloud/domain/VCloudSession.java | 29 +
.../java/org/jclouds/vcloud/domain/VDC.java | 146 +++
.../org/jclouds/vcloud/domain/VDCStatus.java | 57 ++
.../main/java/org/jclouds/vcloud/domain/Vm.java | 108 +++
.../vcloud/domain/internal/CatalogImpl.java | 193 ++++
.../vcloud/domain/internal/CatalogItemImpl.java | 111 +++
.../vcloud/domain/internal/ErrorImpl.java | 119 +++
.../jclouds/vcloud/domain/internal/OrgImpl.java | 171 ++++
.../domain/internal/ReferenceTypeImpl.java | 103 +++
.../vcloud/domain/internal/TaskImpl.java | 165 ++++
.../vcloud/domain/internal/TasksListImpl.java | 81 ++
.../vcloud/domain/internal/VAppImpl.java | 166 ++++
.../domain/internal/VAppTemplateImpl.java | 205 +++++
.../jclouds/vcloud/domain/internal/VDCImpl.java | 292 ++++++
.../jclouds/vcloud/domain/internal/VmImpl.java | 217 +++++
.../vcloud/domain/network/DhcpService.java | 106 +++
.../jclouds/vcloud/domain/network/Features.java | 95 ++
.../vcloud/domain/network/FenceMode.java | 70 ++
.../vcloud/domain/network/FirewallService.java | 86 ++
.../domain/network/IpAddressAllocationMode.java | 52 ++
.../jclouds/vcloud/domain/network/IpRange.java | 76 ++
.../jclouds/vcloud/domain/network/IpScope.java | 170 ++++
.../vcloud/domain/network/NatService.java | 115 +++
.../vcloud/domain/network/NetworkConfig.java | 167 ++++
.../vcloud/domain/network/OrgNetwork.java | 121 +++
.../domain/network/firewall/FirewallPolicy.java | 54 ++
.../network/firewall/FirewallProtocols.java | 73 ++
.../domain/network/firewall/FirewallRule.java | 125 +++
.../domain/network/internal/OrgNetworkImpl.java | 202 +++++
.../vcloud/domain/network/nat/NatPolicy.java | 54 ++
.../vcloud/domain/network/nat/NatProtocol.java | 48 +
.../vcloud/domain/network/nat/NatRule.java | 35 +
.../vcloud/domain/network/nat/NatType.java | 61 ++
.../domain/network/nat/rules/MappingMode.java | 54 ++
.../network/nat/rules/OneToOneVmRule.java | 110 +++
.../network/nat/rules/PortForwardingRule.java | 111 +++
.../vcloud/domain/network/nat/rules/VmRule.java | 128 +++
.../EditableResourceAllocationSettingData.java | 302 +++++++
.../vcloud/domain/ovf/VCloudHardDisk.java | 330 +++++++
.../vcloud/domain/ovf/VCloudNetworkAdapter.java | 332 +++++++
.../vcloud/domain/ovf/VCloudNetworkSection.java | 80 ++
.../ovf/VCloudOperatingSystemSection.java | 118 +++
.../ovf/VCloudVirtualHardwareSection.java | 179 ++++
.../org/jclouds/vcloud/endpoints/Catalog.java | 37 +
.../org/jclouds/vcloud/endpoints/Network.java | 37 +
.../java/org/jclouds/vcloud/endpoints/Org.java | 37 +
.../org/jclouds/vcloud/endpoints/OrgList.java | 37 +
.../org/jclouds/vcloud/endpoints/TasksList.java | 37 +
.../jclouds/vcloud/endpoints/VCloudLogin.java | 38 +
.../java/org/jclouds/vcloud/endpoints/VDC.java | 37 +
.../org/jclouds/vcloud/features/CatalogApi.java | 144 +++
.../org/jclouds/vcloud/features/NetworkApi.java | 61 ++
.../org/jclouds/vcloud/features/OrgApi.java | 86 ++
.../org/jclouds/vcloud/features/TaskApi.java | 82 ++
.../org/jclouds/vcloud/features/VAppApi.java | 261 ++++++
.../vcloud/features/VAppTemplateApi.java | 180 ++++
.../org/jclouds/vcloud/features/VDCApi.java | 73 ++
.../java/org/jclouds/vcloud/features/VmApi.java | 295 ++++++
...ddVCloudAuthorizationAndCookieToRequest.java | 63 ++
.../vcloud/functions/CatalogItemsInCatalog.java | 64 ++
.../vcloud/functions/CatalogItemsInOrg.java | 57 ++
.../jclouds/vcloud/functions/CatalogsInOrg.java | 73 ++
.../functions/DefaultNetworkNameInTemplate.java | 47 +
.../jclouds/vcloud/functions/NetworksInOrg.java | 57 ++
.../vcloud/functions/OrgNameToEndpoint.java | 57 ++
.../functions/OrgNameToTasksListEndpoint.java | 62 ++
.../vcloud/functions/OrgsForLocations.java | 73 ++
.../jclouds/vcloud/functions/OrgsForNames.java | 56 ++
.../ParseLoginResponseFromHeaders.java | 105 +++
.../functions/VAppTemplatesForCatalogItems.java | 66 ++
.../vcloud/functions/VAppTemplatesInOrg.java | 65 ++
.../org/jclouds/vcloud/functions/VDCsInOrg.java | 57 ++
.../ParseVCloudErrorFromHttpResponse.java | 121 +++
.../http/filters/VCloudBasicAuthentication.java | 58 ++
.../http/filters/VCloudSupportedVersions.java | 35 +
.../jclouds/vcloud/internal/VCloudLoginApi.java | 44 +
.../org/jclouds/vcloud/loaders/OVFLoader.java | 47 +
.../vcloud/loaders/VAppTemplateLoader.java | 47 +
.../org/jclouds/vcloud/location/DefaultVDC.java | 74 ++
.../location/OrgAndVDCToLocationSupplier.java | 93 ++
.../vcloud/options/CaptureVAppOptions.java | 51 ++
.../vcloud/options/CatalogItemOptions.java | 77 ++
.../jclouds/vcloud/options/CloneOptions.java | 53 ++
.../vcloud/options/CloneVAppOptions.java | 88 ++
.../options/CloneVAppTemplateOptions.java | 42 +
.../options/InstantiateVAppTemplateOptions.java | 178 ++++
.../jclouds/vcloud/predicates/TaskSuccess.java | 65 ++
.../vcloud/reference/VCloudConstants.java | 51 ++
.../jclouds/vcloud/reference/package-info.java | 21 +
...thNameMatchingConfigurationKeyOrDefault.java | 99 ++
.../vcloud/suppliers/VAppTemplatesSupplier.java | 86 ++
.../java/org/jclouds/vcloud/util/Utils.java | 71 ++
.../org/jclouds/vcloud/util/VCloudUtils.java | 67 ++
.../org/jclouds/vcloud/xml/CatalogHandler.java | 104 +++
.../jclouds/vcloud/xml/CatalogItemHandler.java | 81 ++
.../org/jclouds/vcloud/xml/ErrorHandler.java | 45 +
.../xml/GuestCustomizationSectionHandler.java | 137 +++
.../vcloud/xml/NetworkConnectionHandler.java | 87 ++
.../xml/NetworkConnectionSectionHandler.java | 103 +++
.../java/org/jclouds/vcloud/xml/OrgHandler.java | 112 +++
.../org/jclouds/vcloud/xml/OrgListHandler.java | 54 ++
.../jclouds/vcloud/xml/OrgNetworkHandler.java | 325 +++++++
.../vcloud/xml/SupportedVersionsHandler.java | 60 ++
.../org/jclouds/vcloud/xml/TaskHandler.java | 128 +++
.../jclouds/vcloud/xml/TasksListHandler.java | 74 ++
.../org/jclouds/vcloud/xml/VAppHandler.java | 151 ++++
.../jclouds/vcloud/xml/VAppTemplateHandler.java | 152 ++++
.../xml/VCloudVirtualHardwareHandler.java | 72 ++
.../java/org/jclouds/vcloud/xml/VDCHandler.java | 167 ++++
.../java/org/jclouds/vcloud/xml/VmHandler.java | 178 ++++
.../xml/ovf/VCloudNetworkSectionHandler.java | 69 ++
.../xml/ovf/VCloudOperatingSystemHandler.java | 81 ++
...oudResourceAllocationSettingDataHandler.java | 89 ++
.../services/org.jclouds.apis.ApiMetadata | 1 +
.../jclouds/vcloud/VCloudApiMetadataTest.java | 32 +
.../java/org/jclouds/vcloud/VCloudApiTest.java | 64 ++
.../vcloud/VCloudSessionRefreshLiveTest.java | 41 +
.../jclouds/vcloud/VCloudVersionsApiTest.java | 69 ++
.../BindCatalogItemToXmlPayloadTest.java | 53 ++
.../BindCloneVAppParamsToXmlPayloadTest.java | 81 ++
...CloneVAppTemplateParamsToXmlPayloadTest.java | 89 ++
.../BindDeployVAppParamsToXmlPayloadTest.java | 61 ++
...tiateVAppTemplateParamsToXmlPayloadTest.java | 179 ++++
...etworkConnectionSectionToXmlPayloadTest.java | 68 ++
.../BindUndeployVAppParamsToXmlPayloadTest.java | 61 ++
.../BaseVCloudComputeServiceExpectTest.java | 160 ++++
.../compute/VCloudComputeServiceLiveTest.java | 54 ++
.../functions/FindLocationForResourceTest.java | 64 ++
.../functions/ListImagesInVCloudExpectTest.java | 89 ++
.../functions/VAppToNodeMetadataTest.java | 228 +++++
.../options/VCloudTemplateOptionsTest.java | 197 ++++
...ThenCustomizeDeployAndPowerOnExpectTest.java | 171 ++++
.../VCloudComputeServiceAdapterTest.java | 89 ++
.../vcloud/features/CatalogApiLiveTest.java | 53 ++
.../jclouds/vcloud/features/CatalogApiTest.java | 131 +++
.../vcloud/features/NetworkApiLiveTest.java | 29 +
.../jclouds/vcloud/features/NetworkApiTest.java | 75 ++
.../jclouds/vcloud/features/OrgApiLiveTest.java | 42 +
.../org/jclouds/vcloud/features/OrgApiTest.java | 91 ++
.../vcloud/features/TaskApiLiveTest.java | 29 +
.../jclouds/vcloud/features/TaskApiTest.java | 108 +++
.../vcloud/features/VAppApiLiveTest.java | 53 ++
.../jclouds/vcloud/features/VAppApiTest.java | 315 +++++++
.../features/VAppTemplateApiLiveTest.java | 168 ++++
.../vcloud/features/VAppTemplateApiTest.java | 238 +++++
.../jclouds/vcloud/features/VDCApiLiveTest.java | 29 +
.../org/jclouds/vcloud/features/VDCApiTest.java | 102 +++
.../jclouds/vcloud/features/VmApiLiveTest.java | 163 ++++
.../org/jclouds/vcloud/features/VmApiTest.java | 320 +++++++
...loudAuthorizationAndCookieToRequestTest.java | 55 ++
.../ParseLoginResponseFromHeadersTest.java | 147 +++
.../ParseVCloudErrorFromHttpResponseTest.java | 96 ++
.../vcloud/internal/BasePayloadTest.java | 51 ++
.../vcloud/internal/BaseVCloudApiLiveTest.java | 59 ++
.../vcloud/internal/BaseVCloudApiTest.java | 272 ++++++
.../vcloud/internal/VCloudLoginApiTest.java | 97 ++
.../InstantiateVAppTemplateOptionsTest.java | 74 ++
...meMatchingConfigurationKeyOrDefaultTest.java | 115 +++
.../org/jclouds/vcloud/utils/TestUtils.java | 32 +
.../jclouds/vcloud/xml/CatalogHandlerTest.java | 135 +++
.../vcloud/xml/CatalogItemHandlerTest.java | 86 ++
.../GuestCustomizationSectionHandlerTest.java | 75 ++
.../xml/NetworkConnectionHandlerTest.java | 57 ++
.../NetworkConnectionSectionHandlerTest.java | 63 ++
.../org/jclouds/vcloud/xml/OrgHandlerTest.java | 124 +++
.../jclouds/vcloud/xml/OrgListHandlerTest.java | 57 ++
.../vcloud/xml/OrgNetworkHandlerTest.java | 104 +++
.../xml/SupportedVersionsHandlerTest.java | 53 ++
.../org/jclouds/vcloud/xml/TaskHandlerTest.java | 135 +++
.../vcloud/xml/TasksListHandlerTest.java | 82 ++
.../org/jclouds/vcloud/xml/VAppHandlerTest.java | 77 ++
.../vcloud/xml/VAppTemplateHandlerTest.java | 164 ++++
.../org/jclouds/vcloud/xml/VDCHandlerTest.java | 136 +++
.../org/jclouds/vcloud/xml/VmHandlerTest.java | 79 ++
...VCloudOperatingSystemSectionHandlerTest.java | 61 ++
...VCloudVirtualHardwareSectionHandlerTest.java | 153 ++++
.../src/test/resources/captureVApp-default.xml | 1 +
.../src/test/resources/captureVApp.xml | 1 +
.../src/test/resources/catalog-blank.xml | 7 +
.../src/test/resources/catalog-hosting.xml | 25 +
.../src/test/resources/catalog.xml | 27 +
.../src/test/resources/catalog1.0-vcd15.xml | 9 +
...alogItem-carrenza-with-default-namespace.xml | 8 +
...talogItem-carrenza-with-vcloud-namespace.xml | 8 +
.../src/test/resources/catalogItem-hosting.xml | 14 +
.../test/resources/catalogItem-terremark.xml | 16 +
.../src/test/resources/catalogItem1.0-vcd15.xml | 8 +
.../src/test/resources/copyVApp-default.xml | 1 +
.../src/test/resources/copyVApp.xml | 1 +
.../test/resources/copyVAppTemplate-default.xml | 1 +
.../src/test/resources/copyVAppTemplate.xml | 1 +
.../src/test/resources/cpuItem.xml | 1 +
.../src/test/resources/guestCustomization.xml | 23 +
.../resources/guestCustomizationSection.xml | 3 +
.../src/test/resources/instantiatedvapp.xml | 13 +
.../instantiationparams-description.xml | 1 +
.../resources/instantiationparams-network.xml | 1 +
.../src/test/resources/instantiationparams.xml | 1 +
.../1.7.1-stratos/src/test/resources/log4j.xml | 151 ++++
.../src/test/resources/memoryItem.xml | 1 +
.../src/test/resources/moveVApp.xml | 1 +
.../src/test/resources/moveVAppTemplate.xml | 1 +
.../src/test/resources/networkconnection.xml | 7 +
.../test/resources/networkconnectionsection.xml | 18 +
.../src/test/resources/org-1.0.xml | 24 +
.../src/test/resources/org-hosting.xml | 12 +
.../src/test/resources/org-savvis.xml | 13 +
.../1.7.1-stratos/src/test/resources/org.xml | 5 +
.../src/test/resources/org1.0-vcd15.xml | 11 +
.../src/test/resources/orgList1.0-vcd15.xml | 4 +
.../src/test/resources/orglist-savvis.xml | 3 +
.../src/test/resources/orglist.xml | 3 +
.../src/test/resources/orgnetwork-bridged.xml | 20 +
.../src/test/resources/orgnetwork-isolated.xml | 31 +
.../1.7.1-stratos/src/test/resources/os.xml | 11 +
.../src/test/resources/ovf-multi-vm.xml | 285 ++++++
.../src/test/resources/ovf-ubuntu64.xml | 148 +++
.../src/test/resources/task-1.0.xml | 9 +
.../src/test/resources/task-error.xml | 9 +
.../src/test/resources/task-hosting.xml | 12 +
.../src/test/resources/task-self.xml | 11 +
.../src/test/resources/task-vcd15.xml | 5 +
.../1.7.1-stratos/src/test/resources/task.xml | 8 +
.../src/test/resources/taskslist-hosting.xml | 14 +
.../src/test/resources/taskslist.xml | 27 +
.../resources/template1.0-vcd15-multi-vm.xml | 68 ++
.../src/test/resources/template1.0-vcd15.xml | 72 ++
.../src/test/resources/vAppTemplate-copying.xml | 41 +
.../src/test/resources/vAppTemplate.xml | 143 +++
.../vAppTemplate1.0-vcd15_withNewlines.xml | 109 +++
.../src/test/resources/vapp-hosting.xml | 235 +++++
.../src/test/resources/vapp-none.xml | 237 +++++
.../src/test/resources/vapp-pool.xml | 227 +++++
.../src/test/resources/vapp-rhel-off-static.xml | 325 +++++++
.../src/test/resources/vapp-ubuntu-off-dhcp.xml | 213 +++++
.../src/test/resources/vapp-unresolved.xml | 21 +
.../src/test/resources/vapp-win-off-static.xml | 219 +++++
.../src/test/resources/vdc-1.0.xml | 49 +
.../src/test/resources/vdc-hosting.xml | 60 ++
.../src/test/resources/vdc-nonet.xml | 22 +
.../1.7.1-stratos/src/test/resources/vdc.xml | 36 +
.../src/test/resources/vdc1.0-vcd15.xml | 47 +
.../src/test/resources/versions-vcd15.xml | 906 +++++++++++++++++++
.../src/test/resources/versions.xml | 7 +
.../test/resources/virtualhardwaresection.xml | 118 +++
.../src/test/resources/vm-rhel-off-static.xml | 197 ++++
dependencies/pom.xml | 41 +
.../pom.xml | 4 +-
pom.xml | 2 +
tools/puppet3-agent/config.sh | 3 +-
tools/stratos-installer/setup.sh | 2 +-
328 files changed, 30233 insertions(+), 58 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/5e99f2a0/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java
----------------------------------------------------------------------
diff --cc components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java
index c24f0c4,45b2551..1f70896
--- 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
@@@ -993,20 -1019,305 +991,20 @@@ public class ServiceUtils
subscriptionData.setTenantAdminUsername(tenantUsername);
subscriptionData.setRepositoryType("git");
subscriptionData.setRepositoryURL(cartridgeInfoBean.getRepoURL());
- subscriptionData.setRepositoryUsername(cartridgeInfoBean.getRepoURL());
+ subscriptionData.setRepositoryUsername(cartridgeInfoBean.getRepoUsername());
subscriptionData.setRepositoryPassword(cartridgeInfoBean.getRepoPassword());
- Properties properties = new Properties();
- if(cartridgeInfoBean.isPersistanceRequired()){
- /*
- PersistanceMapping persistanceMapping = new PersistanceMapping();
- persistanceMapping.setPersistanceRequired(persistanceMappingBean.persistanceRequired);
- persistanceMapping.setSize(persistanceMappingBean.size);
- persistanceMapping.setDevice(persistanceMappingBean.device);
- persistanceMapping.setRemoveOntermination(persistanceMappingBean.removeOnTermination);
- subscriptionData.setPersistanceMapping(persistanceMapping);
- */
-
- // Add persistance mapping properties to the subscription.
- Property persistanceRequiredProperty = new Property();
- persistanceRequiredProperty.setName(IS_VOLUME_REQUIRED);
- persistanceRequiredProperty.setValue(String.valueOf(cartridgeInfoBean.isPersistanceRequired()));
-
- Property sizeProperty = new Property();
- sizeProperty.setName(VOLUME_SIZE);
- sizeProperty.setValue(cartridgeInfoBean.getSize());
-
- Property deleteOnTerminationProperty = new Property();
- deleteOnTerminationProperty.setName(SHOULD_DELETE_VOLUME);
- deleteOnTerminationProperty.setValue(String.valueOf( cartridgeInfoBean.isRemoveOnTermination()));
-
- properties.setProperties(new Property[]{persistanceRequiredProperty,sizeProperty, deleteOnTerminationProperty});
- }
-
-
- // If multitenant, return for now. TODO -- fix properly
- if(cartridgeInfo != null && cartridgeInfo.getMultiTenant()) {
- log.info(" ******* MT cartridge ******* ");
-
- subscriptionData.setPrivateRepository(false);
- subscriptionData.setLbClusterId(null);
- subscriptionData.setProperties(null);
-
- CartridgeSubscription cartridgeSubscription =
- cartridgeSubsciptionManager.subscribeToCartridgeWithProperties(subscriptionData);
- log.info(" --- ** -- ");
- return cartridgeSubsciptionManager.registerCartridgeSubscription(cartridgeSubscription, properties);
-
+ if (cartridgeInfoBean.isPersistanceRequired()) {
+ // Add persistence related properties to PersistenceContext
+ PersistenceContext persistenceContext = new PersistenceContext();
+ persistenceContext.setPersistanceRequiredProperty(IS_VOLUME_REQUIRED, String.valueOf(cartridgeInfoBean.isPersistanceRequired()));
+ persistenceContext.setSizeProperty(VOLUME_SIZE, cartridgeInfoBean.getSize());
+ persistenceContext.setDeleteOnTerminationProperty(SHOULD_DELETE_VOLUME, String.valueOf(cartridgeInfoBean.isRemoveOnTermination()));
+ subscriptionData.setPersistanceCtxt(persistenceContext);
}
-
- List<Property> lbRefProp = new ArrayList<Property>();
-
- // get lb config reference
- LoadbalancerConfig lbConfig = cartridgeInfo.getLbConfig();
- String lbClusterId = null;
-
- if (lbConfig == null || lbConfig.getProperties() == null) {
- if (log.isDebugEnabled()) {
- log.debug("This Service does not require a load balancer. " + "[Service Name] " +
- cartridgeType);
- }
- } else {
-
- Properties lbReferenceProperties = lbConfig.getProperties();
-
- Property property = new Property();
- property.setName(org.apache.stratos.messaging.util.Constants.LOAD_BALANCER_REF);
-
- for (org.apache.stratos.cloud.controller.pojo.Property prop : lbReferenceProperties.getProperties()) {
-
- String name = prop.getName();
- String value = prop.getValue();
-
- // TODO make following a chain of responsibility pattern
- if (Constants.NO_LOAD_BALANCER.equals(name)) {
- if ("true".equals(value)) {
- if (log.isDebugEnabled()) {
- log.debug("This cartridge does not require a load balancer. " +
- "[Type] " + cartridgeType);
- }
- property.setValue(name);
- lbRefProp.add(property);
- break;
- }
- } else if (Constants.EXISTING_LOAD_BALANCERS.equals(name)) {
- String clusterIdsVal = value;
- if (log.isDebugEnabled()) {
- log.debug("This cartridge refers to existing load balancers. " + "[Type] " +
- cartridgeType + "[Referenced Cluster Ids] " + clusterIdsVal);
- }
-
- String[] clusterIds = clusterIdsVal.split(",");
-
- for (String clusterId : clusterIds) {
- if (autoscalerServiceClient != null) {
- try {
- autoscalerServiceClient.checkLBExistenceAgainstPolicy(clusterId,
- deploymentPolicy);
- } catch (Exception ex) {
- // we don't need to throw the error here.
- log.error(ex.getMessage(), ex);
- }
- }
- }
-
- property.setValue(name);
- lbRefProp.add(property);
- break;
-
- } else if (Constants.DEFAULT_LOAD_BALANCER.equals(name)) {
-
- if ("true".equals(value)) {
-
- CartridgeInfo lbCartridgeInfo = null;
- String lbCartridgeType = lbConfig.getType();
- try {
- // retrieve lb Cartridge info
- if(lbCartridgeType != null) {
- lbCartridgeInfo = cloudControllerServiceClient.getCartridgeInfo(lbCartridgeType);
- }
- } catch (Exception e) {
- String msg = "Cannot get cartridge info: " + cartridgeType;
- log.error(msg, e);
- throw new ADCException(msg, e);
- }
-
- property.setValue(name);
- if (log.isDebugEnabled()) {
- log.debug("This cartridge uses default load balancer. " + "[Type] " +
- cartridgeType);
- }
- if (autoscalerServiceClient != null) {
- try {
- // get the valid policies for lb cartridge
- DeploymentPolicy[] lbCartridgeDepPolicies =
- autoscalerServiceClient.getDeploymentPolicies(lbCartridgeType);
- // traverse deployment policies of lb cartridge
- for (DeploymentPolicy policy : lbCartridgeDepPolicies) {
- // check existence of the subscribed policy
- if (deploymentPolicy.equals(policy.getId())) {
-
- if (!autoscalerServiceClient.checkDefaultLBExistenceAgainstPolicy(deploymentPolicy)) {
-
- // if lb cluster doesn't exist
- String lbAlias = "lb" + new Random().nextInt();
- if(lbCartridgeInfo != null) {
- lbCartridgeInfo.addProperties(property);
- lbClusterId = subscribeToLb(lbCartridgeType, cartridgeType,
- lbAlias,
- lbCartridgeInfo.getDefaultAutoscalingPolicy(),
- deploymentPolicy, configurationContext,
- tenantUsername, tenantDomain,
- lbCartridgeInfo.getProperties());
- } else {
- String msg = "Please specify a LB cartridge type for the cartridge: "
- + cartridgeType + " as category: " +
- Constants.DEFAULT_LOAD_BALANCER;
- log.error(msg);
- throw new ADCException(msg);
- }
- }
- }
- }
-
- } catch (Exception ex) {
- // we don't need to throw the error here.
- log.error(ex.getMessage(), ex);
- }
- }
-
- lbRefProp.add(property);
- break;
- }
-
- } else if (Constants.SERVICE_AWARE_LOAD_BALANCER.equals(name)) {
-
- if ("true".equals(value)) {
-
- CartridgeInfo lbCartridgeInfo = null;
- String lbCartridgeType = lbConfig.getType();
- try {
- // retrieve lb Cartridge info
- if(lbCartridgeType != null) {
- lbCartridgeInfo = cloudControllerServiceClient.getCartridgeInfo(lbCartridgeType);
- }
- } catch (Exception e) {
- String msg = "Cannot get cartridge info: " + cartridgeType+". Cause: "+e.getMessage();
- log.error(msg, e);
- throw new ADCException(msg, e);
- }
-
- // add a property for the service type
- Property loadBalancedServiceTypeProperty = new Property();
- loadBalancedServiceTypeProperty.setName(Constants.LOAD_BALANCED_SERVICE_TYPE);
-
- property.setValue(name);
- // set the load balanced service type
- loadBalancedServiceTypeProperty.setValue(cartridgeType);
- if (log.isDebugEnabled()) {
- log.debug("This cartridge uses a service aware load balancer. " +
- "[Type] " + cartridgeType);
- }
- if (autoscalerServiceClient != null) {
- try {
-
- // get the valid policies for lb cartridge
- DeploymentPolicy[] lbCartridgeDepPolicies =
- autoscalerServiceClient.getDeploymentPolicies(lbCartridgeType);
- // traverse deployment policies of lb cartridge
- for (DeploymentPolicy policy : lbCartridgeDepPolicies) {
- // check existence of the subscribed policy
- if (deploymentPolicy.equals(policy.getId())) {
-
- if (!autoscalerServiceClient.checkServiceLBExistenceAgainstPolicy(cartridgeType,
- deploymentPolicy)) {
-
- // if lb cluster doesn't exist
- String lbAlias =
- "lb" + cartridgeType +
- new Random().nextInt();
-
- if(lbCartridgeInfo != null) {
- lbCartridgeInfo.addProperties(property);
- lbCartridgeInfo.addProperties(loadBalancedServiceTypeProperty);
-
- lbClusterId = subscribeToLb(lbCartridgeType, cartridgeType,
- lbAlias,
- lbCartridgeInfo.getDefaultAutoscalingPolicy(),
- deploymentPolicy,
- configurationContext, tenantUsername,
- tenantDomain,
- lbCartridgeInfo.getProperties());
- } else {
- String msg = "Please specify a LB cartridge type for the cartridge: "
- + cartridgeType + " as category: " +
- Constants.SERVICE_AWARE_LOAD_BALANCER;
- log.error(msg);
- throw new ADCException(msg);
- }
- }
- }
- }
-
- } catch (Exception ex) {
- // we don't need to throw the error here.
- log.error(ex.getMessage(), ex);
- }
- }
-
- lbRefProp.add(property);
- break;
- }
- }
- }
- }
-
- subscriptionData.setPrivateRepository(cartridgeInfoBean.isPrivateRepo());
- subscriptionData.setLbClusterId(lbClusterId);
- subscriptionData.setProperties(lbRefProp.toArray(new Property[0]));
- CartridgeSubscription cartridgeSubscription =
- cartridgeSubsciptionManager.subscribeToCartridgeWithProperties(subscriptionData);
-
-
- if (dataCartridgeAlias != null && !dataCartridgeAlias.trim().isEmpty()) {
-
- /*dataCartridgeAlias = dataCartridgeAlias.trim();
-
- CartridgeSubscription connectingCartridgeSubscription = null;
- try {
- connectingCartridgeSubscription =
- cartridgeSubsciptionManager.getCartridgeSubscription(tenantDomain,
- dataCartridgeAlias);
-
- } catch (NotSubscribedException e) {
- log.error(e.getMessage(), e);
- }
- if (connectingCartridgeSubscription != null) {
- try {
- cartridgeSubsciptionManager.connectCartridges(tenantDomain,
- cartridgeSubscription,
- connectingCartridgeSubscription.getAlias());
-
- } catch (NotSubscribedException e) {
- log.error(e.getMessage(), e);
-
- } catch (AxisFault axisFault) {
- log.error(axisFault.getMessage(), axisFault);
- }
- } else {
- log.error("Failed to connect. No cartridge subscription found for tenant " +
- ApplicationManagementUtil.getTenantId(configurationContext) +
- " with alias " + alias);
- }*/
- }
-
- for (Property lbRefProperty : lbRefProp) {
- properties.addProperties(lbRefProperty);
- }
-
- SubscriptionInfo registerCartridgeSubscription = cartridgeSubsciptionManager.registerCartridgeSubscription(cartridgeSubscription, properties);
-
- return registerCartridgeSubscription;
+ //subscribe
+ return cartridgeSubsciptionManager.subscribeToCartridgeWithProperties(subscriptionData);
}