x
/
daisycloud-core
Code Issues Proposed changes

Replace oslo.messaging.get_transport with get_notification_transport 

DeprecationWarning: Using function/method 'oslo_messaging.get_transport()'
is deprecated: use get_rpc_transport or get_notification_transport

Change-Id: I92fddd8de982af2a37ac0e7ca56077252d4649cc
This commit is contained in:
Vu Cong Tuan 2017-06-06 11:31:48 +07:00
parent a6c0debf2e
commit c6ea892536
2 changed files with 74 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/daisy/daisy/notifier.py
View File

@ -44,7 +44,7 @@ LOG = logging.getLogger(__name__)
def get_transport():
return oslo_messaging.get_transport(CONF)
return oslo_messaging.get_notification_transport(CONF)
class Notifier(object):

146
code/daisy/daisy/tests/common/test_utils.py
View File

@ -11,76 +11,76 @@
# 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 daisy import test
from daisy.common import exception
from daisy.common import utils
class TestUtils(test.TestCase):
def test_get_numa_node_cpus(self):
host_cpu = {'numa_node0': '0-5,12-17',
'numa_node1': '6-11,18-23'}
node0_cpus = range(0, 6) + range(12, 18)
node1_cpus = range(6, 12) + range(18, 24)
real_numa_cpus = utils.get_numa_node_cpus(host_cpu)
expect_numa_cpus = {'numa_node0': node0_cpus,
'numa_node1': node1_cpus, }
self.assertEqual(real_numa_cpus, expect_numa_cpus)
host_cpu = {'numa_node0': '0-5,12-17'}
node0_cpus = range(0, 6) + range(12, 18)
real_numa_cpus = utils.get_numa_node_cpus(host_cpu)
expect_numa_cpus = {'numa_node0': node0_cpus}
self.assertEqual(real_numa_cpus, expect_numa_cpus)
host_cpu = {'numa_node1': '6-11,18-23'}
node1_cpus = range(6, 12) + range(18, 24)
real_numa_cpus = utils.get_numa_node_cpus(host_cpu)
expect_numa_cpus = {'numa_node1': node1_cpus, }
self.assertEqual(real_numa_cpus, expect_numa_cpus)
host_cpu = {}
real_numa_cpus = utils.get_numa_node_cpus(host_cpu)
expect_numa_cpus = {}
self.assertEqual(real_numa_cpus, expect_numa_cpus)
def test_get_numa_node_from_cpus(self):
node0_cpus = range(0, 6) + range(12, 18)
node1_cpus = range(6, 12) + range(18, 24)
numa_cpus = {'numa_node0': node0_cpus,
'numa_node1': node1_cpus, }
cpus_str = '1,2,12-17'
real_numas = utils.get_numa_node_from_cpus(numa_cpus, cpus_str)
expect_numas = [0]
self.assertEqual(real_numas, expect_numas)
cpus_str = '0-5,6-11,12-17,18-23'
real_numas = utils.get_numa_node_from_cpus(numa_cpus, cpus_str)
expect_numas = [0, 1]
self.assertEqual(real_numas, expect_numas)
numa_cpus = {'numa_node': node0_cpus,
'numa_node1': node1_cpus, }
self.assertRaises(exception.Invalid,
utils.get_numa_node_from_cpus, numa_cpus, cpus_str)
def test_cidr_convert_to_ip_ranges(self):
cidr = '192.168.1.25/31'
ip_range = utils.cidr_convert_to_ip_ranges(cidr)
self.assertEqual('192.168.1.24', ip_range[0])
self.assertEqual('192.168.1.25', ip_range[1])
def test_is_ip_ranges_overlapped(self):
ip_ranges = [['12.1.1.1', '12.1.1.12'], ['12.1.1.9', '12.1.1.17']]
self.assertEqual(True, utils.is_ip_ranges_overlapped(ip_ranges))
def test_is_cidrs_overlapped_true(self):
cidrs = ['12.1.1.1/24', '13.1.1.1/24', '13.1.1.1/23']
self.assertEqual(True, utils.is_cidrs_overlapped(cidrs))
def test_is_cidrs_overlapped_false(self):
cidrs = ['12.1.1.1/24', '13.1.1.1/24', '14.1.1.1/23']
self.assertFalse(utils.is_cidrs_overlapped(cidrs))
# under the License.
from daisy import test
from daisy.common import exception
from daisy.common import utils
class TestUtils(test.TestCase):
def test_get_numa_node_cpus(self):
host_cpu = {'numa_node0': '0-5,12-17',
'numa_node1': '6-11,18-23'}
node0_cpus = range(0, 6) + range(12, 18)
node1_cpus = range(6, 12) + range(18, 24)
real_numa_cpus = utils.get_numa_node_cpus(host_cpu)
expect_numa_cpus = {'numa_node0': node0_cpus,
'numa_node1': node1_cpus, }
self.assertEqual(real_numa_cpus, expect_numa_cpus)
host_cpu = {'numa_node0': '0-5,12-17'}
node0_cpus = range(0, 6) + range(12, 18)
real_numa_cpus = utils.get_numa_node_cpus(host_cpu)
expect_numa_cpus = {'numa_node0': node0_cpus}
self.assertEqual(real_numa_cpus, expect_numa_cpus)
host_cpu = {'numa_node1': '6-11,18-23'}
node1_cpus = range(6, 12) + range(18, 24)
real_numa_cpus = utils.get_numa_node_cpus(host_cpu)
expect_numa_cpus = {'numa_node1': node1_cpus, }
self.assertEqual(real_numa_cpus, expect_numa_cpus)
host_cpu = {}
real_numa_cpus = utils.get_numa_node_cpus(host_cpu)
expect_numa_cpus = {}
self.assertEqual(real_numa_cpus, expect_numa_cpus)
def test_get_numa_node_from_cpus(self):
node0_cpus = range(0, 6) + range(12, 18)
node1_cpus = range(6, 12) + range(18, 24)
numa_cpus = {'numa_node0': node0_cpus,
'numa_node1': node1_cpus, }
cpus_str = '1,2,12-17'
real_numas = utils.get_numa_node_from_cpus(numa_cpus, cpus_str)
expect_numas = [0]
self.assertEqual(real_numas, expect_numas)
cpus_str = '0-5,6-11,12-17,18-23'
real_numas = utils.get_numa_node_from_cpus(numa_cpus, cpus_str)
expect_numas = [0, 1]
self.assertEqual(real_numas, expect_numas)
numa_cpus = {'numa_node': node0_cpus,
'numa_node1': node1_cpus, }
self.assertRaises(exception.Invalid,
utils.get_numa_node_from_cpus, numa_cpus, cpus_str)
def test_cidr_convert_to_ip_ranges(self):
cidr = '192.168.1.25/31'
ip_range = utils.cidr_convert_to_ip_ranges(cidr)
self.assertEqual('192.168.1.24', ip_range[0])
self.assertEqual('192.168.1.25', ip_range[1])
def test_is_ip_ranges_overlapped(self):
ip_ranges = [['12.1.1.1', '12.1.1.12'], ['12.1.1.9', '12.1.1.17']]
self.assertEqual(True, utils.is_ip_ranges_overlapped(ip_ranges))
def test_is_cidrs_overlapped_true(self):
cidrs = ['12.1.1.1/24', '13.1.1.1/24', '13.1.1.1/23']
self.assertEqual(True, utils.is_cidrs_overlapped(cidrs))
def test_is_cidrs_overlapped_false(self):
cidrs = ['12.1.1.1/24', '13.1.1.1/24', '14.1.1.1/23']
self.assertFalse(utils.is_cidrs_overlapped(cidrs))