From f9e11bbaa0d9db27bd418a1e7b2634a54cdf054f Mon Sep 17 00:00:00 2001
From: demx8as6 <martin.skorupski@highstreet-technologies.com>
Date: Fri, 2 Apr 2021 13:37:33 +0200
Subject: [PATCH] Some init version

IssueID: OAM-183
Signed-off-by: demx8as6 <martin.skorupski@highstreet-technologies.com>
Change-Id: Ib6f01925c8152e7412c2a65f86ea47ade2be08d6
---
 .gitignore                                               |   2 ++
 .../__pycache__/globalVesEventEmitter.cpython-38.pyc     | Bin 1092 -> 0 bytes
 .../dev/ves-test-collector/client-scripts-ves-v7/config  |   2 +-
 .../client-scripts-ves-v7/globalVesEventEmitter.py       |   9 +++++++++
 .../client-scripts-ves-v7/sendVesHeartbeat.py            |   6 ++----
 .../client-scripts-ves-v7/sendVesNotification.py         |   2 +-
 6 files changed, 15 insertions(+), 6 deletions(-)
 delete mode 100644 solution/dev/ves-test-collector/client-scripts-ves-v7/__pycache__/globalVesEventEmitter.cpython-38.pyc

diff --git a/.gitignore b/.gitignore
index 45418a7..d4d7d55 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,9 +47,11 @@ release.properties
 
 # VES related
 */**/json/examples
+*/**/__pycache__
 *.log
 
 # documentation
+
 .tox
 docs/_build/
 ci-management/
diff --git a/solution/dev/ves-test-collector/client-scripts-ves-v7/__pycache__/globalVesEventEmitter.cpython-38.pyc b/solution/dev/ves-test-collector/client-scripts-ves-v7/__pycache__/globalVesEventEmitter.cpython-38.pyc
deleted file mode 100644
index 02f9dbaca303f0dd8681708a33b6a0fbc7ed75b1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1092
zcmYjPOK%)S5U!rr&c5u8*<d1tTL7(uJ*NN%D@p>6galR~2{?0E+S9%EtY@Z&?pnvY
z+U4S0que>|9ua?l-_lo3`~^-_&k`wJ>Z+;7^!IgDzv%ZnK<m$9{LAkVz~9b!e|h9Q
zq-~rMAXowE*0Pi}zL$E9^;5sGK^l<tim;5*h=K4$@EX#VV9#I_{zIq0$%xtDDaVV9
zIrsk+lkL*}nzk8G24M<owt*ExZ|bjuMu!+}*oLjV99I4kmcC#|u=L1!&I*6u#eyTi
z);iv}?~uOROSbN8Ktw~hVH9goEn9af5;yg2s_BW2=-zm5pR9t#9`@He%V6Vbdq?my
zRG$Zc{ps#yNB_lO6*5@#aIg$-7^Ccc>c}emEj)#nP<f|K<Olc>P938@A;3O}oqbqE
z*jq+7?Co&X!dvUTWvfBhbqM!i`v-pD_}?L()1erU+<N0Nx(9V{@5Dwzl{~M~w#c>2
zQ0e(%Cz%>mCGwh=bs<d}sToq%29sY!l|OvE3$~4UDGgGAWvOk;D_P-l3N1RBswVmQ
z;k+y?(>B_=i^29tlyo9TX_7^F=s;|6ro{aD$g{1QYdXZ(SYGD_$Lex)+s1;59h8k`
zm{sbP^^~zeO_R1QqEvB8#ai;B3B}{_BroK6Y$KzxONq91F43{JeqNyt=^@y5Zq!8S
zlA{e&Es4UM6WO-m6FDvv7q<QK(f8jSYpt{mYfV4eV9V8IwR^udEH4Ru6l<Tnw42Se
zBkww3eb=f;OEW8wcp$MWtuL>$bnx!_Pl)7+qs}IOfc}Jz_;;FIs8S|Eme*f#^F_kz
z+9ak_iQ;8qR58PxMk3@@awW|Hbr26SRTRy{lB~!H{lH{8uhAU1imNY^^Fp2R;wNd2
z-E@x298v1SdTzValy9pXzv0O561e%46tE5(dI5_`dL%<O@O#W-dnEV#0cAh(KV<qd
zs-$c8$>@)r+I4E^)E!c8jCfJxXHA=$>gIm$DF<fbqf&`kAs^f(&-6$++^zJy{{Rrn
BC%*sy

diff --git a/solution/dev/ves-test-collector/client-scripts-ves-v7/config b/solution/dev/ves-test-collector/client-scripts-ves-v7/config
index 610ed55..a5ffe77 100644
--- a/solution/dev/ves-test-collector/client-scripts-ves-v7/config
+++ b/solution/dev/ves-test-collector/client-scripts-ves-v7/config
@@ -58,7 +58,7 @@ pnfIdByType=(
     [fyng]=LKCYFL79Q01M01FYNG01 
     [r2d2]=MMTSIL02Q01M01R2D201 
     [7dev]=PRTNILACQ01M017DEV01 
-    [nsky]=SEDNKSAHQ01M01nSky01 
+    [nsky]=O-RAN-FH-IPv6-01 
     [1OSF]=SNSNFLR0Q01M011OSF01
 
     [no5g]=MMTSIL02Q01M01NO5G01 
diff --git a/solution/dev/ves-test-collector/client-scripts-ves-v7/globalVesEventEmitter.py b/solution/dev/ves-test-collector/client-scripts-ves-v7/globalVesEventEmitter.py
index 30d596f..f9a1fd9 100644
--- a/solution/dev/ves-test-collector/client-scripts-ves-v7/globalVesEventEmitter.py
+++ b/solution/dev/ves-test-collector/client-scripts-ves-v7/globalVesEventEmitter.py
@@ -52,3 +52,12 @@ def getInitData(domain):
   
   Path(result["outdir"]).mkdir(parents=True, exist_ok=True)
   return result
+
+def saveExample(data):
+  if 'directory' in data and 'domain' in data and 'body' in data:
+    outputFileName = data['directory'] + '/json/examples/' + data['domain'] + '.json'
+    with open(outputFileName, 'w') as f:
+      json.dump(data['body'], f, indent=2, sort_keys=True)
+  else:
+    print("Example could not been saved:\n" + json.dump(data, f, indent=2, sort_keys=True)) 
+  
\ No newline at end of file
diff --git a/solution/dev/ves-test-collector/client-scripts-ves-v7/sendVesHeartbeat.py b/solution/dev/ves-test-collector/client-scripts-ves-v7/sendVesHeartbeat.py
index 4e1ff2d..b2066fb 100644
--- a/solution/dev/ves-test-collector/client-scripts-ves-v7/sendVesHeartbeat.py
+++ b/solution/dev/ves-test-collector/client-scripts-ves-v7/sendVesHeartbeat.py
@@ -21,7 +21,7 @@
 # importing the datetime, json, requests, os socket and yaml library
 import json
 import requests
-from globalVesEventEmitter import getInitData
+from globalVesEventEmitter import getInitData, saveExample
 
 # Globals
 domain = 'heartbeat'
@@ -45,9 +45,7 @@ initData['body']['event']['commonEventHeader']['nfVendorName'] = 'O-RAN-SC OAM'
 initData['body']['event']['heartbeatFields']['additionalFields']['eventTime'] = initData['eventTime']
 
 # Save example body
-outputFileName = initData['directory'] + '/json/examples/' + domain + '.json'
-with open(outputFileName, 'w') as f:
-    json.dump(initData['body'], f, indent=2, sort_keys=True)
+saveExample(initData)
 
 # Send VES Event
 url = initData['config']['vesEndpoint']['url']
diff --git a/solution/dev/ves-test-collector/client-scripts-ves-v7/sendVesNotification.py b/solution/dev/ves-test-collector/client-scripts-ves-v7/sendVesNotification.py
index d6d0adc..99b7784 100644
--- a/solution/dev/ves-test-collector/client-scripts-ves-v7/sendVesNotification.py
+++ b/solution/dev/ves-test-collector/client-scripts-ves-v7/sendVesNotification.py
@@ -29,7 +29,7 @@ from pathlib import Path
 
 # Globals
 dir = os.path.dirname(os.path.realpath(__file__))
-domain = "heartbeat"
+domain = "notification"
 fqdn = socket.getfqdn()
 
 # time formats
-- 
2.16.6