From ea84b36447601d0d6a633ae708b72c6aaae6dc67 Mon Sep 17 00:00:00 2001
From: Brinda Santh <bs2796@att.com>
Date: Tue, 3 Dec 2019 16:15:20 -0500
Subject: Refractor controller blueprint modules

Move controller blueprints modules to blueprints processor and change the maven group name.

Fix test cba and model type paths

Fix dependencies issues.

Issue-ID: CCSDK-1663
Signed-off-by: Brinda Santh <bs2796@att.com>
Change-Id: I3654e6f04811470327acba90e8a452b66e3e189b
---
 .../resources/data/resource-assignment-input.json  |  10 --
 .../src/test/resources/validation/cyclic.json      | 111 ---------------------
 .../src/test/resources/validation/duplicate.json   | 110 --------------------
 .../src/test/resources/validation/success.json     | 110 --------------------
 4 files changed, 341 deletions(-)
 delete mode 100644 ms/controllerblueprints/modules/resource-dict/src/test/resources/data/resource-assignment-input.json
 delete mode 100644 ms/controllerblueprints/modules/resource-dict/src/test/resources/validation/cyclic.json
 delete mode 100644 ms/controllerblueprints/modules/resource-dict/src/test/resources/validation/duplicate.json
 delete mode 100644 ms/controllerblueprints/modules/resource-dict/src/test/resources/validation/success.json

(limited to 'ms/controllerblueprints/modules/resource-dict/src/test/resources')

diff --git a/ms/controllerblueprints/modules/resource-dict/src/test/resources/data/resource-assignment-input.json b/ms/controllerblueprints/modules/resource-dict/src/test/resources/data/resource-assignment-input.json
deleted file mode 100644
index d79c90682..000000000
--- a/ms/controllerblueprints/modules/resource-dict/src/test/resources/data/resource-assignment-input.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "intValue" : 1,
-  "floatValue" : 1.34,
-  "booleanValue" : true,
-  "stringValue" : "sample-String",
-  "timeValue" : "2018-09-29",
-  "arrayStringValue" : ["one", "two"],
-  "mapValue" : {"profile_name1":"profile_name1",
-    "profile_name2":"profile_name2"}
-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/src/test/resources/validation/cyclic.json b/ms/controllerblueprints/modules/resource-dict/src/test/resources/validation/cyclic.json
deleted file mode 100644
index f58c7a705..000000000
--- a/ms/controllerblueprints/modules/resource-dict/src/test/resources/validation/cyclic.json
+++ /dev/null
@@ -1,111 +0,0 @@
-[
-  {
-    "name": "vnf-id",
-    "input-param": true,
-    "property": {
-      "type": "string",
-      "required": true
-    },
-    "dictionary-name": "vnf-id",
-    "dictionary-source": "input",
-    "dependencies": []
-  },
-  {
-    "name": "service-instance-id",
-    "input-param": true,
-    "property": {
-      "type": "string",
-      "required": true
-    },
-    "dictionary-name": "service-instance-id",
-    "dictionary-source": "input",
-    "dependencies": []
-  },
-  {
-    "name": "bundle-id",
-    "input-param": true,
-    "property": {
-      "type": "string",
-      "required": true
-    },
-    "dictionary-name": "bundle-id",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "vnf-id"
-    ]
-  },
-  {
-    "name": "bundle-ip",
-    "input-param": true,
-    "property": {
-      "type": "string",
-      "required": true
-    },
-    "dictionary-name": "bundle-ip",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "vnf-id"
-    ]
-  },
-  {
-    "name": "bundle-mac",
-    "input-param": true,
-    "property": {
-      "type": "string"
-    },
-    "dictionary-name": "bundle-mac",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "vnf-id",
-      "bundle-id"
-    ]
-  },
-  {
-    "name": "managed-ip",
-    "input-param": true,
-    "property": {
-      "type": "string"
-    },
-    "dictionary-name": "managed-ip",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "loopback-ip"
-    ]
-  },
-  {
-    "name": "vnf-name",
-    "input-param": true,
-    "property": {
-      "type": "string",
-      "required": true
-    },
-    "dictionary-name": "vnf-name",
-    "dictionary-source": "input",
-    "dependencies": []
-  },
-  {
-    "name": "managed-ip1",
-    "input-param": true,
-    "property": {
-      "type": "string"
-    },
-    "dictionary-name": "managed-ip1",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "loopback-ip"
-    ]
-  },
-  {
-    "name": "loopback-ip",
-    "input-param": true,
-    "property": {
-      "type": "string"
-    },
-    "dictionary-name": "loopback-ip",
-    "dictionary-source": "processor-db",
-    "dependencies": [
-      "bundle-mac",
-      "managed-ip1"
-    ]
-  }
-]
diff --git a/ms/controllerblueprints/modules/resource-dict/src/test/resources/validation/duplicate.json b/ms/controllerblueprints/modules/resource-dict/src/test/resources/validation/duplicate.json
deleted file mode 100644
index 13a4c9f3e..000000000
--- a/ms/controllerblueprints/modules/resource-dict/src/test/resources/validation/duplicate.json
+++ /dev/null
@@ -1,110 +0,0 @@
-[
-  {
-    "name": "vnf-id",
-    "input-param": true,
-    "property": {
-      "type": "string",
-      "required": true
-    },
-    "dictionary-name": "vnf-id",
-    "dictionary-source": "input",
-    "dependencies": []
-  },
-  {
-    "name": "service-instance-id",
-    "input-param": true,
-    "property": {
-      "type": "string",
-      "required": true
-    },
-    "dictionary-name": "service-instance-id",
-    "dictionary-source": "input",
-    "dependencies": []
-  },
-  {
-    "name": "bundle-id",
-    "input-param": true,
-    "property": {
-      "type": "string",
-      "required": true
-    },
-    "dictionary-name": "bundle-id",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "vnf-id"
-    ]
-  },
-  {
-    "name": "bundle-ip",
-    "input-param": true,
-    "property": {
-      "type": "string",
-      "required": true
-    },
-    "dictionary-name": "bundle-ip",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "vnf-id"
-    ]
-  },
-  {
-    "name": "bundle-mac",
-    "input-param": true,
-    "property": {
-      "type": "string"
-    },
-    "dictionary-name": "bundle-mac",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "vnf-id",
-      "bundle-id"
-    ]
-  },
-  {
-    "name": "bundle-mac",
-    "input-param": true,
-    "property": {
-      "type": "string"
-    },
-    "dictionary-name": "bundle-mac",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "loopback-ip"
-    ]
-  },
-  {
-    "name": "vnf-name",
-    "input-param": true,
-    "property": {
-      "type": "string",
-      "required": true
-    },
-    "dictionary-name": "vnf-name",
-    "dictionary-source": "input",
-    "dependencies": []
-  },
-  {
-    "name": "managed-ip1",
-    "input-param": true,
-    "property": {
-      "type": "string"
-    },
-    "dictionary-name": "managed-ip1",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "loopback-ip"
-    ]
-  },
-  {
-    "name": "loopback-ip",
-    "input-param": true,
-    "property": {
-      "type": "string"
-    },
-    "dictionary-name": "loopback-ip",
-    "dictionary-source": "processor-db",
-    "dependencies": [
-      "bundle-mac"
-    ]
-  }
-]
diff --git a/ms/controllerblueprints/modules/resource-dict/src/test/resources/validation/success.json b/ms/controllerblueprints/modules/resource-dict/src/test/resources/validation/success.json
deleted file mode 100644
index 79925bfac..000000000
--- a/ms/controllerblueprints/modules/resource-dict/src/test/resources/validation/success.json
+++ /dev/null
@@ -1,110 +0,0 @@
-[
-  {
-    "name": "vnf-id",
-    "input-param": true,
-    "property": {
-      "type": "string",
-      "required": true
-    },
-    "dictionary-name": "vnf-id",
-    "dictionary-source": "input",
-    "dependencies": []
-  },
-  {
-    "name": "service-instance-id",
-    "input-param": true,
-    "property": {
-      "type": "string",
-      "required": true
-    },
-    "dictionary-name": "service-instance-id",
-    "dictionary-source": "input",
-    "dependencies": []
-  },
-  {
-    "name": "bundle-id",
-    "input-param": true,
-    "property": {
-      "type": "string",
-      "required": true
-    },
-    "dictionary-name": "bundle-id",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "vnf-id"
-    ]
-  },
-  {
-    "name": "bundle-ip",
-    "input-param": true,
-    "property": {
-      "type": "string",
-      "required": true
-    },
-    "dictionary-name": "bundle-ip",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "vnf-id"
-    ]
-  },
-  {
-    "name": "bundle-mac",
-    "input-param": true,
-    "property": {
-      "type": "string"
-    },
-    "dictionary-name": "bundle-mac",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "vnf-id",
-      "bundle-id"
-    ]
-  },
-  {
-    "name": "managed-ip",
-    "input-param": true,
-    "property": {
-      "type": "string"
-    },
-    "dictionary-name": "managed-ip",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "loopback-ip"
-    ]
-  },
-  {
-    "name": "vnf-name",
-    "input-param": true,
-    "property": {
-      "type": "string",
-      "required": true
-    },
-    "dictionary-name": "vnf-name",
-    "dictionary-source": "input",
-    "dependencies": []
-  },
-  {
-    "name": "managed-ip1",
-    "input-param": true,
-    "property": {
-      "type": "string"
-    },
-    "dictionary-name": "managed-ip1",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "loopback-ip"
-    ]
-  },
-  {
-    "name": "loopback-ip",
-    "input-param": true,
-    "property": {
-      "type": "string"
-    },
-    "dictionary-name": "loopback-ip",
-    "dictionary-source": "processor-db",
-    "dependencies": [
-      "bundle-mac"
-    ]
-  }
-]
-- 
cgit