17 files changed, 16 insertions, 18 deletions
diff --git a/red.xml b/red.xml
index a510063d..d254d431 100644
--- a/red.xml
+++ b/red.xml
@@ -8,7 +8,6 @@
     <referencedLibrary type="PYTHON" name="AngularJSLibrary" path="testsuite/robot/library"/>
     <referencedLibrary type="PYTHON" name="SSHLibrary" path="testsuite/robot/library"/>
     <referencedLibrary type="PYTHON" name="HTTPUtils" path="testsuite/robot/library/eteutils"/>
-    <referencedLibrary type="PYTHON" name="JSONUtils" path="testsuite/robot/library/eteutils"/>
     <referencedLibrary type="PYTHON" name="StringTemplater" path="testsuite/robot/library/eteutils"/>
     <referencedLibrary type="PYTHON" name="OpenstackLibrary" path="testsuite/robot/library/eteutils"/>
     <referencedLibrary type="PYTHON" name="TemplatingEngine" path="testsuite/robot/library/eteutils"/>
@@ -22,6 +21,7 @@
     <referencedLibrary type="PYTHON" name="DateTime" path="testsuite/robot/library"/>
     <referencedLibrary type="PYTHON" name="SocketUtils" path="testsuite/robot/library/eteutils"/>
     <referencedLibrary type="PYTHON" name="ONAPLibrary.ServiceMapping" path="testsuite/robot/library"/>
+    <referencedLibrary type="PYTHON" name="ONAPLibrary.JSON" path="testsuite/robot/library"/>
     <pythonpath>
         <path location="robot/library"/>
     </pythonpath>
diff --git a/robot/resources/aai/network.robot b/robot/resources/aai/network.robot
index 51b0df47..a3fd7737 100644
--- a/robot/resources/aai/network.robot
+++ b/robot/resources/aai/network.robot
@@ -7,7 +7,7 @@ Resource          aai_interface.robot
 Library    Collections
 Library    OperatingSystem
 Library    RequestsLibrary
-Library    JSONUtils
+Library    ONAPLibrary.JSON
 
 Resource          ../json_templater.robot
 
diff --git a/robot/resources/aai/service_instance.robot b/robot/resources/aai/service_instance.robot
index bd399a2c..52212f2a 100644
--- a/robot/resources/aai/service_instance.robot
+++ b/robot/resources/aai/service_instance.robot
@@ -7,7 +7,7 @@ Resource          aai_interface.robot
 Library    Collections
 Library    OperatingSystem
 Library    RequestsLibrary
-Library    JSONUtils
+Library    ONAPLibrary.JSON
 Library    StringTemplater
 Resource          ../json_templater.robot
 Resource          ../stack_validation/validate_vlb.robot
diff --git a/robot/resources/aai/volume_group.robot b/robot/resources/aai/volume_group.robot
index de3e28d3..94ad3b7b 100644
--- a/robot/resources/aai/volume_group.robot
+++ b/robot/resources/aai/volume_group.robot
@@ -7,7 +7,7 @@ Resource          aai_interface.robot
 Library    Collections
 Library    OperatingSystem
 Library    RequestsLibrary
-Library    JSONUtils
+Library    ONAPLibrary.JSON
 
 Resource          ../json_templater.robot
 
diff --git a/robot/resources/asdc_interface.robot b/robot/resources/asdc_interface.robot
index fc17034d..ad98261e 100644
--- a/robot/resources/asdc_interface.robot
+++ b/robot/resources/asdc_interface.robot
@@ -2,7 +2,7 @@
 Documentation     The main interface for interacting with ASDC. It handles low level stuff like managing the http request library and DCAE required fields
 Library           RequestsLibrary
 Library           UUID
-Library           JSONUtils
+Library           ONAPLibrary.JSON
 Library           OperatingSystem
 Library           Collections
 Library           SeleniumLibrary
diff --git a/robot/resources/clamp_interface.robot b/robot/resources/clamp_interface.robot
index 3a3e0b82..b8ec12bf 100644
--- a/robot/resources/clamp_interface.robot
+++ b/robot/resources/clamp_interface.robot
@@ -3,7 +3,7 @@ Documentation     The main interface for interacting with Microservice Bus.
 Library           RequestsLibrary
 Library           Collections
 Library           String
-Library           JSONUtils
+Library           ONAPLibrary.JSON
 
 Resource          global_properties.robot
 Resource          json_templater.robot
diff --git a/robot/resources/mr_interface.robot b/robot/resources/mr_interface.robot
index 56e114e0..efd4e423 100644
--- a/robot/resources/mr_interface.robot
+++ b/robot/resources/mr_interface.robot
@@ -4,7 +4,7 @@ Library           RequestsLibrary
 Library           UUID
 Library           DateTime
 Library           Process
-Library           JSONUtils
+Library           ONAPLibrary.JSON
 
 Resource          global_properties.robot
 Resource          ../resources/json_templater.robot
diff --git a/robot/resources/oof_interface.robot b/robot/resources/oof_interface.robot
index de922d3b..129f2963 100644
--- a/robot/resources/oof_interface.robot
+++ b/robot/resources/oof_interface.robot
@@ -6,7 +6,7 @@ Library           OperatingSystem
 Library	          String
 Library           DateTime
 Library           Collections
-Library           JSONUtils
+Library           ONAPLibrary.JSON
 Resource          global_properties.robot
 Resource          json_templater.robot
 
diff --git a/robot/resources/openstack/nova_interface.robot b/robot/resources/openstack/nova_interface.robot
index 8b64bb95..5958a6c3 100644
--- a/robot/resources/openstack/nova_interface.robot
+++ b/robot/resources/openstack/nova_interface.robot
@@ -2,7 +2,7 @@
 Documentation     The main interface for interacting with Openstack. It handles low level stuff like managing the authtoken and Openstack required fields
 Library           OpenstackLibrary
 Library 	      RequestsLibrary
-Library 	      JSONUtils
+Library 	      ONAPLibrary.JSON
 Library	          UUID
 Library    OperatingSystem
 Library    Collections
diff --git a/robot/resources/policy_interface.robot b/robot/resources/policy_interface.robot
index d5f72924..cc693224 100644
--- a/robot/resources/policy_interface.robot
+++ b/robot/resources/policy_interface.robot
@@ -2,8 +2,6 @@
 Documentation	  The main interface for interacting with Policy. It handles low level stuff like managing the http request library and Policy required fields
 Library 	      RequestsLibrary
 Library           String
-Library           JSONUtils
-Library           Collections
 Library           Collections
 Library           SSHLibrary
 Library           OperatingSystem
diff --git a/robot/resources/stack_validation/policy_check_vfw.robot b/robot/resources/stack_validation/policy_check_vfw.robot
index b3c225aa..b6a29cc1 100644
--- a/robot/resources/stack_validation/policy_check_vfw.robot
+++ b/robot/resources/stack_validation/policy_check_vfw.robot
@@ -4,7 +4,7 @@ Library    OperatingSystem
 Library    Process
 Library    SSHLibrary
 Library    RequestsLibrary
-Library    JSONUtils
+Library    ONAPLibrary.JSON
 Library    OpenstackLibrary
 Library    HEATUtils
 Library    Collections
diff --git a/robot/resources/stack_validation/validate_common.robot b/robot/resources/stack_validation/validate_common.robot
index d189258e..7d8ec964 100644
--- a/robot/resources/stack_validation/validate_common.robot
+++ b/robot/resources/stack_validation/validate_common.robot
@@ -3,7 +3,7 @@ Documentation	  Testing openstack.
 Library    OperatingSystem
 Library    SSHLibrary
 Library    RequestsLibrary
-Library    JSONUtils
+Library    ONAPLibrary.JSON
 Library    OpenstackLibrary
 Library    HEATUtils
 Library    Collections
diff --git a/robot/resources/stack_validation/validate_dns_scaling.robot b/robot/resources/stack_validation/validate_dns_scaling.robot
index b4556591..0e0c6655 100644
--- a/robot/resources/stack_validation/validate_dns_scaling.robot
+++ b/robot/resources/stack_validation/validate_dns_scaling.robot
@@ -3,7 +3,7 @@ Documentation	  Testing openstack.
 Library    OperatingSystem
 Library    SSHLibrary
 Library    RequestsLibrary
-Library    JSONUtils
+Library    ONAPLibrary.JSON
 Library    OpenstackLibrary
 Library    HEATUtils
 Library    Collections
diff --git a/robot/resources/stack_validation/validate_vfw.robot b/robot/resources/stack_validation/validate_vfw.robot
index 3314c7e6..fde3de21 100644
--- a/robot/resources/stack_validation/validate_vfw.robot
+++ b/robot/resources/stack_validation/validate_vfw.robot
@@ -3,7 +3,7 @@ Documentation	  Testing openstack.
 Library    OperatingSystem
 Library    SSHLibrary
 Library    RequestsLibrary
-Library    JSONUtils
+Library    ONAPLibrary.JSON
 Library    OpenstackLibrary
 Library    HEATUtils
 Library    Collections
diff --git a/robot/resources/test_templates/pnf_registration_without_SO_template.robot b/robot/resources/test_templates/pnf_registration_without_SO_template.robot
index 09655b51..cd901094 100644
--- a/robot/resources/test_templates/pnf_registration_without_SO_template.robot
+++ b/robot/resources/test_templates/pnf_registration_without_SO_template.robot
@@ -8,7 +8,7 @@ Library         OperatingSystem
 Library         RequestsLibrary
 Library         UUID
 Library         Collections
-Library         JSONUtils
+Library         ONAPLibrary.JSON
 Library         HTTPUtils
 
 
diff --git a/robot/resources/test_templates/vnf_orchestration_test_template.robot b/robot/resources/test_templates/vnf_orchestration_test_template.robot
index 49201b50..a2ecfeae 100644
--- a/robot/resources/test_templates/vnf_orchestration_test_template.robot
+++ b/robot/resources/test_templates/vnf_orchestration_test_template.robot
@@ -22,7 +22,7 @@ Library         OpenstackLibrary
 Library 	    SeleniumLibrary
 Library	        UUID
 Library	        Collections
-Library         JSONUtils
+Library         ONAPLibrary.JSON
 Library         ONAPLibrary.ServiceMapping
 
 
diff --git a/robot/resources/test_templates/vnf_orchestration_with_cds_test_template.robot b/robot/resources/test_templates/vnf_orchestration_with_cds_test_template.robot
index e5626e6f..db968e31 100644
--- a/robot/resources/test_templates/vnf_orchestration_with_cds_test_template.robot
+++ b/robot/resources/test_templates/vnf_orchestration_with_cds_test_template.robot
@@ -25,7 +25,7 @@ Library         OpenstackLibrary
 Library	        UUID
 Library	        Collections
 Library         String
-Library         JSONUtils
+Library         ONAPLibrary.JSON
 
 Library         RequestsLibrary
 Library    OperatingSystem