diff --git a/config/awsvpcconnectors1.txt b/config/awsvpcconnectors1.txt index 8af2fbf..7fd74b0 100644 --- a/config/awsvpcconnectors1.txt +++ b/config/awsvpcconnectors1.txt @@ -3,14 +3,14 @@ "customerRegion": "us-east-2", "name": "AlkiraEMEA_US-East2-1-vpc", "vpcId": "vpc-052769d7efd0e75eb", - "credentialId": "b269e6d7-2b7d-45dc-9fb5-5ac1f49db139", - "group": "Users", + "credentialId": "", "cxp": "US-EAST-2", "size": "LARGE", - "billingTags": [ - "333" - ], "segments": [ "Corporate" - ] + ], + "group": "Users", + "billingTags": [ + "333" + ] } diff --git a/config/awsvpcconnectors2.txt b/config/awsvpcconnectors2.txt index a79b701..cdbe790 100644 --- a/config/awsvpcconnectors2.txt +++ b/config/awsvpcconnectors2.txt @@ -3,14 +3,14 @@ "customerRegion": "us-east-2", "name": "AlkiraEMEA_US-East2-2-vpc", "vpcId": "vpc-007815b7e755ac4b3", - "credentialId": "b269e6d7-2b7d-45dc-9fb5-5ac1f49db139", - "group": "Users", + "credentialId": "", "cxp": "US-EAST-2", "size": "LARGE", - "billingTags": [ - "333" - ], "segments": [ "Corporate" - ] + ], + "group": "Users", + "billingTags": [ + "333" + ] } diff --git a/config/awsvpcconnectors3.txt b/config/awsvpcconnectors3.txt index ffdd0aa..6f16061 100644 --- a/config/awsvpcconnectors3.txt +++ b/config/awsvpcconnectors3.txt @@ -3,14 +3,14 @@ "customerRegion": "eu-west-2", "name": "AlkiraEMEA_EU-West2-1-vpc", "vpcId": "vpc-0696ef5c79cfbff28", - "credentialId": "b269e6d7-2b7d-45dc-9fb5-5ac1f49db139", - "group": "Users", + "credentialId": "", "cxp": "US-EAST-2", "size": "LARGE", - "billingTags": [ - "333" - ], "segments": [ "Corporate" - ] + ], + "group": "Users", + "billingTags": [ + "333" + ] } diff --git a/config/awsvpcconnectors4.txt b/config/awsvpcconnectors4.txt index a448425..2269197 100644 --- a/config/awsvpcconnectors4.txt +++ b/config/awsvpcconnectors4.txt @@ -3,14 +3,14 @@ "customerRegion": "eu-west-2", "name": "AlkiraEMEA_EU-West2-2-vpc", "vpcId": "vpc-0c697c5d74a518f77", - "credentialId": "b269e6d7-2b7d-45dc-9fb5-5ac1f49db139", - "group": "Users", + "credentialId": "", "cxp": "US-EAST-2", "size": "LARGE", - "billingTags": [ - "333" - ], "segments": [ "Corporate" - ] + ], + "group": "Users", + "billingTags": [ + "333" + ] } diff --git a/config/azurevnetconnectors1.txt b/config/azurevnetconnectors1.txt index 918762f..2725a22 100644 --- a/config/azurevnetconnectors1.txt +++ b/config/azurevnetconnectors1.txt @@ -1,14 +1,13 @@ { - "vnetId": "/subscriptions/4efe155c-a0d1-4807-8c32-813b7894c342/resourceGroups/AlkiraEMEA_Demo/providers/Microsoft.Network/virtualNetworks/AlkiraEMEA_EU-West1-1-vnet", "name": "AlkiraEMEA_EU-West1-1-vnet-AlkiraEMEA_Demo-4efe155c-a0d1-4807-8c32-813b7894c342", + "vnetId": "/subscriptions/4efe155c-a0d1-4807-8c32-813b7894c342/resourceGroups/AlkiraEMEA_Demo/providers/Microsoft.Network/virtualNetworks/AlkiraEMEA_EU-West1-1-vnet", + "credentialId": "91f5e4cb-0fec-41a3-bf91-cf06ef3943bd", "cxp": "GERMANYWESTCENTRAL-AZURE-1", - "type": "AZURE_VNET", - "group": "Users", + "size": "LARGE", "segments": [ "Corporate" ], - "credentialId": "91f5e4cb-0fec-41a3-bf91-cf06ef3943bd", - "size": "LARGE", + "group": "Users", "billingTags": [ "333" ] diff --git a/config/azurevnetconnectors2.txt b/config/azurevnetconnectors2.txt index 0dfb93c..733b2f2 100644 --- a/config/azurevnetconnectors2.txt +++ b/config/azurevnetconnectors2.txt @@ -1,14 +1,13 @@ { "vnetId": "/subscriptions/4efe155c-a0d1-4807-8c32-813b7894c342/resourceGroups/AlkiraEMEA_Demo/providers/Microsoft.Network/virtualNetworks/AlkiraEMEA_EU-West1-2-vnet", "name": "AlkiraEMEA_EU-West1-2-vnet-AlkiraEMEA_Demo-4efe155c-a0d1-4807-8c32-813b7894c342", + "credentialId": "91f5e4cb-0fec-41a3-bf91-cf06ef3943bd", "cxp": "GERMANYWESTCENTRAL-AZURE-1", - "type": "AZURE_VNET", - "group": "Users", + "size": "LARGE", "segments": [ "Corporate" ], - "credentialId": "91f5e4cb-0fec-41a3-bf91-cf06ef3943bd", - "size": "LARGE", + "group": "Users", "billingTags": [ "333" ] diff --git a/config/azurevnetconnectors3.txt b/config/azurevnetconnectors3.txt index 05388e2..9f15fd4 100644 --- a/config/azurevnetconnectors3.txt +++ b/config/azurevnetconnectors3.txt @@ -1,14 +1,13 @@ { "vnetId": "/subscriptions/4efe155c-a0d1-4807-8c32-813b7894c342/resourceGroups/AlkiraEMEA_Demo/providers/Microsoft.Network/virtualNetworks/AlkiraEMEA_EU-North1-1-vnet", "name": "AlkiraEMEA_EU-North1-1-vnet-AlkiraEMEA_Demo-4efe155c-a0d1-4807-8c32-813b7894c342", + "credentialId": "91f5e4cb-0fec-41a3-bf91-cf06ef3943bd", "cxp": "US-EAST-2", - "type": "AZURE_VNET", - "group": "Users", + "size": "LARGE", "segments": [ "Corporate" ], - "credentialId": "91f5e4cb-0fec-41a3-bf91-cf06ef3943bd", - "size": "LARGE", + "group": "Users", "billingTags": [ "333" ] diff --git a/config/azurevnetconnectors4.txt b/config/azurevnetconnectors4.txt index 16826c8..eb3b142 100644 --- a/config/azurevnetconnectors4.txt +++ b/config/azurevnetconnectors4.txt @@ -1,14 +1,13 @@ { "vnetId": "/subscriptions/4efe155c-a0d1-4807-8c32-813b7894c342/resourceGroups/AlkiraEMEA_Demo/providers/Microsoft.Network/virtualNetworks/AlkiraEMEA_EU-North1-2-vnet", "name": "AlkiraEMEA_EU-North1-2-vnet-AlkiraEMEA_Demo-4efe155c-a0d1-4807-8c32-813b7894c342", + "credentialId": "91f5e4cb-0fec-41a3-bf91-cf06ef3943bd", "cxp": "US-EAST-2", - "type": "AZURE_VNET", - "group": "Users", + "size": "LARGE", "segments": [ "Corporate" ], - "credentialId": "91f5e4cb-0fec-41a3-bf91-cf06ef3943bd", - "size": "LARGE", + "group": "Users", "billingTags": [ "333" ] diff --git a/config/ftntfwservices1.txt b/config/ftntfwservices1.txt index 61284af..e1dc654 100644 --- a/config/ftntfwservices1.txt +++ b/config/ftntfwservices1.txt @@ -1,30 +1,30 @@ { "name": "FTNT-US", - "size": "LARGE", "cxp": "US-EAST-2", - "version": "7.0.3", - "credentialId": "set_new", - "managementServer": { - "ipAddress": "10.0.1.1", - "segment": "Corporate" - }, - "licenseType": "PAY_AS_YOU_GO", - "instances": [ - { - "name": "FTNT-US-instance-1", - "hostName": "FTNT-US-instance-1", - "credentialId": "set_new" - } - ], - "maxInstanceCount": "1", - "minInstanceCount": "1", + "credentialId": "", + "size": "LARGE", "segments": [ "Corporate", "Prod", "Pre Prod" ], - "tunnelProtocol": "IPSEC", "billingTags": [ "333" + ], + "version": "7.0.3", + "licenseType": "PAY_AS_YOU_GO", + "maxInstanceCount": "1", + "minInstanceCount": "1", + "tunnelProtocol": "IPSEC", + "managementServer": { + "ipAddress": "10.0.1.1", + "segment": "Corporate" + }, + "instances": [ + { + "name": "FTNT-US-instance-1", + "hostName": "FTNT-US-instance-1", + "credentialId": "" + } ] } diff --git a/config/gcpvpcconnectors1.txt b/config/gcpvpcconnectors1.txt index 7bb407f..f0e800e 100644 --- a/config/gcpvpcconnectors1.txt +++ b/config/gcpvpcconnectors1.txt @@ -4,13 +4,13 @@ "vpcId": "3416920918368921000", "vpcName": "alkiraemea-eu-1", "credentialId": "f273a2dc-d8bb-4106-b66c-53398b5551b1", - "group": "Users", "cxp": "US-EAST-2", "size": "LARGE", - "billingTags": [ - "333" - ], "segments": [ "Corporate" - ] + ], + "group": "Users", + "billingTags": [ + "333" + ] } diff --git a/config/gcpvpcconnectors2.txt b/config/gcpvpcconnectors2.txt index aa38d8f..7458c11 100644 --- a/config/gcpvpcconnectors2.txt +++ b/config/gcpvpcconnectors2.txt @@ -4,13 +4,13 @@ "vpcId": "946779845121746300", "vpcName": "alkiraemea-eu-2", "credentialId": "f273a2dc-d8bb-4106-b66c-53398b5551b1", - "group": "Users", "cxp": "US-EAST-2", "size": "LARGE", - "billingTags": [ - "333" - ], "segments": [ "Corporate" - ] + ], + "group": "Users", + "billingTags": [ + "333" + ] } diff --git a/config/gcpvpcconnectors3.txt b/config/gcpvpcconnectors3.txt index 252ad70..faba69f 100644 --- a/config/gcpvpcconnectors3.txt +++ b/config/gcpvpcconnectors3.txt @@ -4,13 +4,13 @@ "vpcId": "6384785621035487000", "vpcName": "alkiraemea-eu-north1-1-vpc", "credentialId": "f273a2dc-d8bb-4106-b66c-53398b5551b1", - "group": "Users", "cxp": "US-EAST-2", "size": "LARGE", - "billingTags": [ - "333" - ], "segments": [ "Corporate" - ] + ], + "group": "Users", + "billingTags": [ + "333" + ] } diff --git a/config/gcpvpcconnectors4.txt b/config/gcpvpcconnectors4.txt index ac57497..ceb0e5f 100644 --- a/config/gcpvpcconnectors4.txt +++ b/config/gcpvpcconnectors4.txt @@ -4,13 +4,13 @@ "vpcId": "305769359309508740", "vpcName": "alkiraemea-eu-west1-2-vpc", "credentialId": "f273a2dc-d8bb-4106-b66c-53398b5551b1", - "group": "Users", "cxp": "US-EAST-2", "size": "LARGE", - "billingTags": [ - "333" - ], "segments": [ "Corporate" - ] + ], + "group": "Users", + "billingTags": [ + "333" + ] } diff --git a/config/internetconnectors1.txt b/config/internetconnectors1.txt index 76ee2a4..e8afb77 100644 --- a/config/internetconnectors1.txt +++ b/config/internetconnectors1.txt @@ -1,12 +1,12 @@ { "name": "Internet-Exit-US", - "group": "Users", "cxp": "US-EAST-2", "size": "LARGE", - "billingTags": [ - "333" - ], "segments": [ "Corporate" - ] + ]. + "group": "Users", + "billingTags": [ + "333" + ] } diff --git a/config/internetconnectors2.txt b/config/internetconnectors2.txt index 0019b9e..349500a 100644 --- a/config/internetconnectors2.txt +++ b/config/internetconnectors2.txt @@ -1,12 +1,12 @@ { "name": "Internet-Exit-EU", - "group": "Development", "cxp": "GERMANYWESTCENTRAL-AZURE-1", "size": "LARGE", - "billingTags": [ - "343" - ], "segments": [ "Prod" - ] + ], + "group": "Development", + "billingTags": [ + "343" + ] } diff --git a/config/ipsecconnectors1.txt b/config/ipsecconnectors1.txt index 61b6a30..ff1f41d 100644 --- a/config/ipsecconnectors1.txt +++ b/config/ipsecconnectors1.txt @@ -1,11 +1,14 @@ { "name": "SanJose1", "cxp": "US-EAST-2", - "type": "IP_SEC", - "group": "Users", + "size": "LARGE", "segments": [ "Corporate" ], + "group": "Users", + "billingTags": [ + "333" + ], "vpnMode": "ROUTE_BASED", "routingOptions": { "dynamicRouting": { @@ -18,9 +21,5 @@ "gatewayIpType": "STATIC", "customerGwIp": "192.168.1.2" } - ], - "billingTags": [ - "333" - ], - "size": "LARGE" + ] } diff --git a/config/ipsecconnectors2.txt b/config/ipsecconnectors2.txt index 296bc66..5803895 100644 --- a/config/ipsecconnectors2.txt +++ b/config/ipsecconnectors2.txt @@ -1,11 +1,14 @@ { "name": "SanJose2", "cxp": "US-EAST-2", - "type": "IP_SEC", - "group": "Users", + "size": "LARGE", "segments": [ "Prod" ], + "group": "Users", + "billingTags": [ + "333" + ], "vpnMode": "ROUTE_BASED", "routingOptions": { "dynamicRouting": { @@ -18,9 +21,5 @@ "gatewayIpType": "STATIC", "customerGwIp": "192.168.1.3" } - ], - "billingTags": [ - "333" - ], - "size": "LARGE" + ] } diff --git a/config/ipsecconnectors3.txt b/config/ipsecconnectors3.txt index 351cd52..a869963 100644 --- a/config/ipsecconnectors3.txt +++ b/config/ipsecconnectors3.txt @@ -1,11 +1,14 @@ { "name": "Amsterdam1", "cxp": "US-EAST-2", - "type": "IP_SEC", - "group": "Users", + "size": "LARGE", "segments": [ "Prod" ], + "group": "Users", + "billingTags": [ + "333" + ], "vpnMode": "ROUTE_BASED", "routingOptions": { "dynamicRouting": { @@ -18,9 +21,5 @@ "gatewayIpType": "STATIC", "customerGwIp": "192.168.2.2" } - ], - "billingTags": [ - "333" - ], - "size": "LARGE" + ] } diff --git a/config/ipsecconnectors4.txt b/config/ipsecconnectors4.txt index bb555e4..ee94816 100644 --- a/config/ipsecconnectors4.txt +++ b/config/ipsecconnectors4.txt @@ -1,11 +1,14 @@ { "name": "Amsterdam2", "cxp": "US-EAST-2", - "type": "IP_SEC", - "group": "Users", + "size": "LARGE", "segments": [ "Corporate" ], + "group": "Users", + "billingTags": [ + "333" + ], "vpnMode": "ROUTE_BASED", "routingOptions": { "dynamicRouting": { @@ -18,9 +21,5 @@ "gatewayIpType": "STATIC", "customerGwIp": "192.168.2.3" } - ], - "billingTags": [ - "333" - ], - "size": "LARGE" + ] } diff --git a/config/ocivcnconnectors1.txt b/config/ocivcnconnectors1.txt index 10466a4..4bd817f 100644 --- a/config/ocivcnconnectors1.txt +++ b/config/ocivcnconnectors1.txt @@ -4,11 +4,11 @@ "vcnId": "ocid1.vcn.oc1.eu-amsterdam-1.amaaaaaar4jkmoyaralr5msmqce34u5suwe4lpsmocinqc5krtqiks7m6v3a", "credentialId": "1090471d-6b90-45ed-a51d-a5909119f806", "cxp": "GERMANYWESTCENTRAL-AZURE-1", + "size": "LARGE", "segments": [ "Corporate" ], "group": "Users", - "size": "LARGE", "billingTags": [ "333" ] diff --git a/config/ocivcnconnectors2.txt b/config/ocivcnconnectors2.txt index be53f58..c81a36a 100644 --- a/config/ocivcnconnectors2.txt +++ b/config/ocivcnconnectors2.txt @@ -4,11 +4,11 @@ "vcnId": "ocid1.vcn.oc1.eu-amsterdam-1.amaaaaaar4jkmoyanvd4kizf6hv36uqu34gnm5gbxwycqrtwx4ymderkxmha", "credentialId": "1090471d-6b90-45ed-a51d-a5909119f806", "cxp": "GERMANYWESTCENTRAL-AZURE-1", + "size": "LARGE", "segments": [ "Prod" ], "group": "Development", - "size": "LARGE", "billingTags": [ "343" ] diff --git a/config/panfwservices1.txt b/config/panfwservices1.txt index a09616c..deb5af5 100644 --- a/config/panfwservices1.txt +++ b/config/panfwservices1.txt @@ -1,11 +1,15 @@ { "name": "PAN-US", "cxp": "US-EAST-2", + "size": "LARGE", "segments": [ "1636", "1673", "1638" ], + "billingTags": [ + "333" + ], "panoramaEnabled": false, "managementSegment": "Corporate", "maxInstanceCount": "1", @@ -14,17 +18,13 @@ "version": "9.1.3", "tunnelProtocol": "IPSEC", "type": "VM-300", - "credentialId": "set_new", + "credentialId": "", "bundle": "PAN_VM_300_BUNDLE_1", "instances": [ { "name": "PAN-US-instance-1", "hostName": "PAN-US-instance-1", - "credentialId": "set_new" + "credentialId": "" } - ], - "size": "LARGE", - "billingTags": [ - "333" ] } diff --git a/config/panfwservices1.txt-old b/config/panfwservices1.txt-old deleted file mode 100644 index 881d8e2..0000000 --- a/config/panfwservices1.txt-old +++ /dev/null @@ -1,30 +0,0 @@ -{ - "name": "PAN-US", - "cxp": "US-EAST-2", - "segments": [ - "1636", - "1673", - "1638" - ], - "panoramaEnabled": false, - "managementSegment": "Corporate", - "maxInstanceCount": "1", - "minInstanceCount": "1", - "licenseType": "PAY_AS_YOU_GO", - "bundle": "PAN_VM_300_BUNDLE_2", - "version": "9.1.3", - "tunnelProtocol": "IPSEC", - "type": "VM-300", - "credentialId": "871e234c-050d-4815-8432-76b70884a1ea", - "globalProtectEnabled": false, - "instances": [ - { - "name": "PAN-US-instance-1", - "credentialId": "3ab9f3ac-6e22-4d3c-8a37-9c8dad469ee5" - } - ], - "size": "LARGE", - "billingTags": [ - "333" - ] -} diff --git a/config/single.cnf b/config/single.cnf new file mode 100644 index 0000000..079857e --- /dev/null +++ b/config/single.cnf @@ -0,0 +1,6 @@ +[ipsecconnectors1] +cxp = US-EAST-2 +segments = Prod +group = Development +billingtags = 343 +size = LARGE diff --git a/push.py b/push.py index aaea0ae..b9afc19 100755 --- a/push.py +++ b/push.py @@ -153,7 +153,7 @@ def alkira_service(session, connector_name): "userName": "admin", "password": "Blabla123" }, - "name": "fwcredentials01" + "name": "fwcredentials00" } logging.debug(f'Received Connector: {connector_name}') logging.info('=== Create Credentials')