You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ra...@apache.org on 2014/12/23 05:26:26 UTC
[02/51] [partial] stratos git commit: dropping jclouds 1.8.0 clone
http://git-wip-us.apache.org/repos/asf/stratos/blob/a9834e9e/dependencies/jclouds/apis/openstack-nova/1.8.0-stratos/src/test/java/org/jclouds/openstack/nova/v2_0/compute/extensions/NovaSecurityGroupExtensionExpectTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/openstack-nova/1.8.0-stratos/src/test/java/org/jclouds/openstack/nova/v2_0/compute/extensions/NovaSecurityGroupExtensionExpectTest.java b/dependencies/jclouds/apis/openstack-nova/1.8.0-stratos/src/test/java/org/jclouds/openstack/nova/v2_0/compute/extensions/NovaSecurityGroupExtensionExpectTest.java
deleted file mode 100644
index 775490a..0000000
--- a/dependencies/jclouds/apis/openstack-nova/1.8.0-stratos/src/test/java/org/jclouds/openstack/nova/v2_0/compute/extensions/NovaSecurityGroupExtensionExpectTest.java
+++ /dev/null
@@ -1,429 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.openstack.nova.v2_0.compute.extensions;
-
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertTrue;
-
-import java.net.URI;
-import java.util.Properties;
-import java.util.Set;
-
-import org.jclouds.compute.domain.SecurityGroup;
-import org.jclouds.compute.extensions.SecurityGroupExtension;
-import org.jclouds.domain.LocationBuilder;
-import org.jclouds.domain.LocationScope;
-import org.jclouds.http.HttpRequest;
-import org.jclouds.http.HttpResponse;
-import org.jclouds.net.domain.IpPermission;
-import org.jclouds.net.domain.IpProtocol;
-import org.jclouds.openstack.nova.v2_0.internal.BaseNovaComputeServiceExpectTest;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableMap.Builder;
-import com.google.common.collect.ImmutableMultimap;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.LinkedHashMultimap;
-import com.google.common.collect.Multimap;
-import com.google.common.collect.Sets;
-
-@Test(groups = "unit", testName = "NovaSecurityGroupExtensionExpectTest")
-public class NovaSecurityGroupExtensionExpectTest extends BaseNovaComputeServiceExpectTest {
-
- protected String zone = "az-1.region-a.geo-1";
- protected HttpRequest list = HttpRequest.builder().method("GET").endpoint(
- URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-security-groups")).headers(
- ImmutableMultimap.<String, String> builder().put("Accept", "application/json").put("X-Auth-Token",
- authToken).build()).build();
-
- protected HttpResponse listResponse = HttpResponse.builder().statusCode(200).payload(
- payloadFromResource("/securitygroup_list_extension.json")).build();
-
- @Override
- protected Properties setupProperties() {
- Properties overrides = super.setupProperties();
- overrides.setProperty("jclouds.zones", zone);
- return overrides;
- }
-
- public void testListSecurityGroups() {
-
-
- Builder<HttpRequest, HttpResponse> requestResponseMap = ImmutableMap.<HttpRequest, HttpResponse> builder();
- requestResponseMap.put(keystoneAuthWithUsernameAndPasswordAndTenantName, responseWithKeystoneAccess);
- requestResponseMap.put(extensionsOfNovaRequest, extensionsOfNovaResponse);
- requestResponseMap.put(list, listResponse).build();
-
- SecurityGroupExtension extension = requestsSendResponses(requestResponseMap.build()).getSecurityGroupExtension().get();
-
- Set<SecurityGroup> groups = extension.listSecurityGroups();
- assertEquals(groups.size(), 1);
- }
-
- public void testListSecurityGroupsInLocation() {
- HttpRequest list = HttpRequest.builder().method("GET").endpoint(
- URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-security-groups")).headers(
- ImmutableMultimap.<String, String> builder().put("Accept", "application/json").put("X-Auth-Token",
- authToken).build()).build();
-
- HttpResponse listResponse = HttpResponse.builder().statusCode(200).payload(
- payloadFromResource("/securitygroup_list.json")).build();
-
-
- Builder<HttpRequest, HttpResponse> requestResponseMap = ImmutableMap.<HttpRequest, HttpResponse> builder();
- requestResponseMap.put(keystoneAuthWithUsernameAndPasswordAndTenantName, responseWithKeystoneAccess);
- requestResponseMap.put(extensionsOfNovaRequest, extensionsOfNovaResponse);
- requestResponseMap.put(list, listResponse).build();
-
- SecurityGroupExtension extension = requestsSendResponses(requestResponseMap.build()).getSecurityGroupExtension().get();
-
- Set<SecurityGroup> groups = extension.listSecurityGroupsInLocation(new LocationBuilder()
- .scope(LocationScope.ZONE)
- .id(zone)
- .description("zone")
- .build());
- assertEquals(groups.size(), 1);
- }
-
- public void testListSecurityGroupsForNode() {
- HttpRequest serverReq = HttpRequest.builder().method("GET").endpoint(
- URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-create-server-ext/8d0a6ca5-8849-4b3d-b86e-f24c92490ebb"))
- .headers(
- ImmutableMultimap.<String, String> builder().put("Accept", "application/json").put("X-Auth-Token",
- authToken).build()).build();
-
- HttpResponse serverResponse = HttpResponse.builder().statusCode(200).payload(
- payloadFromResource("/server_with_security_groups_extension.json")).build();
-
- HttpRequest list = HttpRequest.builder().method("GET").endpoint(
- URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-security-groups")).headers(
- ImmutableMultimap.<String, String> builder().put("Accept", "application/json").put("X-Auth-Token",
- authToken).build()).build();
-
- HttpResponse listResponse = HttpResponse.builder().statusCode(200).payload(
- payloadFromResource("/securitygroup_list.json")).build();
-
-
- Builder<HttpRequest, HttpResponse> requestResponseMap = ImmutableMap.<HttpRequest, HttpResponse> builder();
- requestResponseMap.put(keystoneAuthWithUsernameAndPasswordAndTenantName, responseWithKeystoneAccess);
- requestResponseMap.put(extensionsOfNovaRequest, extensionsOfNovaResponse);
- requestResponseMap.put(serverReq, serverResponse);
- requestResponseMap.put(list, listResponse).build();
-
- SecurityGroupExtension extension = requestsSendResponses(requestResponseMap.build()).getSecurityGroupExtension().get();
-
- Set<SecurityGroup> groups = extension.listSecurityGroupsForNode(zone + "/8d0a6ca5-8849-4b3d-b86e-f24c92490ebb");
- assertEquals(groups.size(), 1);
- }
-
- public void testGetSecurityGroupById() {
- HttpRequest getSecurityGroup = HttpRequest.builder().method("GET").endpoint(
- URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-security-groups/160")).headers(
- ImmutableMultimap.<String, String> builder().put("Accept", "application/json").put("X-Auth-Token",
- authToken).build()).build();
-
- HttpResponse getSecurityGroupResponse = HttpResponse.builder().statusCode(200).payload(
- payloadFromResource("/securitygroup_details_extension.json")).build();
-
- Builder<HttpRequest, HttpResponse> requestResponseMap = ImmutableMap.<HttpRequest, HttpResponse> builder();
- requestResponseMap.put(keystoneAuthWithUsernameAndPasswordAndTenantName, responseWithKeystoneAccess);
- requestResponseMap.put(extensionsOfNovaRequest, extensionsOfNovaResponse);
- requestResponseMap.put(getSecurityGroup, getSecurityGroupResponse);
- requestResponseMap.put(list, listResponse).build();
-
- SecurityGroupExtension extension = requestsSendResponses(requestResponseMap.build()).getSecurityGroupExtension().get();
-
- SecurityGroup group = extension.getSecurityGroupById(zone + "/160");
- assertEquals(group.getId(), zone + "/160");
- }
-
- public void testCreateSecurityGroup() {
- HttpRequest getSecurityGroup = HttpRequest.builder().method("GET").endpoint(
- URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-security-groups/160")).headers(
- ImmutableMultimap.<String, String> builder().put("Accept", "application/json").put("X-Auth-Token",
- authToken).build()).build();
-
- HttpResponse getSecurityGroupResponse = HttpResponse.builder().statusCode(200).payload(
- payloadFromResource("/securitygroup_details_extension.json")).build();
-
- HttpRequest create = HttpRequest.builder().method("POST").endpoint(
- URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-security-groups")).headers(
- ImmutableMultimap.<String, String> builder().put("Accept", "application/json").put("X-Auth-Token",
- authToken).build())
- .payload(
- payloadFromStringWithContentType(
- "{\"security_group\":{\"name\":\"jclouds-test\",\"description\":\"jclouds-test\"}}",
- "application/json")).build();
-
- HttpResponse createResponse = HttpResponse.builder().statusCode(200).payload(
- payloadFromResource("/securitygroup_created.json")).build();
-
- HttpRequest list = HttpRequest.builder().method("GET").endpoint(
- URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-security-groups")).headers(
- ImmutableMultimap.<String, String>builder().put("Accept", "application/json").put("X-Auth-Token",
- authToken).build()).build();
-
- HttpResponse listResponse = HttpResponse.builder().statusCode(200).payload(
- payloadFromResource("/securitygroup_list_extension.json")).build();
-
- Builder<HttpRequest, HttpResponse> requestResponseMap = ImmutableMap.<HttpRequest, HttpResponse> builder();
- requestResponseMap.put(keystoneAuthWithUsernameAndPasswordAndTenantName, responseWithKeystoneAccess);
- requestResponseMap.put(extensionsOfNovaRequest, extensionsOfNovaResponse);
- requestResponseMap.put(create, createResponse);
- requestResponseMap.put(list, listResponse);
- requestResponseMap.put(getSecurityGroup, getSecurityGroupResponse).build();
-
- SecurityGroupExtension extension = requestsSendResponses(requestResponseMap.build()).getSecurityGroupExtension().get();
-
- SecurityGroup group = extension.createSecurityGroup("test", new LocationBuilder()
- .scope(LocationScope.ZONE)
- .id(zone)
- .description("zone")
- .build());
- assertEquals(group.getId(), zone + "/160");
- }
-
- public void testRemoveSecurityGroup() {
- HttpRequest delete = HttpRequest.builder().method("DELETE").endpoint(
- URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-security-groups/160"))
- .headers(
- ImmutableMultimap.<String, String>builder().put("Accept", "application/json")
- .put("X-Auth-Token", authToken).build()).build();
-
- HttpResponse deleteResponse = HttpResponse.builder().statusCode(202).build();
-
- HttpRequest getSecurityGroup = HttpRequest.builder().method("GET").endpoint(
- URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-security-groups/160")).headers(
- ImmutableMultimap.<String, String> builder().put("Accept", "application/json").put("X-Auth-Token",
- authToken).build()).build();
-
- HttpResponse getSecurityGroupResponse = HttpResponse.builder().statusCode(200).payload(
- payloadFromResource("/securitygroup_details_extension.json")).build();
-
- Builder<HttpRequest, HttpResponse> requestResponseMap = ImmutableMap.<HttpRequest, HttpResponse> builder();
- requestResponseMap.put(keystoneAuthWithUsernameAndPasswordAndTenantName, responseWithKeystoneAccess);
- requestResponseMap.put(extensionsOfNovaRequest, extensionsOfNovaResponse);
- requestResponseMap.put(getSecurityGroup, getSecurityGroupResponse);
- requestResponseMap.put(delete, deleteResponse).build();
-
- SecurityGroupExtension extension = requestsSendResponses(requestResponseMap.build()).getSecurityGroupExtension().get();
-
- assertTrue(extension.removeSecurityGroup(zone + "/160"), "Expected removal of securitygroup to be successful");
- }
-
- public void testAddIpPermissionCidrFromIpPermission() {
- HttpRequest createRule = HttpRequest
- .builder()
- .method("POST")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-security-group-rules")
- .addHeader("Accept", "application/json")
- .addHeader("X-Auth-Token", authToken)
- .payload(
- payloadFromStringWithContentType(
- "{\"security_group_rule\":{\"parent_group_id\":\"160\",\"cidr\":\"10.2.6.0/24\",\"ip_protocol\":\"tcp\",\"from_port\":\"22\",\"to_port\":\"22\"}}",
- "application/json")).build();
-
- HttpResponse createRuleResponse = HttpResponse.builder().statusCode(200).payload(
- payloadFromResource("/securitygrouprule_created_cidr.json")).build();
-
- HttpRequest getSecurityGroup = HttpRequest.builder().method("GET").endpoint(
- URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-security-groups/160")).headers(
- ImmutableMultimap.<String, String> builder().put("Accept", "application/json").put("X-Auth-Token",
- authToken).build()).build();
-
- HttpResponse getSecurityGroupNoRulesResponse = HttpResponse.builder().statusCode(200).payload(
- payloadFromResource("/securitygroup_details_extension_norules.json")).build();
-
- HttpResponse getSecurityGroupResponse = HttpResponse.builder().statusCode(200).payload(
- payloadFromResource("/securitygroup_details_extension.json")).build();
-
-
- SecurityGroupExtension extension = orderedRequestsSendResponses(ImmutableList.of(keystoneAuthWithUsernameAndPasswordAndTenantName,
- extensionsOfNovaRequest, getSecurityGroup, createRule, getSecurityGroup, list, list),
- ImmutableList.of(responseWithKeystoneAccess, extensionsOfNovaResponse, getSecurityGroupNoRulesResponse,
- createRuleResponse, getSecurityGroupResponse, listResponse, listResponse)).getSecurityGroupExtension().get();
-
- IpPermission.Builder builder = IpPermission.builder();
-
- builder.ipProtocol(IpProtocol.TCP);
- builder.fromPort(22);
- builder.toPort(22);
- builder.cidrBlock("10.2.6.0/24");
-
- IpPermission perm = builder.build();
-
- SecurityGroup origGroup = extension.getSecurityGroupById(zone + "/160");
-
- assertNotNull(origGroup);
- SecurityGroup newGroup = extension.addIpPermission(perm, origGroup);
-
- assertNotNull(newGroup);
- }
-
- public void testAddIpPermissionCidrFromParams() {
- HttpRequest createRule = HttpRequest
- .builder()
- .method("POST")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-security-group-rules")
- .addHeader("Accept", "application/json")
- .addHeader("X-Auth-Token", authToken)
- .payload(
- payloadFromStringWithContentType(
- "{\"security_group_rule\":{\"parent_group_id\":\"160\",\"cidr\":\"10.2.6.0/24\",\"ip_protocol\":\"tcp\",\"from_port\":\"22\",\"to_port\":\"22\"}}",
- "application/json")).build();
-
- HttpResponse createRuleResponse = HttpResponse.builder().statusCode(200).payload(
- payloadFromResource("/securitygrouprule_created_cidr.json")).build();
-
- HttpRequest getSecurityGroup = HttpRequest.builder().method("GET").endpoint(
- URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-security-groups/160")).headers(
- ImmutableMultimap.<String, String> builder().put("Accept", "application/json").put("X-Auth-Token",
- authToken).build()).build();
-
- HttpResponse getSecurityGroupNoRulesResponse = HttpResponse.builder().statusCode(200).payload(
- payloadFromResource("/securitygroup_details_extension_norules.json")).build();
-
- HttpResponse getSecurityGroupResponse = HttpResponse.builder().statusCode(200).payload(
- payloadFromResource("/securitygroup_details_extension.json")).build();
-
-
- SecurityGroupExtension extension = orderedRequestsSendResponses(ImmutableList.of(keystoneAuthWithUsernameAndPasswordAndTenantName,
- extensionsOfNovaRequest, getSecurityGroup, createRule, getSecurityGroup, list, list),
- ImmutableList.of(responseWithKeystoneAccess, extensionsOfNovaResponse, getSecurityGroupNoRulesResponse,
- createRuleResponse, getSecurityGroupResponse, listResponse, listResponse)).getSecurityGroupExtension().get();
-
- SecurityGroup origGroup = extension.getSecurityGroupById(zone + "/160");
-
- assertNotNull(origGroup);
- SecurityGroup newGroup = extension.addIpPermission(IpProtocol.TCP,
- 22,
- 22,
- emptyMultimap(),
- ImmutableSet.of("10.2.6.0/24"),
- emptyStringSet(),
- origGroup);
-
- assertNotNull(newGroup);
- }
-
- public void testAddIpPermissionGroupFromIpPermission() {
- HttpRequest createRule = HttpRequest
- .builder()
- .method("POST")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-security-group-rules")
- .addHeader("Accept", "application/json")
- .addHeader("X-Auth-Token", authToken)
- .payload(
- payloadFromStringWithContentType(
- "{\"security_group_rule\":{\"group_id\":\"11111\",\"parent_group_id\":\"160\",\"ip_protocol\":\"tcp\",\"from_port\":\"22\",\"to_port\":\"22\"}}",
- "application/json")).build();
-
- HttpResponse createRuleResponse = HttpResponse.builder().statusCode(200).payload(
- payloadFromResource("/securitygrouprule_created_group.json")).build();
-
- HttpRequest getSecurityGroup = HttpRequest.builder().method("GET").endpoint(
- URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-security-groups/160")).headers(
- ImmutableMultimap.<String, String> builder().put("Accept", "application/json").put("X-Auth-Token",
- authToken).build()).build();
-
- HttpResponse getSecurityGroupNoRulesResponse = HttpResponse.builder().statusCode(200).payload(
- payloadFromResource("/securitygroup_details_extension_norules.json")).build();
-
- HttpResponse getSecurityGroupResponse = HttpResponse.builder().statusCode(200).payload(
- payloadFromResource("/securitygroup_details_extension.json")).build();
-
-
- SecurityGroupExtension extension = orderedRequestsSendResponses(ImmutableList.of(keystoneAuthWithUsernameAndPasswordAndTenantName,
- extensionsOfNovaRequest, getSecurityGroup, createRule, getSecurityGroup, list, list),
- ImmutableList.of(responseWithKeystoneAccess, extensionsOfNovaResponse, getSecurityGroupNoRulesResponse,
- createRuleResponse, getSecurityGroupResponse, listResponse, listResponse)).getSecurityGroupExtension().get();
-
- IpPermission.Builder builder = IpPermission.builder();
-
- builder.ipProtocol(IpProtocol.TCP);
- builder.fromPort(22);
- builder.toPort(22);
- builder.groupId("admin/11111");
-
- IpPermission perm = builder.build();
-
- SecurityGroup origGroup = extension.getSecurityGroupById(zone + "/160");
-
- assertNotNull(origGroup);
- SecurityGroup newGroup = extension.addIpPermission(perm, origGroup);
-
- assertNotNull(newGroup);
- }
-
- public void testAddIpPermissionGroupFromParams() {
- HttpRequest createRule = HttpRequest
- .builder()
- .method("POST")
- .endpoint("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-security-group-rules")
- .addHeader("Accept", "application/json")
- .addHeader("X-Auth-Token", authToken)
- .payload(
- payloadFromStringWithContentType(
- "{\"security_group_rule\":{\"group_id\":\"11111\",\"parent_group_id\":\"160\",\"ip_protocol\":\"tcp\",\"from_port\":\"22\",\"to_port\":\"22\"}}",
- "application/json")).build();
-
- HttpResponse createRuleResponse = HttpResponse.builder().statusCode(200).payload(
- payloadFromResource("/securitygrouprule_created_group.json")).build();
-
- HttpRequest getSecurityGroup = HttpRequest.builder().method("GET").endpoint(
- URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-security-groups/160")).headers(
- ImmutableMultimap.<String, String> builder().put("Accept", "application/json").put("X-Auth-Token",
- authToken).build()).build();
-
- HttpResponse getSecurityGroupNoRulesResponse = HttpResponse.builder().statusCode(200).payload(
- payloadFromResource("/securitygroup_details_extension_norules.json")).build();
-
- HttpResponse getSecurityGroupResponse = HttpResponse.builder().statusCode(200).payload(
- payloadFromResource("/securitygroup_details_extension.json")).build();
-
-
- SecurityGroupExtension extension = orderedRequestsSendResponses(ImmutableList.of(keystoneAuthWithUsernameAndPasswordAndTenantName,
- extensionsOfNovaRequest, getSecurityGroup, createRule, getSecurityGroup, list, list),
- ImmutableList.of(responseWithKeystoneAccess, extensionsOfNovaResponse, getSecurityGroupNoRulesResponse,
- createRuleResponse, getSecurityGroupResponse, listResponse, listResponse)).getSecurityGroupExtension().get();
-
- SecurityGroup origGroup = extension.getSecurityGroupById(zone + "/160");
-
- assertNotNull(origGroup);
- SecurityGroup newGroup = extension.addIpPermission(IpProtocol.TCP,
- 22,
- 22,
- emptyMultimap(),
- emptyStringSet(),
- ImmutableSet.of("admin/11111"),
- origGroup);
-
- assertNotNull(newGroup);
- }
-
- private Multimap<String, String> emptyMultimap() {
- return LinkedHashMultimap.create();
- }
-
- private Set<String> emptyStringSet() {
- return Sets.newLinkedHashSet();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/a9834e9e/dependencies/jclouds/apis/openstack-nova/1.8.0-stratos/src/test/java/org/jclouds/openstack/nova/v2_0/compute/extensions/NovaSecurityGroupExtensionLiveTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/openstack-nova/1.8.0-stratos/src/test/java/org/jclouds/openstack/nova/v2_0/compute/extensions/NovaSecurityGroupExtensionLiveTest.java b/dependencies/jclouds/apis/openstack-nova/1.8.0-stratos/src/test/java/org/jclouds/openstack/nova/v2_0/compute/extensions/NovaSecurityGroupExtensionLiveTest.java
deleted file mode 100644
index 804d546..0000000
--- a/dependencies/jclouds/apis/openstack-nova/1.8.0-stratos/src/test/java/org/jclouds/openstack/nova/v2_0/compute/extensions/NovaSecurityGroupExtensionLiveTest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.openstack.nova.v2_0.compute.extensions;
-
-import org.jclouds.compute.extensions.internal.BaseSecurityGroupExtensionLiveTest;
-import org.testng.annotations.Test;
-
-/**
- * Live test for openstack-nova {@link org.jclouds.compute.extensions.SecurityGroupExtension} implementation.
- */
-@Test(groups = "live", singleThreaded = true, testName = "NovaSecurityGroupExtensionLiveTest")
-public class NovaSecurityGroupExtensionLiveTest extends BaseSecurityGroupExtensionLiveTest {
-
- public NovaSecurityGroupExtensionLiveTest() {
- provider = "openstack-nova";
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/a9834e9e/dependencies/jclouds/apis/openstack-nova/1.8.0-stratos/src/test/java/org/jclouds/openstack/nova/v2_0/compute/functions/AllocateAndAddFloatingIpToNodeExpectTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/openstack-nova/1.8.0-stratos/src/test/java/org/jclouds/openstack/nova/v2_0/compute/functions/AllocateAndAddFloatingIpToNodeExpectTest.java b/dependencies/jclouds/apis/openstack-nova/1.8.0-stratos/src/test/java/org/jclouds/openstack/nova/v2_0/compute/functions/AllocateAndAddFloatingIpToNodeExpectTest.java
deleted file mode 100644
index 28cc533..0000000
--- a/dependencies/jclouds/apis/openstack-nova/1.8.0-stratos/src/test/java/org/jclouds/openstack/nova/v2_0/compute/functions/AllocateAndAddFloatingIpToNodeExpectTest.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.openstack.nova.v2_0.compute.functions;
-
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-
-import java.net.URI;
-import java.util.concurrent.atomic.AtomicReference;
-
-import org.jclouds.compute.domain.NodeMetadata;
-import org.jclouds.compute.domain.NodeMetadata.Status;
-import org.jclouds.compute.domain.NodeMetadataBuilder;
-import org.jclouds.domain.Location;
-import org.jclouds.domain.LocationBuilder;
-import org.jclouds.domain.LocationScope;
-import org.jclouds.domain.LoginCredentials;
-import org.jclouds.http.HttpRequest;
-import org.jclouds.http.HttpResponse;
-import org.jclouds.openstack.nova.v2_0.compute.options.NodeAndNovaTemplateOptions;
-import org.jclouds.openstack.nova.v2_0.compute.options.NovaTemplateOptions;
-import org.jclouds.openstack.nova.v2_0.internal.BaseNovaComputeServiceExpectTest;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableMultimap;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.util.concurrent.Atomics;
-
-/**
- * Tests the compute service abstraction of the nova api.
- */
-@Test(groups = "unit", testName = "AllocateAndAddFloatingIpToNodeTest")
-public class AllocateAndAddFloatingIpToNodeExpectTest extends BaseNovaComputeServiceExpectTest {
- final Location provider = new LocationBuilder().scope(LocationScope.PROVIDER).id("openstack-nova").description(
- "openstack-nova").build();
- final Location zone = new LocationBuilder().id("az-1.region-a.geo-1").description("az-1.region-a.geo-1").scope(
- LocationScope.ZONE).parent(provider).build();
- final Location host = new LocationBuilder().scope(LocationScope.HOST).id("hostId").description("hostId")
- .parent(zone).build();
- final NodeMetadata node = new NodeMetadataBuilder().id("az-1.region-a.geo-1/71592").providerId("71592").location(
- host).name("Server 71592").status(Status.RUNNING).privateAddresses(ImmutableSet.of("10.4.27.237"))
- .credentials(LoginCredentials.builder().password("foo").build()).build();
- final NovaTemplateOptions options = NovaTemplateOptions.Builder.autoAssignFloatingIp(false);
-
- HttpRequest createFloatingIP = HttpRequest.builder().method("POST").endpoint(
- URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-floating-ips")).headers(
- ImmutableMultimap.<String, String> builder().put("Accept", "application/json").put("X-Auth-Token",
- authToken).build()).payload(payloadFromStringWithContentType("{}", "application/json")).build();
-
- HttpResponse addFloatingIPResponse = HttpResponse.builder().statusCode(200).build();
-
- public void testAllocateWhenAllocationReturnsIpIsAddedToServerAndUpdatesNodeMetadataButSavesCredentials() throws Exception {
- HttpResponse createFloatingIPResponse = HttpResponse.builder().statusCode(200).payload(
- payloadFromResource("/floatingip_details.json")).build();
-
- HttpRequest addFloatingIPRequest = addFloatingIPForAddress("10.0.0.3");
-
- AllocateAndAddFloatingIpToNode fn = requestsSendResponses(
- ImmutableMap.<HttpRequest, HttpResponse> builder().put(keystoneAuthWithUsernameAndPasswordAndTenantName,
- responseWithKeystoneAccess).put(extensionsOfNovaRequest, extensionsOfNovaResponse).put(
- createFloatingIP, createFloatingIPResponse)
- .put(addFloatingIPRequest, addFloatingIPResponse).build()).getContext().utils().injector()
- .getInstance(AllocateAndAddFloatingIpToNode.class);
-
- AtomicReference<NodeMetadata> nodeRef = Atomics.newReference(node);
- AtomicReference<NovaTemplateOptions> optionsRef = Atomics.newReference(options);
- AtomicReference<NodeAndNovaTemplateOptions> nodeNovaRef = NodeAndNovaTemplateOptions.newAtomicReference(nodeRef, optionsRef);
-
- fn.apply(nodeNovaRef);
- NodeMetadata node1 = nodeRef.get();
- assertNotNull(node1);
- assertNotNull(optionsRef.get());
- assertEquals(node1.getPublicAddresses(), ImmutableSet.of("10.0.0.3"));
- assertEquals(node1.getCredentials(), node.getCredentials());
-
- }
-
- private HttpRequest addFloatingIPForAddress(String address) {
- HttpRequest addFloatingIPRequest = HttpRequest.builder().method("POST").endpoint(
- URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/71592/action"))
- .headers(
- ImmutableMultimap.<String, String> builder().put("Accept", "application/json")
- .put("X-Auth-Token", authToken).build()).payload(
- payloadFromStringWithContentType("{\"addFloatingIp\":{\"address\":\"" + address + "\"}}",
- "application/json")).build();
- return addFloatingIPRequest;
- }
-
- public void testAllocateWhenAllocationFailsOn400LookupUnusedIpAddToServerAndUpdatesNodeMetadata() throws Exception {
- HttpResponse createFloatingIPResponse = HttpResponse
- .builder()
- .statusCode(400)
- .payload(
- payloadFromStringWithContentType(
- "{\"badRequest\": {\"message\": \"AddressLimitExceeded: Address quota exceeded. You cannot create any more addresses\", \"code\": 400}}",
- "application/json")).build();
-
- HttpRequest list = HttpRequest.builder().method("GET").endpoint(
- URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-floating-ips")).headers(
- ImmutableMultimap.<String, String> builder().put("Accept", "application/json").put("X-Auth-Token",
- authToken).build()).build();
-
- HttpResponse listResponseForUnassigned = HttpResponse.builder().statusCode(200).payload(
- payloadFromResource("/floatingip_list.json")).build();
-
- HttpRequest addFloatingIPRequest = addFloatingIPForAddress("10.0.0.5");
-
- AllocateAndAddFloatingIpToNode fn = requestsSendResponses(
- ImmutableMap.<HttpRequest, HttpResponse> builder().put(keystoneAuthWithUsernameAndPasswordAndTenantName,
- responseWithKeystoneAccess).put(extensionsOfNovaRequest, extensionsOfNovaResponse).put(
- createFloatingIP, createFloatingIPResponse)
- .put(addFloatingIPRequest, addFloatingIPResponse).put(list,
- listResponseForUnassigned).build()).getContext().utils().injector()
- .getInstance(AllocateAndAddFloatingIpToNode.class);
-
- AtomicReference<NodeMetadata> nodeRef = Atomics.newReference(node);
- AtomicReference<NovaTemplateOptions> optionsRef = Atomics.newReference(options);
- AtomicReference<NodeAndNovaTemplateOptions> nodeNovaRef = NodeAndNovaTemplateOptions.newAtomicReference(nodeRef, optionsRef);
-
- fn.apply(nodeNovaRef);
- NodeMetadata node1 = nodeRef.get();
- assertNotNull(node1);
- assertNotNull(optionsRef.get());
- assertEquals(node1.getPublicAddresses(), ImmutableSet.of("10.0.0.5"));
- }
-
- public void testAllocateWhenAllocationFailsOn404LookupUnusedIpAddToServerAndUpdatesNodeMetadata() throws Exception {
- HttpResponse createFloatingIPResponse = HttpResponse
- .builder()
- .statusCode(404)
- .payload(
- payloadFromStringWithContentType(
- "{\"badRequest\": {\"message\": \"AddressLimitExceeded: Address quota exceeded. You cannot create any more addresses\", \"code\": 404}}",
- "application/json")).build();
-
- HttpRequest list = HttpRequest.builder().method("GET").endpoint(
- URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-floating-ips")).headers(
- ImmutableMultimap.<String, String> builder().put("Accept", "application/json").put("X-Auth-Token",
- authToken).build()).build();
-
- HttpResponse listResponseForUnassigned = HttpResponse.builder().statusCode(200).payload(
- payloadFromResource("/floatingip_list.json")).build();
-
- HttpRequest addFloatingIPRequest = addFloatingIPForAddress("10.0.0.5");
-
- AllocateAndAddFloatingIpToNode fn = requestsSendResponses(
- ImmutableMap.<HttpRequest, HttpResponse> builder().put(keystoneAuthWithUsernameAndPasswordAndTenantName,
- responseWithKeystoneAccess).put(extensionsOfNovaRequest, extensionsOfNovaResponse).put(
- createFloatingIP, createFloatingIPResponse)
- .put(addFloatingIPRequest, addFloatingIPResponse).put(list,
- listResponseForUnassigned).build()).getContext().utils().injector()
- .getInstance(AllocateAndAddFloatingIpToNode.class);
-
- AtomicReference<NodeMetadata> nodeRef = Atomics.newReference(node);
- AtomicReference<NovaTemplateOptions> optionsRef = Atomics.newReference(options);
- AtomicReference<NodeAndNovaTemplateOptions> nodeNovaRef = NodeAndNovaTemplateOptions.newAtomicReference(nodeRef, optionsRef);
-
- fn.apply(nodeNovaRef);
- NodeMetadata node1 = nodeRef.get();
- assertNotNull(node1);
- assertNotNull(optionsRef.get());
- assertEquals(node1.getPublicAddresses(), ImmutableSet.of("10.0.0.5"));
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/a9834e9e/dependencies/jclouds/apis/openstack-nova/1.8.0-stratos/src/test/java/org/jclouds/openstack/nova/v2_0/compute/functions/FlavorInZoneToHardwareTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/openstack-nova/1.8.0-stratos/src/test/java/org/jclouds/openstack/nova/v2_0/compute/functions/FlavorInZoneToHardwareTest.java b/dependencies/jclouds/apis/openstack-nova/1.8.0-stratos/src/test/java/org/jclouds/openstack/nova/v2_0/compute/functions/FlavorInZoneToHardwareTest.java
deleted file mode 100644
index 6e0e001..0000000
--- a/dependencies/jclouds/apis/openstack-nova/1.8.0-stratos/src/test/java/org/jclouds/openstack/nova/v2_0/compute/functions/FlavorInZoneToHardwareTest.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.openstack.nova.v2_0.compute.functions;
-
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertNotNull;
-
-import java.util.Map;
-import java.util.UUID;
-
-import org.jclouds.compute.domain.Hardware;
-import org.jclouds.domain.Location;
-import org.jclouds.domain.LocationBuilder;
-import org.jclouds.domain.LocationScope;
-import org.jclouds.openstack.nova.v2_0.domain.Flavor;
-import org.jclouds.openstack.nova.v2_0.domain.zonescoped.FlavorInZone;
-import org.testng.annotations.Test;
-
-import com.google.common.base.Supplier;
-import com.google.common.base.Suppliers;
-import com.google.common.collect.ImmutableMap;
-
-/**
- * Tests the function used to transform Flavor objects into Hardware objects
- */
-@Test(testName = "FlavorInZoneToHardwareTest")
-public class FlavorInZoneToHardwareTest {
- Location provider = new LocationBuilder().scope(LocationScope.PROVIDER).id("openstack-nova").description(
- "openstack-nova").build();
- Location zone = new LocationBuilder().id("az-1.region-a.geo-1").description("az-1.region-a.geo-1").scope(
- LocationScope.ZONE).parent(provider).build();
- Supplier<Map<String, Location>> locationIndex = Suppliers.<Map<String, Location>> ofInstance(ImmutableMap
- .<String, Location> of("az-1.region-a.geo-1", zone));
-
- @Test
- public void testConversionWhereLocationFound() {
-
- UUID id = UUID.randomUUID();
-
- FlavorInZone flavorInZoneToConvert = new FlavorInZone(Flavor.builder().id(id.toString())
- .name("Test Flavor " + id).ram(262144).disk(10000).vcpus(16).build(), "az-1.region-a.geo-1");
-
- Hardware converted = new FlavorInZoneToHardware(locationIndex).apply(flavorInZoneToConvert);
-
- Flavor flavorToConvert = flavorInZoneToConvert.getFlavor();
- assertEquals(converted.getName(), flavorToConvert.getName());
- assertEquals(converted.getId(), flavorInZoneToConvert.slashEncode());
- assertEquals(converted.getProviderId(), flavorToConvert.getId());
- assertEquals(converted.getLocation(), locationIndex.get().get("az-1.region-a.geo-1"));
-
- assertEquals(converted.getRam(), flavorToConvert.getRam());
-
- assertNotNull(converted.getProcessors());
- assertFalse(converted.getProcessors().isEmpty());
- assertEquals(converted.getProcessors().iterator().next().getCores(), (double) flavorToConvert.getVcpus());
-
- assertNotNull(converted.getVolumes());
- assertFalse(converted.getVolumes().isEmpty());
- assertEquals(converted.getVolumes().iterator().next().getSize(), Float.valueOf(flavorToConvert.getDisk()));
-
- }
-
- @Test(expectedExceptions = IllegalStateException.class)
- public void testConversionWhereLocationNotFound() {
-
- UUID id = UUID.randomUUID();
-
- FlavorInZone flavorInZoneToConvert = new FlavorInZone(Flavor.builder().id(id.toString())
- .name("Test Flavor " + id).ram(262144).disk(10000).vcpus(16).build(), "South");
- new FlavorInZoneToHardware(locationIndex).apply(flavorInZoneToConvert);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/a9834e9e/dependencies/jclouds/apis/openstack-nova/1.8.0-stratos/src/test/java/org/jclouds/openstack/nova/v2_0/compute/functions/ImageInZoneToImageTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/openstack-nova/1.8.0-stratos/src/test/java/org/jclouds/openstack/nova/v2_0/compute/functions/ImageInZoneToImageTest.java b/dependencies/jclouds/apis/openstack-nova/1.8.0-stratos/src/test/java/org/jclouds/openstack/nova/v2_0/compute/functions/ImageInZoneToImageTest.java
deleted file mode 100644
index 9872242..0000000
--- a/dependencies/jclouds/apis/openstack-nova/1.8.0-stratos/src/test/java/org/jclouds/openstack/nova/v2_0/compute/functions/ImageInZoneToImageTest.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.openstack.nova.v2_0.compute.functions;
-
-import static org.testng.Assert.assertEquals;
-
-import java.util.Map;
-import java.util.UUID;
-
-import org.jclouds.compute.domain.OperatingSystem;
-import org.jclouds.compute.domain.OsFamily;
-import org.jclouds.domain.Location;
-import org.jclouds.domain.LocationBuilder;
-import org.jclouds.domain.LocationScope;
-import org.jclouds.openstack.nova.v2_0.compute.config.NovaComputeServiceContextModule;
-import org.jclouds.openstack.nova.v2_0.domain.Image;
-import org.jclouds.openstack.nova.v2_0.domain.zonescoped.ImageInZone;
-import org.testng.annotations.Test;
-
-import com.google.common.base.Function;
-import com.google.common.base.Functions;
-import com.google.common.base.Supplier;
-import com.google.common.base.Suppliers;
-import com.google.common.collect.ImmutableMap;
-
-/**
- * Tests the function that transforms nova-specific images to generic images.
- */
-@Test(testName = "ImageInZoneToHardwareTest")
-public class ImageInZoneToImageTest {
-
- Location provider = new LocationBuilder().scope(LocationScope.PROVIDER).id("openstack-nova").description(
- "openstack-nova").build();
- Location zone = new LocationBuilder().id("az-1.region-a.geo-1").description("az-1.region-a.geo-1").scope(
- LocationScope.ZONE).parent(provider).build();
- Supplier<Map<String, Location>> locationIndex = Suppliers.<Map<String, Location>> ofInstance(ImmutableMap
- .<String, Location> of("az-1.region-a.geo-1", zone));
-
- @Test
- public void testConversionWhereLocationFound() {
- UUID id = UUID.randomUUID();
- Image novaImageToConvert = Image.builder().id(id.toString()).name("Test Image " + id).status(Image.Status.DELETED).build();
- OperatingSystem operatingSystem = new OperatingSystem(OsFamily.UBUNTU, "My Test OS", "My Test Version", "x86",
- "My Test OS", true);
- ImageInZoneToImage converter = new ImageInZoneToImage(NovaComputeServiceContextModule.toPortableImageStatus,
- constant(operatingSystem), locationIndex);
-
- ImageInZone novaImageInZoneToConvert = new ImageInZone(novaImageToConvert, "az-1.region-a.geo-1");
-
- org.jclouds.compute.domain.Image convertedImage = converter.apply(novaImageInZoneToConvert);
-
- assertEquals(convertedImage.getId(), novaImageInZoneToConvert.slashEncode());
- assertEquals(convertedImage.getProviderId(), novaImageToConvert.getId());
- assertEquals(convertedImage.getLocation(), locationIndex.get().get("az-1.region-a.geo-1"));
-
- assertEquals(convertedImage.getName(), novaImageToConvert.getName());
- assertEquals(convertedImage.getStatus(), org.jclouds.compute.domain.Image.Status.DELETED);
- assertEquals(convertedImage.getOperatingSystem(), operatingSystem);
- }
-
- @Test(expectedExceptions = IllegalStateException.class)
- public void testConversionWhereLocationNotFound() {
- UUID id = UUID.randomUUID();
- Image novaImageToConvert = Image.builder().id(id.toString()).name("Test Image " + id).build();
- OperatingSystem operatingSystem = new OperatingSystem(OsFamily.UBUNTU, "My Test OS", "My Test Version", "x86",
- "My Test OS", true);
- ImageInZoneToImage converter = new ImageInZoneToImage(NovaComputeServiceContextModule.toPortableImageStatus,
- constant(operatingSystem), locationIndex);
-
- ImageInZone novaImageInZoneToConvert = new ImageInZone(novaImageToConvert, "South");
-
- converter.apply(novaImageInZoneToConvert);
- }
-
- @SuppressWarnings("unchecked")
- private static Function<Image, OperatingSystem> constant(OperatingSystem operatingSystem) {
- return Function.class.cast(Functions.constant(operatingSystem));
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/a9834e9e/dependencies/jclouds/apis/openstack-nova/1.8.0-stratos/src/test/java/org/jclouds/openstack/nova/v2_0/compute/functions/ImageToOperatingSystemTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/openstack-nova/1.8.0-stratos/src/test/java/org/jclouds/openstack/nova/v2_0/compute/functions/ImageToOperatingSystemTest.java b/dependencies/jclouds/apis/openstack-nova/1.8.0-stratos/src/test/java/org/jclouds/openstack/nova/v2_0/compute/functions/ImageToOperatingSystemTest.java
deleted file mode 100644
index cc91b60..0000000
--- a/dependencies/jclouds/apis/openstack-nova/1.8.0-stratos/src/test/java/org/jclouds/openstack/nova/v2_0/compute/functions/ImageToOperatingSystemTest.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.openstack.nova.v2_0.compute.functions;
-
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.jclouds.compute.domain.OperatingSystem;
-import org.jclouds.compute.domain.OsFamily;
-import org.jclouds.openstack.nova.v2_0.domain.Image;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
-import com.google.common.base.Function;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Maps;
-
-/**
- * Tests for the function for transforming a nova specific Image into a generic
- * OperatingSystem object.
- */
-public class ImageToOperatingSystemTest {
-
- @Test(dataProvider = "getOsFamilyValues")
- public void testOsFamilyValues(OsFamily family) {
-
- Image imageToConvert = Image.builder().id("id-" + family.name()).name(family.name()).build();
-
- ImageToOperatingSystem converter = new ImageToOperatingSystem(
- new HashMap<OsFamily, Map<String, String>>());
-
- OperatingSystem convertedOs = converter.apply(imageToConvert);
-
- assertEquals(convertedOs.getName(), imageToConvert.getName());
- assertEquals(convertedOs.getFamily(), family);
- assertEquals(convertedOs.getDescription(), imageToConvert.getName());
- assertEquals(convertedOs.getVersion(), null);
- assertEquals(convertedOs.getArch(), null);
- assertTrue(convertedOs.is64Bit());
- }
-
- @DataProvider
- public Object[][] getOsFamilyValues() {
- return Iterables.toArray(
- Iterables.transform(Arrays.asList(OsFamily.values()), new Function<OsFamily, Object[]>() {
- @Override
- public Object[] apply(OsFamily osFamily) {
- return new Object[] { osFamily };
- }
- }), Object[].class);
- }
-
- @Test
- public void testWindowsServer2008R2x64() {
- String name = "Windows Server 2008 R2 x64";
-
- Image imageToConvert = Image.builder().id("id-" + name).name(name).build();
-
- Map<OsFamily, Map<String, String>> osFamilyMap = Maps.newHashMap();
- osFamilyMap.put(OsFamily.WINDOWS, ImmutableMap.of("Server 2008 R2", "Server-2008-R2"));
-
- ImageToOperatingSystem converter = new ImageToOperatingSystem(osFamilyMap);
-
- OperatingSystem convertedOs = converter.apply(imageToConvert);
-
- assertEquals(convertedOs.getName(), imageToConvert.getName());
- assertEquals(convertedOs.getFamily(), OsFamily.WINDOWS);
- assertEquals(convertedOs.getDescription(), imageToConvert.getName());
- assertEquals(convertedOs.getVersion(), "Server-2008-R2");
- assertEquals(convertedOs.getArch(), null);
- assertTrue(convertedOs.is64Bit());
- }
-
- @Test
- public void testWindows98x86() {
- String name = "Windows 98 x86";
-
- Image imageToConvert = Image.builder().id("id-" + name).name(name).build();
-
- Map<OsFamily, Map<String, String>> osFamilyMap = Maps.newHashMap();
- osFamilyMap.put(OsFamily.WINDOWS, ImmutableMap.of("98", "98"));
-
- ImageToOperatingSystem converter = new ImageToOperatingSystem(osFamilyMap);
-
- OperatingSystem convertedOs = converter.apply(imageToConvert);
-
- assertEquals(convertedOs.getName(), imageToConvert.getName());
- assertEquals(convertedOs.getFamily(), OsFamily.WINDOWS);
- assertEquals(convertedOs.getDescription(), imageToConvert.getName());
- assertEquals(convertedOs.getVersion(), "98");
- assertEquals(convertedOs.getArch(), null);
- assertFalse(convertedOs.is64Bit());
- }
-
- @Test
- public void testRHEL() {
- String name = "Red Hat EL";
-
- Image imageToConvert = Image.builder().id("id-" + name).name(name).build();
-
- ImageToOperatingSystem converter = new ImageToOperatingSystem(
- new HashMap<OsFamily, Map<String, String>>());
-
- OperatingSystem convertedOs = converter.apply(imageToConvert);
-
- assertEquals(convertedOs.getName(), imageToConvert.getName());
- assertEquals(convertedOs.getFamily(), OsFamily.RHEL);
- assertEquals(convertedOs.getDescription(), imageToConvert.getName());
- assertEquals(convertedOs.getVersion(), null);
- assertEquals(convertedOs.getArch(), null);
- assertTrue(convertedOs.is64Bit());
- }
-
- @Test
- public void testOEL() {
- String name = "Oracle EL";
-
- Image imageToConvert = Image.builder().id("id-" + name).name(name).build();
-
- ImageToOperatingSystem converter = new ImageToOperatingSystem(
- new HashMap<OsFamily, Map<String, String>>());
-
- OperatingSystem convertedOs = converter.apply(imageToConvert);
-
- assertEquals(convertedOs.getName(), imageToConvert.getName());
- assertEquals(convertedOs.getFamily(), OsFamily.OEL);
- assertEquals(convertedOs.getDescription(), imageToConvert.getName());
- assertEquals(convertedOs.getVersion(), null);
- assertEquals(convertedOs.getArch(), null);
- assertTrue(convertedOs.is64Bit());
- }
-
-
- ImageToOperatingSystem converterForUbuntu = new ImageToOperatingSystem(ImmutableMap.<OsFamily, Map<String, String>> of(
- OsFamily.UBUNTU, ImmutableMap.of("lucid", "10.04", "maverick", "10.10", "natty", "11.04", "oneiric",
- "11.10")));
- @Test
- public void testTryStackOneric() {
-
- String name = "oneiric-server-cloudimg-amd64";
-
- Image imageToConvert = Image.builder().id("id-" + name).name(name).build();
-
- OperatingSystem convertedOs = converterForUbuntu.apply(imageToConvert);
-
- assertEquals(convertedOs.getName(), imageToConvert.getName());
- assertEquals(convertedOs.getFamily(), OsFamily.UBUNTU);
- assertEquals(convertedOs.getDescription(), imageToConvert.getName());
- assertEquals(convertedOs.getVersion(), "11.10");
- assertEquals(convertedOs.getArch(), null);
- assertTrue(convertedOs.is64Bit());
- }
-
- @Test
- public void testTryStackNatty() {
-
- String name = "natty-server-cloudimg-amd64";
-
- Image imageToConvert = Image.builder().id("id-" + name).name(name).build();
-
- OperatingSystem convertedOs = converterForUbuntu.apply(imageToConvert);
-
- assertEquals(convertedOs.getName(), imageToConvert.getName());
- assertEquals(convertedOs.getFamily(), OsFamily.UBUNTU);
- assertEquals(convertedOs.getDescription(), imageToConvert.getName());
- assertEquals(convertedOs.getVersion(), "11.04");
- assertEquals(convertedOs.getArch(), null);
- assertTrue(convertedOs.is64Bit());
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/a9834e9e/dependencies/jclouds/apis/openstack-nova/1.8.0-stratos/src/test/java/org/jclouds/openstack/nova/v2_0/compute/functions/NovaSecurityGroupInZoneToSecurityGroupTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/openstack-nova/1.8.0-stratos/src/test/java/org/jclouds/openstack/nova/v2_0/compute/functions/NovaSecurityGroupInZoneToSecurityGroupTest.java b/dependencies/jclouds/apis/openstack-nova/1.8.0-stratos/src/test/java/org/jclouds/openstack/nova/v2_0/compute/functions/NovaSecurityGroupInZoneToSecurityGroupTest.java
deleted file mode 100644
index dceba6c..0000000
--- a/dependencies/jclouds/apis/openstack-nova/1.8.0-stratos/src/test/java/org/jclouds/openstack/nova/v2_0/compute/functions/NovaSecurityGroupInZoneToSecurityGroupTest.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.openstack.nova.v2_0.compute.functions;
-
-import static com.google.common.collect.Iterables.transform;
-import static org.jclouds.openstack.nova.v2_0.compute.functions.NovaSecurityGroupToSecurityGroupTest.securityGroupWithCidr;
-import static org.jclouds.openstack.nova.v2_0.compute.functions.NovaSecurityGroupToSecurityGroupTest.securityGroupWithGroup;
-import static org.testng.Assert.assertEquals;
-
-import java.util.Map;
-
-import org.jclouds.compute.domain.SecurityGroup;
-import org.jclouds.domain.Location;
-import org.jclouds.domain.LocationBuilder;
-import org.jclouds.domain.LocationScope;
-import org.jclouds.openstack.nova.v2_0.domain.zonescoped.SecurityGroupInZone;
-import org.testng.annotations.Test;
-
-import com.google.common.base.Supplier;
-import com.google.common.base.Suppliers;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
-
-@Test(groups = "unit", testName = "NovaSecurityGroupInZoneToSecurityGroupTest")
-public class NovaSecurityGroupInZoneToSecurityGroupTest {
-
- Location provider = new LocationBuilder().scope(LocationScope.PROVIDER).id("openstack-nova")
- .description("openstack-nova").build();
- Location zone = new LocationBuilder().id("az-1.region-a.geo-1").description("az-1.region-a.geo-1")
- .scope(LocationScope.ZONE).parent(provider).build();
- Supplier<Map<String, Location>> locationIndex = Suppliers.<Map<String, Location>> ofInstance(ImmutableMap
- .<String, Location>of("az-1.region-a.geo-1", zone));
-
-
- @Test
- public void testApplyWithGroup() {
- NovaSecurityGroupInZoneToSecurityGroup parser = createGroupParser();
-
- SecurityGroupInZone origGroup = new SecurityGroupInZone(securityGroupWithGroup(), zone.getId());
-
- SecurityGroup newGroup = parser.apply(origGroup);
-
- assertEquals(newGroup.getId(), origGroup.getZone() + "/" + origGroup.getSecurityGroup().getId());
- assertEquals(newGroup.getProviderId(), origGroup.getSecurityGroup().getId());
- assertEquals(newGroup.getName(), origGroup.getSecurityGroup().getName());
- assertEquals(newGroup.getOwnerId(), origGroup.getSecurityGroup().getTenantId());
- assertEquals(newGroup.getIpPermissions(), ImmutableSet.copyOf(transform(origGroup.getSecurityGroup().getRules(),
- NovaSecurityGroupToSecurityGroupTest.ruleConverter)));
- assertEquals(newGroup.getLocation().getId(), origGroup.getZone());
- }
-
- @Test
- public void testApplyWithCidr() {
-
- NovaSecurityGroupInZoneToSecurityGroup parser = createGroupParser();
-
- SecurityGroupInZone origGroup = new SecurityGroupInZone(securityGroupWithCidr(), zone.getId());
-
- SecurityGroup newGroup = parser.apply(origGroup);
-
- assertEquals(newGroup.getId(), origGroup.getZone() + "/" + origGroup.getSecurityGroup().getId());
- assertEquals(newGroup.getProviderId(), origGroup.getSecurityGroup().getId());
- assertEquals(newGroup.getName(), origGroup.getSecurityGroup().getName());
- assertEquals(newGroup.getOwnerId(), origGroup.getSecurityGroup().getTenantId());
- assertEquals(newGroup.getIpPermissions(), ImmutableSet.copyOf(transform(origGroup.getSecurityGroup().getRules(),
- NovaSecurityGroupToSecurityGroupTest.ruleConverter)));
- assertEquals(newGroup.getLocation().getId(), origGroup.getZone());
- }
-
- private NovaSecurityGroupInZoneToSecurityGroup createGroupParser() {
- NovaSecurityGroupToSecurityGroup baseParser = new NovaSecurityGroupToSecurityGroup(NovaSecurityGroupToSecurityGroupTest.ruleConverter);
-
- NovaSecurityGroupInZoneToSecurityGroup parser = new NovaSecurityGroupInZoneToSecurityGroup(baseParser, locationIndex);
-
- return parser;
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/a9834e9e/dependencies/jclouds/apis/openstack-nova/1.8.0-stratos/src/test/java/org/jclouds/openstack/nova/v2_0/compute/functions/NovaSecurityGroupToSecurityGroupTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/openstack-nova/1.8.0-stratos/src/test/java/org/jclouds/openstack/nova/v2_0/compute/functions/NovaSecurityGroupToSecurityGroupTest.java b/dependencies/jclouds/apis/openstack-nova/1.8.0-stratos/src/test/java/org/jclouds/openstack/nova/v2_0/compute/functions/NovaSecurityGroupToSecurityGroupTest.java
deleted file mode 100644
index 1a964b6..0000000
--- a/dependencies/jclouds/apis/openstack-nova/1.8.0-stratos/src/test/java/org/jclouds/openstack/nova/v2_0/compute/functions/NovaSecurityGroupToSecurityGroupTest.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.openstack.nova.v2_0.compute.functions;
-
-import static com.google.common.collect.Iterables.transform;
-import static org.testng.Assert.assertEquals;
-
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicReference;
-
-import org.jclouds.compute.domain.SecurityGroup;
-import org.jclouds.domain.Location;
-import org.jclouds.domain.LocationBuilder;
-import org.jclouds.domain.LocationScope;
-import org.jclouds.net.domain.IpProtocol;
-import org.jclouds.openstack.nova.v2_0.domain.SecurityGroupRule;
-import org.jclouds.openstack.nova.v2_0.domain.TenantIdAndName;
-import org.jclouds.openstack.nova.v2_0.domain.zonescoped.SecurityGroupInZone;
-import org.jclouds.openstack.nova.v2_0.domain.zonescoped.ZoneAndName;
-import org.testng.annotations.Test;
-
-import com.google.common.base.Functions;
-import com.google.common.base.Predicate;
-import com.google.common.base.Predicates;
-import com.google.common.base.Supplier;
-import com.google.common.base.Suppliers;
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
-
-@Test(groups = "unit", testName = "NovaSecurityGroupToSecurityGroupTest")
-public class NovaSecurityGroupToSecurityGroupTest {
-
- private static final Location provider = new LocationBuilder().scope(LocationScope.PROVIDER).id("openstack-nova")
- .description("openstack-nova").build();
- private static final Location zone = new LocationBuilder().id("az-1.region-a.geo-1").description("az-1.region-a.geo-1")
- .scope(LocationScope.ZONE).parent(provider).build();
- private static final Supplier<Map<String, Location>> locationIndex = Suppliers.<Map<String, Location>> ofInstance(ImmutableMap
- .<String, Location>of("az-1.region-a.geo-1", zone));
-
-
- private static final Predicate<AtomicReference<ZoneAndName>> returnSecurityGroupExistsInZone = Predicates.alwaysTrue();
-
- private static final Map<ZoneAndName, SecurityGroupInZone> groupMap = ImmutableMap.of(
- ZoneAndName.fromZoneAndName("az-1.region-a.geo-1", "some-group"), new SecurityGroupInZone(securityGroupWithGroup(), "az-1.region-a.geo-1"),
- ZoneAndName.fromZoneAndName("az-1.region-a.geo-1", "some-other-group"), new SecurityGroupInZone(securityGroupWithCidr(), "az-1.region-a.geo-1"));
-
- // weird compilation error means have to declare extra generics for call to build() - see https://bugs.eclipse.org/bugs/show_bug.cgi?id=365818
- private static final Supplier <LoadingCache<ZoneAndName, SecurityGroupInZone>> groupCache = Suppliers.<LoadingCache<ZoneAndName, SecurityGroupInZone>> ofInstance(
- CacheBuilder.newBuilder().<ZoneAndName, SecurityGroupInZone>build(CacheLoader.from(Functions.forMap(groupMap))));
-
- public static final SecurityGroupRuleToIpPermission ruleConverter = new SecurityGroupRuleToIpPermission(returnSecurityGroupExistsInZone, locationIndex,
- groupCache.get());
-
- public static org.jclouds.openstack.nova.v2_0.domain.SecurityGroup securityGroupWithGroup() {
- TenantIdAndName group = TenantIdAndName.builder().tenantId("tenant").name("some-other-group").build();
-
- SecurityGroupRule ruleToConvert = SecurityGroupRule.builder()
- .id("some-id")
- .ipProtocol(IpProtocol.TCP)
- .fromPort(10)
- .toPort(20)
- .group(group)
- .parentGroupId("some-other-id")
- .build();
-
- org.jclouds.openstack.nova.v2_0.domain.SecurityGroup origGroup = org.jclouds.openstack.nova.v2_0.domain.SecurityGroup.builder()
- .tenantId("tenant")
- .id("some-id")
- .name("some-group")
- .description("some-description")
- .rules(ruleToConvert)
- .build();
-
- return origGroup;
- }
-
- public static org.jclouds.openstack.nova.v2_0.domain.SecurityGroup securityGroupWithCidr() {
- SecurityGroupRule ruleToConvert = SecurityGroupRule.builder()
- .id("some-id")
- .ipProtocol(IpProtocol.TCP)
- .fromPort(10)
- .toPort(20)
- .ipRange("0.0.0.0/0")
- .parentGroupId("some-other-id")
- .build();
-
- org.jclouds.openstack.nova.v2_0.domain.SecurityGroup origGroup = org.jclouds.openstack.nova.v2_0.domain.SecurityGroup.builder()
- .tenantId("tenant")
- .id("some-id")
- .name("some-other-group")
- .description("some-description")
- .rules(ruleToConvert)
- .build();
-
- return origGroup;
- }
-
- @Test
- public void testApplyWithGroup() {
- NovaSecurityGroupToSecurityGroup parser = createGroupParser();
-
- org.jclouds.openstack.nova.v2_0.domain.SecurityGroup origGroup = securityGroupWithGroup();
-
- SecurityGroup newGroup = parser.apply(origGroup);
-
- assertEquals(newGroup.getId(), origGroup.getId());
- assertEquals(newGroup.getProviderId(), origGroup.getId());
- assertEquals(newGroup.getName(), origGroup.getName());
- assertEquals(newGroup.getOwnerId(), origGroup.getTenantId());
- assertEquals(newGroup.getIpPermissions(), ImmutableSet.copyOf(transform(origGroup.getRules(), ruleConverter)));
- }
-
- @Test
- public void testApplyWithCidr() {
-
- NovaSecurityGroupToSecurityGroup parser = createGroupParser();
-
- org.jclouds.openstack.nova.v2_0.domain.SecurityGroup origGroup = securityGroupWithCidr();
-
- SecurityGroup group = parser.apply(origGroup);
-
- assertEquals(group.getId(), origGroup.getId());
- assertEquals(group.getProviderId(), origGroup.getId());
- assertEquals(group.getName(), origGroup.getName());
- assertEquals(group.getOwnerId(), origGroup.getTenantId());
- assertEquals(group.getIpPermissions(), ImmutableSet.copyOf(transform(origGroup.getRules(), ruleConverter)));
- }
-
- private NovaSecurityGroupToSecurityGroup createGroupParser() {
- NovaSecurityGroupToSecurityGroup parser = new NovaSecurityGroupToSecurityGroup(ruleConverter);
-
- return parser;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/a9834e9e/dependencies/jclouds/apis/openstack-nova/1.8.0-stratos/src/test/java/org/jclouds/openstack/nova/v2_0/compute/functions/OrphanedGroupsByZoneIdTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/openstack-nova/1.8.0-stratos/src/test/java/org/jclouds/openstack/nova/v2_0/compute/functions/OrphanedGroupsByZoneIdTest.java b/dependencies/jclouds/apis/openstack-nova/1.8.0-stratos/src/test/java/org/jclouds/openstack/nova/v2_0/compute/functions/OrphanedGroupsByZoneIdTest.java
deleted file mode 100644
index b6ae064..0000000
--- a/dependencies/jclouds/apis/openstack-nova/1.8.0-stratos/src/test/java/org/jclouds/openstack/nova/v2_0/compute/functions/OrphanedGroupsByZoneIdTest.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.openstack.nova.v2_0.compute.functions;
-
-import static org.testng.Assert.assertEquals;
-
-import java.util.Map;
-import java.util.Set;
-
-import org.jclouds.compute.domain.Hardware;
-import org.jclouds.compute.domain.Image;
-import org.jclouds.compute.domain.NodeMetadata;
-import org.jclouds.compute.functions.GroupNamingConvention;
-import org.jclouds.domain.Location;
-import org.jclouds.domain.LocationBuilder;
-import org.jclouds.domain.LocationScope;
-import org.jclouds.openstack.nova.v2_0.compute.config.NovaComputeServiceContextModule;
-import org.jclouds.openstack.nova.v2_0.domain.zonescoped.ServerInZone;
-import org.jclouds.openstack.nova.v2_0.domain.zonescoped.ZoneAndName;
-import org.jclouds.openstack.nova.v2_0.parse.ParseServerTest;
-import org.testng.annotations.Test;
-
-import com.google.common.base.Predicates;
-import com.google.common.base.Supplier;
-import com.google.common.base.Suppliers;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableMultimap;
-import com.google.common.collect.ImmutableSet;
-import com.google.inject.Guice;
-
-@Test(testName = "OrphanedGroupsByZoneIdTest")
-public class OrphanedGroupsByZoneIdTest {
-
- Location provider = new LocationBuilder().scope(LocationScope.PROVIDER).id("openstack-nova").description(
- "openstack-nova").build();
- Location zone = new LocationBuilder().id("az-1.region-a.geo-1").description("az-1.region-a.geo-1").scope(
- LocationScope.ZONE).parent(provider).build();
- Supplier<Map<String, Location>> locationIndex = Suppliers.<Map<String, Location>> ofInstance(ImmutableMap
- .<String, Location> of("az-1.region-a.geo-1", zone));
-
- GroupNamingConvention.Factory namingConvention = Guice.createInjector().getInstance(GroupNamingConvention.Factory.class);
-
- @Test
- public void testWhenComputeServiceSaysAllNodesAreDeadBothGroupsAreReturned() {
-
- ServerInZone withoutHost = new ServerInZone(new ServerInZoneToNodeMetadataTest().expectedServer(), "az-1.region-a.geo-1");
- ServerInZone withHost = new ServerInZone(new ParseServerTest().expected(), "az-1.region-a.geo-1");
-
- ServerInZoneToNodeMetadata converter = new ServerInZoneToNodeMetadata(
- NovaComputeServiceContextModule.toPortableNodeStatus, locationIndex, Suppliers
- .<Set<? extends Image>> ofInstance(ImmutableSet.<Image> of()), Suppliers
- .<Set<? extends Hardware>> ofInstance(ImmutableSet.<Hardware> of()), namingConvention);
-
- Set<? extends NodeMetadata> set = ImmutableSet.of(converter.apply(withHost), converter.apply(withoutHost));
-
- assertEquals(new OrphanedGroupsByZoneId(Predicates.<ZoneAndName> alwaysTrue()).apply(set), ImmutableMultimap
- .<String, String> builder().putAll("az-1.region-a.geo-1", "sample", "test").build());
- }
-
- @Test
- public void testWhenComputeServiceSaysAllNodesAreDeadNoGroupsAreReturned() {
-
- ServerInZone withoutHost = new ServerInZone(new ServerInZoneToNodeMetadataTest().expectedServer(), "az-1.region-a.geo-1");
- ServerInZone withHost = new ServerInZone(new ParseServerTest().expected(), "az-1.region-a.geo-1");
-
- ServerInZoneToNodeMetadata converter = new ServerInZoneToNodeMetadata(
- NovaComputeServiceContextModule.toPortableNodeStatus, locationIndex, Suppliers
- .<Set<? extends Image>> ofInstance(ImmutableSet.<Image> of()), Suppliers
- .<Set<? extends Hardware>> ofInstance(ImmutableSet.<Hardware> of()), namingConvention);
-
- Set<? extends NodeMetadata> set = ImmutableSet.of(converter.apply(withHost), converter.apply(withoutHost));
-
- assertEquals(new OrphanedGroupsByZoneId(Predicates.<ZoneAndName> alwaysFalse()).apply(set), ImmutableMultimap
- .<String, String> of());
-
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/a9834e9e/dependencies/jclouds/apis/openstack-nova/1.8.0-stratos/src/test/java/org/jclouds/openstack/nova/v2_0/compute/functions/SecurityGroupRuleToIpPermissionTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/openstack-nova/1.8.0-stratos/src/test/java/org/jclouds/openstack/nova/v2_0/compute/functions/SecurityGroupRuleToIpPermissionTest.java b/dependencies/jclouds/apis/openstack-nova/1.8.0-stratos/src/test/java/org/jclouds/openstack/nova/v2_0/compute/functions/SecurityGroupRuleToIpPermissionTest.java
deleted file mode 100644
index dedf100..0000000
--- a/dependencies/jclouds/apis/openstack-nova/1.8.0-stratos/src/test/java/org/jclouds/openstack/nova/v2_0/compute/functions/SecurityGroupRuleToIpPermissionTest.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.openstack.nova.v2_0.compute.functions;
-
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
-
-import org.jclouds.net.domain.IpPermission;
-import org.jclouds.net.domain.IpProtocol;
-import org.jclouds.openstack.nova.v2_0.domain.SecurityGroupRule;
-import org.jclouds.openstack.nova.v2_0.domain.TenantIdAndName;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-
-
-/**
- * Tests for the function for transforming a nova specific SecurityGroupRule into a generic
- * IpPermission object.
- */
-public class SecurityGroupRuleToIpPermissionTest {
-
- @Test
- public void testApplyWithGroup() {
-
- TenantIdAndName group = TenantIdAndName.builder().tenantId("tenant").name("some-group").build();
-
- SecurityGroupRule ruleToConvert = SecurityGroupRule.builder()
- .id("some-id")
- .ipProtocol(IpProtocol.TCP)
- .fromPort(10)
- .toPort(20)
- .group(group)
- .parentGroupId("some-other-id")
- .build();
-
- IpPermission convertedPerm = NovaSecurityGroupToSecurityGroupTest.ruleConverter.apply(ruleToConvert);
-
- assertEquals(convertedPerm.getIpProtocol(), ruleToConvert.getIpProtocol());
- assertEquals(convertedPerm.getFromPort(), ruleToConvert.getFromPort());
- assertEquals(convertedPerm.getToPort(), ruleToConvert.getToPort());
- assertTrue(convertedPerm.getGroupIds().contains("az-1.region-a.geo-1/some-id"));
- assertEquals(convertedPerm.getCidrBlocks().size(), 0);
- }
-
- @Test
- public void testApplyWithCidr() {
- SecurityGroupRule ruleToConvert = SecurityGroupRule.builder()
- .id("some-id")
- .ipProtocol(IpProtocol.TCP)
- .fromPort(10)
- .toPort(20)
- .ipRange("0.0.0.0/0")
- .parentGroupId("some-other-id")
- .build();
-
- IpPermission convertedPerm = NovaSecurityGroupToSecurityGroupTest.ruleConverter.apply(ruleToConvert);
-
- assertEquals(convertedPerm.getIpProtocol(), ruleToConvert.getIpProtocol());
- assertEquals(convertedPerm.getFromPort(), ruleToConvert.getFromPort());
- assertEquals(convertedPerm.getToPort(), ruleToConvert.getToPort());
- assertEquals(convertedPerm.getCidrBlocks(), ImmutableSet.of("0.0.0.0/0"));
- assertEquals(convertedPerm.getTenantIdGroupNamePairs().size(), 0);
- }
-}