old_contents: # Licensed under the Apache License, Version 2.0 (the "License"); you may
  # not use this file except in compliance with the License. You may obtain
  # a copy of the License at
  #
  #      http://www.apache.org/licenses/LICENSE-2.0
  #
  # Unless required by applicable law or agreed to in writing, software
  # distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
  # License for the specific language governing permissions and limitations
  # under the License.
  
  from tempest.lib import decorators
  from tempest import test
  
  from senlin.tests.tempest.common import utils
  from senlin.tests.tempest.integration import base
  
  
  class TestNovaServerCluster(base.BaseSenlinIntegrationTest):
  
      def setUp(self):
          super(TestNovaServerCluster, self).setUp()
          self.profile_id = utils.create_a_profile(self)
          self.addCleanup(utils.delete_a_profile, self, self.profile_id)
  
      @test.attr(type=['integration'])
      @decorators.idempotent_id('c26eae1c-5c46-4a5f-be63-954d7229c8cc')
      def test_cluster_create_delete(self):
          # Create a cluster
          desired_capacity = 2
          min_size = 1
          max_size = 3
          metadata = {'k1': 'v1'}
          timeout = 600
          cluster_id = utils.create_a_cluster(
              self, self.profile_id, desired_capacity, min_size, max_size,
              timeout, metadata)
  
          # Verify creation result
          cluster = utils.get_a_cluster(self, cluster_id)
          self.assertIsNotNone(cluster)
          self.assertEqual(desired_capacity, cluster['desired_capacity'])
          self.assertEqual(desired_capacity, len(cluster['nodes']))
          for nid in cluster['nodes']:
              # TODO(Yanyan Hu)verify nova server property as well
              # after node show datail works.
              node = utils.get_a_node(self, nid)
              self.assertEqual('ACTIVE', node['status'])
              self.assertEqual(cluster_id, node['cluster_id'])
  
          # Delete cluster
          utils.delete_a_cluster(self, cluster_id)
  
new_contents: # Licensed under the Apache License, Version 2.0 (the "License"); you may
  # not use this file except in compliance with the License. You may obtain
  # a copy of the License at
  #
  #      http://www.apache.org/licenses/LICENSE-2.0
  #
  # Unless required by applicable law or agreed to in writing, software
  # distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
  # License for the specific language governing permissions and limitations
  # under the License.
  
  from tempest.lib import decorators
  from tempest import test
  
  from senlin.tests.tempest.common import constants
  from senlin.tests.tempest.common import utils
  from senlin.tests.tempest.integration import base
  
  
  class TestNovaServerCluster(base.BaseSenlinIntegrationTest):
  
      def setUp(self):
          super(TestNovaServerCluster, self).setUp()
          spec = constants.spec_nova_server
          spec['properties'].pop('key_name')
          self.profile_id = utils.create_a_profile(self, spec)
          self.addCleanup(utils.delete_a_profile, self, self.profile_id)
  
      @test.attr(type=['integration'])
      @decorators.idempotent_id('c26eae1c-5c46-4a5f-be63-954d7229c8cc')
      def test_cluster_create_delete(self):
          # Create a cluster
          desired_capacity = 2
          min_size = 1
          max_size = 3
          metadata = {'k1': 'v1'}
          timeout = 600
          cluster_id = utils.create_a_cluster(
              self, self.profile_id, desired_capacity, min_size, max_size,
              timeout, metadata)
  
          # Verify creation result
          cluster = utils.get_a_cluster(self, cluster_id)
          self.assertIsNotNone(cluster)
          self.assertEqual(desired_capacity, cluster['desired_capacity'])
          self.assertEqual(desired_capacity, len(cluster['nodes']))
          for nid in cluster['nodes']:
              # TODO(Yanyan Hu)verify nova server property as well
              # after node show datail works.
              node = utils.get_a_node(self, nid)
              self.assertEqual('ACTIVE', node['status'])
              self.assertEqual(cluster_id, node['cluster_id'])
  
          # Delete cluster
          utils.delete_a_cluster(self, cluster_id)
  
subject: Fix integration test