Merge branch 'py3' features 8029 8030

[osm/RO.git] / RO / osm_ro / database_utils / migrate_mano_db.sh

diff --git a/RO/osm_ro/database_utils/migrate_mano_db.sh b/RO/osm_ro/database_utils/migrate_mano_db.sh
index 5d03b96..ab26ade 100755 (executable)
--- a/RO/osm_ro/database_utils/migrate_mano_db.sh
+++ b/RO/osm_ro/database_utils/migrate_mano_db.sh
@@ -1464,8 +1464,8 @@ function downgrade_from_39(){
 }
 function upgrade_to_40(){
     echo "      Adding instance_wim_net_id, created_at, modified_at at 'instance_interfaces'"
-    sql "ALTER TABLE instance_interfaces ADD COLUMN instance_wim_net_id VARCHAR(36) NULL AFTER instance_net_id, "\
-        "ADD COLUMN model VARCHAR(12) NULL DEFAULT NULL AFTER type, "\"
+    sql "ALTER TABLE instance_interfaces ADD COLUMN instance_wim_net_id VARCHAR(36) NULL AFTER instance_net_id, " \
+        "ADD COLUMN model VARCHAR(12) NULL DEFAULT NULL AFTER type, " \
         "ADD COLUMN created_at DOUBLE NULL DEFAULT NULL AFTER vlan, " \
         "ADD COLUMN modified_at DOUBLE NULL DEFAULT NULL AFTER created_at;"
     echo "      Adding sdn to 'instance_wim_nets'"
@@ -1480,7 +1480,7 @@ function upgrade_to_40(){
         " CHANGE COLUMN pop_switch_port device_interface_id VARCHAR(64) NULL AFTER device_id, " \
         " CHANGE COLUMN wan_service_endpoint_id service_endpoint_id VARCHAR(256) NOT NULL AFTER device_interface_id, " \
         " CHANGE COLUMN wan_service_mapping_info service_mapping_info TEXT NULL AFTER service_endpoint_id, " \
-        " ADD COLUMN switch_dpid VARCHAR(64) NULL AFTER wan_service_endpoint_id," \
+        " ADD COLUMN switch_dpid VARCHAR(64) NULL AFTER service_endpoint_id," \
         " ADD COLUMN switch_port VARCHAR(64) NULL AFTER switch_dpid;"
     echo "      remove unique name to 'datacenters'"
     sql "ALTER TABLE datacenters DROP INDEX name;"
@@ -1504,8 +1504,8 @@ function downgrade_from_40(){
         " CHANGE COLUMN service_endpoint_id wan_service_endpoint_id VARCHAR(256) NOT NULL AFTER pop_switch_port, " \
         " CHANGE COLUMN service_mapping_info wan_service_mapping_info TEXT NULL AFTER wan_service_endpoint_id, " \
              " DROP COLUMN switch_dpid, DROP COLUMN switch_port;"
-    sql "ALTER TABLE wim_port_mappings ADD UNIQUE INDEX unique_datacenter_port_mapping(datacenter_id, pop_switch_dpid,
-         pop_switch_port);"
+    sql "ALTER TABLE wim_port_mappings ADD UNIQUE INDEX unique_datacenter_port_mapping(datacenter_id, " \
+        "pop_switch_dpid, pop_switch_port);"
     echo "      add unique name to 'datacenters'"
     sql "ALTER TABLE datacenters ADD UNIQUE INDEX name (name);"
     sql "DELETE FROM schema_version WHERE version_int='40';"