Delete OrchestrationManager, and its unusual credentials

This removes the need for heat tests to be run with admin user
in the demo tenant.

NeutronResourcesTestJSON also needed to be modified as it was creating a router
with external_gateway_info which is enforced by policy as an admin-only operation.
This router is not required for connectivity in this test. An admin scenario
test can be created in the future which creates a router with
external_gateway_info.

Change-Id: Iba26845423b2bf52259a0c0cfab27ae09cfa4e60
Related-Bug: #1089261

tempest/api/orchestration/base.py

@@ -30,7 +30,7 @@ class BaseOrchestrationTest(tempest.test.BaseTestCase):
     @classmethod
     def setUpClass(cls):
         super(BaseOrchestrationTest, cls).setUpClass()
-        cls.os = clients.OrchestrationManager()
+        cls.os = clients.Manager()
         if not CONF.service_available.heat:
             raise cls.skipException("Heat support is required")
         cls.build_timeout = CONF.orchestration.build_timeout

tempest/api/orchestration/stacks/templates/neutron_basic.yaml

@@ -36,7 +36,6 @@ resources:
       admin_state_up: false
       external_gateway_info:
         network: {get_param: ExternalNetworkId}
-        enable_snat: false
   RouterInterface:
     type: OS::Neutron::RouterInterface
     properties:

tempest/api/orchestration/stacks/test_neutron_resources.py

@@ -137,8 +137,6 @@ class NeutronResourcesTestJSON(base.BaseOrchestrationTest):
         self.assertEqual('NewRouter', router['name'])
         self.assertEqual(self.external_network_id,
                          router['external_gateway_info']['network_id'])
-        self.assertEqual(False,
-                         router['external_gateway_info']['enable_snat'])
         self.assertEqual(False, router['admin_state_up'])
 
     @test.attr(type='slow')

tempest/clients.py

@@ -432,24 +432,6 @@ class ComputeAdminManager(Manager):
                       service=service)
 
 
-class OrchestrationManager(Manager):
-    """
-    Manager object that uses the admin credentials for its
-    so that heat templates can create users
-    """
-    def __init__(self, interface='json', service=None):
-        base = super(OrchestrationManager, self)
-        # heat currently needs an admin user so that stacks can create users
-        # however the tests need the demo tenant so that the neutron
-        # private network is the default. DO NOT change this auth combination
-        # until heat can run with the demo user.
-        base.__init__(CONF.identity.admin_username,
-                      CONF.identity.admin_password,
-                      CONF.identity.tenant_name,
-                      interface=interface,
-                      service=service)
-
-
 class OfficialClientManager(manager.Manager):
     """
     Manager that provides access to the official python clients for