From 07b6f6d67871b0341b4647b976e09852607d9126 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Alexis=20de=20Talhou=C3=ABt?= <adetalhouet89@gmail.com>
Date: Fri, 5 Oct 2018 14:34:54 -0400
Subject: [PATCH] Fix ss-netbox-assign flow
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Change-Id: Ic0693f6c893d1fe51e22d1c61d390497285b3d7d
Issue-ID: SDNC-444
Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>

Former-commit-id: e152ce8357e74fea4fa624c76dc254b46bf61ec6
---
 installation/sdnc/src/main/resources/ipam.data.dump                    | 2 +-
 ...ment.json => GENERIC-RESOURCE-API_self-serve-netbox-ip-assign.json} | 0
 .../main/json/GENERIC-RESOURCE-API_self-serve-vf-module-assign.json    | 3 +--
 ...gnment.xml => GENERIC-RESOURCE-API_self-serve-netbox-ip-assign.xml} | 0
 4 files changed, 2 insertions(+), 3 deletions(-)
 rename platform-logic/generic-resource-api/src/main/json/{GENERIC-RESOURCE-API_self-serve-netbox-ip-assignment.json => GENERIC-RESOURCE-API_self-serve-netbox-ip-assign.json} (100%)
 rename platform-logic/generic-resource-api/src/main/xml/{GENERIC-RESOURCE-API_self-serve-netbox-ip-assignment.xml => GENERIC-RESOURCE-API_self-serve-netbox-ip-assign.xml} (100%)

diff --git a/installation/sdnc/src/main/resources/ipam.data.dump b/installation/sdnc/src/main/resources/ipam.data.dump
index 934fdc9c..00362d2f 100644
--- a/installation/sdnc/src/main/resources/ipam.data.dump
+++ b/installation/sdnc/src/main/resources/ipam.data.dump
@@ -62,7 +62,7 @@ CREATE TABLE `IPAM_IP_ASSIGNEMENT` (
   `ip_address` varchar(255) DEFAULT NULL,
   `ip_address_type` varchar(255) DEFAULT NULL,
   `ip_status` varchar(255) DEFAULT NULL,
-  `ip_response_json` varchar(255) DEFAULT NULL,
+  `ip_response_json` TEXT DEFAULT NULL,
   PRIMARY KEY (`ipam_ip_uuid`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 /*!40101 SET character_set_client = @saved_cs_client */;
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-netbox-ip-assignment.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-netbox-ip-assign.json
similarity index 100%
rename from platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-netbox-ip-assignment.json
rename to platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-netbox-ip-assign.json
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vf-module-assign.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vf-module-assign.json
index b7d2141e..53818a46 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vf-module-assign.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vf-module-assign.json
@@ -151,8 +151,7 @@
     "id": "6aad54ac.f3caac",
     "type": "set",
     "name": "set ss.capability.execution-order[]",
-    "xml": "<set>\n<parameter name='ss.capability.execution-order[0]' value='generate-name' />\n<parameter name='ss.capability.execution-order[1]' value='alts-entitlement-assign' />\n<parameter name='ss.capability.execution-order[2]' value='alts-license-assign' />\n<parameter name='ss.capability.execution-order[3]' value='vlan-tag-assign' />\n<parameter name='ss.capability.execution-order[4]' value='mS-vlan-tag-assign' />\n<parameter name='ss.capability.execution-order[5]' value='eipam-ip-assignment' />\n<parameter name='ss.capability.execution-order[6]' value='eipam-create-pool' />\n<parameter
-name='ss.capability.execution-order[7]' value='netbox-ip-assign' />\n<parameter name='ss.capability.execution-order[8]' value='mac-address-assign' />\n<parameter name='ss.capability.execution-order[9]' value='mS-mac-address-assign' />\n<parameter name='ss.capability.execution-order[10]' value='create-vpe-pool' />\n<parameter name='ss.capability.execution-order[11]' value='unresolved-composite-data' />\n<parameter name='ss.capability.execution-order[12]' value='aai-vf-module-put' />\n<parameter name='ss.capability.execution-order_length' value='13' />\n",
+    "xml": "<set>\n<parameter name='ss.capability.execution-order[0]' value='generate-name' />\n<parameter name='ss.capability.execution-order[1]' value='alts-entitlement-assign' />\n<parameter name='ss.capability.execution-order[2]' value='alts-license-assign' />\n<parameter name='ss.capability.execution-order[3]' value='vlan-tag-assign' />\n<parameter name='ss.capability.execution-order[4]' value='mS-vlan-tag-assign' />\n<parameter name='ss.capability.execution-order[5]' value='eipam-ip-assignment' />\n<parameter name='ss.capability.execution-order[6]' value='eipam-create-pool' />\n<parameter name='ss.capability.execution-order[7]' value='netbox-ip-assign' />\n<parameter name='ss.capability.execution-order[8]' value='mac-address-assign' />\n<parameter name='ss.capability.execution-order[9]' value='mS-mac-address-assign' />\n<parameter name='ss.capability.execution-order[10]' value='create-vpe-pool' />\n<parameter name='ss.capability.execution-order[11]' value='unresolved-composite-data' />\n<parameter name='ss.capability.execution-order[12]' value='aai-vf-module-put' />\n<parameter name='ss.capability.execution-order_length' value='13' />\n",
     "comments": "",
     "x": 450.41666412353516,
     "y": 1264.4286407232285,
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-netbox-ip-assignment.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-netbox-ip-assign.xml
similarity index 100%
rename from platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-netbox-ip-assignment.xml
rename to platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-netbox-ip-assign.xml
-- 
2.16.6