Merge "Remove legacy code from stable branch" into stable/danube

1 files changed, 0 insertions, 118 deletions

diff --git a/legacy/tests/create_zones_test.py b/legacy/tests/create_zones_test.py
deleted file mode 100644
index 1aa37477..00000000
--- a/legacy/tests/create_zones_test.py
+++ /dev/null
@@ -1,118 +0,0 @@
-##############################################################################
-# Copyright (c) 2017 ZTE Corporation and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-import pytest
-import mock
-from mock import Mock, MagicMock
-import os
-from qtip.utils.create_zones import AvailabilityZone
-
-return_list = []
-
-
-def get_agg_mock(host):
-    agg = Mock()
-    agg.name = host
-    agg.id = host
-    return agg
-
-
-class HyperMock(MagicMock):
-    def list(self):
-        mock_hypervisor = [Mock(service={'host': '10.20.0.4'}), Mock(service={'host': '10.20.0.5'})]
-        return mock_hypervisor
-
-
-class AggMock(MagicMock):
-    def get_details(self, agg_id):
-        print "get_details:{0}".format(agg_id)
-        return Mock(hosts=[])
-
-    def create(self, host, agg):
-        print "create:{0}:{1}".format(host, agg)
-        return agg
-
-    def list(self):
-        return return_list
-
-    def delete(self, agg_id):
-        print "delete:{0}".format(agg_id)
-        pass
-
-    def add_host(self, aggregate, host):
-        print "add_host:{0}:{1}".format(aggregate, host)
-        pass
-
-    def remove_host(self, agg_id, host):
-        print "remove_host:{0}:{1}".format(agg_id, host)
-        pass
-
-
-class NovaMock(MagicMock):
-    hypervisors = HyperMock()
-    aggregates = AggMock()
-
-
-@pytest.mark.xfail(reason="unstable result")
-class TestClass:
-    @pytest.mark.parametrize("test_input, expected", [
-        (['compute1', 'compute2'],
-         ['create:compute1:compute1',
-          'add_host:compute1:10.20.0.4',
-          'create:compute2:compute2',
-          'add_host:compute2:10.20.0.5']),
-        (['compute1'],
-         ['create:compute1:compute1',
-          'add_host:compute1:10.20.0.4']),
-    ])
-    @mock.patch('qtip.utils.create_zones.client', autospec=True)
-    @mock.patch('qtip.utils.create_zones.v2', autospec=True)
-    @mock.patch('qtip.utils.create_zones.session')
-    def test_create_zones_success(self, mock_keystone_session, mock_keystone_v2, mock_nova_client, test_input, expected, capfd):
-        nova_obj = NovaMock()
-        mock_nova_client.Client.return_value = nova_obj()
-        k = mock.patch.dict(os.environ, {'OS_AUTH_URL': 'http://172.10.0.5:5000',
-                                         'OS_USERNAME': 'admin',
-                                         'OS_PASSWORD': 'admin',
-                                         'OS_TENANT_NAME': 'admin'})
-        k.start()
-        azone = AvailabilityZone()
-        azone.create_aggs(test_input)
-        k.stop()
-        resout, reserr = capfd.readouterr()
-        for x in expected:
-            assert x in resout
-
-    @pytest.mark.parametrize("test_input, expected", [
-        ([get_agg_mock('10.20.0.4'), get_agg_mock('10.20.0.5')],
-         ['get_details:10.20.0.4',
-          'delete:10.20.0.4',
-          'get_details:10.20.0.5',
-          'delete:10.20.0.5']),
-        ([],
-         []),
-    ])
-    @mock.patch('qtip.utils.create_zones.client', autospec=True)
-    @mock.patch('qtip.utils.create_zones.v2', autospec=True)
-    @mock.patch('qtip.utils.create_zones.session')
-    def test_clean_all_aggregates(self, mock_keystone_session, mock_keystone_v2, mock_nova_client, test_input, expected, capfd):
-        global return_list
-        return_list = test_input
-        nova_obj = NovaMock()
-        mock_nova_client.Client.return_value = nova_obj()
-        k = mock.patch.dict(os.environ, {'OS_AUTH_URL': 'http://172.10.0.5:5000',
-                                         'OS_USERNAME': 'admin',
-                                         'OS_PASSWORD': 'admin',
-                                         'OS_TENANT_NAME': 'admin'})
-        k.start()
-        azone = AvailabilityZone()
-        azone.clean_all_aggregates()
-        k.stop()
-        resout, reserr = capfd.readouterr()
-        for x in expected:
-            assert x in resout