Test env updates for dmaap messages in batch and for running external agent

Restructured and consolidated testcases

Various minor updates and adjustment to test functions

Change-Id: Ie796b04b7a12bbd410b56db19d718e1c5a0510de
Issue-ID: NONRTRIC-154
Signed-off-by: BjornMagnussonXA <bjorn.magnusson@est.tech>
diff --git a/test/common/extract_sdnc_reply.py b/test/common/extract_sdnc_reply.py
index cb80e5e..9158edc 100644
--- a/test/common/extract_sdnc_reply.py
+++ b/test/common/extract_sdnc_reply.py
@@ -32,8 +32,12 @@
         resp=status
         if ( 'body' in output.keys()):
             body=str(output['body'])
-            bodyJson=json.loads(body)
-            resp=str(json.dumps(bodyJson))+str(status)
+            try:
+                bodyJson=json.loads(body)
+                resp=str(json.dumps(bodyJson))+str(status)
+            except Exception as e1:
+                resp=body+str(status)
+
         print(resp)
 
 except Exception as e: