openstack
/
fuel-stats
Code Issues Proposed changes

Fix for fuel-stats DB migration 

Unique constraint fixed on oswl_stats

Change-Id: I6dc453e82b96677e93333d7e1123b3364d49b6de
This commit is contained in:
Alexander Kislitsky 2015-02-19 19:24:36 +03:00
parent b3ceff8541
commit 8d16631e88
3 changed files with 93 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
collector/collector/api/db/migrations/versions/4da2da15ec42_oswl_stats_db_structure.py
View File

@ -47,7 +47,7 @@ def upgrade():
sa.Column('resource_data', postgresql.JSON(), nullable=True),
sa.Column('resource_checksum', sa.Text(), nullable=False),
sa.PrimaryKeyConstraint('id'),
sa.UniqueConstraint('master_node_uid', 'external_id')
sa.UniqueConstraint('master_node_uid', 'external_id', 'resource_type')
),
op.create_index(op.f('ix_oswl_stats_created_date'), 'oswl_stats',
['created_date'], unique=False)

3
collector/collector/api/db/model.py
View File

@ -46,7 +46,8 @@ class InstallationStructure(db.Model):
class OpenStackWorkloadStats(db.Model):
__tablename__ = 'oswl_stats'
__table_args__ = (
db.UniqueConstraint('master_node_uid', 'external_id'),
db.UniqueConstraint('master_node_uid', 'external_id',
'resource_type'),
)
id = db.Column(db.Integer, primary_key=True)

90
collector/collector/test/db/test_model_oswl_stats.py Normal file
View File

@ -0,0 +1,90 @@
# Copyright 2015 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 datetime import datetime
from sqlalchemy.exc import IntegrityError
from collector.test.base import DbTest
from collector.api.app import db
from collector.api.db.model import OpenStackWorkloadStats
class TestModelOswlStatsLog(DbTest):
def test_unique_constraints(self):
db.session.add(OpenStackWorkloadStats(
master_node_uid='master_node_uid', external_id=1,
resource_type='vm'))
db.session.add(OpenStackWorkloadStats(
master_node_uid='master_node_uid', external_id=1,
resource_type='vm'))
self.assertRaises(IntegrityError, db.session.flush)
def test_non_nullable_fields(self):
db.session.add(OpenStackWorkloadStats())
self.assertRaises(IntegrityError, db.session.flush)
db.session.rollback()
db.session.add(OpenStackWorkloadStats(
master_node_uid='master_node_uid'))
self.assertRaises(IntegrityError, db.session.flush)
db.session.rollback()
db.session.add(OpenStackWorkloadStats(
master_node_uid='master_node_uid',
external_id=1))
self.assertRaises(IntegrityError, db.session.flush)
db.session.rollback()
db.session.add(OpenStackWorkloadStats(
master_node_uid='master_node_uid',
external_id=1, cluster_id=2))
self.assertRaises(IntegrityError, db.session.flush)
db.session.rollback()
db.session.add(OpenStackWorkloadStats(
master_node_uid='master_node_uid',
external_id=1, cluster_id=2,
created_date=datetime.utcnow()))
self.assertRaises(IntegrityError, db.session.flush)
db.session.rollback()
db.session.add(OpenStackWorkloadStats(
master_node_uid='master_node_uid',
external_id=1, cluster_id=2,
created_date=datetime.utcnow(),
updated_time=datetime.utcnow().time()))
self.assertRaises(IntegrityError, db.session.flush)
db.session.rollback()
db.session.add(OpenStackWorkloadStats(
master_node_uid='master_node_uid',
external_id=1, cluster_id=2,
created_date=datetime.utcnow(),
updated_time=datetime.utcnow().time(),
resource_checksum=''))
self.assertRaises(IntegrityError, db.session.flush)
db.session.rollback()
# All fields set
db.session.add(OpenStackWorkloadStats(
master_node_uid='master_node_uid',
external_id=1, cluster_id=2,
created_date=datetime.utcnow(),
updated_time=datetime.utcnow().time(),
resource_checksum='', resource_type='vm'))
db.session.flush()
db.session.rollback()