Removing jackson to mitigate cve-2017-4995

Signed-off-by: Denes Nemeth <denes.nemeth@nokia.com>
Issue-ID: VFC-728
Change-Id: Ib495d4706361cc39527dfe86463aa505d9564afa

2 files changed, 55 insertions, 83 deletions

diff --git a/nokiav2/driver/src/test/resources/unittests/packageconverter/cbam.full.modified.vnfd.yaml b/nokiav2/driver/src/test/resources/unittests/packageconverter/cbam.full.modified.vnfd.yaml
index 83f1ea35..ba65e4f2 100644
--- a/nokiav2/driver/src/test/resources/unittests/packageconverter/cbam.full.modified.vnfd.yaml
+++ b/nokiav2/driver/src/test/resources/unittests/packageconverter/cbam.full.modified.vnfd.yaml
@@ -1,87 +1,68 @@
----
-tosca_definitions_version: "tosca_simple_profile_for_nfv_1_0_0_nokia"
+tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0_nokia
 topology_template:
   substitution_mappings:
-    node_type: "tosca.nodes.nfv.VNF"
+    node_type: tosca.nodes.nfv.VNF
     capabilities:
       vnf:
         properties:
           modifiable_attributes:
             extensions:
-              existingAttribute:
-                default: "value"
-              onapCsarId:
-                default: "kuku"
-              vimId:
-                default: "kuku"
+              existingAttribute: {default: value}
+              onapCsarId: {default: kuku}
+              vimId: {default: kuku}
     interfaces:
       Basic:
         instantiate:
           inputs:
             extensions:
               pre_actions:
-              - javascript: "pre"
-                include:
-                - "javascript/scalable_prepare_cbam_include.js"
-                output: "stack_parameters"
-              - javascript: "javascript/cbam.pre.collectConnectionPoints.js"
-                include:
-                - "javascript/cbam.collectConnectionPoints.js"
-                output: "operation_result"
+              - javascript: pre
+                include: [javascript/scalable_prepare_cbam_include.js]
+                output: stack_parameters
+              - javascript: javascript/cbam.pre.collectConnectionPoints.js
+                include: [javascript/cbam.collectConnectionPoints.js]
+                output: operation_result
               post_actions:
-              - javascript: "post"
-                output: "ansible_inventory"
-              - javascript: "javascript/cbam.post.collectConnectionPoints.js"
-                include:
-                - "javascript/cbam.collectConnectionPoints.js"
-                output: "operation_result"
-            additional_parameters:
-              kuku: "muku"
-              jobId: "kuku"
+              - {javascript: post, output: ansible_inventory}
+              - javascript: javascript/cbam.post.collectConnectionPoints.js
+                include: [javascript/cbam.collectConnectionPoints.js]
+                output: operation_result
+            additional_parameters: {kuku: muku, jobId: kuku}
         terminate:
           inputs:
             extensions:
               pre_actions:
-              - javascript: "javascript/cbam.pre.collectConnectionPoints.js"
-                include:
-                - "javascript/cbam.collectConnectionPoints.js"
-                output: "operation_result"
+              - javascript: javascript/cbam.pre.collectConnectionPoints.js
+                include: [javascript/cbam.collectConnectionPoints.js]
+                output: operation_result
               post_actions:
-              - javascript: "javascript/cbam.post.collectConnectionPoints.js"
-                include:
-                - "javascript/cbam.collectConnectionPoints.js"
-                output: "operation_result"
-            additional_parameters:
-              jobId: "kuku"
+              - javascript: javascript/cbam.post.collectConnectionPoints.js
+                include: [javascript/cbam.collectConnectionPoints.js]
+                output: operation_result
+            additional_parameters: {jobId: kuku}
       Scalable:
         scale:
           inputs:
             extensions:
               pre_actions:
-              - javascript: "javascript/cbam.pre.collectConnectionPoints.js"
-                include:
-                - "javascript/cbam.collectConnectionPoints.js"
-                output: "operation_result"
+              - javascript: javascript/cbam.pre.collectConnectionPoints.js
+                include: [javascript/cbam.collectConnectionPoints.js]
+                output: operation_result
               post_actions:
-              - javascript: "javascript/cbam.post.collectConnectionPoints.js"
-                include:
-                - "javascript/cbam.collectConnectionPoints.js"
-                output: "operation_result"
-            additional_parameters:
-              jobId: "kuku"
+              - javascript: javascript/cbam.post.collectConnectionPoints.js
+                include: [javascript/cbam.collectConnectionPoints.js]
+                output: operation_result
+            additional_parameters: {jobId: kuku}
       Healable:
         heal:
           inputs:
             extensions:
               pre_actions:
-              - javascript: "javascript/cbam.pre.collectConnectionPoints.js"
-                include:
-                - "javascript/cbam.collectConnectionPoints.js"
-                output: "operation_result"
+              - javascript: javascript/cbam.pre.collectConnectionPoints.js
+                include: [javascript/cbam.collectConnectionPoints.js]
+                output: operation_result
               post_actions:
-              - javascript: "javascript/cbam.post.collectConnectionPoints.js"
-                include:
-                - "javascript/cbam.collectConnectionPoints.js"
-                output: "operation_result"
-            additional_parameters:
-              jobId: "kuku"
+              - javascript: javascript/cbam.post.collectConnectionPoints.js
+                include: [javascript/cbam.collectConnectionPoints.js]
+                output: operation_result
+            additional_parameters: {jobId: kuku}
diff --git a/nokiav2/driver/src/test/resources/unittests/packageconverter/cbam.minimal.modified.vnfd.yaml b/nokiav2/driver/src/test/resources/unittests/packageconverter/cbam.minimal.modified.vnfd.yaml
index 2b05ecf1..ed242473 100644
--- a/nokiav2/driver/src/test/resources/unittests/packageconverter/cbam.minimal.modified.vnfd.yaml
+++ b/nokiav2/driver/src/test/resources/unittests/packageconverter/cbam.minimal.modified.vnfd.yaml
@@ -1,46 +1,37 @@
----
-tosca_definitions_version: "tosca_simple_profile_for_nfv_1_0_0_nokia"
+tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0_nokia
 topology_template:
   substitution_mappings:
-    node_type: "tosca.nodes.nfv.VNF"
+    node_type: tosca.nodes.nfv.VNF
     interfaces:
       Basic:
         instantiate:
           inputs:
             extensions:
               pre_actions:
-              - javascript: "javascript/cbam.pre.collectConnectionPoints.js"
-                include:
-                - "javascript/cbam.collectConnectionPoints.js"
-                output: "operation_result"
+              - javascript: javascript/cbam.pre.collectConnectionPoints.js
+                include: [javascript/cbam.collectConnectionPoints.js]
+                output: operation_result
               post_actions:
-              - javascript: "javascript/cbam.post.collectConnectionPoints.js"
-                include:
-                - "javascript/cbam.collectConnectionPoints.js"
-                output: "operation_result"
-            additional_parameters:
-              jobId: "kuku"
+              - javascript: javascript/cbam.post.collectConnectionPoints.js
+                include: [javascript/cbam.collectConnectionPoints.js]
+                output: operation_result
+            additional_parameters: {jobId: kuku}
         terminate:
           inputs:
             extensions:
               pre_actions:
-              - javascript: "javascript/cbam.pre.collectConnectionPoints.js"
-                include:
-                - "javascript/cbam.collectConnectionPoints.js"
-                output: "operation_result"
+              - javascript: javascript/cbam.pre.collectConnectionPoints.js
+                include: [javascript/cbam.collectConnectionPoints.js]
+                output: operation_result
               post_actions:
-              - javascript: "javascript/cbam.post.collectConnectionPoints.js"
-                include:
-                - "javascript/cbam.collectConnectionPoints.js"
-                output: "operation_result"
-            additional_parameters:
-              jobId: "kuku"
+              - javascript: javascript/cbam.post.collectConnectionPoints.js
+                include: [javascript/cbam.collectConnectionPoints.js]
+                output: operation_result
+            additional_parameters: {jobId: kuku}
     capabilities:
       vnf:
         properties:
           modifiable_attributes:
             extensions:
-              onapCsarId:
-                default: "kuku"
-              vimId:
-                default: "kuku"
+              onapCsarId: {default: kuku}
+              vimId: {default: kuku}