From 80604e98e62c451cb21924c3ed0ee57456c94adf Mon Sep 17 00:00:00 2001
From: Mike Arnold <dharmamike@gmail.com>
Date: Mon, 12 Mar 2012 16:42:01 -0500
Subject: [PATCH] fixing and moving tests after upstream merge

---
 .../nova/v1_1/features/SecurityGroupClientLiveTest.java        | 1 +
 .../jclouds/openstack/nova/v1_1/parse/ParseKeyPairTest.java    | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/features/SecurityGroupClientLiveTest.java b/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/features/SecurityGroupClientLiveTest.java
index fb9d829f27..c19187915d 100644
--- a/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/features/SecurityGroupClientLiveTest.java
+++ b/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/features/SecurityGroupClientLiveTest.java
@@ -20,6 +20,7 @@ package org.jclouds.openstack.nova.v1_1.features;
 
 import org.jclouds.openstack.nova.v1_1.domain.SecurityGroup;
 import org.jclouds.openstack.nova.v1_1.domain.SecurityGroupRule;
+import org.jclouds.openstack.nova.v1_1.extensions.SecurityGroupClient;
 import org.jclouds.openstack.nova.v1_1.internal.BaseNovaClientLiveTest;
 import org.testng.annotations.Test;
 
diff --git a/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseKeyPairTest.java b/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseKeyPairTest.java
index c90284c595..9901ba5f2d 100644
--- a/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseKeyPairTest.java
+++ b/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseKeyPairTest.java
@@ -30,8 +30,6 @@ import org.testng.annotations.Test;
 
 import javax.ws.rs.Consumes;
 import javax.ws.rs.core.MediaType;
-import java.util.HashMap;
-import java.util.Map;
 
 /**
  *
@@ -46,6 +44,7 @@ public class ParseKeyPairTest extends BaseItemParserTest<KeyPair> {
     }
 
     @Override
+    @SelectJson("keypair")
     @Consumes(MediaType.APPLICATION_JSON)
     public KeyPair expected() {
         return KeyPair