Revert "Fixes for commit 6e4ef67269b849edb20e7ea9e73685a5cee0e6fc"

This reverts commit 763d5c25bc.

Change-Id: I6eea7fc85b6940109ed9cf3f3b97148b7bf90332
Partial-Bug: #1656804
This commit is contained in:
Anastasia Balobashina 2017-01-17 18:33:17 +00:00 committed by Anastasiya
parent b697091131
commit 75db9b9d2b
3 changed files with 8 additions and 52 deletions

View File

@ -308,7 +308,6 @@ DEFAULT_RELEASE_BOND_NFV_ATTRIBUTES = {
}
}
# minimal RAM amount for OVS+DPDK in MB
MIN_DPDK_HUGEPAGES_MEMORY = 1024
@ -554,16 +553,14 @@ def upgrade_cluster_attributes(connection):
def upgrade_release_node_attributes(connection):
select_query = sa.sql.text(
'SELECT id, node_attributes, version FROM releases '
'SELECT id, node_attributes FROM releases '
'WHERE node_attributes IS NOT NULL')
update_query = sa.sql.text(
'UPDATE releases SET node_attributes = :node_attributes '
'WHERE id = :release_id')
for release_id, node_attrs, version in connection.execute(select_query):
if not is_feature_supported(version, FUEL_DPDK_HUGEPAGES_VERSION):
continue
for release_id, node_attrs in connection.execute(select_query):
node_attrs = jsonutils.loads(node_attrs)
dpdk = node_attrs.setdefault('hugepages', {}).setdefault('dpdk', {})
dpdk['min'] = MIN_DPDK_HUGEPAGES_MEMORY
@ -576,18 +573,14 @@ def upgrade_release_node_attributes(connection):
def upgrade_node_attributes(connection):
select_query = sa.sql.text(
'SELECT nodes.id, attributes, version FROM nodes INNER JOIN clusters '
'ON clusters.id = nodes.cluster_id INNER JOIN releases '
'ON releases.id = clusters.release_id '
'WHERE nodes.attributes IS NOT NULL')
'SELECT id, attributes FROM nodes '
'WHERE attributes IS NOT NULL')
update_query = sa.sql.text(
'UPDATE nodes SET attributes = :attributes '
'WHERE id = :node_id')
for node_id, attrs, version in connection.execute(select_query):
if not is_feature_supported(version, FUEL_DPDK_HUGEPAGES_VERSION):
continue
for node_id, attrs in connection.execute(select_query):
attrs = jsonutils.loads(attrs)
dpdk = attrs.setdefault('hugepages', {}).setdefault('dpdk', {})
dpdk['min'] = MIN_DPDK_HUGEPAGES_MEMORY

View File

@ -1578,7 +1578,7 @@ class NodeAttributes(object):
"""
hugepages = cls._safe_get_hugepages(node)
if (not Node.dpdk_enabled(node) or 'dpdk' not in hugepages or
if (not Node.dpdk_enabled(node) and 'dpdk' not in hugepages or
not hugepages['dpdk']['value']):
return {}

View File

@ -273,8 +273,6 @@ MIN_DPDK_HUGEPAGES_VALUE = 1024
RELEASE_VERSION = '9.0'
# version of Fuel when tags was introduced
FUEL_TAGS_SUPPORT = '9.0'
# version of Fuel when DPDK hugepages was introduced
FUEL_DPDK_HUGEPAGES_VERSION = '9.0'
NEW_ROLES_META = {
'controller': {
@ -678,57 +676,22 @@ class TestAttributesUpdate(base.BaseAlembicMigrationTest):
def test_release_node_attributes_update(self):
releases = self.meta.tables['releases']
results = db.execute(
sa.select([releases.c.node_attributes],
releases.c.id.in_(
self.get_release_ids(RELEASE_VERSION))))
sa.select([releases.c.node_attributes]))
for node_attrs in results:
node_attrs = jsonutils.loads(node_attrs[0])
dpdk = node_attrs.setdefault('hugepages', {}).setdefault('dpdk',
{})
self.assertEqual(dpdk.get('min'), MIN_DPDK_HUGEPAGES_VALUE)
def test_release_node_attributes_no_update(self):
releases = self.meta.tables['releases']
releases_list = self.get_release_ids(RELEASE_VERSION, available=False)
results = db.execute(
sa.select([releases.c.node_attributes],
releases.c.id.in_(releases_list)))
for node_attrs in results:
node_attrs = jsonutils.loads(node_attrs[0])
dpdk = node_attrs.setdefault('hugepages', {}).setdefault('dpdk',
{})
self.assertEqual(dpdk.get('min'), 0)
def test_node_attributes_update(self):
nodes = self.meta.tables['nodes']
clusters = self.meta.tables['clusters']
releases_list = self.get_release_ids(RELEASE_VERSION)
results = db.execute(
sa.select([nodes.c.attributes],
clusters.c.release_id.in_(releases_list)
).select_from(sa.join(clusters, nodes,
clusters.c.id ==
nodes.c.cluster_id)))
sa.select([nodes.c.attributes]))
for attrs in results:
attrs = jsonutils.loads(attrs[0])
dpdk = attrs.setdefault('hugepages', {}).setdefault('dpdk', {})
self.assertEqual(dpdk.get('min'), MIN_DPDK_HUGEPAGES_VALUE)
def test_node_attributes_no_update(self):
nodes = self.meta.tables['nodes']
clusters = self.meta.tables['clusters']
releases_list = self.get_release_ids(RELEASE_VERSION, available=False)
results = db.execute(
sa.select([nodes.c.attributes],
clusters.c.release_id.in_(releases_list)
).select_from(sa.join(clusters, nodes,
clusters.c.id ==
nodes.c.cluster_id)))
for attrs in results:
attrs = jsonutils.loads(attrs[0])
dpdk = attrs.setdefault('hugepages', {}).setdefault('dpdk', {})
self.assertEqual(dpdk.get('min'), 0)
def test_upgrade_release_with_nic_attributes(self):
releases_table = self.meta.tables['releases']
result = db.execute(