From c3dd362b4b002e3a9553536215a116e42c8d80c8 Mon Sep 17 00:00:00 2001 From: Adrian Cole Date: Thu, 22 Mar 2012 21:42:22 -0700 Subject: [PATCH] Issue 814:recreate nova api as openstack-nova --- README.txt | 6 +++--- allcompute/pom.xml | 5 +++++ {labs => apis}/openstack-nova/pom.xml | 2 +- .../org/jclouds/openstack/nova/v1_1/NovaAsyncClient.java | 0 .../java/org/jclouds/openstack/nova/v1_1/NovaClient.java | 0 .../org/jclouds/openstack/nova/v1_1/NovaContextBuilder.java | 0 .../jclouds/openstack/nova/v1_1/NovaPropertiesBuilder.java | 0 .../v1_1/binders/BindSecurityGroupRuleToJsonPayload.java | 0 .../openstack/nova/v1_1/compute/NovaComputeService.java | 0 .../nova/v1_1/compute/NovaComputeServiceAdapter.java | 0 .../compute/config/NovaComputeServiceContextModule.java | 0 .../compute/functions/AllocateAndAddFloatingIpToNode.java | 0 .../v1_1/compute/functions/CreateSecurityGroupIfNeeded.java | 0 .../nova/v1_1/compute/functions/CreateUniqueKeyPair.java | 0 .../nova/v1_1/compute/functions/FlavorInZoneToHardware.java | 0 .../nova/v1_1/compute/functions/ImageInZoneToImage.java | 0 .../nova/v1_1/compute/functions/ImageToOperatingSystem.java | 0 .../nova/v1_1/compute/functions/OrphanedGroupsByZoneId.java | 0 .../functions/RemoveFloatingIpFromNodeAndDeallocate.java | 0 .../v1_1/compute/functions/ServerInZoneToNodeMetadata.java | 0 .../nova/v1_1/compute/loaders/FindKeyPairOrCreate.java | 0 .../v1_1/compute/loaders/FindSecurityGroupOrCreate.java | 0 .../v1_1/compute/loaders/LoadFloatingIpsForInstance.java | 0 .../nova/v1_1/compute/options/NovaTemplateOptions.java | 0 .../v1_1/compute/predicates/AllNodesInGroupTerminated.java | 0 ...ionsCreateNodesWithGroupEncodedIntoNameThenAddToSet.java | 0 .../openstack/nova/v1_1/config/NovaParserModule.java | 0 .../openstack/nova/v1_1/config/NovaRestClientModule.java | 0 .../org/jclouds/openstack/nova/v1_1/domain/Address.java | 0 .../org/jclouds/openstack/nova/v1_1/domain/Extension.java | 0 .../java/org/jclouds/openstack/nova/v1_1/domain/Flavor.java | 0 .../org/jclouds/openstack/nova/v1_1/domain/FloatingIP.java | 0 .../java/org/jclouds/openstack/nova/v1_1/domain/Image.java | 0 .../org/jclouds/openstack/nova/v1_1/domain/Ingress.java | 0 .../org/jclouds/openstack/nova/v1_1/domain/IpProtocol.java | 0 .../org/jclouds/openstack/nova/v1_1/domain/KeyPair.java | 0 .../org/jclouds/openstack/nova/v1_1/domain/RebootType.java | 0 .../jclouds/openstack/nova/v1_1/domain/SecurityGroup.java | 0 .../openstack/nova/v1_1/domain/SecurityGroupRule.java | 0 .../java/org/jclouds/openstack/nova/v1_1/domain/Server.java | 0 .../jclouds/openstack/nova/v1_1/domain/TenantIdAndName.java | 0 .../openstack/nova/v1_1/domain/zonescoped/FlavorInZone.java | 0 .../openstack/nova/v1_1/domain/zonescoped/ImageInZone.java | 0 .../nova/v1_1/domain/zonescoped/SecurityGroupInZone.java | 0 .../openstack/nova/v1_1/domain/zonescoped/ServerInZone.java | 0 .../openstack/nova/v1_1/domain/zonescoped/ZoneAndId.java | 0 .../openstack/nova/v1_1/domain/zonescoped/ZoneAndName.java | 0 .../domain/zonescoped/ZoneSecurityGroupNameAndPorts.java | 0 .../openstack/nova/v1_1/extensions/ExtensionNamespaces.java | 0 .../nova/v1_1/extensions/FloatingIPAsyncClient.java | 0 .../openstack/nova/v1_1/extensions/FloatingIPClient.java | 0 .../openstack/nova/v1_1/extensions/KeyPairAsyncClient.java | 0 .../openstack/nova/v1_1/extensions/KeyPairClient.java | 0 .../nova/v1_1/extensions/SecurityGroupAsyncClient.java | 0 .../openstack/nova/v1_1/extensions/SecurityGroupClient.java | 0 .../openstack/nova/v1_1/features/ExtensionAsyncClient.java | 0 .../openstack/nova/v1_1/features/ExtensionClient.java | 0 .../openstack/nova/v1_1/features/FlavorAsyncClient.java | 0 .../jclouds/openstack/nova/v1_1/features/FlavorClient.java | 0 .../openstack/nova/v1_1/features/ImageAsyncClient.java | 0 .../jclouds/openstack/nova/v1_1/features/ImageClient.java | 0 .../openstack/nova/v1_1/features/ServerAsyncClient.java | 0 .../jclouds/openstack/nova/v1_1/features/ServerClient.java | 0 .../openstack/nova/v1_1/functions/ExtensionToNameSpace.java | 0 ...nnotationNamespaceEqualsAnyNamespaceInExtensionsSet.java | 0 .../openstack/nova/v1_1/handlers/NovaErrorHandler.java | 0 .../openstack/nova/v1_1/options/CreateServerOptions.java | 0 .../jclouds/openstack/nova/v1_1/options/ListOptions.java | 0 .../openstack/nova/v1_1/options/RebuildServerOptions.java | 0 .../openstack/nova/v1_1/predicates/ExtensionPredicates.java | 0 .../predicates/FindSecurityGroupWithNameAndReturnTrue.java | 0 .../openstack/nova/v1_1/predicates/ImagePredicates.java | 0 .../openstack/nova/v1_1/predicates/KeyPairPredicates.java | 0 .../nova/v1_1/predicates/SecurityGroupPredicates.java | 0 .../openstack/nova/v1_1/reference/NovaConstants.java | 0 .../jclouds/openstack/nova/v1_1/NovaErrorHandlerTest.java | 0 .../nova/v1_1/PasswordAuthenticationExpectTest.java | 0 .../v1_1/compute/NovaComputeServiceAdapterExpectTest.java | 0 .../nova/v1_1/compute/NovaComputeServiceExpectTest.java | 0 .../nova/v1_1/compute/NovaComputeServiceLiveTest.java | 0 .../functions/AllocateAndAddFloatingIpToNodeExpectTest.java | 0 .../v1_1/compute/functions/CreateUniqueKeyPairTest.java | 0 .../v1_1/compute/functions/FlavorInZoneToHardwareTest.java | 0 .../nova/v1_1/compute/functions/ImageInZoneToImageTest.java | 0 .../v1_1/compute/functions/ImageToOperatingSystemTest.java | 0 .../v1_1/compute/functions/OrphanedGroupsByZoneIdTest.java | 0 .../compute/functions/ServerInZoneToNodeMetadataTest.java | 0 .../v1_1/compute/loaders/FindSecurityGroupOrCreateTest.java | 0 .../compute/loaders/LoadFloatingIpsForInstanceTest.java | 0 .../nova/v1_1/compute/options/NovaTemplateOptionsTest.java | 0 .../v1_1/extensions/FloatingIPAsyncClientExpectTest.java | 0 .../nova/v1_1/extensions/FloatingIPClientExpectTest.java | 0 .../nova/v1_1/extensions/FloatingIPClientLiveTest.java | 0 .../nova/v1_1/extensions/KeyPairClientExpectTest.java | 0 .../nova/v1_1/extensions/KeyPairClientLiveTest.java | 0 .../nova/v1_1/extensions/SecurityGroupClientExpectTest.java | 0 .../nova/v1_1/extensions/SecurityGroupClientLiveTest.java | 0 .../nova/v1_1/features/ExtensionClientExpectTest.java | 0 .../nova/v1_1/features/ExtensionClientLiveTest.java | 0 .../nova/v1_1/features/FlavorClientExpectTest.java | 0 .../openstack/nova/v1_1/features/FlavorClientLiveTest.java | 0 .../openstack/nova/v1_1/features/ImageClientExpectTest.java | 0 .../openstack/nova/v1_1/features/ImageClientLiveTest.java | 0 .../nova/v1_1/features/ServerClientExpectTest.java | 0 .../openstack/nova/v1_1/features/ServerClientLiveTest.java | 0 .../v1_1/functions/CreateSecurityGroupIfNeededTest.java | 0 .../nova/v1_1/functions/ExtensionToNameSpaceTest.java | 0 .../FindSecurityGroupWithNameAndReturnTrueExpectTest.java | 0 .../nova/v1_1/internal/BaseNovaAsyncClientExpectTest.java | 0 .../nova/v1_1/internal/BaseNovaClientExpectTest.java | 0 .../nova/v1_1/internal/BaseNovaClientLiveTest.java | 0 .../internal/BaseNovaComputeServiceContextExpectTest.java | 0 .../v1_1/internal/BaseNovaComputeServiceExpectTest.java | 0 .../openstack/nova/v1_1/internal/BaseNovaExpectTest.java | 0 .../parse/ParseComputeServiceTypicalSecurityGroupTest.java | 0 .../openstack/nova/v1_1/parse/ParseCreatedServerTest.java | 0 .../nova/v1_1/parse/ParseExtensionListNormalTest.java | 0 .../openstack/nova/v1_1/parse/ParseExtensionListTest.java | 0 .../openstack/nova/v1_1/parse/ParseExtensionTest.java | 0 .../openstack/nova/v1_1/parse/ParseFlavorListTest.java | 0 .../jclouds/openstack/nova/v1_1/parse/ParseFlavorTest.java | 0 .../openstack/nova/v1_1/parse/ParseFloatingIPListTest.java | 0 .../openstack/nova/v1_1/parse/ParseFloatingIPTest.java | 0 .../openstack/nova/v1_1/parse/ParseImageListTest.java | 0 .../jclouds/openstack/nova/v1_1/parse/ParseImageTest.java | 0 .../openstack/nova/v1_1/parse/ParseKeyPairListTest.java | 0 .../jclouds/openstack/nova/v1_1/parse/ParseKeyPairTest.java | 0 .../nova/v1_1/parse/ParseSecurityGroupListTest.java | 0 .../openstack/nova/v1_1/parse/ParseSecurityGroupTest.java | 0 .../openstack/nova/v1_1/parse/ParseServerListTest.java | 0 .../jclouds/openstack/nova/v1_1/parse/ParseServerTest.java | 0 .../v1_1/parse/ParseServerWithInternetAddressesTest.java | 0 ...ateAddressBlockShouldRerouteToPublicBlockExpectTest.java | 0 .../nova/v1_1/predicates/ExtensionPredicatesTest.java | 0 .../openstack/nova/v1_1/predicates/ImagePredicatesTest.java | 0 .../nova/v1_1/predicates/SecurityGroupPredicatesTest.java | 0 .../src/test/resources/extension_details.json | 0 .../openstack-nova/src/test/resources/extension_list.json | 0 .../src/test/resources/extension_list_normal.json | 0 .../src/test/resources/extension_list_trystack.json | 0 .../openstack-nova/src/test/resources/flavor_details.json | 0 .../openstack-nova/src/test/resources/flavor_list.json | 0 .../src/test/resources/flavor_list_detail.json | 0 .../src/test/resources/flavor_list_detail_trystack.json | 0 .../src/test/resources/floatingip_details.json | 0 .../openstack-nova/src/test/resources/floatingip_list.json | 0 .../openstack-nova/src/test/resources/image_details.json | 0 .../openstack-nova/src/test/resources/image_list.json | 0 .../src/test/resources/image_list_detail.json | 0 .../src/test/resources/image_list_detail_trystack.json | 0 .../openstack-nova/src/test/resources/keypair_created.json | 0 .../openstack-nova/src/test/resources/keypair_list.json | 0 .../openstack-nova/src/test/resources/new_server.json | 0 .../src/test/resources/securitygroup_created.json | 0 .../src/test/resources/securitygroup_details.json | 0 .../securitygroup_details_computeservice_typical.json | 0 .../src/test/resources/securitygroup_list.json | 0 .../securitygroup_list_details_computeservice_typical.json | 0 .../src/test/resources/securitygrouprule_created.json | 0 .../openstack-nova/src/test/resources/server_details.json | 0 .../src/test/resources/server_details_trystack.json | 0 .../openstack-nova/src/test/resources/server_list.json | 0 .../src/test/resources/server_list_details.json | 0 .../src/test/resources/server_public_ip_in_private.json | 0 apis/pom.xml | 1 + labs/hpcloud-compute/pom.xml | 4 ++-- labs/pom.xml | 1 - labs/trystack-nova/pom.xml | 4 ++-- 168 files changed, 14 insertions(+), 9 deletions(-) rename {labs => apis}/openstack-nova/pom.xml (99%) rename {labs => apis}/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/NovaAsyncClient.java (100%) rename {labs => apis}/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/NovaClient.java (100%) rename {labs => apis}/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/NovaContextBuilder.java (100%) rename {labs => apis}/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/NovaPropertiesBuilder.java (100%) rename {labs => apis}/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/binders/BindSecurityGroupRuleToJsonPayload.java (100%) rename {labs => apis}/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/NovaComputeService.java (100%) rename {labs => apis}/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/NovaComputeServiceAdapter.java (100%) rename {labs => apis}/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/config/NovaComputeServiceContextModule.java (100%) rename {labs => apis}/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/functions/AllocateAndAddFloatingIpToNode.java (100%) rename {labs => apis}/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/functions/CreateSecurityGroupIfNeeded.java (100%) rename {labs => apis}/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/functions/CreateUniqueKeyPair.java (100%) rename {labs => apis}/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/functions/FlavorInZoneToHardware.java (100%) rename {labs => apis}/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/functions/ImageInZoneToImage.java (100%) rename {labs => apis}/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/functions/ImageToOperatingSystem.java (100%) rename {labs => apis}/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/functions/OrphanedGroupsByZoneId.java (100%) rename {labs => apis}/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/functions/RemoveFloatingIpFromNodeAndDeallocate.java (100%) rename {labs => apis}/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/functions/ServerInZoneToNodeMetadata.java (100%) rename {labs => apis}/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/loaders/FindKeyPairOrCreate.java (100%) rename {labs => apis}/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/loaders/FindSecurityGroupOrCreate.java (100%) rename {labs => apis}/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/loaders/LoadFloatingIpsForInstance.java (100%) rename {labs => apis}/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/options/NovaTemplateOptions.java (100%) rename {labs => apis}/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/predicates/AllNodesInGroupTerminated.java (100%) rename {labs => apis}/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/strategy/ApplyNovaTemplateOptionsCreateNodesWithGroupEncodedIntoNameThenAddToSet.java (100%) rename {labs => apis}/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/config/NovaParserModule.java (100%) rename {labs => apis}/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/config/NovaRestClientModule.java (100%) rename {labs => apis}/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/Address.java (100%) rename {labs => apis}/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/Extension.java (100%) rename {labs => apis}/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/Flavor.java (100%) rename {labs => apis}/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/FloatingIP.java (100%) rename {labs => apis}/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/Image.java (100%) rename {labs => apis}/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/Ingress.java (100%) rename {labs => apis}/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/IpProtocol.java (100%) rename {labs => apis}/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/KeyPair.java (100%) rename {labs => apis}/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/RebootType.java (100%) rename {labs => apis}/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/SecurityGroup.java (100%) rename {labs => apis}/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/SecurityGroupRule.java (100%) rename {labs => apis}/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/Server.java (100%) rename {labs => apis}/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/TenantIdAndName.java (100%) rename {labs => apis}/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/zonescoped/FlavorInZone.java (100%) rename {labs => apis}/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/zonescoped/ImageInZone.java (100%) rename {labs => apis}/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/zonescoped/SecurityGroupInZone.java (100%) rename {labs => apis}/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/zonescoped/ServerInZone.java (100%) rename {labs => apis}/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/zonescoped/ZoneAndId.java (100%) rename {labs => apis}/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/zonescoped/ZoneAndName.java (100%) rename {labs => apis}/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/zonescoped/ZoneSecurityGroupNameAndPorts.java (100%) rename {labs => apis}/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/extensions/ExtensionNamespaces.java (100%) rename {labs => apis}/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/extensions/FloatingIPAsyncClient.java (100%) rename {labs => apis}/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/extensions/FloatingIPClient.java (100%) rename {labs => apis}/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/extensions/KeyPairAsyncClient.java (100%) rename {labs => apis}/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/extensions/KeyPairClient.java (100%) rename {labs => apis}/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/extensions/SecurityGroupAsyncClient.java (100%) rename {labs => apis}/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/extensions/SecurityGroupClient.java (100%) rename {labs => apis}/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/features/ExtensionAsyncClient.java (100%) rename {labs => apis}/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/features/ExtensionClient.java (100%) rename {labs => apis}/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/features/FlavorAsyncClient.java (100%) rename {labs => apis}/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/features/FlavorClient.java (100%) rename {labs => apis}/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/features/ImageAsyncClient.java (100%) rename {labs => apis}/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/features/ImageClient.java (100%) rename {labs => apis}/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/features/ServerAsyncClient.java (100%) rename {labs => apis}/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/features/ServerClient.java (100%) rename {labs => apis}/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/functions/ExtensionToNameSpace.java (100%) rename {labs => apis}/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/functions/PresentWhenExtensionAnnotationNamespaceEqualsAnyNamespaceInExtensionsSet.java (100%) rename {labs => apis}/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/handlers/NovaErrorHandler.java (100%) rename {labs => apis}/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/options/CreateServerOptions.java (100%) rename {labs => apis}/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/options/ListOptions.java (100%) rename {labs => apis}/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/options/RebuildServerOptions.java (100%) rename {labs => apis}/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/predicates/ExtensionPredicates.java (100%) rename {labs => apis}/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/predicates/FindSecurityGroupWithNameAndReturnTrue.java (100%) rename {labs => apis}/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/predicates/ImagePredicates.java (100%) rename {labs => apis}/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/predicates/KeyPairPredicates.java (100%) rename {labs => apis}/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/predicates/SecurityGroupPredicates.java (100%) rename {labs => apis}/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/reference/NovaConstants.java (100%) rename {labs => apis}/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/NovaErrorHandlerTest.java (100%) rename {labs => apis}/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/PasswordAuthenticationExpectTest.java (100%) rename {labs => apis}/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/NovaComputeServiceAdapterExpectTest.java (100%) rename {labs => apis}/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/NovaComputeServiceExpectTest.java (100%) rename {labs => apis}/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/NovaComputeServiceLiveTest.java (100%) rename {labs => apis}/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/functions/AllocateAndAddFloatingIpToNodeExpectTest.java (100%) rename {labs => apis}/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/functions/CreateUniqueKeyPairTest.java (100%) rename {labs => apis}/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/functions/FlavorInZoneToHardwareTest.java (100%) rename {labs => apis}/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/functions/ImageInZoneToImageTest.java (100%) rename {labs => apis}/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/functions/ImageToOperatingSystemTest.java (100%) rename {labs => apis}/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/functions/OrphanedGroupsByZoneIdTest.java (100%) rename {labs => apis}/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/functions/ServerInZoneToNodeMetadataTest.java (100%) rename {labs => apis}/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/loaders/FindSecurityGroupOrCreateTest.java (100%) rename {labs => apis}/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/loaders/LoadFloatingIpsForInstanceTest.java (100%) rename {labs => apis}/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/options/NovaTemplateOptionsTest.java (100%) rename {labs => apis}/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/extensions/FloatingIPAsyncClientExpectTest.java (100%) rename {labs => apis}/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/extensions/FloatingIPClientExpectTest.java (100%) rename {labs => apis}/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/extensions/FloatingIPClientLiveTest.java (100%) rename {labs => apis}/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/extensions/KeyPairClientExpectTest.java (100%) rename {labs => apis}/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/extensions/KeyPairClientLiveTest.java (100%) rename {labs => apis}/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/extensions/SecurityGroupClientExpectTest.java (100%) rename {labs => apis}/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/extensions/SecurityGroupClientLiveTest.java (100%) rename {labs => apis}/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/features/ExtensionClientExpectTest.java (100%) rename {labs => apis}/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/features/ExtensionClientLiveTest.java (100%) rename {labs => apis}/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/features/FlavorClientExpectTest.java (100%) rename {labs => apis}/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/features/FlavorClientLiveTest.java (100%) rename {labs => apis}/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/features/ImageClientExpectTest.java (100%) rename {labs => apis}/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/features/ImageClientLiveTest.java (100%) rename {labs => apis}/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/features/ServerClientExpectTest.java (100%) rename {labs => apis}/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/features/ServerClientLiveTest.java (100%) rename {labs => apis}/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/functions/CreateSecurityGroupIfNeededTest.java (100%) rename {labs => apis}/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/functions/ExtensionToNameSpaceTest.java (100%) rename {labs => apis}/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/functions/FindSecurityGroupWithNameAndReturnTrueExpectTest.java (100%) rename {labs => apis}/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/internal/BaseNovaAsyncClientExpectTest.java (100%) rename {labs => apis}/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/internal/BaseNovaClientExpectTest.java (100%) rename {labs => apis}/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/internal/BaseNovaClientLiveTest.java (100%) rename {labs => apis}/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/internal/BaseNovaComputeServiceContextExpectTest.java (100%) rename {labs => apis}/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/internal/BaseNovaComputeServiceExpectTest.java (100%) rename {labs => apis}/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/internal/BaseNovaExpectTest.java (100%) rename {labs => apis}/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseComputeServiceTypicalSecurityGroupTest.java (100%) rename {labs => apis}/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseCreatedServerTest.java (100%) rename {labs => apis}/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseExtensionListNormalTest.java (100%) rename {labs => apis}/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseExtensionListTest.java (100%) rename {labs => apis}/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseExtensionTest.java (100%) rename {labs => apis}/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseFlavorListTest.java (100%) rename {labs => apis}/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseFlavorTest.java (100%) rename {labs => apis}/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseFloatingIPListTest.java (100%) rename {labs => apis}/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseFloatingIPTest.java (100%) rename {labs => apis}/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseImageListTest.java (100%) rename {labs => apis}/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseImageTest.java (100%) rename {labs => apis}/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseKeyPairListTest.java (100%) rename {labs => apis}/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseKeyPairTest.java (100%) rename {labs => apis}/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseSecurityGroupListTest.java (100%) rename {labs => apis}/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseSecurityGroupTest.java (100%) rename {labs => apis}/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseServerListTest.java (100%) rename {labs => apis}/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseServerTest.java (100%) rename {labs => apis}/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseServerWithInternetAddressesTest.java (100%) rename {labs => apis}/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/PublicIpsInPrivateAddressBlockShouldRerouteToPublicBlockExpectTest.java (100%) rename {labs => apis}/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/predicates/ExtensionPredicatesTest.java (100%) rename {labs => apis}/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/predicates/ImagePredicatesTest.java (100%) rename {labs => apis}/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/predicates/SecurityGroupPredicatesTest.java (100%) rename {labs => apis}/openstack-nova/src/test/resources/extension_details.json (100%) rename {labs => apis}/openstack-nova/src/test/resources/extension_list.json (100%) rename {labs => apis}/openstack-nova/src/test/resources/extension_list_normal.json (100%) rename {labs => apis}/openstack-nova/src/test/resources/extension_list_trystack.json (100%) rename {labs => apis}/openstack-nova/src/test/resources/flavor_details.json (100%) rename {labs => apis}/openstack-nova/src/test/resources/flavor_list.json (100%) rename {labs => apis}/openstack-nova/src/test/resources/flavor_list_detail.json (100%) rename {labs => apis}/openstack-nova/src/test/resources/flavor_list_detail_trystack.json (100%) rename {labs => apis}/openstack-nova/src/test/resources/floatingip_details.json (100%) rename {labs => apis}/openstack-nova/src/test/resources/floatingip_list.json (100%) rename {labs => apis}/openstack-nova/src/test/resources/image_details.json (100%) rename {labs => apis}/openstack-nova/src/test/resources/image_list.json (100%) rename {labs => apis}/openstack-nova/src/test/resources/image_list_detail.json (100%) rename {labs => apis}/openstack-nova/src/test/resources/image_list_detail_trystack.json (100%) rename {labs => apis}/openstack-nova/src/test/resources/keypair_created.json (100%) rename {labs => apis}/openstack-nova/src/test/resources/keypair_list.json (100%) rename {labs => apis}/openstack-nova/src/test/resources/new_server.json (100%) rename {labs => apis}/openstack-nova/src/test/resources/securitygroup_created.json (100%) rename {labs => apis}/openstack-nova/src/test/resources/securitygroup_details.json (100%) rename {labs => apis}/openstack-nova/src/test/resources/securitygroup_details_computeservice_typical.json (100%) rename {labs => apis}/openstack-nova/src/test/resources/securitygroup_list.json (100%) rename {labs => apis}/openstack-nova/src/test/resources/securitygroup_list_details_computeservice_typical.json (100%) rename {labs => apis}/openstack-nova/src/test/resources/securitygrouprule_created.json (100%) rename {labs => apis}/openstack-nova/src/test/resources/server_details.json (100%) rename {labs => apis}/openstack-nova/src/test/resources/server_details_trystack.json (100%) rename {labs => apis}/openstack-nova/src/test/resources/server_list.json (100%) rename {labs => apis}/openstack-nova/src/test/resources/server_list_details.json (100%) rename {labs => apis}/openstack-nova/src/test/resources/server_public_ip_in_private.json (100%) diff --git a/README.txt b/README.txt index f0ba8c3822..c88e793e51 100644 --- a/README.txt +++ b/README.txt @@ -7,8 +7,8 @@ two abstractions at the moment: compute and blobstore. compute helps you bootstrap machines in the cloud. blobstore helps you manage key-value data. -our current version is 1.3.2 -our next maintenance version is 1.3.3-SNAPSHOT +our current version is 1.4.0 +our next maintenance version is 1.4.1-SNAPSHOT our dev version is 1.5.0-SNAPSHOT check out our examples site! https://github.com/jclouds/jclouds-examples @@ -22,7 +22,7 @@ our compute api supports: aws-ec2, gogrid, cloudservers-us, stub (in-memory), de elastichosts-sat-p (Peer 1), elastichosts-lon-b (BlueSquare), openhosting-east1, serverlove-z1-man, skalicloud-sdg-my, greenhousedata-element-vcloud, softlayer, cloudsigma (generic), - cloudstack (generic), ninefold-compute + cloudstack (generic), ninefold-compute, openstack-nova * note * the pom dependency org.jclouds/jclouds-allcompute gives you access to to all of these providers diff --git a/allcompute/pom.xml b/allcompute/pom.xml index 1d64dfa16a..92a7334192 100644 --- a/allcompute/pom.xml +++ b/allcompute/pom.xml @@ -55,6 +55,11 @@ rimuhosting ${project.version} + + org.jclouds.api + openstack-nova + ${project.version} + org.jclouds.api nova diff --git a/labs/openstack-nova/pom.xml b/apis/openstack-nova/pom.xml similarity index 99% rename from labs/openstack-nova/pom.xml rename to apis/openstack-nova/pom.xml index e36096eb74..fa2663a3c3 100644 --- a/labs/openstack-nova/pom.xml +++ b/apis/openstack-nova/pom.xml @@ -27,7 +27,7 @@ 1.5.0-SNAPSHOT ../../project/pom.xml - org.jclouds.labs + org.jclouds.api openstack-nova jcloud openstack-nova api jclouds components to access an implementation of OpenStack Nova diff --git a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/NovaAsyncClient.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/NovaAsyncClient.java similarity index 100% rename from labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/NovaAsyncClient.java rename to apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/NovaAsyncClient.java diff --git a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/NovaClient.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/NovaClient.java similarity index 100% rename from labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/NovaClient.java rename to apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/NovaClient.java diff --git a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/NovaContextBuilder.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/NovaContextBuilder.java similarity index 100% rename from labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/NovaContextBuilder.java rename to apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/NovaContextBuilder.java diff --git a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/NovaPropertiesBuilder.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/NovaPropertiesBuilder.java similarity index 100% rename from labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/NovaPropertiesBuilder.java rename to apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/NovaPropertiesBuilder.java diff --git a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/binders/BindSecurityGroupRuleToJsonPayload.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/binders/BindSecurityGroupRuleToJsonPayload.java similarity index 100% rename from labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/binders/BindSecurityGroupRuleToJsonPayload.java rename to apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/binders/BindSecurityGroupRuleToJsonPayload.java diff --git a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/NovaComputeService.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/NovaComputeService.java similarity index 100% rename from labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/NovaComputeService.java rename to apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/NovaComputeService.java diff --git a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/NovaComputeServiceAdapter.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/NovaComputeServiceAdapter.java similarity index 100% rename from labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/NovaComputeServiceAdapter.java rename to apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/NovaComputeServiceAdapter.java diff --git a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/config/NovaComputeServiceContextModule.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/config/NovaComputeServiceContextModule.java similarity index 100% rename from labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/config/NovaComputeServiceContextModule.java rename to apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/config/NovaComputeServiceContextModule.java diff --git a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/functions/AllocateAndAddFloatingIpToNode.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/functions/AllocateAndAddFloatingIpToNode.java similarity index 100% rename from labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/functions/AllocateAndAddFloatingIpToNode.java rename to apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/functions/AllocateAndAddFloatingIpToNode.java diff --git a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/functions/CreateSecurityGroupIfNeeded.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/functions/CreateSecurityGroupIfNeeded.java similarity index 100% rename from labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/functions/CreateSecurityGroupIfNeeded.java rename to apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/functions/CreateSecurityGroupIfNeeded.java diff --git a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/functions/CreateUniqueKeyPair.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/functions/CreateUniqueKeyPair.java similarity index 100% rename from labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/functions/CreateUniqueKeyPair.java rename to apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/functions/CreateUniqueKeyPair.java diff --git a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/functions/FlavorInZoneToHardware.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/functions/FlavorInZoneToHardware.java similarity index 100% rename from labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/functions/FlavorInZoneToHardware.java rename to apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/functions/FlavorInZoneToHardware.java diff --git a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/functions/ImageInZoneToImage.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/functions/ImageInZoneToImage.java similarity index 100% rename from labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/functions/ImageInZoneToImage.java rename to apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/functions/ImageInZoneToImage.java diff --git a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/functions/ImageToOperatingSystem.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/functions/ImageToOperatingSystem.java similarity index 100% rename from labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/functions/ImageToOperatingSystem.java rename to apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/functions/ImageToOperatingSystem.java diff --git a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/functions/OrphanedGroupsByZoneId.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/functions/OrphanedGroupsByZoneId.java similarity index 100% rename from labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/functions/OrphanedGroupsByZoneId.java rename to apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/functions/OrphanedGroupsByZoneId.java diff --git a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/functions/RemoveFloatingIpFromNodeAndDeallocate.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/functions/RemoveFloatingIpFromNodeAndDeallocate.java similarity index 100% rename from labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/functions/RemoveFloatingIpFromNodeAndDeallocate.java rename to apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/functions/RemoveFloatingIpFromNodeAndDeallocate.java diff --git a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/functions/ServerInZoneToNodeMetadata.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/functions/ServerInZoneToNodeMetadata.java similarity index 100% rename from labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/functions/ServerInZoneToNodeMetadata.java rename to apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/functions/ServerInZoneToNodeMetadata.java diff --git a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/loaders/FindKeyPairOrCreate.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/loaders/FindKeyPairOrCreate.java similarity index 100% rename from labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/loaders/FindKeyPairOrCreate.java rename to apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/loaders/FindKeyPairOrCreate.java diff --git a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/loaders/FindSecurityGroupOrCreate.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/loaders/FindSecurityGroupOrCreate.java similarity index 100% rename from labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/loaders/FindSecurityGroupOrCreate.java rename to apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/loaders/FindSecurityGroupOrCreate.java diff --git a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/loaders/LoadFloatingIpsForInstance.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/loaders/LoadFloatingIpsForInstance.java similarity index 100% rename from labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/loaders/LoadFloatingIpsForInstance.java rename to apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/loaders/LoadFloatingIpsForInstance.java diff --git a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/options/NovaTemplateOptions.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/options/NovaTemplateOptions.java similarity index 100% rename from labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/options/NovaTemplateOptions.java rename to apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/options/NovaTemplateOptions.java diff --git a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/predicates/AllNodesInGroupTerminated.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/predicates/AllNodesInGroupTerminated.java similarity index 100% rename from labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/predicates/AllNodesInGroupTerminated.java rename to apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/predicates/AllNodesInGroupTerminated.java diff --git a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/strategy/ApplyNovaTemplateOptionsCreateNodesWithGroupEncodedIntoNameThenAddToSet.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/strategy/ApplyNovaTemplateOptionsCreateNodesWithGroupEncodedIntoNameThenAddToSet.java similarity index 100% rename from labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/strategy/ApplyNovaTemplateOptionsCreateNodesWithGroupEncodedIntoNameThenAddToSet.java rename to apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/strategy/ApplyNovaTemplateOptionsCreateNodesWithGroupEncodedIntoNameThenAddToSet.java diff --git a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/config/NovaParserModule.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/config/NovaParserModule.java similarity index 100% rename from labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/config/NovaParserModule.java rename to apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/config/NovaParserModule.java diff --git a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/config/NovaRestClientModule.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/config/NovaRestClientModule.java similarity index 100% rename from labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/config/NovaRestClientModule.java rename to apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/config/NovaRestClientModule.java diff --git a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/Address.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/Address.java similarity index 100% rename from labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/Address.java rename to apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/Address.java diff --git a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/Extension.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/Extension.java similarity index 100% rename from labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/Extension.java rename to apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/Extension.java diff --git a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/Flavor.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/Flavor.java similarity index 100% rename from labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/Flavor.java rename to apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/Flavor.java diff --git a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/FloatingIP.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/FloatingIP.java similarity index 100% rename from labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/FloatingIP.java rename to apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/FloatingIP.java diff --git a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/Image.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/Image.java similarity index 100% rename from labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/Image.java rename to apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/Image.java diff --git a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/Ingress.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/Ingress.java similarity index 100% rename from labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/Ingress.java rename to apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/Ingress.java diff --git a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/IpProtocol.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/IpProtocol.java similarity index 100% rename from labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/IpProtocol.java rename to apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/IpProtocol.java diff --git a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/KeyPair.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/KeyPair.java similarity index 100% rename from labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/KeyPair.java rename to apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/KeyPair.java diff --git a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/RebootType.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/RebootType.java similarity index 100% rename from labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/RebootType.java rename to apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/RebootType.java diff --git a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/SecurityGroup.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/SecurityGroup.java similarity index 100% rename from labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/SecurityGroup.java rename to apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/SecurityGroup.java diff --git a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/SecurityGroupRule.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/SecurityGroupRule.java similarity index 100% rename from labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/SecurityGroupRule.java rename to apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/SecurityGroupRule.java diff --git a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/Server.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/Server.java similarity index 100% rename from labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/Server.java rename to apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/Server.java diff --git a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/TenantIdAndName.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/TenantIdAndName.java similarity index 100% rename from labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/TenantIdAndName.java rename to apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/TenantIdAndName.java diff --git a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/zonescoped/FlavorInZone.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/zonescoped/FlavorInZone.java similarity index 100% rename from labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/zonescoped/FlavorInZone.java rename to apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/zonescoped/FlavorInZone.java diff --git a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/zonescoped/ImageInZone.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/zonescoped/ImageInZone.java similarity index 100% rename from labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/zonescoped/ImageInZone.java rename to apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/zonescoped/ImageInZone.java diff --git a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/zonescoped/SecurityGroupInZone.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/zonescoped/SecurityGroupInZone.java similarity index 100% rename from labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/zonescoped/SecurityGroupInZone.java rename to apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/zonescoped/SecurityGroupInZone.java diff --git a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/zonescoped/ServerInZone.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/zonescoped/ServerInZone.java similarity index 100% rename from labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/zonescoped/ServerInZone.java rename to apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/zonescoped/ServerInZone.java diff --git a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/zonescoped/ZoneAndId.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/zonescoped/ZoneAndId.java similarity index 100% rename from labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/zonescoped/ZoneAndId.java rename to apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/zonescoped/ZoneAndId.java diff --git a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/zonescoped/ZoneAndName.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/zonescoped/ZoneAndName.java similarity index 100% rename from labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/zonescoped/ZoneAndName.java rename to apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/zonescoped/ZoneAndName.java diff --git a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/zonescoped/ZoneSecurityGroupNameAndPorts.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/zonescoped/ZoneSecurityGroupNameAndPorts.java similarity index 100% rename from labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/zonescoped/ZoneSecurityGroupNameAndPorts.java rename to apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/zonescoped/ZoneSecurityGroupNameAndPorts.java diff --git a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/extensions/ExtensionNamespaces.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/extensions/ExtensionNamespaces.java similarity index 100% rename from labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/extensions/ExtensionNamespaces.java rename to apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/extensions/ExtensionNamespaces.java diff --git a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/extensions/FloatingIPAsyncClient.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/extensions/FloatingIPAsyncClient.java similarity index 100% rename from labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/extensions/FloatingIPAsyncClient.java rename to apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/extensions/FloatingIPAsyncClient.java diff --git a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/extensions/FloatingIPClient.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/extensions/FloatingIPClient.java similarity index 100% rename from labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/extensions/FloatingIPClient.java rename to apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/extensions/FloatingIPClient.java diff --git a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/extensions/KeyPairAsyncClient.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/extensions/KeyPairAsyncClient.java similarity index 100% rename from labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/extensions/KeyPairAsyncClient.java rename to apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/extensions/KeyPairAsyncClient.java diff --git a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/extensions/KeyPairClient.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/extensions/KeyPairClient.java similarity index 100% rename from labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/extensions/KeyPairClient.java rename to apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/extensions/KeyPairClient.java diff --git a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/extensions/SecurityGroupAsyncClient.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/extensions/SecurityGroupAsyncClient.java similarity index 100% rename from labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/extensions/SecurityGroupAsyncClient.java rename to apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/extensions/SecurityGroupAsyncClient.java diff --git a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/extensions/SecurityGroupClient.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/extensions/SecurityGroupClient.java similarity index 100% rename from labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/extensions/SecurityGroupClient.java rename to apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/extensions/SecurityGroupClient.java diff --git a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/features/ExtensionAsyncClient.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/features/ExtensionAsyncClient.java similarity index 100% rename from labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/features/ExtensionAsyncClient.java rename to apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/features/ExtensionAsyncClient.java diff --git a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/features/ExtensionClient.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/features/ExtensionClient.java similarity index 100% rename from labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/features/ExtensionClient.java rename to apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/features/ExtensionClient.java diff --git a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/features/FlavorAsyncClient.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/features/FlavorAsyncClient.java similarity index 100% rename from labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/features/FlavorAsyncClient.java rename to apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/features/FlavorAsyncClient.java diff --git a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/features/FlavorClient.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/features/FlavorClient.java similarity index 100% rename from labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/features/FlavorClient.java rename to apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/features/FlavorClient.java diff --git a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/features/ImageAsyncClient.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/features/ImageAsyncClient.java similarity index 100% rename from labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/features/ImageAsyncClient.java rename to apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/features/ImageAsyncClient.java diff --git a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/features/ImageClient.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/features/ImageClient.java similarity index 100% rename from labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/features/ImageClient.java rename to apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/features/ImageClient.java diff --git a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/features/ServerAsyncClient.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/features/ServerAsyncClient.java similarity index 100% rename from labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/features/ServerAsyncClient.java rename to apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/features/ServerAsyncClient.java diff --git a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/features/ServerClient.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/features/ServerClient.java similarity index 100% rename from labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/features/ServerClient.java rename to apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/features/ServerClient.java diff --git a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/functions/ExtensionToNameSpace.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/functions/ExtensionToNameSpace.java similarity index 100% rename from labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/functions/ExtensionToNameSpace.java rename to apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/functions/ExtensionToNameSpace.java diff --git a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/functions/PresentWhenExtensionAnnotationNamespaceEqualsAnyNamespaceInExtensionsSet.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/functions/PresentWhenExtensionAnnotationNamespaceEqualsAnyNamespaceInExtensionsSet.java similarity index 100% rename from labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/functions/PresentWhenExtensionAnnotationNamespaceEqualsAnyNamespaceInExtensionsSet.java rename to apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/functions/PresentWhenExtensionAnnotationNamespaceEqualsAnyNamespaceInExtensionsSet.java diff --git a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/handlers/NovaErrorHandler.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/handlers/NovaErrorHandler.java similarity index 100% rename from labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/handlers/NovaErrorHandler.java rename to apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/handlers/NovaErrorHandler.java diff --git a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/options/CreateServerOptions.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/options/CreateServerOptions.java similarity index 100% rename from labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/options/CreateServerOptions.java rename to apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/options/CreateServerOptions.java diff --git a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/options/ListOptions.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/options/ListOptions.java similarity index 100% rename from labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/options/ListOptions.java rename to apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/options/ListOptions.java diff --git a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/options/RebuildServerOptions.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/options/RebuildServerOptions.java similarity index 100% rename from labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/options/RebuildServerOptions.java rename to apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/options/RebuildServerOptions.java diff --git a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/predicates/ExtensionPredicates.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/predicates/ExtensionPredicates.java similarity index 100% rename from labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/predicates/ExtensionPredicates.java rename to apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/predicates/ExtensionPredicates.java diff --git a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/predicates/FindSecurityGroupWithNameAndReturnTrue.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/predicates/FindSecurityGroupWithNameAndReturnTrue.java similarity index 100% rename from labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/predicates/FindSecurityGroupWithNameAndReturnTrue.java rename to apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/predicates/FindSecurityGroupWithNameAndReturnTrue.java diff --git a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/predicates/ImagePredicates.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/predicates/ImagePredicates.java similarity index 100% rename from labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/predicates/ImagePredicates.java rename to apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/predicates/ImagePredicates.java diff --git a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/predicates/KeyPairPredicates.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/predicates/KeyPairPredicates.java similarity index 100% rename from labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/predicates/KeyPairPredicates.java rename to apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/predicates/KeyPairPredicates.java diff --git a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/predicates/SecurityGroupPredicates.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/predicates/SecurityGroupPredicates.java similarity index 100% rename from labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/predicates/SecurityGroupPredicates.java rename to apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/predicates/SecurityGroupPredicates.java diff --git a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/reference/NovaConstants.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/reference/NovaConstants.java similarity index 100% rename from labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/reference/NovaConstants.java rename to apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/reference/NovaConstants.java diff --git a/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/NovaErrorHandlerTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/NovaErrorHandlerTest.java similarity index 100% rename from labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/NovaErrorHandlerTest.java rename to apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/NovaErrorHandlerTest.java diff --git a/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/PasswordAuthenticationExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/PasswordAuthenticationExpectTest.java similarity index 100% rename from labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/PasswordAuthenticationExpectTest.java rename to apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/PasswordAuthenticationExpectTest.java diff --git a/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/NovaComputeServiceAdapterExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/NovaComputeServiceAdapterExpectTest.java similarity index 100% rename from labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/NovaComputeServiceAdapterExpectTest.java rename to apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/NovaComputeServiceAdapterExpectTest.java diff --git a/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/NovaComputeServiceExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/NovaComputeServiceExpectTest.java similarity index 100% rename from labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/NovaComputeServiceExpectTest.java rename to apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/NovaComputeServiceExpectTest.java diff --git a/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/NovaComputeServiceLiveTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/NovaComputeServiceLiveTest.java similarity index 100% rename from labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/NovaComputeServiceLiveTest.java rename to apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/NovaComputeServiceLiveTest.java diff --git a/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/functions/AllocateAndAddFloatingIpToNodeExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/functions/AllocateAndAddFloatingIpToNodeExpectTest.java similarity index 100% rename from labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/functions/AllocateAndAddFloatingIpToNodeExpectTest.java rename to apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/functions/AllocateAndAddFloatingIpToNodeExpectTest.java diff --git a/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/functions/CreateUniqueKeyPairTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/functions/CreateUniqueKeyPairTest.java similarity index 100% rename from labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/functions/CreateUniqueKeyPairTest.java rename to apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/functions/CreateUniqueKeyPairTest.java diff --git a/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/functions/FlavorInZoneToHardwareTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/functions/FlavorInZoneToHardwareTest.java similarity index 100% rename from labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/functions/FlavorInZoneToHardwareTest.java rename to apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/functions/FlavorInZoneToHardwareTest.java diff --git a/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/functions/ImageInZoneToImageTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/functions/ImageInZoneToImageTest.java similarity index 100% rename from labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/functions/ImageInZoneToImageTest.java rename to apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/functions/ImageInZoneToImageTest.java diff --git a/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/functions/ImageToOperatingSystemTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/functions/ImageToOperatingSystemTest.java similarity index 100% rename from labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/functions/ImageToOperatingSystemTest.java rename to apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/functions/ImageToOperatingSystemTest.java diff --git a/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/functions/OrphanedGroupsByZoneIdTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/functions/OrphanedGroupsByZoneIdTest.java similarity index 100% rename from labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/functions/OrphanedGroupsByZoneIdTest.java rename to apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/functions/OrphanedGroupsByZoneIdTest.java diff --git a/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/functions/ServerInZoneToNodeMetadataTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/functions/ServerInZoneToNodeMetadataTest.java similarity index 100% rename from labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/functions/ServerInZoneToNodeMetadataTest.java rename to apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/functions/ServerInZoneToNodeMetadataTest.java diff --git a/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/loaders/FindSecurityGroupOrCreateTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/loaders/FindSecurityGroupOrCreateTest.java similarity index 100% rename from labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/loaders/FindSecurityGroupOrCreateTest.java rename to apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/loaders/FindSecurityGroupOrCreateTest.java diff --git a/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/loaders/LoadFloatingIpsForInstanceTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/loaders/LoadFloatingIpsForInstanceTest.java similarity index 100% rename from labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/loaders/LoadFloatingIpsForInstanceTest.java rename to apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/loaders/LoadFloatingIpsForInstanceTest.java diff --git a/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/options/NovaTemplateOptionsTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/options/NovaTemplateOptionsTest.java similarity index 100% rename from labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/options/NovaTemplateOptionsTest.java rename to apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/options/NovaTemplateOptionsTest.java diff --git a/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/extensions/FloatingIPAsyncClientExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/extensions/FloatingIPAsyncClientExpectTest.java similarity index 100% rename from labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/extensions/FloatingIPAsyncClientExpectTest.java rename to apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/extensions/FloatingIPAsyncClientExpectTest.java diff --git a/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/extensions/FloatingIPClientExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/extensions/FloatingIPClientExpectTest.java similarity index 100% rename from labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/extensions/FloatingIPClientExpectTest.java rename to apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/extensions/FloatingIPClientExpectTest.java diff --git a/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/extensions/FloatingIPClientLiveTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/extensions/FloatingIPClientLiveTest.java similarity index 100% rename from labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/extensions/FloatingIPClientLiveTest.java rename to apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/extensions/FloatingIPClientLiveTest.java diff --git a/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/extensions/KeyPairClientExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/extensions/KeyPairClientExpectTest.java similarity index 100% rename from labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/extensions/KeyPairClientExpectTest.java rename to apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/extensions/KeyPairClientExpectTest.java diff --git a/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/extensions/KeyPairClientLiveTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/extensions/KeyPairClientLiveTest.java similarity index 100% rename from labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/extensions/KeyPairClientLiveTest.java rename to apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/extensions/KeyPairClientLiveTest.java diff --git a/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/extensions/SecurityGroupClientExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/extensions/SecurityGroupClientExpectTest.java similarity index 100% rename from labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/extensions/SecurityGroupClientExpectTest.java rename to apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/extensions/SecurityGroupClientExpectTest.java diff --git a/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/extensions/SecurityGroupClientLiveTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/extensions/SecurityGroupClientLiveTest.java similarity index 100% rename from labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/extensions/SecurityGroupClientLiveTest.java rename to apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/extensions/SecurityGroupClientLiveTest.java diff --git a/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/features/ExtensionClientExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/features/ExtensionClientExpectTest.java similarity index 100% rename from labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/features/ExtensionClientExpectTest.java rename to apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/features/ExtensionClientExpectTest.java diff --git a/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/features/ExtensionClientLiveTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/features/ExtensionClientLiveTest.java similarity index 100% rename from labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/features/ExtensionClientLiveTest.java rename to apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/features/ExtensionClientLiveTest.java diff --git a/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/features/FlavorClientExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/features/FlavorClientExpectTest.java similarity index 100% rename from labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/features/FlavorClientExpectTest.java rename to apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/features/FlavorClientExpectTest.java diff --git a/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/features/FlavorClientLiveTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/features/FlavorClientLiveTest.java similarity index 100% rename from labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/features/FlavorClientLiveTest.java rename to apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/features/FlavorClientLiveTest.java diff --git a/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/features/ImageClientExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/features/ImageClientExpectTest.java similarity index 100% rename from labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/features/ImageClientExpectTest.java rename to apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/features/ImageClientExpectTest.java diff --git a/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/features/ImageClientLiveTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/features/ImageClientLiveTest.java similarity index 100% rename from labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/features/ImageClientLiveTest.java rename to apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/features/ImageClientLiveTest.java diff --git a/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/features/ServerClientExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/features/ServerClientExpectTest.java similarity index 100% rename from labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/features/ServerClientExpectTest.java rename to apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/features/ServerClientExpectTest.java diff --git a/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/features/ServerClientLiveTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/features/ServerClientLiveTest.java similarity index 100% rename from labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/features/ServerClientLiveTest.java rename to apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/features/ServerClientLiveTest.java diff --git a/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/functions/CreateSecurityGroupIfNeededTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/functions/CreateSecurityGroupIfNeededTest.java similarity index 100% rename from labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/functions/CreateSecurityGroupIfNeededTest.java rename to apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/functions/CreateSecurityGroupIfNeededTest.java diff --git a/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/functions/ExtensionToNameSpaceTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/functions/ExtensionToNameSpaceTest.java similarity index 100% rename from labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/functions/ExtensionToNameSpaceTest.java rename to apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/functions/ExtensionToNameSpaceTest.java diff --git a/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/functions/FindSecurityGroupWithNameAndReturnTrueExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/functions/FindSecurityGroupWithNameAndReturnTrueExpectTest.java similarity index 100% rename from labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/functions/FindSecurityGroupWithNameAndReturnTrueExpectTest.java rename to apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/functions/FindSecurityGroupWithNameAndReturnTrueExpectTest.java diff --git a/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/internal/BaseNovaAsyncClientExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/internal/BaseNovaAsyncClientExpectTest.java similarity index 100% rename from labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/internal/BaseNovaAsyncClientExpectTest.java rename to apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/internal/BaseNovaAsyncClientExpectTest.java diff --git a/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/internal/BaseNovaClientExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/internal/BaseNovaClientExpectTest.java similarity index 100% rename from labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/internal/BaseNovaClientExpectTest.java rename to apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/internal/BaseNovaClientExpectTest.java diff --git a/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/internal/BaseNovaClientLiveTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/internal/BaseNovaClientLiveTest.java similarity index 100% rename from labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/internal/BaseNovaClientLiveTest.java rename to apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/internal/BaseNovaClientLiveTest.java diff --git a/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/internal/BaseNovaComputeServiceContextExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/internal/BaseNovaComputeServiceContextExpectTest.java similarity index 100% rename from labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/internal/BaseNovaComputeServiceContextExpectTest.java rename to apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/internal/BaseNovaComputeServiceContextExpectTest.java diff --git a/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/internal/BaseNovaComputeServiceExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/internal/BaseNovaComputeServiceExpectTest.java similarity index 100% rename from labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/internal/BaseNovaComputeServiceExpectTest.java rename to apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/internal/BaseNovaComputeServiceExpectTest.java diff --git a/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/internal/BaseNovaExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/internal/BaseNovaExpectTest.java similarity index 100% rename from labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/internal/BaseNovaExpectTest.java rename to apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/internal/BaseNovaExpectTest.java diff --git a/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseComputeServiceTypicalSecurityGroupTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseComputeServiceTypicalSecurityGroupTest.java similarity index 100% rename from labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseComputeServiceTypicalSecurityGroupTest.java rename to apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseComputeServiceTypicalSecurityGroupTest.java diff --git a/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseCreatedServerTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseCreatedServerTest.java similarity index 100% rename from labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseCreatedServerTest.java rename to apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseCreatedServerTest.java diff --git a/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseExtensionListNormalTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseExtensionListNormalTest.java similarity index 100% rename from labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseExtensionListNormalTest.java rename to apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseExtensionListNormalTest.java diff --git a/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseExtensionListTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseExtensionListTest.java similarity index 100% rename from labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseExtensionListTest.java rename to apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseExtensionListTest.java diff --git a/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseExtensionTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseExtensionTest.java similarity index 100% rename from labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseExtensionTest.java rename to apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseExtensionTest.java diff --git a/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseFlavorListTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseFlavorListTest.java similarity index 100% rename from labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseFlavorListTest.java rename to apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseFlavorListTest.java diff --git a/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseFlavorTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseFlavorTest.java similarity index 100% rename from labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseFlavorTest.java rename to apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseFlavorTest.java diff --git a/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseFloatingIPListTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseFloatingIPListTest.java similarity index 100% rename from labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseFloatingIPListTest.java rename to apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseFloatingIPListTest.java diff --git a/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseFloatingIPTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseFloatingIPTest.java similarity index 100% rename from labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseFloatingIPTest.java rename to apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseFloatingIPTest.java diff --git a/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseImageListTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseImageListTest.java similarity index 100% rename from labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseImageListTest.java rename to apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseImageListTest.java diff --git a/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseImageTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseImageTest.java similarity index 100% rename from labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseImageTest.java rename to apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseImageTest.java diff --git a/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseKeyPairListTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseKeyPairListTest.java similarity index 100% rename from labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseKeyPairListTest.java rename to apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseKeyPairListTest.java diff --git a/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseKeyPairTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseKeyPairTest.java similarity index 100% rename from labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseKeyPairTest.java rename to apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseKeyPairTest.java diff --git a/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseSecurityGroupListTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseSecurityGroupListTest.java similarity index 100% rename from labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseSecurityGroupListTest.java rename to apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseSecurityGroupListTest.java diff --git a/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseSecurityGroupTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseSecurityGroupTest.java similarity index 100% rename from labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseSecurityGroupTest.java rename to apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseSecurityGroupTest.java diff --git a/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseServerListTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseServerListTest.java similarity index 100% rename from labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseServerListTest.java rename to apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseServerListTest.java diff --git a/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseServerTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseServerTest.java similarity index 100% rename from labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseServerTest.java rename to apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseServerTest.java diff --git a/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseServerWithInternetAddressesTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseServerWithInternetAddressesTest.java similarity index 100% rename from labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseServerWithInternetAddressesTest.java rename to apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseServerWithInternetAddressesTest.java diff --git a/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/PublicIpsInPrivateAddressBlockShouldRerouteToPublicBlockExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/PublicIpsInPrivateAddressBlockShouldRerouteToPublicBlockExpectTest.java similarity index 100% rename from labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/PublicIpsInPrivateAddressBlockShouldRerouteToPublicBlockExpectTest.java rename to apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/PublicIpsInPrivateAddressBlockShouldRerouteToPublicBlockExpectTest.java diff --git a/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/predicates/ExtensionPredicatesTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/predicates/ExtensionPredicatesTest.java similarity index 100% rename from labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/predicates/ExtensionPredicatesTest.java rename to apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/predicates/ExtensionPredicatesTest.java diff --git a/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/predicates/ImagePredicatesTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/predicates/ImagePredicatesTest.java similarity index 100% rename from labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/predicates/ImagePredicatesTest.java rename to apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/predicates/ImagePredicatesTest.java diff --git a/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/predicates/SecurityGroupPredicatesTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/predicates/SecurityGroupPredicatesTest.java similarity index 100% rename from labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/predicates/SecurityGroupPredicatesTest.java rename to apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/predicates/SecurityGroupPredicatesTest.java diff --git a/labs/openstack-nova/src/test/resources/extension_details.json b/apis/openstack-nova/src/test/resources/extension_details.json similarity index 100% rename from labs/openstack-nova/src/test/resources/extension_details.json rename to apis/openstack-nova/src/test/resources/extension_details.json diff --git a/labs/openstack-nova/src/test/resources/extension_list.json b/apis/openstack-nova/src/test/resources/extension_list.json similarity index 100% rename from labs/openstack-nova/src/test/resources/extension_list.json rename to apis/openstack-nova/src/test/resources/extension_list.json diff --git a/labs/openstack-nova/src/test/resources/extension_list_normal.json b/apis/openstack-nova/src/test/resources/extension_list_normal.json similarity index 100% rename from labs/openstack-nova/src/test/resources/extension_list_normal.json rename to apis/openstack-nova/src/test/resources/extension_list_normal.json diff --git a/labs/openstack-nova/src/test/resources/extension_list_trystack.json b/apis/openstack-nova/src/test/resources/extension_list_trystack.json similarity index 100% rename from labs/openstack-nova/src/test/resources/extension_list_trystack.json rename to apis/openstack-nova/src/test/resources/extension_list_trystack.json diff --git a/labs/openstack-nova/src/test/resources/flavor_details.json b/apis/openstack-nova/src/test/resources/flavor_details.json similarity index 100% rename from labs/openstack-nova/src/test/resources/flavor_details.json rename to apis/openstack-nova/src/test/resources/flavor_details.json diff --git a/labs/openstack-nova/src/test/resources/flavor_list.json b/apis/openstack-nova/src/test/resources/flavor_list.json similarity index 100% rename from labs/openstack-nova/src/test/resources/flavor_list.json rename to apis/openstack-nova/src/test/resources/flavor_list.json diff --git a/labs/openstack-nova/src/test/resources/flavor_list_detail.json b/apis/openstack-nova/src/test/resources/flavor_list_detail.json similarity index 100% rename from labs/openstack-nova/src/test/resources/flavor_list_detail.json rename to apis/openstack-nova/src/test/resources/flavor_list_detail.json diff --git a/labs/openstack-nova/src/test/resources/flavor_list_detail_trystack.json b/apis/openstack-nova/src/test/resources/flavor_list_detail_trystack.json similarity index 100% rename from labs/openstack-nova/src/test/resources/flavor_list_detail_trystack.json rename to apis/openstack-nova/src/test/resources/flavor_list_detail_trystack.json diff --git a/labs/openstack-nova/src/test/resources/floatingip_details.json b/apis/openstack-nova/src/test/resources/floatingip_details.json similarity index 100% rename from labs/openstack-nova/src/test/resources/floatingip_details.json rename to apis/openstack-nova/src/test/resources/floatingip_details.json diff --git a/labs/openstack-nova/src/test/resources/floatingip_list.json b/apis/openstack-nova/src/test/resources/floatingip_list.json similarity index 100% rename from labs/openstack-nova/src/test/resources/floatingip_list.json rename to apis/openstack-nova/src/test/resources/floatingip_list.json diff --git a/labs/openstack-nova/src/test/resources/image_details.json b/apis/openstack-nova/src/test/resources/image_details.json similarity index 100% rename from labs/openstack-nova/src/test/resources/image_details.json rename to apis/openstack-nova/src/test/resources/image_details.json diff --git a/labs/openstack-nova/src/test/resources/image_list.json b/apis/openstack-nova/src/test/resources/image_list.json similarity index 100% rename from labs/openstack-nova/src/test/resources/image_list.json rename to apis/openstack-nova/src/test/resources/image_list.json diff --git a/labs/openstack-nova/src/test/resources/image_list_detail.json b/apis/openstack-nova/src/test/resources/image_list_detail.json similarity index 100% rename from labs/openstack-nova/src/test/resources/image_list_detail.json rename to apis/openstack-nova/src/test/resources/image_list_detail.json diff --git a/labs/openstack-nova/src/test/resources/image_list_detail_trystack.json b/apis/openstack-nova/src/test/resources/image_list_detail_trystack.json similarity index 100% rename from labs/openstack-nova/src/test/resources/image_list_detail_trystack.json rename to apis/openstack-nova/src/test/resources/image_list_detail_trystack.json diff --git a/labs/openstack-nova/src/test/resources/keypair_created.json b/apis/openstack-nova/src/test/resources/keypair_created.json similarity index 100% rename from labs/openstack-nova/src/test/resources/keypair_created.json rename to apis/openstack-nova/src/test/resources/keypair_created.json diff --git a/labs/openstack-nova/src/test/resources/keypair_list.json b/apis/openstack-nova/src/test/resources/keypair_list.json similarity index 100% rename from labs/openstack-nova/src/test/resources/keypair_list.json rename to apis/openstack-nova/src/test/resources/keypair_list.json diff --git a/labs/openstack-nova/src/test/resources/new_server.json b/apis/openstack-nova/src/test/resources/new_server.json similarity index 100% rename from labs/openstack-nova/src/test/resources/new_server.json rename to apis/openstack-nova/src/test/resources/new_server.json diff --git a/labs/openstack-nova/src/test/resources/securitygroup_created.json b/apis/openstack-nova/src/test/resources/securitygroup_created.json similarity index 100% rename from labs/openstack-nova/src/test/resources/securitygroup_created.json rename to apis/openstack-nova/src/test/resources/securitygroup_created.json diff --git a/labs/openstack-nova/src/test/resources/securitygroup_details.json b/apis/openstack-nova/src/test/resources/securitygroup_details.json similarity index 100% rename from labs/openstack-nova/src/test/resources/securitygroup_details.json rename to apis/openstack-nova/src/test/resources/securitygroup_details.json diff --git a/labs/openstack-nova/src/test/resources/securitygroup_details_computeservice_typical.json b/apis/openstack-nova/src/test/resources/securitygroup_details_computeservice_typical.json similarity index 100% rename from labs/openstack-nova/src/test/resources/securitygroup_details_computeservice_typical.json rename to apis/openstack-nova/src/test/resources/securitygroup_details_computeservice_typical.json diff --git a/labs/openstack-nova/src/test/resources/securitygroup_list.json b/apis/openstack-nova/src/test/resources/securitygroup_list.json similarity index 100% rename from labs/openstack-nova/src/test/resources/securitygroup_list.json rename to apis/openstack-nova/src/test/resources/securitygroup_list.json diff --git a/labs/openstack-nova/src/test/resources/securitygroup_list_details_computeservice_typical.json b/apis/openstack-nova/src/test/resources/securitygroup_list_details_computeservice_typical.json similarity index 100% rename from labs/openstack-nova/src/test/resources/securitygroup_list_details_computeservice_typical.json rename to apis/openstack-nova/src/test/resources/securitygroup_list_details_computeservice_typical.json diff --git a/labs/openstack-nova/src/test/resources/securitygrouprule_created.json b/apis/openstack-nova/src/test/resources/securitygrouprule_created.json similarity index 100% rename from labs/openstack-nova/src/test/resources/securitygrouprule_created.json rename to apis/openstack-nova/src/test/resources/securitygrouprule_created.json diff --git a/labs/openstack-nova/src/test/resources/server_details.json b/apis/openstack-nova/src/test/resources/server_details.json similarity index 100% rename from labs/openstack-nova/src/test/resources/server_details.json rename to apis/openstack-nova/src/test/resources/server_details.json diff --git a/labs/openstack-nova/src/test/resources/server_details_trystack.json b/apis/openstack-nova/src/test/resources/server_details_trystack.json similarity index 100% rename from labs/openstack-nova/src/test/resources/server_details_trystack.json rename to apis/openstack-nova/src/test/resources/server_details_trystack.json diff --git a/labs/openstack-nova/src/test/resources/server_list.json b/apis/openstack-nova/src/test/resources/server_list.json similarity index 100% rename from labs/openstack-nova/src/test/resources/server_list.json rename to apis/openstack-nova/src/test/resources/server_list.json diff --git a/labs/openstack-nova/src/test/resources/server_list_details.json b/apis/openstack-nova/src/test/resources/server_list_details.json similarity index 100% rename from labs/openstack-nova/src/test/resources/server_list_details.json rename to apis/openstack-nova/src/test/resources/server_list_details.json diff --git a/labs/openstack-nova/src/test/resources/server_public_ip_in_private.json b/apis/openstack-nova/src/test/resources/server_public_ip_in_private.json similarity index 100% rename from labs/openstack-nova/src/test/resources/server_public_ip_in_private.json rename to apis/openstack-nova/src/test/resources/server_public_ip_in_private.json diff --git a/apis/pom.xml b/apis/pom.xml index 528328ac6e..448260dace 100644 --- a/apis/pom.xml +++ b/apis/pom.xml @@ -47,6 +47,7 @@ elasticstack atmos nova + openstack-nova cloudwatch cloudsigma cloudstack diff --git a/labs/hpcloud-compute/pom.xml b/labs/hpcloud-compute/pom.xml index fa62e74897..3323424a19 100644 --- a/labs/hpcloud-compute/pom.xml +++ b/labs/hpcloud-compute/pom.xml @@ -46,7 +46,7 @@ - org.jclouds.labs + org.jclouds.api openstack-nova ${project.version} @@ -65,7 +65,7 @@ test - org.jclouds.labs + org.jclouds.api openstack-nova ${project.version} test-jar diff --git a/labs/pom.xml b/labs/pom.xml index bdbf5bd6d7..61b805c919 100644 --- a/labs/pom.xml +++ b/labs/pom.xml @@ -32,7 +32,6 @@ pom jclouds labs project - openstack-nova virtualbox vcloud-director glesys diff --git a/labs/trystack-nova/pom.xml b/labs/trystack-nova/pom.xml index d67a3309f1..9ffed3c0cf 100644 --- a/labs/trystack-nova/pom.xml +++ b/labs/trystack-nova/pom.xml @@ -46,7 +46,7 @@ - org.jclouds.labs + org.jclouds.api openstack-nova ${project.version} @@ -65,7 +65,7 @@ test - org.jclouds.labs + org.jclouds.api openstack-nova ${project.version} test-jar