From 6a5caad7ef6585978af0ee1018154d898ddee909 Mon Sep 17 00:00:00 2001 From: mischa Date: Fri, 17 Jun 2022 18:35:46 +0200 Subject: [PATCH] added size option in config --- config/connectors.cnf | 4 ++-- config/demo.cnf | 4 ++-- config/ipsec.cnf | 11 ----------- push.py | 10 +++++++++- 4 files changed, 13 insertions(+), 16 deletions(-) delete mode 100644 config/ipsec.cnf diff --git a/config/connectors.cnf b/config/connectors.cnf index e1133ba..79a4279 100644 --- a/config/connectors.cnf +++ b/config/connectors.cnf @@ -109,13 +109,13 @@ segments = Corporate group = Users billingtags = 333 -[ocivcnconnector1] +[ocivcnconnectors1] cxp = GERMANYWESTCENTRAL-AZURE-1 segments = Corporate group = Users billingtags = 333 -[ocivcnconnector2] +[ocivcnconnectoris2] cxp = GERMANYWESTCENTRAL-AZURE-1 segments = Prod group = Development diff --git a/config/demo.cnf b/config/demo.cnf index 533f28c..521b43a 100644 --- a/config/demo.cnf +++ b/config/demo.cnf @@ -106,13 +106,13 @@ segments = Corporate group = Users billingtags = 343 -[ocivcnconnector1] +[ocivcnconnectors1] cxp = GERMANYWESTCENTRAL-AZURE-1 segments = Corporate group = Users billingtags = 333 -[ocivcnconnector2] +[ocivcnconnectors2] cxp = GERMANYWESTCENTRAL-AZURE-1 segments = Prod group = Development diff --git a/config/ipsec.cnf b/config/ipsec.cnf deleted file mode 100644 index 52a39d4..0000000 --- a/config/ipsec.cnf +++ /dev/null @@ -1,11 +0,0 @@ -[ipsecconnectors1] -cxp = US-EAST-2 -segments = Corporate -group = Users -billingtags = 333 - -[ipsecconnectors2] -cxp = GERMANYWESTCENTRAL-AZURE-1 -segments = Prod -group = Development -billingtags = 343 diff --git a/push.py b/push.py index 1b765ad..f689726 100755 --- a/push.py +++ b/push.py @@ -183,8 +183,16 @@ for connector in config.sections(): logging.debug(f'CONFIG billingtags: {billingtags}') body['billingTags'][0] = billingtags + if 'size' in body: + size = body['size'] + logging.debug(f'JSON size: {size}') + if 'size' in section: + size = section['size'] + logging.debug(f'CONFIG size: {size}') + body['size'] = size + logging.debug(json.dumps(body)) - logging.info(f'Pushing {connector_name} to {cxp} (network segment: {segments}; group: {group})') + logging.info(f'Pushing {connector_name} to {cxp} (size: {size}; segment: {segments}; group: {group})') if connector_name in service_exceptions.keys(): connector_name = service_exceptions[connector_name] r = alkira_post(s, f'/tenantnetworks/{tenantNetworkId}/{connector_name}', body)