old_contents: #    Copyright 2013 Mirantis, Inc.
  #
  #    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 proboscis import SkipTest
  from proboscis import test
  
  from fuelweb_test.helpers.decorators import log_snapshot_on_error
  from fuelweb_test.settings import DEPLOYMENT_MODE
  from fuelweb_test.settings import OPENSTACK_RELEASE
  from fuelweb_test.settings import OPENSTACK_RELEASE_REDHAT
  from fuelweb_test.tests.base_test_case import SetupEnvironment
  from fuelweb_test.tests.base_test_case import TestBasic
  
  
  @test(groups=["test_pullrequest"])
  class TestPullRequest(TestBasic):
      @test(depends_on=[SetupEnvironment.prepare_slaves_3],
            groups=["deploy_pr_ha"])
      @log_snapshot_on_error
      def deploy_pr_ha(self):
          """Deploy cluster in HA mode with Neutron GRE
  
          Scenario:
              1. Create cluster
              2. Add 1 node with controller role
              3. Add 1 node with compute role
              4. Deploy the cluster
              5. Validate cluster network
  
          Snapshot: deploy_pr_ha
  
          """
          if OPENSTACK_RELEASE == OPENSTACK_RELEASE_REDHAT:
              raise SkipTest()
  
          self.env.revert_snapshot("ready_with_3_slaves")
  
          segment_type = 'gre'
          cluster_id = self.fuel_web.create_cluster(
              name=self.__class__.__name__,
              mode=DEPLOYMENT_MODE,
              settings={
                  "net_provider": 'neutron',
                  "net_segment_type": segment_type
              }
          )
          self.fuel_web.update_nodes(
              cluster_id,
              {
                  'slave-01': ['controller'],
                  'slave-02': ['compute'],
              }
          )
  
          self.fuel_web.deploy_cluster_wait(cluster_id, is_feature=True)
  
          self.fuel_web.run_ostf(
              cluster_id=self.fuel_web.get_last_created_cluster(),
              should_fail=1
          )
  
new_contents: #    Copyright 2013 Mirantis, Inc.
  #
  #    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 proboscis import SkipTest
  from proboscis import test
  
  from fuelweb_test.helpers.decorators import log_snapshot_on_error
  from fuelweb_test.settings import DEPLOYMENT_MODE
  from fuelweb_test.settings import OPENSTACK_RELEASE
  from fuelweb_test.settings import OPENSTACK_RELEASE_REDHAT
  from fuelweb_test.tests.base_test_case import SetupEnvironment
  from fuelweb_test.tests.base_test_case import TestBasic
  
  
  @test(groups=["test_pullrequest"])
  class TestPullRequest(TestBasic):
      @test(depends_on=[SetupEnvironment.prepare_slaves_3],
            groups=["deploy_pr_ha"])
      @log_snapshot_on_error
      def deploy_pr_ha(self):
          """Deploy cluster in HA mode with Neutron GRE
  
          Scenario:
              1. Create cluster
              2. Add 1 node with controller role
              3. Add 1 node with compute role
              4. Deploy the cluster
              5. Validate cluster network
  
          Snapshot: deploy_pr_ha
  
          """
          if OPENSTACK_RELEASE == OPENSTACK_RELEASE_REDHAT:
              raise SkipTest()
  
          self.env.revert_snapshot("ready_with_3_slaves")
  
          segment_type = 'gre'
          cluster_id = self.fuel_web.create_cluster(
              name=self.__class__.__name__,
              mode=DEPLOYMENT_MODE,
              settings={
                  "net_provider": 'neutron',
                  "net_segment_type": segment_type
              }
          )
          self.fuel_web.update_nodes(
              cluster_id,
              {
                  'slave-01': ['controller'],
                  'slave-02': ['compute'],
              }
          )
  
          self.fuel_web.deploy_cluster_wait(cluster_id, is_feature=True)
  
subject: Remove ostf tests from test_pullrequest