From fc0480e007355a2c9e3fc7e2c0e2caa021b94ec8 Mon Sep 17 00:00:00 2001
From: Jose Idar <jose.idar@rackspace.com>
Date: Mon, 30 Mar 2015 10:47:33 -0500
Subject: [PATCH] Replaced all imports of unittest2 with unitest imports

Change-Id: Id5796f5e1953dc9a0073f0e76a23ccce83c2bbd7
---
 metatests/cloudcafe/compute/common/models/test_metadata.py      | 2 +-
 .../extensions/console_output/models/test_console_output.py     | 2 +-
 .../console_output/models/test_console_output_requests.py       | 2 +-
 .../cloudcafe/compute/extensions/rescue/models/test_rescue.py   | 2 +-
 .../compute/extensions/vnc_console/models/test_console.py       | 2 +-
 .../extensions/vnc_console/models/test_console_requests.py      | 2 +-
 .../extensions/volumes_boot_api/volume_servers_requests.py      | 2 +-
 metatests/cloudcafe/compute/fixtures.py                         | 2 +-
 .../cloudcafe/compute/flavors/models/test_flavor_access.py      | 2 +-
 .../cloudcafe/compute/flavors/models/test_flavor_extra_specs.py | 2 +-
 metatests/cloudcafe/compute/flavors/models/test_flavors.py      | 2 +-
 metatests/cloudcafe/compute/hosts/models/test_hosts.py          | 2 +-
 .../cloudcafe/compute/hypervisors/models/test_hypervisors.py    | 2 +-
 .../compute/hypervisors/models/test_hypervisors_min.py          | 2 +-
 metatests/cloudcafe/compute/images/models/test_images.py        | 2 +-
 metatests/cloudcafe/compute/limits/models/test_limits.py        | 2 +-
 .../cloudcafe/compute/quotas/models/test_quota_requests.py      | 2 +-
 metatests/cloudcafe/compute/quotas/models/test_quotas.py        | 2 +-
 .../security_group_rules/models/test_security_group_requests.py | 2 +-
 .../security_group_rules/models/test_security_group_rule.py     | 2 +-
 metatests/cloudcafe/compute/servers/models/servers_requests.py  | 2 +-
 metatests/cloudcafe/compute/servers/models/test_servers.py      | 2 +-
 metatests/cloudcafe/images/v2_0/client_test.py                  | 2 +-
 metatests/cloudcafe/images/v2_0/models/image_test.py            | 2 +-
 metatests/cloudcafe/images/v2_0/models/member_test.py           | 2 +-
 metatests/cloudcafe/images/v2_0/models/members_test.py          | 2 +-
 metatests/cloudcafe/networking/lbaas/common/client.py           | 2 +-
 test-requirements.txt                                           | 1 -
 28 files changed, 27 insertions(+), 28 deletions(-)

diff --git a/metatests/cloudcafe/compute/common/models/test_metadata.py b/metatests/cloudcafe/compute/common/models/test_metadata.py
index c9832aa3..269111f3 100644
--- a/metatests/cloudcafe/compute/common/models/test_metadata.py
+++ b/metatests/cloudcafe/compute/common/models/test_metadata.py
@@ -15,7 +15,7 @@ limitations under the License.
 """
 
 import json
-import unittest2 as unittest
+import unittest
 
 from cloudcafe.compute.common.models.metadata import Metadata, MetadataItem
 
diff --git a/metatests/cloudcafe/compute/extensions/console_output/models/test_console_output.py b/metatests/cloudcafe/compute/extensions/console_output/models/test_console_output.py
index bdefadc2..997379b3 100644
--- a/metatests/cloudcafe/compute/extensions/console_output/models/test_console_output.py
+++ b/metatests/cloudcafe/compute/extensions/console_output/models/test_console_output.py
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
-import unittest2 as unittest
+import unittest
 
 from cloudcafe.compute.extensions.console_output_api.models.console_output\
     import VncConsoleOutput
diff --git a/metatests/cloudcafe/compute/extensions/console_output/models/test_console_output_requests.py b/metatests/cloudcafe/compute/extensions/console_output/models/test_console_output_requests.py
index 9338c24f..1f59221c 100644
--- a/metatests/cloudcafe/compute/extensions/console_output/models/test_console_output_requests.py
+++ b/metatests/cloudcafe/compute/extensions/console_output/models/test_console_output_requests.py
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
-import unittest2 as unittest
+import unittest
 
 from cloudcafe.compute.extensions.console_output_api.models.requests\
     import GetConsoleOutput
diff --git a/metatests/cloudcafe/compute/extensions/rescue/models/test_rescue.py b/metatests/cloudcafe/compute/extensions/rescue/models/test_rescue.py
index f9984c22..b8a4ce64 100644
--- a/metatests/cloudcafe/compute/extensions/rescue/models/test_rescue.py
+++ b/metatests/cloudcafe/compute/extensions/rescue/models/test_rescue.py
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
-import unittest2 as unittest
+import unittest
 
 from cloudcafe.compute.extensions.rescue_api.models.responses \
     import RescueResponse
diff --git a/metatests/cloudcafe/compute/extensions/vnc_console/models/test_console.py b/metatests/cloudcafe/compute/extensions/vnc_console/models/test_console.py
index 4878dd3f..3c3b0f95 100644
--- a/metatests/cloudcafe/compute/extensions/vnc_console/models/test_console.py
+++ b/metatests/cloudcafe/compute/extensions/vnc_console/models/test_console.py
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
-import unittest2 as unittest
+import unittest
 
 from cloudcafe.compute.extensions.vnc_console_api.models.vnc_console\
     import VncConsole
diff --git a/metatests/cloudcafe/compute/extensions/vnc_console/models/test_console_requests.py b/metatests/cloudcafe/compute/extensions/vnc_console/models/test_console_requests.py
index 7efb4946..aa0077af 100644
--- a/metatests/cloudcafe/compute/extensions/vnc_console/models/test_console_requests.py
+++ b/metatests/cloudcafe/compute/extensions/vnc_console/models/test_console_requests.py
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
-import unittest2 as unittest
+import unittest
 
 from cloudcafe.compute.extensions.vnc_console_api.models.requests\
     import GetVncConsole
diff --git a/metatests/cloudcafe/compute/extensions/volumes_boot_api/volume_servers_requests.py b/metatests/cloudcafe/compute/extensions/volumes_boot_api/volume_servers_requests.py
index 6134333a..c6d9590a 100644
--- a/metatests/cloudcafe/compute/extensions/volumes_boot_api/volume_servers_requests.py
+++ b/metatests/cloudcafe/compute/extensions/volumes_boot_api/volume_servers_requests.py
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
-import unittest2 as unittest
+import unittest
 import xml.etree.ElementTree as ET
 
 from cloudcafe.compute.extensions.extensions_api.models.request import \
diff --git a/metatests/cloudcafe/compute/fixtures.py b/metatests/cloudcafe/compute/fixtures.py
index f5321ec8..c57b38fe 100644
--- a/metatests/cloudcafe/compute/fixtures.py
+++ b/metatests/cloudcafe/compute/fixtures.py
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
-import unittest2 as unittest
+import unittest
 from httpretty import HTTPretty
 
 
diff --git a/metatests/cloudcafe/compute/flavors/models/test_flavor_access.py b/metatests/cloudcafe/compute/flavors/models/test_flavor_access.py
index b644d122..1502ca44 100644
--- a/metatests/cloudcafe/compute/flavors/models/test_flavor_access.py
+++ b/metatests/cloudcafe/compute/flavors/models/test_flavor_access.py
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
-import unittest2 as unittest
+import unittest
 
 from cloudcafe.compute.flavors_api.models.flavor_access \
     import FlavorAccess, FlavorAccessList
diff --git a/metatests/cloudcafe/compute/flavors/models/test_flavor_extra_specs.py b/metatests/cloudcafe/compute/flavors/models/test_flavor_extra_specs.py
index 95bcb8d6..a08f171b 100644
--- a/metatests/cloudcafe/compute/flavors/models/test_flavor_extra_specs.py
+++ b/metatests/cloudcafe/compute/flavors/models/test_flavor_extra_specs.py
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
-import unittest2 as unittest
+import unittest
 
 from cloudcafe.compute.flavors_api.models.flavor_extra_specs \
     import FlavorExtraSpecs
diff --git a/metatests/cloudcafe/compute/flavors/models/test_flavors.py b/metatests/cloudcafe/compute/flavors/models/test_flavors.py
index 530dc281..babe4a8e 100644
--- a/metatests/cloudcafe/compute/flavors/models/test_flavors.py
+++ b/metatests/cloudcafe/compute/flavors/models/test_flavors.py
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
-import unittest2 as unittest
+import unittest
 
 from cloudcafe.compute.common.constants import Constants
 from cloudcafe.compute.flavors_api.models.flavor import Flavor
diff --git a/metatests/cloudcafe/compute/hosts/models/test_hosts.py b/metatests/cloudcafe/compute/hosts/models/test_hosts.py
index ba5ddab5..0c9525e0 100644
--- a/metatests/cloudcafe/compute/hosts/models/test_hosts.py
+++ b/metatests/cloudcafe/compute/hosts/models/test_hosts.py
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
-import unittest2 as unittest
+import unittest
 
 from cloudcafe.compute.hosts_api.models.hosts import Host
 
diff --git a/metatests/cloudcafe/compute/hypervisors/models/test_hypervisors.py b/metatests/cloudcafe/compute/hypervisors/models/test_hypervisors.py
index 7507ca68..e480583e 100644
--- a/metatests/cloudcafe/compute/hypervisors/models/test_hypervisors.py
+++ b/metatests/cloudcafe/compute/hypervisors/models/test_hypervisors.py
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
-import unittest2 as unittest
+import unittest
 from cloudcafe.compute.hypervisors_api.model.hypervisor import Hypervisors
 
 
diff --git a/metatests/cloudcafe/compute/hypervisors/models/test_hypervisors_min.py b/metatests/cloudcafe/compute/hypervisors/models/test_hypervisors_min.py
index 0c97fd1b..eb354b62 100644
--- a/metatests/cloudcafe/compute/hypervisors/models/test_hypervisors_min.py
+++ b/metatests/cloudcafe/compute/hypervisors/models/test_hypervisors_min.py
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
-import unittest2 as unittest
+import unittest
 from cloudcafe.compute.hypervisors_api.model.hypervisor import HypervisorsMin
 
 
diff --git a/metatests/cloudcafe/compute/images/models/test_images.py b/metatests/cloudcafe/compute/images/models/test_images.py
index 478e2e86..687f05ca 100644
--- a/metatests/cloudcafe/compute/images/models/test_images.py
+++ b/metatests/cloudcafe/compute/images/models/test_images.py
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
-import unittest2 as unittest
+import unittest
 
 from cloudcafe.compute.images_api.models.image import Image
 
diff --git a/metatests/cloudcafe/compute/limits/models/test_limits.py b/metatests/cloudcafe/compute/limits/models/test_limits.py
index c159f446..cae54b91 100644
--- a/metatests/cloudcafe/compute/limits/models/test_limits.py
+++ b/metatests/cloudcafe/compute/limits/models/test_limits.py
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
-import unittest2 as unittest
+import unittest
 
 from cloudcafe.compute.limits_api.models.limit import TenantLimits
 
diff --git a/metatests/cloudcafe/compute/quotas/models/test_quota_requests.py b/metatests/cloudcafe/compute/quotas/models/test_quota_requests.py
index 5c649141..bdac9e78 100644
--- a/metatests/cloudcafe/compute/quotas/models/test_quota_requests.py
+++ b/metatests/cloudcafe/compute/quotas/models/test_quota_requests.py
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
-import unittest2 as unittest
+import unittest
 
 from cloudcafe.compute.quotas_api.models.requests import UpdateQuotaRequest
 
diff --git a/metatests/cloudcafe/compute/quotas/models/test_quotas.py b/metatests/cloudcafe/compute/quotas/models/test_quotas.py
index 5371ff57..a93678c7 100644
--- a/metatests/cloudcafe/compute/quotas/models/test_quotas.py
+++ b/metatests/cloudcafe/compute/quotas/models/test_quotas.py
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
-import unittest2 as unittest
+import unittest
 
 from cloudcafe.compute.quotas_api.models.quotas import Quota
 
diff --git a/metatests/cloudcafe/compute/security_group_rules/models/test_security_group_requests.py b/metatests/cloudcafe/compute/security_group_rules/models/test_security_group_requests.py
index 10f446f3..effccf7a 100644
--- a/metatests/cloudcafe/compute/security_group_rules/models/test_security_group_requests.py
+++ b/metatests/cloudcafe/compute/security_group_rules/models/test_security_group_requests.py
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
-import unittest2 as unittest
+import unittest
 
 from cloudcafe.compute.extensions.security_groups_api.models.\
     requests import CreateSecurityGroupRule
diff --git a/metatests/cloudcafe/compute/security_group_rules/models/test_security_group_rule.py b/metatests/cloudcafe/compute/security_group_rules/models/test_security_group_rule.py
index 9a06ca94..55f53764 100644
--- a/metatests/cloudcafe/compute/security_group_rules/models/test_security_group_rule.py
+++ b/metatests/cloudcafe/compute/security_group_rules/models/test_security_group_rule.py
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
-import unittest2 as unittest
+import unittest
 
 from cloudcafe.compute.extensions.security_groups_api.models.\
     security_group_rule import SecurityGroupRule
diff --git a/metatests/cloudcafe/compute/servers/models/servers_requests.py b/metatests/cloudcafe/compute/servers/models/servers_requests.py
index 08aeac1f..fe9acd51 100644
--- a/metatests/cloudcafe/compute/servers/models/servers_requests.py
+++ b/metatests/cloudcafe/compute/servers/models/servers_requests.py
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
-import unittest2 as unittest
+import unittest
 import xml.etree.ElementTree as ET
 
 from cloudcafe.compute.servers_api.models.requests import CreateServer
diff --git a/metatests/cloudcafe/compute/servers/models/test_servers.py b/metatests/cloudcafe/compute/servers/models/test_servers.py
index 0203ad59..c44aed32 100644
--- a/metatests/cloudcafe/compute/servers/models/test_servers.py
+++ b/metatests/cloudcafe/compute/servers/models/test_servers.py
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
-import unittest2 as unittest
+import unittest
 
 from cloudcafe.compute.common.types import ComputeTaskStates
 from cloudcafe.compute.servers_api.models.servers import Server
diff --git a/metatests/cloudcafe/images/v2_0/client_test.py b/metatests/cloudcafe/images/v2_0/client_test.py
index dca91184..b3cde1fe 100644
--- a/metatests/cloudcafe/images/v2_0/client_test.py
+++ b/metatests/cloudcafe/images/v2_0/client_test.py
@@ -18,7 +18,7 @@ from copy import deepcopy
 from httpretty import HTTPretty
 import os
 import re
-import unittest2 as unittest
+import unittest
 
 from cloudcafe.images.v2.client import ImagesClient
 from cloudcafe.images.v2.models.image import Image
diff --git a/metatests/cloudcafe/images/v2_0/models/image_test.py b/metatests/cloudcafe/images/v2_0/models/image_test.py
index 1ecab519..b9a30bc0 100644
--- a/metatests/cloudcafe/images/v2_0/models/image_test.py
+++ b/metatests/cloudcafe/images/v2_0/models/image_test.py
@@ -18,7 +18,7 @@ from copy import deepcopy
 import dateutil.parser
 import json
 import os
-import unittest2 as unittest
+import unittest
 
 from cloudcafe.images.common.types import (
     ImageContainerFormat, ImageDiskFormat, ImageStatus, ImageVisibility)
diff --git a/metatests/cloudcafe/images/v2_0/models/member_test.py b/metatests/cloudcafe/images/v2_0/models/member_test.py
index 309c6710..c034b004 100644
--- a/metatests/cloudcafe/images/v2_0/models/member_test.py
+++ b/metatests/cloudcafe/images/v2_0/models/member_test.py
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
-import unittest2 as unittest
+import unittest
 
 from cloudcafe.images.v2.models.image import Member
 
diff --git a/metatests/cloudcafe/images/v2_0/models/members_test.py b/metatests/cloudcafe/images/v2_0/models/members_test.py
index 2b7eeae4..71856ae5 100644
--- a/metatests/cloudcafe/images/v2_0/models/members_test.py
+++ b/metatests/cloudcafe/images/v2_0/models/members_test.py
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
-import unittest2 as unittest
+import unittest
 
 from cloudcafe.images.v2.models.image import Members, Member
 
diff --git a/metatests/cloudcafe/networking/lbaas/common/client.py b/metatests/cloudcafe/networking/lbaas/common/client.py
index b5c28676..acebe202 100644
--- a/metatests/cloudcafe/networking/lbaas/common/client.py
+++ b/metatests/cloudcafe/networking/lbaas/common/client.py
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
-import unittest2 as unittest
+import unittest
 
 from lbaascafe.lbaas.lbaas_api.clients.base_load_balancers_client \
     import BaseLoadBalancersClient
diff --git a/test-requirements.txt b/test-requirements.txt
index 729c458e..b4396f14 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,4 +1,3 @@
 httpretty
-unittest2
 mock
 flake8