From 45b5eb19523f1fe46c64afb71ce9bc2011b3b8e2 Mon Sep 17 00:00:00 2001 From: Ladislav Smola Date: Tue, 21 Aug 2018 15:17:35 +0200 Subject: [PATCH 01/13] Create OpenShift Service Catalog tables Create OpenShift Service Catalog tables --- ...create_openshift_service_catalog_tables.rb | 114 ++++++++++++++++++ 1 file changed, 114 insertions(+) create mode 100644 db/migrate/20180821112856_create_openshift_service_catalog_tables.rb diff --git a/db/migrate/20180821112856_create_openshift_service_catalog_tables.rb b/db/migrate/20180821112856_create_openshift_service_catalog_tables.rb new file mode 100644 index 000000000..86570ccdb --- /dev/null +++ b/db/migrate/20180821112856_create_openshift_service_catalog_tables.rb @@ -0,0 +1,114 @@ +class CreateOpenshiftServiceCatalogTables < ActiveRecord::Migration[5.0] + def change + create_table :container_service_brokers, :id => :bigserial, :force => :cascade do |t| + t.string :name + t.string :kind + t.string :ems_ref + t.integer :resource_version + t.text :url + + t.references :ems_id, :type => :bigint, :index => true, :references => :ext_management_systems + t.references :container_projects, :type => :bigint, :index => true + + t.jsonb :extra + + t.datetime :ems_created_on + t.timestamps + end + + create_table :container_service_classes, :id => :bigserial, :force => :cascade do |t| + t.string :name + t.string :kind + t.string :status + t.string :ems_ref + t.integer :resource_version + t.text :description + t.boolean :bindable + t.boolean :plan_updatable + + t.references :ems_id, :type => :bigint, :index => true, :references => :ext_management_systems + t.references :container_projects, :type => :bigint, :index => true + t.references :container_service_brokers, :type => :bigint, :index => true + + t.jsonb :extra + + t.datetime :ems_created_on + t.timestamps + end + + create_table :container_service_plans, :id => :bigserial, :force => :cascade do |t| + t.string :name + t.string :kind + t.string :status + t.string :ems_ref + t.integer :resource_version + t.text :description + t.boolean :free + + t.references :ems_id, :type => :bigint, :index => true, :references => :ext_management_systems + t.references :container_projects, :type => :bigint, :index => true + t.references :container_service_classes, :type => :bigint, :index => true + + t.jsonb :extra + + t.datetime :ems_created_on + t.timestamps + end + + create_table :container_service_instances, :id => :bigserial, :force => :cascade do |t| + t.string :name + t.string :kind + t.string :status + t.string :ems_ref + t.string :secret_name + t.integer :resource_version + + t.references :ems_id, :type => :bigint, :index => true, :references => :ext_management_systems + t.references :container_projects, :type => :bigint, :index => true + t.references :container_service_classes, :type => :bigint, :index => {:name => 'csi_on_container_service_classes'} + t.references :container_service_plans, :type => :bigint, :index => true + + t.jsonb :parameters + t.jsonb :parameters_from + t.jsonb :extra + + t.datetime :ems_created_on + t.timestamps + end + + create_table :container_service_bindings, :id => :bigserial, :force => :cascade do |t| + t.string :name + t.string :kind + t.string :status + t.string :ems_ref + t.string :secret_name + t.integer :resource_version + + t.references :ems_id, :type => :bigint, :index => true, :references => :ext_management_systems + t.references :container_projects, :type => :bigint, :index => true + t.references :container_service_instances, :type => :bigint, :index => {:name => 'csb_on_container_service_instances'} + + t.jsonb :parameters + t.jsonb :parameters_from + t.jsonb :extra + + t.datetime :ems_created_on + t.timestamps + end + + create_table :container_secrets, :id => :bigserial, :force => :cascade do |t| + t.string :name + t.string :kind + t.string :ems_ref + t.integer :resource_version + + t.references :ems_id, :type => :bigint, :index => true, :references => :ext_management_systems + t.references :container_projects, :type => :bigint, :index => true + + t.jsonb :extra + + t.datetime :ems_created_on + t.timestamps + end + end +end From dae30d55e19e5711da9887ad335024a2d25af7cd Mon Sep 17 00:00:00 2001 From: Ladislav Smola Date: Wed, 22 Aug 2018 14:35:51 +0200 Subject: [PATCH 02/13] Cleanup the tables and remove secrets Cleanup the tables and remove secrets --- ...create_openshift_service_catalog_tables.rb | 33 +------------------ 1 file changed, 1 insertion(+), 32 deletions(-) diff --git a/db/migrate/20180821112856_create_openshift_service_catalog_tables.rb b/db/migrate/20180821112856_create_openshift_service_catalog_tables.rb index 86570ccdb..c379515de 100644 --- a/db/migrate/20180821112856_create_openshift_service_catalog_tables.rb +++ b/db/migrate/20180821112856_create_openshift_service_catalog_tables.rb @@ -2,7 +2,6 @@ class CreateOpenshiftServiceCatalogTables < ActiveRecord::Migration[5.0] def change create_table :container_service_brokers, :id => :bigserial, :force => :cascade do |t| t.string :name - t.string :kind t.string :ems_ref t.integer :resource_version t.text :url @@ -18,13 +17,9 @@ def change create_table :container_service_classes, :id => :bigserial, :force => :cascade do |t| t.string :name - t.string :kind - t.string :status t.string :ems_ref t.integer :resource_version t.text :description - t.boolean :bindable - t.boolean :plan_updatable t.references :ems_id, :type => :bigint, :index => true, :references => :ext_management_systems t.references :container_projects, :type => :bigint, :index => true @@ -38,12 +33,9 @@ def change create_table :container_service_plans, :id => :bigserial, :force => :cascade do |t| t.string :name - t.string :kind - t.string :status t.string :ems_ref t.integer :resource_version t.text :description - t.boolean :free t.references :ems_id, :type => :bigint, :index => true, :references => :ext_management_systems t.references :container_projects, :type => :bigint, :index => true @@ -57,19 +49,16 @@ def change create_table :container_service_instances, :id => :bigserial, :force => :cascade do |t| t.string :name - t.string :kind - t.string :status t.string :ems_ref t.string :secret_name t.integer :resource_version + t.string :generate_name t.references :ems_id, :type => :bigint, :index => true, :references => :ext_management_systems t.references :container_projects, :type => :bigint, :index => true t.references :container_service_classes, :type => :bigint, :index => {:name => 'csi_on_container_service_classes'} t.references :container_service_plans, :type => :bigint, :index => true - t.jsonb :parameters - t.jsonb :parameters_from t.jsonb :extra t.datetime :ems_created_on @@ -78,33 +67,13 @@ def change create_table :container_service_bindings, :id => :bigserial, :force => :cascade do |t| t.string :name - t.string :kind - t.string :status t.string :ems_ref - t.string :secret_name t.integer :resource_version t.references :ems_id, :type => :bigint, :index => true, :references => :ext_management_systems t.references :container_projects, :type => :bigint, :index => true t.references :container_service_instances, :type => :bigint, :index => {:name => 'csb_on_container_service_instances'} - t.jsonb :parameters - t.jsonb :parameters_from - t.jsonb :extra - - t.datetime :ems_created_on - t.timestamps - end - - create_table :container_secrets, :id => :bigserial, :force => :cascade do |t| - t.string :name - t.string :kind - t.string :ems_ref - t.integer :resource_version - - t.references :ems_id, :type => :bigint, :index => true, :references => :ext_management_systems - t.references :container_projects, :type => :bigint, :index => true - t.jsonb :extra t.datetime :ems_created_on From 72b309194fb54087337330346b59e3d177efa5a1 Mon Sep 17 00:00:00 2001 From: Ladislav Smola Date: Wed, 22 Aug 2018 15:09:52 +0200 Subject: [PATCH 03/13] Fix ems_id name, it was generated wrong --- ...21112856_create_openshift_service_catalog_tables.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/db/migrate/20180821112856_create_openshift_service_catalog_tables.rb b/db/migrate/20180821112856_create_openshift_service_catalog_tables.rb index c379515de..578e3632a 100644 --- a/db/migrate/20180821112856_create_openshift_service_catalog_tables.rb +++ b/db/migrate/20180821112856_create_openshift_service_catalog_tables.rb @@ -6,7 +6,7 @@ def change t.integer :resource_version t.text :url - t.references :ems_id, :type => :bigint, :index => true, :references => :ext_management_systems + t.references :ems, :type => :bigint, :index => true, :references => :ext_management_systems t.references :container_projects, :type => :bigint, :index => true t.jsonb :extra @@ -21,7 +21,7 @@ def change t.integer :resource_version t.text :description - t.references :ems_id, :type => :bigint, :index => true, :references => :ext_management_systems + t.references :ems, :type => :bigint, :index => true, :references => :ext_management_systems t.references :container_projects, :type => :bigint, :index => true t.references :container_service_brokers, :type => :bigint, :index => true @@ -37,7 +37,7 @@ def change t.integer :resource_version t.text :description - t.references :ems_id, :type => :bigint, :index => true, :references => :ext_management_systems + t.references :ems, :type => :bigint, :index => true, :references => :ext_management_systems t.references :container_projects, :type => :bigint, :index => true t.references :container_service_classes, :type => :bigint, :index => true @@ -54,7 +54,7 @@ def change t.integer :resource_version t.string :generate_name - t.references :ems_id, :type => :bigint, :index => true, :references => :ext_management_systems + t.references :ems, :type => :bigint, :index => true, :references => :ext_management_systems t.references :container_projects, :type => :bigint, :index => true t.references :container_service_classes, :type => :bigint, :index => {:name => 'csi_on_container_service_classes'} t.references :container_service_plans, :type => :bigint, :index => true @@ -70,7 +70,7 @@ def change t.string :ems_ref t.integer :resource_version - t.references :ems_id, :type => :bigint, :index => true, :references => :ext_management_systems + t.references :ems, :type => :bigint, :index => true, :references => :ext_management_systems t.references :container_projects, :type => :bigint, :index => true t.references :container_service_instances, :type => :bigint, :index => {:name => 'csb_on_container_service_instances'} From de8bb9856e9d3d096f9085db19c92253e4cd05a9 Mon Sep 17 00:00:00 2001 From: Ladislav Smola Date: Wed, 22 Aug 2018 15:18:36 +0200 Subject: [PATCH 04/13] References name needs to be singular --- ...create_openshift_service_catalog_tables.rb | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/db/migrate/20180821112856_create_openshift_service_catalog_tables.rb b/db/migrate/20180821112856_create_openshift_service_catalog_tables.rb index 578e3632a..77d7d6692 100644 --- a/db/migrate/20180821112856_create_openshift_service_catalog_tables.rb +++ b/db/migrate/20180821112856_create_openshift_service_catalog_tables.rb @@ -6,8 +6,8 @@ def change t.integer :resource_version t.text :url - t.references :ems, :type => :bigint, :index => true, :references => :ext_management_systems - t.references :container_projects, :type => :bigint, :index => true + t.references :ems, :type => :bigint, :index => true, :references => :ext_management_system + t.references :container_project, :type => :bigint, :index => true t.jsonb :extra @@ -21,9 +21,9 @@ def change t.integer :resource_version t.text :description - t.references :ems, :type => :bigint, :index => true, :references => :ext_management_systems - t.references :container_projects, :type => :bigint, :index => true - t.references :container_service_brokers, :type => :bigint, :index => true + t.references :ems, :type => :bigint, :index => true, :references => :ext_management_system + t.references :container_project, :type => :bigint, :index => true + t.references :container_service_broker, :type => :bigint, :index => true t.jsonb :extra @@ -37,9 +37,9 @@ def change t.integer :resource_version t.text :description - t.references :ems, :type => :bigint, :index => true, :references => :ext_management_systems - t.references :container_projects, :type => :bigint, :index => true - t.references :container_service_classes, :type => :bigint, :index => true + t.references :ems, :type => :bigint, :index => true, :references => :ext_management_system + t.references :container_project, :type => :bigint, :index => true + t.references :container_service_class, :type => :bigint, :index => true t.jsonb :extra @@ -54,10 +54,10 @@ def change t.integer :resource_version t.string :generate_name - t.references :ems, :type => :bigint, :index => true, :references => :ext_management_systems - t.references :container_projects, :type => :bigint, :index => true - t.references :container_service_classes, :type => :bigint, :index => {:name => 'csi_on_container_service_classes'} - t.references :container_service_plans, :type => :bigint, :index => true + t.references :ems, :type => :bigint, :index => true, :references => :ext_management_system + t.references :container_project, :type => :bigint, :index => true + t.references :container_service_class, :type => :bigint, :index => {:name => 'csi_on_container_service_classes'} + t.references :container_service_plan, :type => :bigint, :index => true t.jsonb :extra @@ -70,9 +70,9 @@ def change t.string :ems_ref t.integer :resource_version - t.references :ems, :type => :bigint, :index => true, :references => :ext_management_systems - t.references :container_projects, :type => :bigint, :index => true - t.references :container_service_instances, :type => :bigint, :index => {:name => 'csb_on_container_service_instances'} + t.references :ems, :type => :bigint, :index => true, :references => :ext_management_system + t.references :container_project, :type => :bigint, :index => true + t.references :container_service_instance, :type => :bigint, :index => {:name => 'csb_on_container_service_instances'} t.jsonb :extra From e3ef4d07460a61e387a0ff639a6440b2a684caba Mon Sep 17 00:00:00 2001 From: Ladislav Smola Date: Wed, 22 Aug 2018 18:06:52 +0200 Subject: [PATCH 05/13] Drop bindings and broker for now --- ...create_openshift_service_catalog_tables.rb | 30 ------------------- 1 file changed, 30 deletions(-) diff --git a/db/migrate/20180821112856_create_openshift_service_catalog_tables.rb b/db/migrate/20180821112856_create_openshift_service_catalog_tables.rb index 77d7d6692..43b6d63b8 100644 --- a/db/migrate/20180821112856_create_openshift_service_catalog_tables.rb +++ b/db/migrate/20180821112856_create_openshift_service_catalog_tables.rb @@ -1,20 +1,5 @@ class CreateOpenshiftServiceCatalogTables < ActiveRecord::Migration[5.0] def change - create_table :container_service_brokers, :id => :bigserial, :force => :cascade do |t| - t.string :name - t.string :ems_ref - t.integer :resource_version - t.text :url - - t.references :ems, :type => :bigint, :index => true, :references => :ext_management_system - t.references :container_project, :type => :bigint, :index => true - - t.jsonb :extra - - t.datetime :ems_created_on - t.timestamps - end - create_table :container_service_classes, :id => :bigserial, :force => :cascade do |t| t.string :name t.string :ems_ref @@ -64,20 +49,5 @@ def change t.datetime :ems_created_on t.timestamps end - - create_table :container_service_bindings, :id => :bigserial, :force => :cascade do |t| - t.string :name - t.string :ems_ref - t.integer :resource_version - - t.references :ems, :type => :bigint, :index => true, :references => :ext_management_system - t.references :container_project, :type => :bigint, :index => true - t.references :container_service_instance, :type => :bigint, :index => {:name => 'csb_on_container_service_instances'} - - t.jsonb :extra - - t.datetime :ems_created_on - t.timestamps - end end end From dff8a6a1ed69b8615243617924f94ab0b6147b34 Mon Sep 17 00:00:00 2001 From: Ladislav Smola Date: Wed, 22 Aug 2018 18:08:18 +0200 Subject: [PATCH 06/13] Resource version has to be string for now --- ...0180821112856_create_openshift_service_catalog_tables.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/db/migrate/20180821112856_create_openshift_service_catalog_tables.rb b/db/migrate/20180821112856_create_openshift_service_catalog_tables.rb index 43b6d63b8..91b0ad857 100644 --- a/db/migrate/20180821112856_create_openshift_service_catalog_tables.rb +++ b/db/migrate/20180821112856_create_openshift_service_catalog_tables.rb @@ -3,7 +3,7 @@ def change create_table :container_service_classes, :id => :bigserial, :force => :cascade do |t| t.string :name t.string :ems_ref - t.integer :resource_version + t.string :resource_version t.text :description t.references :ems, :type => :bigint, :index => true, :references => :ext_management_system @@ -19,7 +19,7 @@ def change create_table :container_service_plans, :id => :bigserial, :force => :cascade do |t| t.string :name t.string :ems_ref - t.integer :resource_version + t.string :resource_version t.text :description t.references :ems, :type => :bigint, :index => true, :references => :ext_management_system @@ -36,7 +36,7 @@ def change t.string :name t.string :ems_ref t.string :secret_name - t.integer :resource_version + t.string :resource_version t.string :generate_name t.references :ems, :type => :bigint, :index => true, :references => :ext_management_system From 48968bfc55d1b0b09a456e47702b27c6a35823be Mon Sep 17 00:00:00 2001 From: Ladislav Smola Date: Thu, 23 Aug 2018 12:59:51 +0200 Subject: [PATCH 07/13] Make service catalog entites archivable --- ...0821112856_create_openshift_service_catalog_tables.rb | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/db/migrate/20180821112856_create_openshift_service_catalog_tables.rb b/db/migrate/20180821112856_create_openshift_service_catalog_tables.rb index 91b0ad857..2ee8202d9 100644 --- a/db/migrate/20180821112856_create_openshift_service_catalog_tables.rb +++ b/db/migrate/20180821112856_create_openshift_service_catalog_tables.rb @@ -13,7 +13,10 @@ def change t.jsonb :extra t.datetime :ems_created_on + t.datetime :deleted_on t.timestamps + + t.index :deleted_on end create_table :container_service_plans, :id => :bigserial, :force => :cascade do |t| @@ -29,7 +32,10 @@ def change t.jsonb :extra t.datetime :ems_created_on + t.datetime :deleted_on t.timestamps + + t.index :deleted_on end create_table :container_service_instances, :id => :bigserial, :force => :cascade do |t| @@ -47,7 +53,10 @@ def change t.jsonb :extra t.datetime :ems_created_on + t.datetime :deleted_on t.timestamps + + t.index :deleted_on end end end From ff7dcd0fc69cd6c682e01a0b313fec853f53d217 Mon Sep 17 00:00:00 2001 From: Ladislav Smola Date: Fri, 24 Aug 2018 08:58:04 +0200 Subject: [PATCH 08/13] Remove container specific references Remove container specific references, since these services needs to be general --- ...21112856_create_service_catalog_tables.rb} | 23 ++++++++----------- 1 file changed, 10 insertions(+), 13 deletions(-) rename db/migrate/{20180821112856_create_openshift_service_catalog_tables.rb => 20180821112856_create_service_catalog_tables.rb} (51%) diff --git a/db/migrate/20180821112856_create_openshift_service_catalog_tables.rb b/db/migrate/20180821112856_create_service_catalog_tables.rb similarity index 51% rename from db/migrate/20180821112856_create_openshift_service_catalog_tables.rb rename to db/migrate/20180821112856_create_service_catalog_tables.rb index 2ee8202d9..f57f1278a 100644 --- a/db/migrate/20180821112856_create_openshift_service_catalog_tables.rb +++ b/db/migrate/20180821112856_create_service_catalog_tables.rb @@ -1,14 +1,13 @@ -class CreateOpenshiftServiceCatalogTables < ActiveRecord::Migration[5.0] +class CreateServiceCatalogTables < ActiveRecord::Migration[5.0] def change - create_table :container_service_classes, :id => :bigserial, :force => :cascade do |t| + create_table :service_classes, :id => :bigserial, :force => :cascade do |t| t.string :name t.string :ems_ref t.string :resource_version + t.string :type t.text :description t.references :ems, :type => :bigint, :index => true, :references => :ext_management_system - t.references :container_project, :type => :bigint, :index => true - t.references :container_service_broker, :type => :bigint, :index => true t.jsonb :extra @@ -19,15 +18,15 @@ def change t.index :deleted_on end - create_table :container_service_plans, :id => :bigserial, :force => :cascade do |t| + create_table :service_plans, :id => :bigserial, :force => :cascade do |t| t.string :name t.string :ems_ref t.string :resource_version + t.string :type t.text :description t.references :ems, :type => :bigint, :index => true, :references => :ext_management_system - t.references :container_project, :type => :bigint, :index => true - t.references :container_service_class, :type => :bigint, :index => true + t.references :service_class, :type => :bigint, :index => true t.jsonb :extra @@ -38,17 +37,15 @@ def change t.index :deleted_on end - create_table :container_service_instances, :id => :bigserial, :force => :cascade do |t| + create_table :service_instances, :id => :bigserial, :force => :cascade do |t| t.string :name t.string :ems_ref - t.string :secret_name t.string :resource_version - t.string :generate_name + t.string :type t.references :ems, :type => :bigint, :index => true, :references => :ext_management_system - t.references :container_project, :type => :bigint, :index => true - t.references :container_service_class, :type => :bigint, :index => {:name => 'csi_on_container_service_classes'} - t.references :container_service_plan, :type => :bigint, :index => true + t.references :service_class, :type => :bigint, :index => true + t.references :service_plan, :type => :bigint, :index => true t.jsonb :extra From 215fc81b01595aa89184f21c94229b83ad14b600 Mon Sep 17 00:00:00 2001 From: Ladislav Smola Date: Fri, 24 Aug 2018 15:23:58 +0200 Subject: [PATCH 09/13] Rename ServiceClass to ServiceOffering --- db/migrate/20180821112856_create_service_catalog_tables.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/db/migrate/20180821112856_create_service_catalog_tables.rb b/db/migrate/20180821112856_create_service_catalog_tables.rb index f57f1278a..8a71c052e 100644 --- a/db/migrate/20180821112856_create_service_catalog_tables.rb +++ b/db/migrate/20180821112856_create_service_catalog_tables.rb @@ -1,6 +1,6 @@ class CreateServiceCatalogTables < ActiveRecord::Migration[5.0] def change - create_table :service_classes, :id => :bigserial, :force => :cascade do |t| + create_table :service_offerings, :id => :bigserial, :force => :cascade do |t| t.string :name t.string :ems_ref t.string :resource_version @@ -26,7 +26,7 @@ def change t.text :description t.references :ems, :type => :bigint, :index => true, :references => :ext_management_system - t.references :service_class, :type => :bigint, :index => true + t.references :service_offering, :type => :bigint, :index => true t.jsonb :extra @@ -44,7 +44,7 @@ def change t.string :type t.references :ems, :type => :bigint, :index => true, :references => :ext_management_system - t.references :service_class, :type => :bigint, :index => true + t.references :service_offering, :type => :bigint, :index => true t.references :service_plan, :type => :bigint, :index => true t.jsonb :extra From 0a47788a8adc50e72b633b24710b8118870c7354 Mon Sep 17 00:00:00 2001 From: Ladislav Smola Date: Fri, 24 Aug 2018 15:24:53 +0200 Subject: [PATCH 10/13] Remove OpenShift specific columns Remove OpenShift specific columns --- db/migrate/20180821112856_create_service_catalog_tables.rb | 6 ------ 1 file changed, 6 deletions(-) diff --git a/db/migrate/20180821112856_create_service_catalog_tables.rb b/db/migrate/20180821112856_create_service_catalog_tables.rb index 8a71c052e..0707af236 100644 --- a/db/migrate/20180821112856_create_service_catalog_tables.rb +++ b/db/migrate/20180821112856_create_service_catalog_tables.rb @@ -3,7 +3,6 @@ def change create_table :service_offerings, :id => :bigserial, :force => :cascade do |t| t.string :name t.string :ems_ref - t.string :resource_version t.string :type t.text :description @@ -11,7 +10,6 @@ def change t.jsonb :extra - t.datetime :ems_created_on t.datetime :deleted_on t.timestamps @@ -21,7 +19,6 @@ def change create_table :service_plans, :id => :bigserial, :force => :cascade do |t| t.string :name t.string :ems_ref - t.string :resource_version t.string :type t.text :description @@ -30,7 +27,6 @@ def change t.jsonb :extra - t.datetime :ems_created_on t.datetime :deleted_on t.timestamps @@ -40,7 +36,6 @@ def change create_table :service_instances, :id => :bigserial, :force => :cascade do |t| t.string :name t.string :ems_ref - t.string :resource_version t.string :type t.references :ems, :type => :bigint, :index => true, :references => :ext_management_system @@ -49,7 +44,6 @@ def change t.jsonb :extra - t.datetime :ems_created_on t.datetime :deleted_on t.timestamps From 30611aaac565cd2593f236aa7341be1b7dcbb0a0 Mon Sep 17 00:00:00 2001 From: Ladislav Smola Date: Fri, 24 Aug 2018 17:27:26 +0200 Subject: [PATCH 11/13] Remove service_instances tables for now Remove service_instances tables for now, we'll add it back if it'll be needed for crosslink with the deployed stuff --- ...80821112856_create_service_catalog_tables.rb | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/db/migrate/20180821112856_create_service_catalog_tables.rb b/db/migrate/20180821112856_create_service_catalog_tables.rb index 0707af236..5e9211b14 100644 --- a/db/migrate/20180821112856_create_service_catalog_tables.rb +++ b/db/migrate/20180821112856_create_service_catalog_tables.rb @@ -32,22 +32,5 @@ def change t.index :deleted_on end - - create_table :service_instances, :id => :bigserial, :force => :cascade do |t| - t.string :name - t.string :ems_ref - t.string :type - - t.references :ems, :type => :bigint, :index => true, :references => :ext_management_system - t.references :service_offering, :type => :bigint, :index => true - t.references :service_plan, :type => :bigint, :index => true - - t.jsonb :extra - - t.datetime :deleted_on - t.timestamps - - t.index :deleted_on - end end end From cf315b8b0cd4ac7a791d40c9a163dab40a8197d8 Mon Sep 17 00:00:00 2001 From: Adam Grare Date: Fri, 24 Aug 2018 16:06:04 -0400 Subject: [PATCH 12/13] Rename service_plans to service_parameters_set --- db/migrate/20180821112856_create_service_catalog_tables.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/migrate/20180821112856_create_service_catalog_tables.rb b/db/migrate/20180821112856_create_service_catalog_tables.rb index 5e9211b14..7465116b9 100644 --- a/db/migrate/20180821112856_create_service_catalog_tables.rb +++ b/db/migrate/20180821112856_create_service_catalog_tables.rb @@ -16,7 +16,7 @@ def change t.index :deleted_on end - create_table :service_plans, :id => :bigserial, :force => :cascade do |t| + create_table :service_parameters_set, :id => :bigserial, :force => :cascade do |t| t.string :name t.string :ems_ref t.string :type From bc3dcdd9cd6ec7f12dfa97d0a1a9e9b2f0980183 Mon Sep 17 00:00:00 2001 From: Ladislav Smola Date: Mon, 27 Aug 2018 10:44:58 +0200 Subject: [PATCH 13/13] Table name needs to be plural --- db/migrate/20180821112856_create_service_catalog_tables.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/migrate/20180821112856_create_service_catalog_tables.rb b/db/migrate/20180821112856_create_service_catalog_tables.rb index 7465116b9..9f9fbeefc 100644 --- a/db/migrate/20180821112856_create_service_catalog_tables.rb +++ b/db/migrate/20180821112856_create_service_catalog_tables.rb @@ -16,7 +16,7 @@ def change t.index :deleted_on end - create_table :service_parameters_set, :id => :bigserial, :force => :cascade do |t| + create_table :service_parameters_sets, :id => :bigserial, :force => :cascade do |t| t.string :name t.string :ems_ref t.string :type