Change namespace for Nova resources and tests

Change namespace to more specified.
Use path to specify resource or test should be enough.

Change-Id: I8f42e4ab446b0369d4c53fa4d3a734689ab541e3

contrib/rackspace/rackspace/tests/test_rackspace_cloud_server.py

@@ -25,12 +25,11 @@ from heat.engine import scheduler
 from heat.engine import stack as parser
 from heat.engine import template
 from heat.tests import common
-from heat.tests.nova import fakes
+from heat.tests.openstack.nova import fakes
 from heat.tests import utils
 
 from ..resources import cloud_server  # noqa
 
-
 wp_template = '''
 {
   "AWSTemplateFormatVersion" : "2010-09-09",

heat/tests/autoscaling/test_scaling_group.py

@@ -25,7 +25,7 @@ from heat.engine import rsrc_defn
 from heat.engine import scheduler
 from heat.tests.autoscaling import inline_templates
 from heat.tests import common
-from heat.tests.nova import fakes as fakes_nova
+from heat.tests.openstack.nova import fakes as fakes_nova
 from heat.tests import utils
 
 

heat/tests/aws/test_eip.py

@@ -29,7 +29,7 @@ from heat.engine import scheduler
 from heat.engine import stack as parser
 from heat.engine import template as tmpl
 from heat.tests import common
-from heat.tests.nova import fakes as fakes_nova
+from heat.tests.openstack.nova import fakes as fakes_nova
 from heat.tests import utils
 
 

heat/tests/aws/test_instance.py

@@ -34,10 +34,9 @@ from heat.engine import scheduler
 from heat.engine import stack as parser
 from heat.engine import template
 from heat.tests import common
-from heat.tests.nova import fakes as fakes_nova
+from heat.tests.openstack.nova import fakes as fakes_nova
 from heat.tests import utils
 
-
 wp_template = '''
 {
   "AWSTemplateFormatVersion" : "2010-09-09",

heat/tests/aws/test_instance_network.py

@@ -25,10 +25,9 @@ from heat.engine import scheduler
 from heat.engine import stack as parser
 from heat.engine import template
 from heat.tests import common
-from heat.tests.nova import fakes as fakes_nova
+from heat.tests.openstack.nova import fakes as fakes_nova
 from heat.tests import utils
 
-
 wp_template = '''
 {
   "AWSTemplateFormatVersion" : "2010-09-09",

heat/tests/aws/test_loadbalancer.py

@@ -22,7 +22,7 @@ from heat.engine.clients.os import nova
 from heat.engine.resources.aws.lb import loadbalancer as lb
 from heat.engine import rsrc_defn
 from heat.tests import common
-from heat.tests.nova import fakes as fakes_nova
+from heat.tests.openstack.nova import fakes as fakes_nova
 from heat.tests import utils
 
 

heat/tests/aws/test_security_group.py

@@ -31,10 +31,9 @@ from heat.engine import scheduler
 from heat.engine import stack as parser
 from heat.engine import template
 from heat.tests import common
-from heat.tests.nova import fakes as fakes_nova
+from heat.tests.openstack.nova import fakes as fakes_nova
 from heat.tests import utils
 
-
 NovaSG = collections.namedtuple('NovaSG',
                                 ' '.join([
                                     'name',

heat/tests/aws/test_volume.py

@@ -28,7 +28,7 @@ from heat.engine.resources.aws.ec2 import volume as aws_vol
 from heat.engine import rsrc_defn
 from heat.engine import scheduler
 from heat.tests.cinder import test_volume_utils as vt_base
-from heat.tests.nova import fakes as fakes_nova
+from heat.tests.openstack.nova import fakes as fakes_nova
 from heat.tests import utils
 
 

heat/tests/cinder/test_volume.py

@@ -29,7 +29,7 @@ from heat.engine import rsrc_defn
 from heat.engine import scheduler
 from heat.objects import resource_data as resource_data_object
 from heat.tests.cinder import test_volume_utils as vt_base
-from heat.tests.nova import fakes as fakes_nova
+from heat.tests.openstack.nova import fakes as fakes_nova
 from heat.tests import utils
 
 cinder_volume_template = '''

heat/tests/cinder/test_volume_utils.py

@@ -21,7 +21,7 @@ from heat.engine.resources.aws.ec2 import volume as aws_vol
 from heat.engine.resources.openstack.cinder import volume as os_vol
 from heat.engine import scheduler
 from heat.tests import common
-from heat.tests.nova import fakes as fakes_nova
+from heat.tests.openstack.nova import fakes as fakes_nova
 
 
 class BaseVolumeTest(common.HeatTestCase):

heat/tests/clients/test_clients.py

@@ -35,7 +35,7 @@ from heat.engine import clients
 from heat.engine.clients import client_plugin
 from heat.tests import common
 from heat.tests import fakes
-from heat.tests.nova import fakes as fakes_nova
+from heat.tests.openstack.nova import fakes as fakes_nova
 from heat.tests import utils
 
 

heat/tests/clients/test_nova_client.py

@@ -25,7 +25,7 @@ import six
 from heat.common import exception
 from heat.engine.clients.os import nova
 from heat.tests import common
-from heat.tests.nova import fakes as fakes_nova
+from heat.tests.openstack.nova import fakes as fakes_nova
 from heat.tests import utils
 
 

heat/tests/db/test_sqlalchemy_api.py

@@ -35,10 +35,9 @@ from heat.engine import scheduler
 from heat.engine import stack as parser
 from heat.engine import template as tmpl
 from heat.tests import common
-from heat.tests.nova import fakes as fakes_nova
+from heat.tests.openstack.nova import fakes as fakes_nova
 from heat.tests import utils
 
-
 wp_template = '''
 {
   "AWSTemplateFormatVersion" : "2010-09-09",

heat/tests/engine/service/test_stack_create.py

@@ -28,7 +28,7 @@ from heat.engine import template as templatem
 from heat.objects import stack as stack_object
 from heat.tests import common
 from heat.tests.engine import tools
-from heat.tests.nova import fakes as fakes_nova
+from heat.tests.openstack.nova import fakes as fakes_nova
 from heat.tests import utils
 
 

heat/tests/engine/tools.py

@@ -24,7 +24,7 @@ from heat.engine.resources.aws.ec2 import instance as instances
 from heat.engine import stack as parser
 from heat.engine import template as templatem
 from heat.tests import fakes as test_fakes
-from heat.tests.nova import fakes as fakes_nova
+from heat.tests.openstack.nova import fakes as fakes_nova
 from heat.tests import utils
 
 wp_template = '''

heat/tests/neutron/test_neutron_loadbalancer.py

@@ -28,7 +28,7 @@ from heat.engine.clients.os import nova
 from heat.engine.resources.openstack.neutron import loadbalancer
 from heat.engine import scheduler
 from heat.tests import common
-from heat.tests.nova import fakes as fakes_nova
+from heat.tests.openstack.nova import fakes as fakes_nova
 from heat.tests import utils
 
 

heat/tests/neutron/test_neutron_security_group.py

@@ -23,7 +23,7 @@ from heat.engine import scheduler
 from heat.engine import stack as parser
 from heat.engine import template
 from heat.tests import common
-from heat.tests.nova import fakes as fakes_nova
+from heat.tests.openstack.nova import fakes as fakes_nova
 from heat.tests import utils
 
 

heat/tests/openstack/nova/test_flavor.py

@@ -14,7 +14,7 @@
 import mock
 
 from heat.engine.clients.os import nova as novac
-from heat.engine.resources.openstack.nova import nova_flavor
+from heat.engine.resources.openstack.nova import flavor
 from heat.engine import stack
 from heat.engine import template
 from heat.tests import common
@@ -59,10 +59,10 @@ class NovaFlavorTest(common.HeatTestCase):
         self.flavors = self.novaclient.flavors
 
     def test_resource_mapping(self):
-        mapping = nova_flavor.resource_mapping()
+        mapping = flavor.resource_mapping()
         self.assertEqual(1, len(mapping))
-        self.assertEqual(nova_flavor.NovaFlavor, mapping['OS::Nova::Flavor'])
-        self.assertIsInstance(self.my_flavor, nova_flavor.NovaFlavor)
+        self.assertEqual(flavor.NovaFlavor, mapping['OS::Nova::Flavor'])
+        self.assertIsInstance(self.my_flavor, flavor.NovaFlavor)
 
     def test_flavor_handle_create(self):
         value = mock.MagicMock()

heat/tests/openstack/nova/test_floatingip.py

@@ -20,11 +20,11 @@ from heat.common import exception as heat_ex
 from heat.common import short_id
 from heat.common import template_format
 from heat.engine.clients.os import nova
-from heat.engine.resources.openstack.nova import nova_floatingip
+from heat.engine.resources.openstack.nova import floatingip
 from heat.engine import rsrc_defn
 from heat.engine import scheduler
 from heat.tests import common
-from heat.tests.nova import fakes as fakes_nova
+from heat.tests.openstack.nova import fakes as fakes_nova
 from heat.tests import utils
 
 
@@ -95,9 +95,9 @@ class NovaFloatingIPTest(common.HeatTestCase):
         self.stack = utils.parse_stack(template)
         defns = self.stack.t.resource_definitions(self.stack)
 
-        return nova_floatingip.NovaFloatingIp('MyFloatingIP',
-                                              defns['MyFloatingIP'],
-                                              self.stack)
+        return floatingip.NovaFloatingIp('MyFloatingIP',
+                                         defns['MyFloatingIP'],
+                                         self.stack)
 
     def prepare_floating_ip_assoc(self):
         nova.NovaClientPlugin._create().AndReturn(
@@ -116,7 +116,7 @@ class NovaFloatingIPTest(common.HeatTestCase):
         resource_defns = self.stack.t.resource_definitions(self.stack)
         floating_ip_assoc = resource_defns['MyFloatingIPAssociation']
 
-        return nova_floatingip.NovaFloatingIpAssociation(
+        return floatingip.NovaFloatingIpAssociation(
             'MyFloatingIPAssociation', floating_ip_assoc, self.stack)
 
     def test_floating_ip_create(self):

heat/tests/openstack/nova/test_keypair.py

@@ -18,10 +18,10 @@ import six
 
 from heat.common import exception
 from heat.engine.clients.os import nova
-from heat.engine.resources.openstack.nova import nova_keypair
+from heat.engine.resources.openstack.nova import keypair
 from heat.engine import scheduler
 from heat.tests import common
-from heat.tests.nova import fakes as fakes_nova
+from heat.tests.openstack.nova import fakes as fakes_nova
 from heat.tests import utils
 
 
@@ -60,7 +60,7 @@ class NovaKeyPairTest(common.HeatTestCase):
     def _get_test_resource(self, template):
         self.stack = utils.parse_stack(template)
         definition = self.stack.t.resource_definitions(self.stack)['kp']
-        kp_res = nova_keypair.KeyPair('kp', definition, self.stack)
+        kp_res = keypair.KeyPair('kp', definition, self.stack)
         self.m.StubOutWithMock(nova.NovaClientPlugin, '_create')
         nova.NovaClientPlugin._create().AndReturn(self.fake_nova)
         return kp_res
@@ -105,7 +105,7 @@ class NovaKeyPairTest(common.HeatTestCase):
         template['resources']['kp']['properties']['name'] = key_name
         stack = utils.parse_stack(template)
         definition = stack.t.resource_definitions(stack)['kp']
-        kp_res = nova_keypair.KeyPair('kp', definition, stack)
+        kp_res = keypair.KeyPair('kp', definition, stack)
         self.m.ReplayAll()
         error = self.assertRaises(exception.StackValidationFailed,
                                   kp_res.validate)
@@ -121,7 +121,7 @@ class NovaKeyPairTest(common.HeatTestCase):
         template['resources']['kp']['properties']['name'] = key_name
         stack = utils.parse_stack(template)
         definition = stack.t.resource_definitions(stack)['kp']
-        kp_res = nova_keypair.KeyPair('kp', definition, stack)
+        kp_res = keypair.KeyPair('kp', definition, stack)
         self.m.ReplayAll()
         error = self.assertRaises(exception.StackValidationFailed,
                                   kp_res.validate)

heat/tests/openstack/nova/test_server.py

@@ -41,10 +41,9 @@ from heat.engine import stack as parser
 from heat.engine import template
 from heat.objects import resource_data as resource_data_object
 from heat.tests import common
-from heat.tests.nova import fakes as fakes_nova
+from heat.tests.openstack.nova import fakes as fakes_nova
 from heat.tests import utils
 
-
 wp_template = '''
 {
   "AWSTemplateFormatVersion" : "2010-09-09",

heat/tests/test_engine_service.py

@@ -36,7 +36,7 @@ from heat.objects import stack as stack_object
 from heat.tests import common
 from heat.tests.engine import tools
 from heat.tests import generic_resource as generic_rsrc
-from heat.tests.nova import fakes as fakes_nova
+from heat.tests.openstack.nova import fakes as fakes_nova
 from heat.tests import utils
 
 cfg.CONF.import_opt('engine_life_check_timeout', 'heat.common.config')

heat/tests/test_instance_group_update_policy.py

@@ -21,7 +21,7 @@ from heat.engine import function
 from heat.engine.resources.openstack.heat import instance_group as instgrp
 from heat.engine import rsrc_defn
 from heat.tests import common
-from heat.tests.nova import fakes as fakes_nova
+from heat.tests.openstack.nova import fakes as fakes_nova
 from heat.tests import utils
 
 

heat/tests/test_nokey.py

@@ -17,7 +17,7 @@ from heat.engine.clients.os import nova
 from heat.engine.resources.aws.ec2 import instance as instances
 from heat.engine import scheduler
 from heat.tests import common
-from heat.tests.nova import fakes as fakes_nova
+from heat.tests.openstack.nova import fakes as fakes_nova
 from heat.tests import utils
 
 

heat/tests/test_server_tags.py

@@ -23,10 +23,9 @@ from heat.engine import scheduler
 from heat.engine import stack as parser
 from heat.engine import template as tmpl
 from heat.tests import common
-from heat.tests.nova import fakes as fakes_nova
+from heat.tests.openstack.nova import fakes as fakes_nova
 from heat.tests import utils
 
-
 instance_template = '''
 {
   "AWSTemplateFormatVersion" : "2010-09-09",

heat/tests/test_template.py

@@ -33,10 +33,9 @@ from heat.engine import rsrc_defn
 from heat.engine import stack
 from heat.engine import template
 from heat.tests import common
-from heat.tests.nova import fakes as fakes_nova
+from heat.tests.openstack.nova import fakes as fakes_nova
 from heat.tests import utils
 
-
 mapping_template = template_format.parse('''{
   "AWSTemplateFormatVersion" : "2010-09-09",
   "Mappings" : {

heat/tests/test_validate.py

@@ -28,7 +28,7 @@ from heat.engine import service
 from heat.engine import stack as parser
 from heat.engine import template as tmpl
 from heat.tests import common
-from heat.tests.nova import fakes as fakes_nova
+from heat.tests.openstack.nova import fakes as fakes_nova
 from heat.tests import utils
 
 test_template_volumeattach = '''