Move nova resources to engine/resources/openstack/nova/

Change-Id: Ic07bbd9b356c581db4ffe47835e84900ffa41d8a
Implements: blueprint reorganize-resources-code-structure

contrib/rackspace/rackspace/resources/cloud_server.py

@@ -16,7 +16,8 @@ from oslo_log import log as logging
 from heat.common import exception
 from heat.common.i18n import _
 from heat.common.i18n import _LW
-from heat.engine.resources import server
+from heat.engine.resources.openstack.nova import server
+
 
 try:
     import pyrax  # noqa

heat/tests/test_environment.py

@@ -23,6 +23,7 @@ from heat.common import environment_format
 from heat.engine import environment
 from heat.engine import resources
 from heat.engine.resources.aws.ec2 import instance
+from heat.engine.resources.openstack.nova import server
 from heat.tests import common
 from heat.tests import generic_resource
 
@@ -408,7 +409,7 @@ class GlobalEnvLoadingTest(common.HeatTestCase):
         self.assertIsNone(g_env.get_resource_info('AWS::EC2::Instance'))
 
         # 4. make sure we haven't removed something we shouldn't have
-        self.assertEqual(resources.server.Server,
+        self.assertEqual(server.Server,
                          g_env.get_resource_info('OS::Nova::Server').value)
 
     def test_env_user_cant_disable_sys_resource(self):

heat/tests/test_metadata_refresh.py

@@ -21,7 +21,7 @@ from heat.engine import environment
 from heat.engine import parser
 from heat.engine.resources.aws.cfn import wait_condition_handle as aws_wch
 from heat.engine.resources.aws.ec2 import instance
-from heat.engine.resources import server
+from heat.engine.resources.openstack.nova import server
 from heat.engine import scheduler
 from heat.engine import service
 from heat.tests import common

heat/tests/test_nova_floatingip.py

@@ -19,7 +19,7 @@ import six
 from heat.common import exception as heat_ex
 from heat.common import template_format
 from heat.engine.clients.os import nova
-from heat.engine.resources import nova_floatingip
+from heat.engine.resources.openstack.nova import nova_floatingip
 from heat.engine import rsrc_defn
 from heat.engine import scheduler
 from heat.tests import common

heat/tests/test_nova_keypair.py

@@ -18,7 +18,7 @@ import six
 
 from heat.common import exception
 from heat.engine.clients.os import nova
-from heat.engine.resources import nova_keypair
+from heat.engine.resources.openstack.nova import nova_keypair
 from heat.engine import scheduler
 from heat.tests import common
 from heat.tests import utils

heat/tests/test_server.py

@@ -31,7 +31,7 @@ from heat.engine.clients.os import swift
 from heat.engine import environment
 from heat.engine import parser
 from heat.engine import resource
-from heat.engine.resources import server as servers
+from heat.engine.resources.openstack.nova import server as servers
 from heat.engine import scheduler
 from heat.engine import template
 from heat.tests import common