You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2014/10/27 15:16:25 UTC
[21/50] [abbrv] git commit: Merge remote-tracking branch
'upstream/master'
Merge remote-tracking branch 'upstream/master'
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/9982ae92
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/9982ae92
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/9982ae92
Branch: refs/heads/master
Commit: 9982ae92ed482ad4125a7af90afef0f2f9494242
Parents: bcddfba b23a9c7
Author: Chamila de Alwis <ch...@wso2.com>
Authored: Mon Oct 20 13:21:56 2014 +0530
Committer: Chamila de Alwis <ch...@wso2.com>
Committed: Mon Oct 20 13:21:56 2014 +0530
----------------------------------------------------------------------
.../org.apache.stratos.cloud.controller/pom.xml | 5 +
.../cloud/controller/iaases/GCEIaas.java | 455 +++++++
.../validate/GCEPartitionValidator.java | 54 +
.../jclouds/apis/gce/1.8.0-stratos/README.txt | 77 ++
.../jclouds/apis/gce/1.8.0-stratos/pom.xml | 135 ++
.../GoogleComputeEngineApi.java | 185 +++
.../GoogleComputeEngineApiMetadata.java | 104 ++
.../GoogleComputeEngineConstants.java | 81 ++
.../compute/GoogleComputeEngineService.java | 200 +++
.../GoogleComputeEngineServiceAdapter.java | 439 +++++++
...GoogleComputeEngineServiceContextModule.java | 283 +++++
...ogleComputeEngineSecurityGroupExtension.java | 338 +++++
.../functions/BuildInstanceMetadata.java | 46 +
.../functions/FirewallTagNamingConvention.java | 62 +
.../functions/FirewallToIpPermission.java | 87 ++
.../GoogleComputeEngineImageToImage.java | 80 ++
.../functions/InstanceInZoneToNodeMetadata.java | 150 +++
.../functions/MachineTypeInZoneToHardware.java | 100 ++
.../functions/NetworkToSecurityGroup.java | 82 ++
.../functions/OrphanedGroupsFromDeadNodes.java | 57 +
.../compute/functions/RegionToLocation.java | 45 +
.../compute/functions/ZoneToLocation.java | 45 +
.../compute/loaders/FindNetworkOrCreate.java | 62 +
.../GoogleComputeEngineTemplateOptions.java | 382 ++++++
.../predicates/AllNodesInGroupTerminated.java | 48 +
...desWithGroupEncodedIntoNameThenAddToSet.java | 183 +++
...DefaultLoginCredentialsForImageStrategy.java | 69 +
...eNodeCredentialsButOverrideFromTemplate.java | 57 +
.../GoogleComputeEngineHttpApiModule.java | 177 +++
.../config/GoogleComputeEngineParserModule.java | 413 ++++++
.../config/OAuthModuleWithoutTypeAdapters.java | 51 +
.../googlecomputeengine/config/UserProject.java | 33 +
.../domain/AbstractDisk.java | 121 ++
.../googlecomputeengine/domain/Address.java | 177 +++
.../googlecomputeengine/domain/Deprecated.java | 195 +++
.../googlecomputeengine/domain/Disk.java | 123 ++
.../googlecomputeengine/domain/Firewall.java | 379 ++++++
.../googlecomputeengine/domain/Image.java | 286 +++++
.../googlecomputeengine/domain/Instance.java | 1187 ++++++++++++++++++
.../domain/InstanceInZone.java | 52 +
.../domain/InstanceTemplate.java | 445 +++++++
.../googlecomputeengine/domain/ListPage.java | 179 +++
.../googlecomputeengine/domain/MachineType.java | 360 ++++++
.../domain/MachineTypeInZone.java | 52 +
.../googlecomputeengine/domain/Metadata.java | 139 ++
.../googlecomputeengine/domain/Network.java | 133 ++
.../googlecomputeengine/domain/Operation.java | 556 ++++++++
.../googlecomputeengine/domain/Project.java | 162 +++
.../googlecomputeengine/domain/Quota.java | 152 +++
.../googlecomputeengine/domain/Region.java | 175 +++
.../googlecomputeengine/domain/Resource.java | 283 +++++
.../googlecomputeengine/domain/Route.java | 433 +++++++
.../domain/SlashEncodedIds.java | 83 ++
.../googlecomputeengine/domain/Snapshot.java | 135 ++
.../googlecomputeengine/domain/Zone.java | 334 +++++
.../domain/internal/NetworkAndAddressRange.java | 91 ++
.../features/AddressApi.java | 187 +++
.../googlecomputeengine/features/DiskApi.java | 255 ++++
.../features/FirewallApi.java | 227 ++++
.../features/GlobalOperationApi.java | 158 +++
.../googlecomputeengine/features/ImageApi.java | 167 +++
.../features/InstanceApi.java | 381 ++++++
.../features/MachineTypeApi.java | 143 +++
.../features/NetworkApi.java | 204 +++
.../features/ProjectApi.java | 96 ++
.../googlecomputeengine/features/RegionApi.java | 135 ++
.../features/RegionOperationApi.java | 163 +++
.../googlecomputeengine/features/RouteApi.java | 184 +++
.../features/SnapshotApi.java | 160 +++
.../googlecomputeengine/features/ZoneApi.java | 135 ++
.../features/ZoneOperationApi.java | 163 +++
.../functions/CreateNetworkIfNeeded.java | 100 ++
.../functions/internal/BaseToPagedIterable.java | 66 +
.../internal/BaseWithRegionToPagedIterable.java | 72 ++
.../internal/BaseWithZoneToPagedIterable.java | 72 ++
.../functions/internal/PATCH.java | 35 +
.../functions/internal/ParseAddresses.java | 67 +
.../functions/internal/ParseDisks.java | 67 +
.../functions/internal/ParseFirewalls.java | 63 +
.../internal/ParseGlobalOperations.java | 63 +
.../functions/internal/ParseImages.java | 63 +
.../functions/internal/ParseInstances.java | 65 +
.../functions/internal/ParseMachineTypes.java | 64 +
.../functions/internal/ParseNetworks.java | 63 +
.../internal/ParseRegionOperations.java | 65 +
.../functions/internal/ParseRegions.java | 63 +
.../functions/internal/ParseRoutes.java | 63 +
.../functions/internal/ParseSnapshots.java | 66 +
.../functions/internal/ParseZoneOperations.java | 65 +
.../functions/internal/ParseZones.java | 63 +
.../handlers/FirewallBinder.java | 56 +
.../GoogleComputeEngineErrorHandler.java | 62 +
.../handlers/InstanceBinder.java | 65 +
.../handlers/MetadataBinder.java | 60 +
.../handlers/RouteBinder.java | 56 +
.../options/AttachDiskOptions.java | 128 ++
.../options/DeprecateOptions.java | 126 ++
.../options/FirewallOptions.java | 166 +++
.../options/ListOptions.java | 91 ++
.../options/RouteOptions.java | 202 +++
.../GlobalOperationDonePredicate.java | 59 +
.../predicates/InstancePredicates.java | 33 +
.../predicates/NetworkFirewallPredicates.java | 121 ++
.../RegionOperationDonePredicate.java | 69 +
.../predicates/ZoneOperationDonePredicate.java | 68 +
.../java/org/jclouds/oauth/v2/OAuthApi.java | 63 +
.../org/jclouds/oauth/v2/OAuthApiMetadata.java | 80 ++
.../org/jclouds/oauth/v2/OAuthConstants.java | 78 ++
.../jclouds/oauth/v2/config/Authentication.java | 35 +
.../v2/config/OAuthAuthenticationModule.java | 52 +
.../oauth/v2/config/OAuthHttpApiModule.java | 45 +
.../jclouds/oauth/v2/config/OAuthModule.java | 86 ++
.../oauth/v2/config/OAuthProperties.java | 43 +
.../jclouds/oauth/v2/config/OAuthScopes.java | 40 +
.../org/jclouds/oauth/v2/domain/ClaimSet.java | 191 +++
.../org/jclouds/oauth/v2/domain/Header.java | 128 ++
.../oauth/v2/domain/OAuthCredentials.java | 129 ++
.../java/org/jclouds/oauth/v2/domain/Token.java | 149 +++
.../jclouds/oauth/v2/domain/TokenRequest.java | 131 ++
.../oauth/v2/domain/TokenRequestFormat.java | 45 +
.../oauth/v2/filters/OAuthAuthenticator.java | 63 +
.../oauth/v2/functions/BuildTokenRequest.java | 135 ++
.../jclouds/oauth/v2/functions/FetchToken.java | 41 +
.../v2/functions/OAuthCredentialsSupplier.java | 125 ++
.../v2/functions/SignOrProduceMacForToken.java | 119 ++
.../oauth/v2/handlers/OAuthErrorHandler.java | 64 +
.../oauth/v2/handlers/OAuthTokenBinder.java | 45 +
.../oauth/v2/json/ClaimSetTypeAdapter.java | 59 +
.../oauth/v2/json/HeaderTypeAdapter.java | 52 +
.../oauth/v2/json/JWTTokenRequestFormat.java | 96 ++
.../services/org.jclouds.apis.ApiMetadata | 19 +
.../GoogleComputeEngineApiMetadataTest.java | 38 +
...eEngineAuthenticatedRestContextLiveTest.java | 33 +
.../PageSystemExpectTest.java | 114 ++
.../GoogleComputeEngineServiceExpectTest.java | 574 +++++++++
.../GoogleComputeEngineServiceLiveTest.java | 128 ++
...uteEngineSecurityGroupExtensionLiveTest.java | 28 +
.../functions/FirewallToIpPermissionTest.java | 93 ++
.../GoogleComputeEngineImageToImageTest.java | 60 +
.../InstanceInZoneToNodeMetadataTest.java | 286 +++++
.../functions/NetworkToSecurityGroupTest.java | 94 ++
.../OrphanedGroupsFromDeadNodesTest.java | 136 ++
.../loaders/FindNetworkOrCreateTest.java | 141 +++
.../features/AddressApiExpectTest.java | 163 +++
.../features/AddressApiLiveTest.java | 71 ++
.../features/DiskApiExpectTest.java | 226 ++++
.../features/DiskApiLiveTest.java | 85 ++
.../features/FirewallApiExpectTest.java | 301 +++++
.../features/FirewallApiLiveTest.java | 163 +++
.../features/GlobalOperationApiExpectTest.java | 158 +++
.../features/GlobalOperationApiLiveTest.java | 91 ++
.../features/ImageApiExpectTest.java | 159 +++
.../features/ImageApiLiveTest.java | 74 ++
.../features/InstanceApiExpectTest.java | 410 ++++++
.../features/InstanceApiLiveTest.java | 240 ++++
.../features/MachineTypeApiExpectTest.java | 113 ++
.../features/MachineTypeApiLiveTest.java | 73 ++
.../features/NetworkApiExpectTest.java | 164 +++
.../features/NetworkApiLiveTest.java | 83 ++
.../features/ProjectApiExpectTest.java | 96 ++
.../features/ProjectApiLiveTest.java | 123 ++
.../features/RegionApiExpectTest.java | 94 ++
.../features/RegionApiLiveTest.java | 74 ++
.../features/RegionOperationApiExpectTest.java | 195 +++
.../features/RegionOperationApiLiveTest.java | 91 ++
.../features/RouteApiExpectTest.java | 175 +++
.../features/RouteApiLiveTest.java | 96 ++
.../features/SnapshotApiExpectTest.java | 94 ++
.../features/SnapshotApiLiveTest.java | 92 ++
.../features/ZoneApiExpectTest.java | 97 ++
.../features/ZoneApiLiveTest.java | 74 ++
.../features/ZoneOperationApiExpectTest.java | 193 +++
.../features/ZoneOperationApiLiveTest.java | 90 ++
.../functions/CreateNetworkIfNeededTest.java | 132 ++
.../GoogleComputeEngineErrorHandlerTest.java | 92 ++
.../BaseGoogleComputeEngineApiExpectTest.java | 31 +
.../BaseGoogleComputeEngineApiLiveTest.java | 160 +++
.../BaseGoogleComputeEngineExpectTest.java | 195 +++
.../BaseGoogleComputeEngineParseTest.java | 33 +
...leComputeEngineServiceContextExpectTest.java | 49 +
...aseGoogleComputeEngineServiceExpectTest.java | 28 +
.../parse/ParseAddressListTest.java | 61 +
.../parse/ParseAddressTest.java | 51 +
.../parse/ParseDiskListTest.java | 61 +
.../parse/ParseDiskTest.java | 50 +
.../parse/ParseFirewallListTest.java | 68 +
.../parse/ParseFirewallTest.java | 60 +
.../parse/ParseImageListTest.java | 71 ++
.../parse/ParseImageTest.java | 55 +
.../parse/ParseInstanceListTest.java | 48 +
.../parse/ParseInstanceSerialOutputTest.java | 38 +
.../parse/ParseInstanceTest.java | 81 ++
.../parse/ParseMachineTypeListTest.java | 94 ++
.../parse/ParseMachineTypeTest.java | 57 +
.../parse/ParseMetadataTest.java | 45 +
.../parse/ParseNetworkListTest.java | 49 +
.../parse/ParseNetworkTest.java | 48 +
.../parse/ParseOperationListTest.java | 46 +
.../parse/ParseOperationTest.java | 58 +
.../parse/ParseProjectTest.java | 67 +
.../parse/ParseQuotaTest.java | 39 +
.../parse/ParseRegionListTest.java | 72 ++
.../parse/ParseRegionTest.java | 62 +
.../parse/ParseRouteListTest.java | 62 +
.../parse/ParseRouteTest.java | 56 +
.../parse/ParseSnapshotListTest.java | 64 +
.../parse/ParseSnapshotTest.java | 52 +
.../parse/ParseZoneListTest.java | 70 ++
.../parse/ParseZoneTest.java | 55 +
.../NetworkFirewallPredicatesTest.java | 162 +++
.../jclouds/oauth/v2/OAuthApiMetadataTest.java | 38 +
.../org/jclouds/oauth/v2/OAuthTestUtils.java | 75 ++
.../oauth/v2/features/OAuthApiExpectTest.java | 99 ++
.../oauth/v2/features/OAuthApiLiveTest.java | 80 ++
.../functions/OAuthCredentialsFromPKTest.java | 61 +
.../functions/OAuthCredentialsSupplierTest.java | 55 +
.../oauth/v2/functions/SignerFunctionTest.java | 61 +
.../v2/handlers/OAuthErrorHandlerTest.java | 92 ++
.../oauth/v2/internal/Base64UrlSafeTest.java | 40 +
.../v2/internal/BaseOAuthApiExpectTest.java | 23 +
.../oauth/v2/internal/BaseOAuthApiLiveTest.java | 56 +
.../BaseOAuthAuthenticatedApiLiveTest.java | 110 ++
.../oauth/v2/internal/BaseOAuthExpectTest.java | 26 +
.../v2/json/JWTTokenRequestFormatTest.java | 69 +
.../jclouds/oauth/v2/parse/ParseTokenTest.java | 40 +
.../firewall_list.json | 37 +
.../network_get.json | 10 +
.../src/test/resources/address_get.json | 12 +
.../src/test/resources/address_insert.json | 1 +
.../src/test/resources/address_list.json | 31 +
.../test/resources/disk_create_snapshot.json | 1 +
.../src/test/resources/disk_get.json | 10 +
.../src/test/resources/disk_insert.json | 1 +
.../src/test/resources/disk_list.json | 17 +
.../src/test/resources/firewall_get.json | 30 +
.../src/test/resources/firewall_insert.json | 1 +
.../src/test/resources/firewall_list.json | 58 +
.../src/test/resources/global_operation.json | 15 +
.../test/resources/global_operation_list.json | 22 +
.../src/test/resources/image_get.json | 13 +
.../src/test/resources/image_insert.json | 4 +
.../src/test/resources/image_list.json | 24 +
.../src/test/resources/image_list_empty.json | 6 +
.../resources/image_list_multiple_page_1.json | 55 +
.../resources/image_list_multiple_page_2.json | 47 +
.../test/resources/image_list_single_page.json | 50 +
.../resources/instance_add_access_config.json | 11 +
.../test/resources/instance_attach_disk.json | 6 +
.../src/test/resources/instance_get.json | 62 +
.../src/test/resources/instance_insert.json | 1 +
.../test/resources/instance_insert_simple.json | 1 +
.../src/test/resources/instance_list.json | 69 +
.../instance_list_central1b_empty.json | 6 +
.../test/resources/instance_serial_port.json | 4 +
.../test/resources/instance_set_metadata.json | 10 +
.../src/test/resources/logback.xml | 83 ++
.../src/test/resources/machinetype.json | 22 +
.../src/test/resources/machinetype_list.json | 57 +
.../resources/machinetype_list_central1b.json | 43 +
.../machinetype_list_central1b_empty.json | 6 +
.../src/test/resources/metadata.json | 1 +
.../src/test/resources/network_get.json | 10 +
.../src/test/resources/network_insert.json | 1 +
.../src/test/resources/network_list.json | 18 +
.../src/test/resources/operation.json | 17 +
.../src/test/resources/operation_error.json | 26 +
.../src/test/resources/operation_list.json | 24 +
.../src/test/resources/project.json | 69 +
.../1.8.0-stratos/src/test/resources/quota.json | 5 +
.../src/test/resources/region_get.json | 60 +
.../src/test/resources/region_list.json | 126 ++
.../src/test/resources/region_operation.json | 16 +
.../test/resources/region_operation_list.json | 23 +
.../src/test/resources/route_get.json | 14 +
.../src/test/resources/route_insert.json | 1 +
.../src/test/resources/route_list.json | 34 +
.../src/test/resources/snapshot_get.json | 13 +
.../src/test/resources/snapshot_list.json | 33 +
.../src/test/resources/tag_insert.json | 1 +
.../1.8.0-stratos/src/test/resources/testpk.pem | 15 +
.../src/test/resources/tokenResponse.json | 5 +
.../src/test/resources/zone_get.json | 17 +
.../src/test/resources/zone_list.json | 41 +
.../src/test/resources/zone_list_short.json | 24 +
.../src/test/resources/zone_operation.json | 16 +
.../test/resources/zone_operation_error.json | 25 +
.../src/test/resources/zone_operation_list.json | 23 +
dependencies/pom.xml | 1 +
.../pom.xml | 6 +
tools/puppet3-agent/config-gce.sh | 101 ++
tools/puppet3-agent/init-gce.sh | 146 +++
tools/stratos-installer/clean.sh | 2 -
tools/stratos-installer/conf/setup.conf | 4 +
.../all/repository/conf/cloud-controller.xml | 8 +
tools/stratos-installer/ec2.sh | 2 +
tools/stratos-installer/gce.sh | 67 +
tools/stratos-installer/openstack.sh | 2 +
tools/stratos-installer/setup.sh | 12 +-
tools/stratos-installer/vcloud.sh | 2 +
299 files changed, 29459 insertions(+), 3 deletions(-)
----------------------------------------------------------------------