Replaced all imports of unittest2 with unitest imports

Change-Id: Id5796f5e1953dc9a0073f0e76a23ccce83c2bbd7

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
 

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

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

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

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

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

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 \

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
 
 

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

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

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

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
 

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
 
 

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
 
 

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
 

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
 

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
 

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
 

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

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

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

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

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

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)

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
 

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
 

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

test-requirements.txt

@@ -1,4 +1,3 @@
 httpretty
-unittest2
 mock
 flake8