openstack
/
monasca-api
Code Issues Proposed changes

Removed mysql tables - follow up 

By mistake tables containing data referenced by one
of the removed tables were left behind.
This change completes removal process

Change-Id: I4fe105da166737530b57b37bb5407866c246f021
Based-On: I4d9aa891fa1631912e5219366dc322b645eae61e
This commit is contained in:
Tomasz Trębski 2016-07-29 12:52:42 +02:00
parent 88d786745f
commit d8b8014988
4 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
devstack/files/monasca-smoke-test/smoke2_configs.py
View File

@ -32,11 +32,9 @@ test_config = {
'mysql_schema': [
'alarm', 'alarm_action', 'alarm_definition', 'alarm_metric',
'metric_definition', 'metric_definition_dimensions',
'metric_dimension', 'notification_method', 'schema_migrations',
'stream_actions', 'stream_definition', 'sub_alarm',
'metric_dimension', 'notification_method', 'sub_alarm',
'sub_alarm_definition', 'sub_alarm_definition_dimension',
'event_transform', 'alarm_state', 'alarm_definition_severity',
'notification_method_type', 'stream_actions_action_type'
'alarm_state', 'alarm_definition_severity', 'notification_method_type'
],
'arg_defaults': {
'dbtype': "influxdb",

8
devstack/files/schema/mon_mysql.sql
View File

@ -41,11 +41,6 @@ CREATE TABLE `notification_method_type` (
PRIMARY KEY (`name`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
CREATE TABLE `stream_actions_action_type` (
`name` varchar(20) COLLATE utf8mb4_unicode_ci NOT NULL,
PRIMARY KEY (`name`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
CREATE TABLE `alarm` (
`id` varchar(36) COLLATE utf8mb4_unicode_ci NOT NULL,
`alarm_definition_id` varchar(36) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
@ -212,7 +207,4 @@ insert into `alarm_definition_severity` values ('CRITICAL');
insert into `notification_method_type` values ('EMAIL');
insert into `notification_method_type` values ('WEBHOOK');
insert into `notification_method_type` values ('PAGERDUTY');
insert into `stream_actions_action_type` values ('FIRE');
insert into `stream_actions_action_type` values ('EXPIRE');
/* provide data for enum tables */

3
monasca_api/tests/sqlite_alarm.sql
View File

@ -106,9 +106,6 @@ CREATE TABLE `sub_alarm` (
`updated_at` datetime NOT NULL,
PRIMARY KEY (`id`)
);
CREATE TABLE `schema_migrations` (
`version` varchar(255) NOT NULL
);
insert into `alarm_state` values ('UNDETERMINED');
insert into `alarm_state` values ('OK');

1
monasca_api/tests/test_nm_repository.py
View File

@ -116,7 +116,6 @@ class TestNotificationMethodRepoDB(testtools.TestCase, fixtures.TestWithFixtures
'metric_dimension',
'notification_method',
'notification_method_type',
'schema_migrations',
'sub_alarm',
'sub_alarm_definition',
'sub_alarm_definition_dimension']