Update DGs for Carbon and remove comments part 2

Update plugins for Carbon CCSDK
Update schemaLocation and namespace for Carbon CCSDK
Remove license text comments since json files don't handle comments

Change-Id: I6d7cdc7e082d3376b435d0549688a687b2f1cf6a
Issue-ID: APPC-293
Signed-off-by: Skip Wonnell <skip@att.com>

1 files changed, 15 insertions, 35 deletions

diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_method_Generic_Sync_2.0.0.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_method_Generic_Sync_2.0.0.json
index 289376697..e829c98eb 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_method_Generic_Sync_2.0.0.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_method_Generic_Sync_2.0.0.json
@@ -1,23 +1,3 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APP-C
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
 [{
   "id": "9c13e82a.387b38",
   "type": "dgstart",
@@ -35,7 +15,7 @@
     "module": "APPC",
     "version": "2.0.0",
     "comments": "",
-    "xml": "<service-logic xmlns='http://www.openecomp.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd' module='APPC' version='2.0.0'>",
+    "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='APPC' version='2.0.0'>",
     "outputs": 1,
     "x": 311.6666564941406,
     "y": 116.6666750907898,
@@ -58,7 +38,7 @@
     "id": "9ec6a6d6.7a5678",
     "type": "get-resource",
     "name": "Retrieve current config details",
-    "xml": "<get-resource plugin='org.openecomp.sdnc.sli.resource.sql.SqlResource' resource='SQL' key=\"SELECT service_description, vnf_name, vm_name, vnf_type, vnfc_type, host_ip_address FROM UPLOAD_CONFIG WHERE vnf_id = $input.action-identifiers.vnf-id AND config_indicator='Current' AND (pending_delete IS NULL OR pending_delete != 'Y')\" pfx=\"currnt-config[]\">",
+    "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL' key=\"SELECT service_description, vnf_name, vm_name, vnf_type, vnfc_type, host_ip_address FROM UPLOAD_CONFIG WHERE vnf_id = $input.action-identifiers.vnf-id AND config_indicator='Current' AND (pending_delete IS NULL OR pending_delete != 'Y')\" pfx=\"currnt-config[]\">",
     "comments": "",
     "outputs": 1,
     "x": 519.0861930847168,
@@ -295,7 +275,7 @@
     "id": "4f4a7a36.c2a284",
     "type": "update",
     "name": "Mark current configs as historic",
-    "xml": "<update resource='SQL' force='true' plugin='org.openecomp.sdnc.sli.resource.sql.SqlResource' key=\"UPDATE UPLOAD_CONFIG SET config_indicator=null WHERE vnf_id = $input.action-identifiers.vnf-id AND config_indicator='Current' AND (pending_delete IS NULL OR pending_delete != 'Y')\">\n",
+    "xml": "<update resource='SQL' force='true' plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' key=\"UPDATE UPLOAD_CONFIG SET config_indicator=null WHERE vnf_id = $input.action-identifiers.vnf-id AND config_indicator='Current' AND (pending_delete IS NULL OR pending_delete != 'Y')\">\n",
     "comments": "",
     "outputs": 1,
     "x": 801.5814094543457,
@@ -308,7 +288,7 @@
     "id": "d5cea21b.c34aa",
     "type": "save",
     "name": "Store device config as 'Current'",
-    "xml": "<save plugin='org.openecomp.sdnc.sli.resource.sql.SqlResource' resource='SQL' key=\"INSERT INTO UPLOAD_CONFIG (request_id, originator_id, service_description, action, vnf_id, vnf_name, vm_name, vnf_type, vnfc_type, host_ip_address, config_indicator, content) SELECT request_id, originator_id, service_description, action, vnf_id, vnf_name, vm_name, vnf_type, vnfc_type, host_ip_address, 'Current', content FROM UPLOAD_CONFIG WHERE vnf_id = $input.action-identifiers.vnf-id AND config_indicator = 'Running' AND (pending_delete IS NULL OR pending_delete != 'Y')\" force='true'>\n",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL' key=\"INSERT INTO UPLOAD_CONFIG (request_id, originator_id, service_description, action, vnf_id, vnf_name, vm_name, vnf_type, vnfc_type, host_ip_address, config_indicator, content) SELECT request_id, originator_id, service_description, action, vnf_id, vnf_name, vm_name, vnf_type, vnfc_type, host_ip_address, 'Current', content FROM UPLOAD_CONFIG WHERE vnf_id = $input.action-identifiers.vnf-id AND config_indicator = 'Running' AND (pending_delete IS NULL OR pending_delete != 'Y')\" force='true'>\n",
     "comments": "",
     "outputs": 1,
     "x": 795.196704864502,
@@ -539,7 +519,7 @@
     "id": "1aa4df6e.f6da11",
     "type": "record",
     "name": "Log error",
-    "xml": "<record plugin=\"org.openecomp.sdnc.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$error-message`\"/>\n",
+    "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$error-message`\"/>\n",
     "comments": "",
     "outputs": 1,
     "x": 1182.3589057922363,
@@ -551,7 +531,7 @@
     "id": "4b77bb4a.9f7014",
     "type": "record",
     "name": "Log error",
-    "xml": "<record plugin=\"org.openecomp.sdnc.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$error-message`\"/>\n",
+    "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$error-message`\"/>\n",
     "comments": "",
     "outputs": 1,
     "x": 1778.0247383117676,
@@ -563,7 +543,7 @@
     "id": "3521d3f3.e7bf6c",
     "type": "record",
     "name": "Log error",
-    "xml": "<record plugin=\"org.openecomp.sdnc.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$error-message`\"/>\n",
+    "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$error-message`\"/>\n",
     "comments": "",
     "outputs": 1,
     "x": 1427.1704940795898,
@@ -575,7 +555,7 @@
     "id": "58cdab19.f47684",
     "type": "record",
     "name": "Log message",
-    "xml": "<record plugin=\"org.openecomp.sdnc.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`'Retrieving current configuration details from the repository for vnf-id: ' + $input.action-identifiers.vnf-id`\"/>\n",
+    "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`'Retrieving current configuration details from the repository for vnf-id: ' + $input.action-identifiers.vnf-id`\"/>\n",
     "comments": "",
     "outputs": 1,
     "x": 481.0855522155762,
@@ -587,7 +567,7 @@
     "id": "11dcb423.01808c",
     "type": "record",
     "name": "Log message",
-    "xml": "<record plugin=\"org.openecomp.sdnc.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`'Marking current configuration as historic in the repository for vnf-id: ' + $input.action-identifiers.vnf-id`\"/>\n",
+    "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`'Marking current configuration as historic in the repository for vnf-id: ' + $input.action-identifiers.vnf-id`\"/>\n",
     "comments": "",
     "outputs": 1,
     "x": 735.7780342102051,
@@ -599,7 +579,7 @@
     "id": "6d230a1.4a08cf4",
     "type": "record",
     "name": "Log message",
-    "xml": "<record plugin=\"org.openecomp.sdnc.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`'Storing device configuration as Current configuration in the repository for vnf-id: ' + $input.action-identifiers.vnf-id`\"/>\n",
+    "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`'Storing device configuration as Current configuration in the repository for vnf-id: ' + $input.action-identifiers.vnf-id`\"/>\n",
     "comments": "",
     "outputs": 1,
     "x": 745.7009773254395,
@@ -611,7 +591,7 @@
     "id": "855ad0e4.d405c",
     "type": "record",
     "name": "Log message",
-    "xml": "<record plugin=\"org.openecomp.sdnc.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`'Current configuration marked as historic in the repository for vnf-id: ' + $input.action-identifiers.vnf-id`\"/>\n",
+    "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`'Current configuration marked as historic in the repository for vnf-id: ' + $input.action-identifiers.vnf-id`\"/>\n",
     "comments": "",
     "outputs": 1,
     "x": 748.6198616027832,
@@ -623,7 +603,7 @@
     "id": "59566c79.8df204",
     "type": "record",
     "name": "Log message",
-    "xml": "<record plugin=\"org.openecomp.sdnc.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`'Device configuration stored as Current configuration in the repository for vnf-id: ' + $input.action-identifiers.vnf-id`\"/>\n",
+    "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"debug\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`'Device configuration stored as Current configuration in the repository for vnf-id: ' + $input.action-identifiers.vnf-id`\"/>\n",
     "comments": "",
     "outputs": 1,
     "x": 735.6198616027832,
@@ -856,7 +836,7 @@
     "id": "60059d22.c2ba54",
     "type": "get-resource",
     "name": "Retrieve Running config details DB",
-    "xml": "<get-resource plugin='org.openecomp.sdnc.sli.resource.sql.SqlResource' resource='SQL' key=\"SELECT upload_config_id, request_id, originator_id, service_description, action, upload_date, vnf_id, vnf_name, vm_name, vnf_type, vnfc_type, host_ip_address, config_indicator, pending_delete ,content FROM UPLOAD_CONFIG WHERE upload_config_id = $runningConfig.UPLOAD-CONFIG-ID\" pfx=\"running-config\">",
+    "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL' key=\"SELECT upload_config_id, request_id, originator_id, service_description, action, upload_date, vnf_id, vnf_name, vm_name, vnf_type, vnfc_type, host_ip_address, config_indicator, pending_delete ,content FROM UPLOAD_CONFIG WHERE upload_config_id = $runningConfig.UPLOAD-CONFIG-ID\" pfx=\"running-config\">",
     "comments": "",
     "outputs": 1,
     "x": 1432.6667404174805,
@@ -988,7 +968,7 @@
     "id": "ba52c35d.d0a18",
     "type": "record",
     "name": "Log error",
-    "xml": "<record plugin=\"org.openecomp.sdnc.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$error-message`\"/>\n",
+    "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$error-message`\"/>\n",
     "comments": "",
     "outputs": 1,
     "x": 1859.8998336791992,
@@ -1099,7 +1079,7 @@
     "id": "feccd180.68417",
     "type": "record",
     "name": "Log error",
-    "xml": "<record plugin=\"org.openecomp.sdnc.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$error-message`\"/>\n",
+    "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"error\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"record\" value=\"`$error-message`\"/>\n",
     "comments": "",
     "outputs": 1,
     "x": 3182.3132286071777,