Code Review
/
oam.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Correct E2 protocol
[oam.git]
/
solution
/
dev
/
client-scripts-ves-v7
/
globalVesEventEmitter.py
diff --git
a/solution/dev/client-scripts-ves-v7/globalVesEventEmitter.py
b/solution/dev/client-scripts-ves-v7/globalVesEventEmitter.py
index
1824a04
..
26c3879
100644
(file)
--- a/
solution/dev/client-scripts-ves-v7/globalVesEventEmitter.py
+++ b/
solution/dev/client-scripts-ves-v7/globalVesEventEmitter.py
@@
-26,6
+26,7
@@
import socket
import sys
import yaml
from pathlib import Path
import sys
import yaml
from pathlib import Path
+from _datetime import timezone
def sendVesEvent(data):
url = data['config']['vesEndpoint']['url']
def sendVesEvent(data):
url = data['config']['vesEndpoint']['url']
@@
-43,11
+44,12
@@
def sendVesEvent(data):
except requests.exceptions.RequestException as e:
# catastrophic error. bail.
raise SystemExit(e)
except requests.exceptions.RequestException as e:
# catastrophic error. bail.
raise SystemExit(e)
-
- if response.status_code >= 200 and response.status_code < 300:
+
+ if response.status_code >= 200 and response.status_code <
=
300:
print(response)
else:
print(response)
else:
- sys.exit('Reading VES "stndDefined" message template failed.')
+ print(response.status_code)
+ sys.exit('Sending VES "stndDefined" message template failed with code %d.' % response.status_code)
def sendHttpGet(url):
try:
def sendHttpGet(url):
try:
@@
-59,14
+61,14
@@
def sendHttpGet(url):
except requests.exceptions.RequestException as e:
# catastrophic error. bail.
raise SystemExit(e)
except requests.exceptions.RequestException as e:
# catastrophic error. bail.
raise SystemExit(e)
-
+
if response.status_code >= 200 and response.status_code < 300:
return response.json()
else:
sys.exit('Reading VES "stndDefined" message template failed.')
def getInitData(domain, stndBody=''):
if response.status_code >= 200 and response.status_code < 300:
return response.json()
else:
sys.exit('Reading VES "stndDefined" message template failed.')
def getInitData(domain, stndBody=''):
- currentTime = datetime.datetime.
utcnow(
)
+ currentTime = datetime.datetime.
now(tz=timezone.utc
)
dir = os.path.dirname(os.path.realpath(__file__))
result = {}
dir = os.path.dirname(os.path.realpath(__file__))
result = {}
@@
-105,5
+107,4
@@
def saveExample(data):
with open(outputFileName, 'w') as f:
json.dump(data['body'], f, indent=2, sort_keys=True)
else:
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
+ print("Example could not been saved:\n" + json.dump(data, f, indent=2, sort_keys=True))