diff --git a/config/connectors.cnf b/config/connectors.cnf index c2081e0..03c1eaf 100644 --- a/config/connectors.cnf +++ b/config/connectors.cnf @@ -1,41 +1,98 @@ +#[panfwservices1] +#cxp = US-EAST-2 + [ipsecconnectors1] cxp = US-EAST-2 segments = Corporate -group = Development +group = Users billingtags = 333 -[awsvpcconnectors1] +[ipsecconnectors2] cxp = GERMANYWESTCENTRAL-AZURE-1 segments = Prod group = Development +billingtags = 343 + +[internetconnectors1] +cxp = US-EAST-2 +segments = Corporate +group = Users billingtags = 333 +[internetconnectors2] +cxp = GERMANYWESTCENTRAL-AZURE-1 +segments = Prod +group = Development +billingtags = 343 + +[awsvpcconnectors1] +cxp = US-EAST-2 +segments = Prod +group = Development +billingtags = 343 + [awsvpcconnectors2] +cxp = US-EAST-2 +segments = Corporate +group = Users +billingtags = 333 + +[awsvpcconnectors3] +cxp = GERMANYWESTCENTRAL-AZURE-1 +segments = Prod +group = Development +billingtags = 343 + +[awsvpcconnectors4] cxp = GERMANYWESTCENTRAL-AZURE-1 segments = Corporate -group = Development +group = Users billingtags = 333 [azurevnetconnectors1] -cxp = GERMANYWESTCENTRAL-AZURE-1 +cxp = US-EAST-2 segments = Prod group = Development -billingtags = 333 +billingtags = 343 [azurevnetconnectors2] -cxp = GERMANYWESTCENTRAL-AZURE-1 +cxp = US-EAST-2 segments = Corporate -group = Development +group = Users billingtags = 333 [azurevnetconnectors3] cxp = GERMANYWESTCENTRAL-AZURE-1 segments = Prod group = Development -billingtags = 333 +billingtags = 343 [azurevnetconnectors4] cxp = GERMANYWESTCENTRAL-AZURE-1 +segments = Corporate +group = Users +billingtags = 333 + +[gcpvpcconnectors1] +cxp = US-EAST-2 segments = Prod group = Development +billingtags = 343 + +[gcpvpcconnectors2] +cxp = US-EAST-2 +segments = Corporate +group = Users billingtags = 333 + +[gcpvpcconnectors3] +cxp = GERMANYWESTCENTRAL-AZURE-1 +segments = Prod +group = Development +billingtags = 343 + +[gcpvpcconnectors4] +cxp = GERMANYWESTCENTRAL-AZURE-1 +segments = Corporate +group = Users +billingtags = 343 diff --git a/config/ipsecconnectors1.txt b/config/ipsecconnectors1.txt index 17bc5f0..217ed34 100644 --- a/config/ipsecconnectors1.txt +++ b/config/ipsecconnectors1.txt @@ -1,5 +1,5 @@ { - "name": "Amsterdam", + "name": "SanJose", "cxp": "US-EAST-2", "cxpId": "5ada678d-ce4a-428a-ac8d-0dc636b72b10", "type": "IP_SEC", diff --git a/push-debug.py b/push-debug.py index 7b5bf75..f007dc7 100755 --- a/push-debug.py +++ b/push-debug.py @@ -16,7 +16,7 @@ if not os.path.isfile(ALKIRA_CONFIG): logging.error(f"The config file {ALKIRA_CONFIG} doesn't exist") sys.exit(1) alkira = configparser.RawConfigParser() -alkira.read(CONFIG_FILE) +alkira.read(ALKIRA_CONFIG) ALKIRA_TENANT = alkira.get('alkira', 'ALKIRA_TENANT') ALKIRA_USERNAME = alkira.get('alkira', 'ALKIRA_USERNAME') @@ -45,11 +45,11 @@ logging.info(f'Tenant Name: {tenantName}') logging.info(f'Tenant ID: {tenantNetworkId}') # Do Things -with open ('ipsecconnectors1.txt', 'r') as f: +with open ('config/panfwservices1.txt', 'r') as f: body = json.load(f) print(json.dumps(body, indent=4)) print(json.dumps(body)) -url = f'{ALKIRA_BASE_URI}/tenantnetworks/{tenantNetworkId}/ipsecconnectors' +url = f'{ALKIRA_BASE_URI}/tenantnetworks/{tenantNetworkId}/panfwservices' response = session.post(url, data=json.dumps(body), headers=headers) print(response.status_code) print(response.content) diff --git a/push.py b/push.py index 5ed9fb5..3cd5a35 100755 --- a/push.py +++ b/push.py @@ -129,6 +129,12 @@ for connector in config.sections(): region = section['cxp'] segments = section['segments'] logging.debug(f'{section} - {region} - {segments}') + if 'region' in config: + region = section['region'] + logging.debug(region) + if 'segments' in config: + segments = section['segments'] + logging.debug(segments) if 'group' in config: group = section['group'] logging.debug(group) diff --git a/validate-json.py b/validate-json.py index 7870c2b..59a89bc 100755 --- a/validate-json.py +++ b/validate-json.py @@ -2,6 +2,6 @@ import json -with open ('ipsecconnectors1.txt', 'r') as f: +with open ('config/panfwservices1.txt', 'r') as f: body = json.load(f) print(body)