Merge branch 'master' of github.vcp.vzwnet.com:konstca/openbook-v4-ci

1 files changed, 21 insertions, 10 deletions

diff --git a/salt/openbook/database/files/create_openbook_schemas.sql b/salt/openbook/database/files/create_openbook_schemas.sql
index aa5ecfe..ed21ba2 100644
--- a/salt/openbook/database/files/create_openbook_schemas.sql
+++ b/salt/openbook/database/files/create_openbook_schemas.sql
@@ -83,7 +83,7 @@ CREATE TABLE `t_audit_event` (
   PRIMARY KEY (`event_id`),
   KEY `ix_audit_event_1` (`event_time`,`event_type`,`entity_id`),
   KEY `ix_audit_event_2` (`user_id`,`event_time`)
-) ENGINE=InnoDB AUTO_INCREMENT=1795 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=1798 DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
@@ -286,7 +286,7 @@ CREATE TABLE `t_customer` (
   `registration_number` varchar(128) DEFAULT NULL,
   PRIMARY KEY (`customer_id`),
   UNIQUE KEY `ix_customer_3` (`management_region_id`,`customer_name`(255))
-) ENGINE=InnoDB AUTO_INCREMENT=315459 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=315462 DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
@@ -416,7 +416,7 @@ CREATE TABLE `t_host` (
   `disk_allocation_ratio` decimal(6,2) DEFAULT NULL,
   PRIMARY KEY (`host_id`),
   KEY `ix_host_1` (`service_manager_id`,`service_region_id`,`host_foreign_id`(255))
-) ENGINE=InnoDB AUTO_INCREMENT=1421 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=1858 DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
@@ -432,7 +432,7 @@ CREATE TABLE `t_host_attributes` (
   `vm_count` int(11) NOT NULL,
   `socket_count` int(11) NOT NULL,
   PRIMARY KEY (`host_id`,`update_date`)
-) ENGINE=InnoDB AUTO_INCREMENT=1419 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=1858 DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
@@ -455,7 +455,7 @@ CREATE TABLE `t_invoice` (
   `payer_metadata` text DEFAULT NULL,
   PRIMARY KEY (`invoice_id`),
   KEY `ix_invoice_1` (`management_region_id`,`payer_type`,`payer_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=12483741 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=12484695 DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
@@ -815,7 +815,8 @@ CREATE TABLE `t_properties_schema` (
   `permitted_values` text DEFAULT NULL,
   `required` tinyint(4) NOT NULL DEFAULT 0,
   `description` varchar(2048) DEFAULT NULL,
-  PRIMARY KEY (`property_group`,`property_name`)
+  `property_type` tinyint(4) NOT NULL DEFAULT 0,
+  PRIMARY KEY (`property_group`,`property_name`,`property_type`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
@@ -1025,7 +1026,7 @@ CREATE TABLE `t_service_instance` (
   PRIMARY KEY (`service_instance_id`),
   UNIQUE KEY `ix_provisioned_entity_1` (`service_manager_id`,`service_region_id`,`service_instance_foreign_id`(255)),
   KEY `ix_provisioned_entity_3` (`service_manager_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=80235 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=82254 DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
@@ -1087,6 +1088,16 @@ CREATE TABLE `t_service_manager` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `t_service_manager_properties` (
+  `service_manager_id` int(10) unsigned NOT NULL,
+  `property_group` varchar(128) NOT NULL,
+  `property_name` varchar(128) NOT NULL,
+  `property_value` text DEFAULT NULL,
+  PRIMARY KEY (`service_manager_id`,`property_group`,`property_name`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t_service_manager_sync_metrics` (
   `service_manager_id` int(10) unsigned NOT NULL,
   `metric_name` varchar(255) NOT NULL,
@@ -1118,7 +1129,7 @@ CREATE TABLE `t_tenant` (
   KEY `ix_tenant_1` (`tenant_id`),
   KEY `ix_tenant_2` (`customer_id`),
   KEY `ix_tenant_3` (`service_manager_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=1861 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=1940 DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
@@ -1138,7 +1149,7 @@ CREATE TABLE `t_unbilled_charges` (
   `payer_metadata` text DEFAULT NULL,
   PRIMARY KEY (`invoice_id`),
   KEY `t_unbilled_charges_1` (`management_region_id`,`payer_type`,`payer_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=798 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=824 DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
@@ -1220,7 +1231,7 @@ CREATE TABLE `t_unbilled_charges_temp` (
   `payer_metadata` text DEFAULT NULL,
   PRIMARY KEY (`invoice_id`),
   KEY `t_unbilled_charges_1` (`management_region_id`,`payer_type`,`payer_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=372 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=824 DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;