commit 9cd6b7dc1949ec07052f3de9d4d42519cbd31293 from: mischa date: Fri Jul 08 19:45:21 2022 UTC major change in alkira.cnf (see example.cnf), for all json files, except FWs, config of CXP, SIZE, SEGMENTS, GROUPS and BILLINTAGS is done in the alkira.cnf file commit - 82f9d79c903a18a40d59b392961f021d681a80d9 commit + 9cd6b7dc1949ec07052f3de9d4d42519cbd31293 blob - ecd2a2e19e9ad410d0fc5f89fb67739ada703d98 blob + 435f778081a8a64f609e8176379074f6501907ae --- config/connectors.cnf +++ config/connectors.cnf @@ -1,154 +1,154 @@ [ipsecconnectors1] -cxp = US-EAST-2 -size = MEDIUM -segments = Corporate -group = Users -billingtags = 333 +cxp = CXP1 +size = SIZE2 +segments = SEGMENT1 +group = GROUP1 +billingtags = TAG1 [ipsecconnectors2] -cxp = US-EAST-2 -size = MEDIUM -segments = Prod -group = Development -billingtags = 343 +cxp = CXP1 +size = SIZE2 +segments = SEGMENT2 +group = GROUP2 +billingtags = TAG2 [ipsecconnectors3] -cxp = US-EAST-2 -size = SMALL -segments = Pre Prod -group = Development -billingtags = 343 +cxp = CXP1 +size = SIZE1 +segments = Pre SEGMENT2 +group = GROUP2 +billingtags = TAG2 [ipsecconnectors4] -cxp = GERMANYWESTCENTRAL-AZURE-1 -size = MEDIUM -segments = Corporate -group = Users -billingtags = 333 +cxp = CXP2 +size = SIZE2 +segments = SEGMENT1 +group = GROUP1 +billingtags = TAG1 [ipsecconnectors5] -cxp = GERMANYWESTCENTRAL-AZURE-1 -size = MEDIUM -segments = Prod -group = Development -billingtags = 343 +cxp = CXP2 +size = SIZE2 +segments = SEGMENT2 +group = GROUP2 +billingtags = TAG2 [ipsecconnectors6] -cxp = GERMANYWESTCENTRAL-AZURE-1 -size = SMALL -segments = Pre Prod -group = Development -billingtags = 343 +cxp = CXP2 +size = SIZE1 +segments = Pre SEGMENT2 +group = GROUP2 +billingtags = TAG2 [internetconnectors1] -cxp = US-EAST-2 -size = MEDIUM -segments = Corporate -billingtags = 333 +cxp = CXP1 +size = SIZE2 +segments = SEGMENT1 +billingtags = TAG1 [internetconnectors2] -cxp = GERMANYWESTCENTRAL-AZURE-1 -size = MEDIUM -segments = Prod -billingtags = 343 +cxp = CXP2 +size = SIZE2 +segments = SEGMENT2 +billingtags = TAG2 [awsvpcconnectors1] -cxp = US-EAST-2 -size = MEDIUM -segments = Prod -group = Development -billingtags = 343 +cxp = CXP1 +size = SIZE2 +segments = SEGMENT2 +group = GROUP2 +billingtags = TAG2 [awsvpcconnectors2] -cxp = US-EAST-2 -size = MEDIUM -segments = Corporate -group = Users -billingtags = 333 +cxp = CXP1 +size = SIZE2 +segments = SEGMENT1 +group = GROUP1 +billingtags = TAG1 [awsvpcconnectors3] -cxp = GERMANYWESTCENTRAL-AZURE-1 -size = MEDIUM -segments = Prod -group = Development -billingtags = 343 +cxp = CXP2 +size = SIZE2 +segments = SEGMENT2 +group = GROUP2 +billingtags = TAG2 [awsvpcconnectors4] -cxp = GERMANYWESTCENTRAL-AZURE-1 -size = MEDIUM -segments = Corporate -group = Users -billingtags = 333 +cxp = CXP2 +size = SIZE2 +segments = SEGMENT1 +group = GROUP1 +billingtags = TAG1 [azurevnetconnectors1] -cxp = US-EAST-2 -size = MEDIUM -segments = Prod -group = Development -billingtags = 343 +cxp = CXP1 +size = SIZE2 +segments = SEGMENT2 +group = GROUP2 +billingtags = TAG2 [azurevnetconnectors2] -cxp = US-EAST-2 -size = MEDIUM -segments = Corporate -group = Users -billingtags = 333 +cxp = CXP1 +size = SIZE2 +segments = SEGMENT1 +group = GROUP1 +billingtags = TAG1 [azurevnetconnectors3] -cxp = GERMANYWESTCENTRAL-AZURE-1 -size = MEDIUM -segments = Prod -group = Development -billingtags = 343 +cxp = CXP2 +size = SIZE2 +segments = SEGMENT2 +group = GROUP2 +billingtags = TAG2 [azurevnetconnectors4] -cxp = GERMANYWESTCENTRAL-AZURE-1 -size = MEDIUM -segments = Corporate -group = Users -billingtags = 333 +cxp = CXP2 +size = SIZE2 +segments = SEGMENT1 +group = GROUP1 +billingtags = TAG1 [gcpvpcconnectors1] -cxp = US-EAST-2 -size = MEDIUM -segments = Prod -group = Development -billingtags = 343 +cxp = CXP1 +size = SIZE2 +segments = SEGMENT2 +group = GROUP2 +billingtags = TAG2 [gcpvpcconnectors2] -cxp = US-EAST-2 -size = MEDIUM -segments = Corporate -group = Users -billingtags = 333 +cxp = CXP1 +size = SIZE2 +segments = SEGMENT1 +group = GROUP1 +billingtags = TAG1 [gcpvpcconnectors3] -cxp = GERMANYWESTCENTRAL-AZURE-1 -size = MEDIUM -segments = Prod -group = Development -billingtags = 343 +cxp = CXP2 +size = SIZE2 +segments = SEGMENT2 +group = GROUP2 +billingtags = TAG2 [gcpvpcconnectors4] -cxp = GERMANYWESTCENTRAL-AZURE-1 -size = MEDIUM -segments = Corporate -group = Users -billingtags = 333 +cxp = CXP2 +size = SIZE2 +segments = SEGMENT1 +group = GROUP1 +billingtags = TAG1 [ocivcnconnectors1] -cxp = GERMANYWESTCENTRAL-AZURE-1 -size = MEDIUM -segments = Corporate -group = Users -billingtags = 333 +cxp = CXP2 +size = SIZE2 +segments = SEGMENT1 +group = GROUP1 +billingtags = TAG1 [ocivcnconnectors2] -cxp = GERMANYWESTCENTRAL-AZURE-1 -size = MEDIUM -segments = Prod -group = Development -billingtags = 343 +cxp = CXP2 +size = SIZE2 +segments = SEGMENT2 +group = GROUP2 +billingtags = TAG2 [ftntfwservices1.txt] -cxp = US-EAST-2 +cxp = CXP1 blob - a83c70c8195b09ccc424320a6acd606eb4b23d77 blob + af4dd3517b57e3efdfcdcc09e9dc015f4fb1dd92 --- config/cxp-eu.cnf +++ config/cxp-eu.cnf @@ -1,82 +1,82 @@ [ipsecconnectors4] -cxp = GERMANYWESTCENTRAL-AZURE-1 -size = MEDIUM -segments = Corporate -group = Users -billingtags = 333 +cxp = CXP2 +size = SIZE2 +segments = SEGMENT1 +group = GROUP1 +billingtags = TAG1 [ipsecconnectors5] -cxp = GERMANYWESTCENTRAL-AZURE-1 -size = MEDIUM -segments = Prod -group = Development -billingtags = 343 +cxp = CXP2 +size = SIZE2 +segments = SEGMENT2 +group = GROUP2 +billingtags = TAG2 [ipsecconnectors6] -cxp = GERMANYWESTCENTRAL-AZURE-1 -size = SMALL -segments = Pre Prod -group = Development -billingtags = 343 +cxp = CXP2 +size = SIZE1 +segments = Pre SEGMENT2 +group = GROUP2 +billingtags = TAG2 [internetconnectors2] -cxp = GERMANYWESTCENTRAL-AZURE-1 -size = MEDIUM -segments = Corporate -billingtags = 343 +cxp = CXP2 +size = SIZE2 +segments = SEGMENT1 +billingtags = TAG2 [awsvpcconnectors3] -cxp = GERMANYWESTCENTRAL-AZURE-1 -size = MEDIUM -segments = Corporate -group = Users -billingtags = 343 +cxp = CXP2 +size = SIZE2 +segments = SEGMENT1 +group = GROUP1 +billingtags = TAG2 [awsvpcconnectors4] -cxp = GERMANYWESTCENTRAL-AZURE-1 -size = MEDIUM -segments = Corporate -group = Users -billingtags = 333 +cxp = CXP2 +size = SIZE2 +segments = SEGMENT1 +group = GROUP1 +billingtags = TAG1 [azurevnetconnectors3] -cxp = GERMANYWESTCENTRAL-AZURE-1 -size = MEDIUM -segments = Prod -group = Development -billingtags = 343 +cxp = CXP2 +size = SIZE2 +segments = SEGMENT2 +group = GROUP2 +billingtags = TAG2 [azurevnetconnectors4] -cxp = GERMANYWESTCENTRAL-AZURE-1 -size = MEDIUM -segments = Prod -group = Development -billingtags = 333 +cxp = CXP2 +size = SIZE2 +segments = SEGMENT2 +group = GROUP2 +billingtags = TAG1 [gcpvpcconnectors3] -cxp = GERMANYWESTCENTRAL-AZURE-1 -size = MEDIUM -segments = Pre Prod -group = Development -billingtags = 343 +cxp = CXP2 +size = SIZE2 +segments = Pre SEGMENT2 +group = GROUP2 +billingtags = TAG2 [gcpvpcconnectors4] -cxp = GERMANYWESTCENTRAL-AZURE-1 -size = MEDIUM -segments = Pre Prod -group = Development -billingtags = 333 +cxp = CXP2 +size = SIZE2 +segments = Pre SEGMENT2 +group = GROUP2 +billingtags = TAG1 [ocivcnconnectors1] -cxp = GERMANYWESTCENTRAL-AZURE-1 -size = MEDIUM -segments = Corporate -group = Users -billingtags = 333 +cxp = CXP2 +size = SIZE2 +segments = SEGMENT1 +group = GROUP1 +billingtags = TAG1 [ocivcnconnectors2] -cxp = GERMANYWESTCENTRAL-AZURE-1 -size = MEDIUM -segments = Corporate -group = Users -billingtags = 333 +cxp = CXP2 +size = SIZE2 +segments = SEGMENT1 +group = GROUP1 +billingtags = TAG1 blob - ebb6e5d57a46bfcafd7e9bcee668535ab5d43438 blob + b56bbd482dc113b17c4cb1610cb940c88ebb228f --- config/cxp-us.cnf +++ config/cxp-us.cnf @@ -1,71 +1,71 @@ [ipsecconnectors1] -cxp = US-EAST-2 -size = MEDIUM -segments = Corporate -group = Users -billingtags = 333 +cxp = CXP1 +size = SIZE2 +segments = SEGMENT1 +group = GROUP1 +billingtags = TAG1 [ipsecconnectors2] -cxp = US-EAST-2 -size = MEDIUM -segments = Prod -group = Development -billingtags = 343 +cxp = CXP1 +size = SIZE2 +segments = SEGMENT2 +group = GROUP2 +billingtags = TAG2 [ipsecconnectors3] -cxp = US-EAST-2 -size = SMALL -segments = Pre Prod -group = Development -billingtags = 343 +cxp = CXP1 +size = SIZE1 +segments = Pre SEGMENT2 +group = GROUP2 +billingtags = TAG2 [internetconnectors1] -cxp = US-EAST-2 -size = MEDIUM -segments = Corporate -billingtags = 333 +cxp = CXP1 +size = SIZE2 +segments = SEGMENT1 +billingtags = TAG1 [awsvpcconnectors1] -cxp = US-EAST-2 -size = MEDIUM -segments = Prod -group = Development -billingtags = 343 +cxp = CXP1 +size = SIZE2 +segments = SEGMENT2 +group = GROUP2 +billingtags = TAG2 [awsvpcconnectors2] -cxp = US-EAST-2 -size = MEDIUM -segments = Prod -group = Development -billingtags = 333 +cxp = CXP1 +size = SIZE2 +segments = SEGMENT2 +group = GROUP2 +billingtags = TAG1 [azurevnetconnectors1] -cxp = US-EAST-2 -size = MEDIUM -segments = Corporate -group = Users -billingtags = 343 +cxp = CXP1 +size = SIZE2 +segments = SEGMENT1 +group = GROUP1 +billingtags = TAG2 [azurevnetconnectors2] -cxp = US-EAST-2 -size = MEDIUM -segments = Corporate -group = Users -billingtags = 333 +cxp = CXP1 +size = SIZE2 +segments = SEGMENT1 +group = GROUP1 +billingtags = TAG1 [gcpvpcconnectors1] -cxp = US-EAST-2 -size = MEDIUM -segments = Pre Prod -group = Development -billingtags = 343 +cxp = CXP1 +size = SIZE2 +segments = Pre SEGMENT2 +group = GROUP2 +billingtags = TAG2 [gcpvpcconnectors2] -cxp = US-EAST-2 -size = MEDIUM -segments = Pre Prod -group = Development -billingtags = 333 +cxp = CXP1 +size = SIZE2 +segments = Pre SEGMENT2 +group = GROUP2 +billingtags = TAG1 [ftntfwservices1.txt] -cxp = US-EAST-2 +cxp = CXP1 blob - c4a06c025d1644646dd62780c634ef53366e8687 blob + 66a10b34ad49e8d110ffbcf5a3fff0dc8b34808c --- config/demo-chkp.cnf +++ config/demo-chkp.cnf @@ -1,146 +1,146 @@ [ipsecconnectors1] -cxp = US-EAST-2 -size = MEDIUM -segments = Corporate -group = Users -billingtags = 333 +cxp = CXP1 +size = SIZE2 +segments = SEGMENT1 +group = GROUP1 +billingtags = TAG1 [ipsecconnectors2] -cxp = US-EAST-2 -size = LARGE -segments = Prod -group = Development -billingtags = 343 +cxp = CXP1 +size = SIZE3 +segments = SEGMENT2 +group = GROUP2 +billingtags = TAG2 [ipsecconnectors3] -cxp = GERMANYWESTCENTRAL-AZURE-1 -size = MEDIUM -segments = Corporate -group = Users -billingtags = 333 +cxp = CXP2 +size = SIZE2 +segments = SEGMENT1 +group = GROUP1 +billingtags = TAG1 [ipsecconnectors4] -cxp = GERMANYWESTCENTRAL-AZURE-1 -size = LARGE -segments = Prod -group = Development -billingtags = 343 +cxp = CXP2 +size = SIZE3 +segments = SEGMENT2 +group = GROUP2 +billingtags = TAG2 [internetconnectors1] -cxp = US-EAST-2 -size = MEDIUM -segments = Corporate -billingtags = 333 +cxp = CXP1 +size = SIZE2 +segments = SEGMENT1 +billingtags = TAG1 [internetconnectors2] -cxp = GERMANYWESTCENTRAL-AZURE-1 -size = LARGE -segments = Prod -billingtags = 343 +cxp = CXP2 +size = SIZE3 +segments = SEGMENT2 +billingtags = TAG2 [awsvpcconnectors1] -cxp = US-EAST-2 -size = LARGE -segments = Pre Prod -group = Development -billingtags = 343 +cxp = CXP1 +size = SIZE3 +segments = Pre SEGMENT2 +group = GROUP2 +billingtags = TAG2 [awsvpcconnectors2] -cxp = US-EAST-2 -size = LARGE -segments = Prod -group = Development -billingtags = 333 +cxp = CXP1 +size = SIZE3 +segments = SEGMENT2 +group = GROUP2 +billingtags = TAG1 [awsvpcconnectors3] -cxp = GERMANYWESTCENTRAL-AZURE-1 -size = LARGE -segments = Prod -group = Development -billingtags = 343 +cxp = CXP2 +size = SIZE3 +segments = SEGMENT2 +group = GROUP2 +billingtags = TAG2 [awsvpcconnectors4] -cxp = GERMANYWESTCENTRAL-AZURE-1 -size = LARGE -segments = Prod -group = Development -billingtags = 333 +cxp = CXP2 +size = SIZE3 +segments = SEGMENT2 +group = GROUP2 +billingtags = TAG1 [azurevnetconnectors1] -cxp = US-EAST-2 -size = MEDIUM -segments = Corporate -group = Users -billingtags = 343 +cxp = CXP1 +size = SIZE2 +segments = SEGMENT1 +group = GROUP1 +billingtags = TAG2 [azurevnetconnectors2] -cxp = US-EAST-2 -size = MEDIUM -segments = Corporate -group = Users -billingtags = 333 +cxp = CXP1 +size = SIZE2 +segments = SEGMENT1 +group = GROUP1 +billingtags = TAG1 [azurevnetconnectors3] -cxp = GERMANYWESTCENTRAL-AZURE-1 -size = MEDIUM -segments = Corporate -group = Users -billingtags = 343 +cxp = CXP2 +size = SIZE2 +segments = SEGMENT1 +group = GROUP1 +billingtags = TAG2 [azurevnetconnectors4] -cxp = GERMANYWESTCENTRAL-AZURE-1 -size = MEDIUM -segments = Corporate -group = Users -billingtags = 333 +cxp = CXP2 +size = SIZE2 +segments = SEGMENT1 +group = GROUP1 +billingtags = TAG1 [gcpvpcconnectors1] -cxp = US-EAST-2 -size = LARGE -segments = Prod -group = Development -billingtags = 343 +cxp = CXP1 +size = SIZE3 +segments = SEGMENT2 +group = GROUP2 +billingtags = TAG2 [gcpvpcconnectors2] -cxp = US-EAST-2 -size = LARGE -segments = Prod -group = Development -billingtags = 333 +cxp = CXP1 +size = SIZE3 +segments = SEGMENT2 +group = GROUP2 +billingtags = TAG1 [gcpvpcconnectors3] -cxp = GERMANYWESTCENTRAL-AZURE-1 -size = MEDIUM -segments = Corporate -group = Users -billingtags = 343 +cxp = CXP2 +size = SIZE2 +segments = SEGMENT1 +group = GROUP1 +billingtags = TAG2 [gcpvpcconnectors4] -cxp = GERMANYWESTCENTRAL-AZURE-1 -size = MEDIUM -segments = Corporate -group = Users -billingtags = 343 +cxp = CXP2 +size = SIZE2 +segments = SEGMENT1 +group = GROUP1 +billingtags = TAG2 [ocivcnconnectors1] -cxp = GERMANYWESTCENTRAL-AZURE-1 -size = MEDIUM -segments = Corporate -group = Users -billingtags = 333 +cxp = CXP2 +size = SIZE2 +segments = SEGMENT1 +group = GROUP1 +billingtags = TAG1 [ocivcnconnectors2] -cxp = GERMANYWESTCENTRAL-AZURE-1 -size = LARGE -segments = Prod -group = Development -billingtags = 343 +cxp = CXP2 +size = SIZE3 +segments = SEGMENT2 +group = GROUP2 +billingtags = TAG2 [chkpfwservices1.txt] -cxp = US-EAST-2 +cxp = CXP1 [chkpfwservices2.txt] -cxp = US-EAST-2 +cxp = CXP1 [chkpfwservices3.txt] -cxp = US-EAST-2 +cxp = CXP1 blob - 65f8a6b9ee9a1197b93fd6b90387b566ae292c9e blob + 6128152734259ad8ef2a017c91f81b416e9b690e --- config/demo-ftnt.cnf +++ config/demo-ftnt.cnf @@ -1,140 +1,140 @@ [ipsecconnectors1] -cxp = US-EAST-2 -size = MEDIUM -segments = Corporate -group = Users -billingtags = 333 +cxp = CXP1 +size = SIZE2 +segments = SEGMENT1 +group = GROUP1 +billingtags = TAG1 [ipsecconnectors2] -cxp = US-EAST-2 -size = LARGE -segments = Prod -group = Development -billingtags = 343 +cxp = CXP1 +size = SIZE3 +segments = SEGMENT2 +group = GROUP2 +billingtags = TAG2 [ipsecconnectors3] -cxp = GERMANYWESTCENTRAL-AZURE-1 -size = MEDIUM -segments = Corporate -group = Users -billingtags = 333 +cxp = CXP2 +size = SIZE2 +segments = SEGMENT1 +group = GROUP1 +billingtags = TAG1 [ipsecconnectors4] -cxp = GERMANYWESTCENTRAL-AZURE-1 -size = LARGE -segments = Prod -group = Development -billingtags = 343 +cxp = CXP2 +size = SIZE3 +segments = SEGMENT2 +group = GROUP2 +billingtags = TAG2 [internetconnectors1] -cxp = US-EAST-2 -size = MEDIUM -segments = Corporate -billingtags = 333 +cxp = CXP1 +size = SIZE2 +segments = SEGMENT1 +billingtags = TAG1 [internetconnectors2] -cxp = GERMANYWESTCENTRAL-AZURE-1 -size = LARGE -segments = Prod -billingtags = 343 +cxp = CXP2 +size = SIZE3 +segments = SEGMENT2 +billingtags = TAG2 [awsvpcconnectors1] -cxp = US-EAST-2 -size = LARGE -segments = Prod -group = Development -billingtags = 343 +cxp = CXP1 +size = SIZE3 +segments = SEGMENT2 +group = GROUP2 +billingtags = TAG2 [awsvpcconnectors2] -cxp = US-EAST-2 -size = LARGE -segments = Prod -group = Development -billingtags = 333 +cxp = CXP1 +size = SIZE3 +segments = SEGMENT2 +group = GROUP2 +billingtags = TAG1 [awsvpcconnectors3] -cxp = GERMANYWESTCENTRAL-AZURE-1 -size = LARGE -segments = Prod -group = Development -billingtags = 343 +cxp = CXP2 +size = SIZE3 +segments = SEGMENT2 +group = GROUP2 +billingtags = TAG2 [awsvpcconnectors4] -cxp = GERMANYWESTCENTRAL-AZURE-1 -size = LARGE -segments = Prod -group = Development -billingtags = 333 +cxp = CXP2 +size = SIZE3 +segments = SEGMENT2 +group = GROUP2 +billingtags = TAG1 [azurevnetconnectors1] -cxp = US-EAST-2 -size = MEDIUM -segments = Corporate -group = Users -billingtags = 343 +cxp = CXP1 +size = SIZE2 +segments = SEGMENT1 +group = GROUP1 +billingtags = TAG2 [azurevnetconnectors2] -cxp = US-EAST-2 -size = MEDIUM -segments = Corporate -group = Users -billingtags = 333 +cxp = CXP1 +size = SIZE2 +segments = SEGMENT1 +group = GROUP1 +billingtags = TAG1 [azurevnetconnectors3] -cxp = GERMANYWESTCENTRAL-AZURE-1 -size = MEDIUM -segments = Corporate -group = Users -billingtags = 343 +cxp = CXP2 +size = SIZE2 +segments = SEGMENT1 +group = GROUP1 +billingtags = TAG2 [azurevnetconnectors4] -cxp = GERMANYWESTCENTRAL-AZURE-1 -size = MEDIUM -segments = Corporate -group = Users -billingtags = 333 +cxp = CXP2 +size = SIZE2 +segments = SEGMENT1 +group = GROUP1 +billingtags = TAG1 [gcpvpcconnectors1] -cxp = US-EAST-2 -size = LARGE -segments = Prod -group = Development -billingtags = 343 +cxp = CXP1 +size = SIZE3 +segments = SEGMENT2 +group = GROUP2 +billingtags = TAG2 [gcpvpcconnectors2] -cxp = US-EAST-2 -size = LARGE -segments = Prod -group = Development -billingtags = 333 +cxp = CXP1 +size = SIZE3 +segments = SEGMENT2 +group = GROUP2 +billingtags = TAG1 [gcpvpcconnectors3] -cxp = GERMANYWESTCENTRAL-AZURE-1 -size = MEDIUM -segments = Corporate -group = Users -billingtags = 343 +cxp = CXP2 +size = SIZE2 +segments = SEGMENT1 +group = GROUP1 +billingtags = TAG2 [gcpvpcconnectors4] -cxp = GERMANYWESTCENTRAL-AZURE-1 -size = MEDIUM -segments = Corporate -group = Users -billingtags = 343 +cxp = CXP2 +size = SIZE2 +segments = SEGMENT1 +group = GROUP1 +billingtags = TAG2 [ocivcnconnectors1] -cxp = GERMANYWESTCENTRAL-AZURE-1 -size = MEDIUM -segments = Corporate -group = Users -billingtags = 333 +cxp = CXP2 +size = SIZE2 +segments = SEGMENT1 +group = GROUP1 +billingtags = TAG1 [ocivcnconnectors2] -cxp = GERMANYWESTCENTRAL-AZURE-1 -size = LARGE -segments = Prod -group = Development -billingtags = 343 +cxp = CXP2 +size = SIZE3 +segments = SEGMENT2 +group = GROUP2 +billingtags = TAG2 [ftntfwservices1.txt] -cxp = US-EAST-2 +cxp = CXP1 blob - 251d317becb764596ff7fcd9862565185d4a95bf blob + ab5e6c38c01ce46bb8e1adc5669953ef1841233a --- config/demo-small.cnf +++ config/demo-small.cnf @@ -1,84 +1,84 @@ [ipsecconnectors1] -cxp = US-EAST-2 -size = MEDIUM -segments = Corporate -group = Users -billingtags = 333 +cxp = CXP1 +size = SIZE2 +segments = SEGMENT1 +group = GROUP1 +billingtags = TAG1 [ipsecconnectors2] -cxp = GERMANYWESTCENTRAL-AZURE-1 -size = MEDIUM -segments = Corporate -group = Users -billingtags = 333 +cxp = CXP2 +size = SIZE2 +segments = SEGMENT1 +group = GROUP1 +billingtags = TAG1 [internetconnectors1] -size = MEDIUM -cxp = US-EAST-2 -segments = Corporate -billingtags = 333 +size = SIZE2 +cxp = CXP1 +segments = SEGMENT1 +billingtags = TAG1 [internetconnectors2] -size = LARGE -cxp = GERMANYWESTCENTRAL-AZURE-1 -segments = Corporate -billingtags = 333 +size = SIZE3 +cxp = CXP2 +segments = SEGMENT1 +billingtags = TAG1 [awsvpcconnectors1] -cxp = US-EAST-2 -size = LARGE -segments = Corporate -group = Users -billingtags = 343 +cxp = CXP1 +size = SIZE3 +segments = SEGMENT1 +group = GROUP1 +billingtags = TAG2 [awsvpcconnectors2] -cxp = US-EAST-2 -size = LARGE -segments = Corporate -group = Users -billingtags = 333 +cxp = CXP1 +size = SIZE3 +segments = SEGMENT1 +group = GROUP1 +billingtags = TAG1 [awsvpcconnectors3] -cxp = GERMANYWESTCENTRAL-AZURE-1 -size = LARGE -segments = Prod -group = Development -billingtags = 343 +cxp = CXP2 +size = SIZE3 +segments = SEGMENT2 +group = GROUP2 +billingtags = TAG2 [awsvpcconnectors4] -cxp = GERMANYWESTCENTRAL-AZURE-1 -size = LARGE -segments = Prod -group = Development -billingtags = 333 +cxp = CXP2 +size = SIZE3 +segments = SEGMENT2 +group = GROUP2 +billingtags = TAG1 [azurevnetconnectors1] -cxp = US-EAST-2 -size = MEDIUM -segments = Corporate -group = Users -billingtags = 343 +cxp = CXP1 +size = SIZE2 +segments = SEGMENT1 +group = GROUP1 +billingtags = TAG2 [azurevnetconnectors2] -cxp = US-EAST-2 -size = MEDIUM -segments = Corporate -group = Users -billingtags = 333 +cxp = CXP1 +size = SIZE2 +segments = SEGMENT1 +group = GROUP1 +billingtags = TAG1 [azurevnetconnectors3] -cxp = GERMANYWESTCENTRAL-AZURE-1 -size = MEDIUM -segments = Corporate -group = Users -billingtags = 343 +cxp = CXP2 +size = SIZE2 +segments = SEGMENT1 +group = GROUP1 +billingtags = TAG2 [azurevnetconnectors4] -cxp = GERMANYWESTCENTRAL-AZURE-1 -size = MEDIUM -segments = Corporate -group = Users -billingtags = 333 +cxp = CXP2 +size = SIZE2 +segments = SEGMENT1 +group = GROUP1 +billingtags = TAG1 [ftntfwservices1.txt] -cxp = US-EAST-2 +cxp = CXP1 blob - 661af6b753fc6c2693b322fe0fd3a4ed28e16d02 blob + 29ec4490eb813335a651b6220f9b1aade321f3d9 --- config/demo.cnf +++ config/demo.cnf @@ -1,154 +1,154 @@ [ipsecconnectors1] -cxp = US-EAST-2 -size = MEDIUM -segments = Corporate -group = Users -billingtags = 333 +cxp = CXP1 +size = SIZE2 +segments = SEGMENT1 +group = GROUP1 +billingtags = TAG1 [ipsecconnectors2] -cxp = US-EAST-2 -size = MEDIUM -segments = Prod -group = Development -billingtags = 343 +cxp = CXP1 +size = SIZE2 +segments = SEGMENT2 +group = GROUP2 +billingtags = TAG2 [ipsecconnectors3] -cxp = US-EAST-2 -size = SMALL -segments = Pre Prod -group = Development -billingtags = 343 +cxp = CXP1 +size = SIZE1 +segments = Pre SEGMENT2 +group = GROUP2 +billingtags = TAG2 [ipsecconnectors4] -cxp = GERMANYWESTCENTRAL-AZURE-1 -size = MEDIUM -segments = Corporate -group = Users -billingtags = 333 +cxp = CXP2 +size = SIZE2 +segments = SEGMENT1 +group = GROUP1 +billingtags = TAG1 [ipsecconnectors5] -cxp = GERMANYWESTCENTRAL-AZURE-1 -size = MEDIUM -segments = Prod -group = Development -billingtags = 343 +cxp = CXP2 +size = SIZE2 +segments = SEGMENT2 +group = GROUP2 +billingtags = TAG2 [ipsecconnectors6] -cxp = GERMANYWESTCENTRAL-AZURE-1 -size = SMALL -segments = Pre Prod -group = Development -billingtags = 343 +cxp = CXP2 +size = SIZE1 +segments = Pre SEGMENT2 +group = GROUP2 +billingtags = TAG2 [internetconnectors1] -cxp = US-EAST-2 -size = MEDIUM -segments = Corporate -billingtags = 333 +cxp = CXP1 +size = SIZE2 +segments = SEGMENT1 +billingtags = TAG1 [internetconnectors2] -cxp = GERMANYWESTCENTRAL-AZURE-1 -size = LARGE -segments = Prod -billingtags = 343 +cxp = CXP2 +size = SIZE3 +segments = SEGMENT2 +billingtags = TAG2 [awsvpcconnectors1] -cxp = US-EAST-2 -size = LARGE -segments = Prod -group = Development -billingtags = 343 +cxp = CXP1 +size = SIZE3 +segments = SEGMENT2 +group = GROUP2 +billingtags = TAG2 [awsvpcconnectors2] -cxp = US-EAST-2 -size = LARGE -segments = Prod -group = Development -billingtags = 333 +cxp = CXP1 +size = SIZE3 +segments = SEGMENT2 +group = GROUP2 +billingtags = TAG1 [awsvpcconnectors3] -cxp = GERMANYWESTCENTRAL-AZURE-1 -size = LARGE -segments = Prod -group = Development -billingtags = 343 +cxp = CXP2 +size = SIZE3 +segments = SEGMENT2 +group = GROUP2 +billingtags = TAG2 [awsvpcconnectors4] -cxp = GERMANYWESTCENTRAL-AZURE-1 -size = LARGE -segments = Prod -group = Development -billingtags = 333 +cxp = CXP2 +size = SIZE3 +segments = SEGMENT2 +group = GROUP2 +billingtags = TAG1 [azurevnetconnectors1] -cxp = US-EAST-2 -size = MEDIUM -segments = Corporate -group = Users -billingtags = 343 +cxp = CXP1 +size = SIZE2 +segments = SEGMENT1 +group = GROUP1 +billingtags = TAG2 [azurevnetconnectors2] -cxp = US-EAST-2 -size = MEDIUM -segments = Corporate -group = Users -billingtags = 333 +cxp = CXP1 +size = SIZE2 +segments = SEGMENT1 +group = GROUP1 +billingtags = TAG1 [azurevnetconnectors3] -cxp = GERMANYWESTCENTRAL-AZURE-1 -size = MEDIUM -segments = Corporate -group = Users -billingtags = 343 +cxp = CXP2 +size = SIZE2 +segments = SEGMENT1 +group = GROUP1 +billingtags = TAG2 [azurevnetconnectors4] -cxp = GERMANYWESTCENTRAL-AZURE-1 -size = MEDIUM -segments = Corporate -group = Users -billingtags = 333 +cxp = CXP2 +size = SIZE2 +segments = SEGMENT1 +group = GROUP1 +billingtags = TAG1 [gcpvpcconnectors1] -cxp = US-EAST-2 -size = LARGE -segments = Prod -group = Development -billingtags = 343 +cxp = CXP1 +size = SIZE3 +segments = SEGMENT2 +group = GROUP2 +billingtags = TAG2 [gcpvpcconnectors2] -cxp = US-EAST-2 -size = LARGE -segments = Prod -group = Development -billingtags = 333 +cxp = CXP1 +size = SIZE3 +segments = SEGMENT2 +group = GROUP2 +billingtags = TAG1 [gcpvpcconnectors3] -cxp = GERMANYWESTCENTRAL-AZURE-1 -size = MEDIUM -segments = Corporate -group = Users -billingtags = 343 +cxp = CXP2 +size = SIZE2 +segments = SEGMENT1 +group = GROUP1 +billingtags = TAG2 [gcpvpcconnectors4] -cxp = GERMANYWESTCENTRAL-AZURE-1 -size = MEDIUM -segments = Corporate -group = Users -billingtags = 343 +cxp = CXP2 +size = SIZE2 +segments = SEGMENT1 +group = GROUP1 +billingtags = TAG2 [ocivcnconnectors1] -cxp = GERMANYWESTCENTRAL-AZURE-1 -size = MEDIUM -segments = Corporate -group = Users -billingtags = 333 +cxp = CXP2 +size = SIZE2 +segments = SEGMENT1 +group = GROUP1 +billingtags = TAG1 [ocivcnconnectors2] -cxp = GERMANYWESTCENTRAL-AZURE-1 -size = LARGE -segments = Prod -group = Development -billingtags = 343 +cxp = CXP2 +size = SIZE3 +segments = SEGMENT2 +group = GROUP2 +billingtags = TAG2 [ftntfwservices1.txt] -cxp = US-EAST-2 +cxp = CXP1 blob - 5414f569541379d75baebda66dd1104ce5a47c5a blob + ab331f4fbefed5093b6e2c493aaa0a0da77ebe87 --- config/minimal.cnf +++ config/minimal.cnf @@ -1,43 +1,43 @@ [ipsecconnectors1] -cxp = US-EAST-2 -segments = Corporate -group = Users -billingtags = 333 -size = MEDIUM +cxp = CXP1 +segments = SEGMENT1 +group = GROUP1 +billingtags = TAG1 +size = SIZE2 [internetconnectors1] -cxp = US-EAST-2 -segments = Corporate -billingtags = 333 -size = MEDIUM +cxp = CXP1 +segments = SEGMENT1 +billingtags = TAG1 +size = SIZE2 [awsvpcconnectors1] -cxp = US-EAST-2 -segments = Prod -group = Development -billingtags = 343 -size = LARGE +cxp = CXP1 +segments = SEGMENT2 +group = GROUP2 +billingtags = TAG2 +size = SIZE3 [azurevnetconnectors1] -cxp = US-EAST-2 -segments = Corporate -group = Users -billingtags = 343 -size = MEDIUM +cxp = CXP1 +segments = SEGMENT1 +group = GROUP1 +billingtags = TAG2 +size = SIZE2 [gcpvpcconnectors1] -cxp = US-EAST-2 -segments = Prod -group = Development -billingtags = 343 -size = LARGE +cxp = CXP1 +segments = SEGMENT2 +group = GROUP2 +billingtags = TAG2 +size = SIZE3 [ocivcnconnectors1] -cxp = GERMANYWESTCENTRAL-AZURE-1 -segments = Corporate -group = Users -billingtags = 333 -size = MEDIUM +cxp = CXP2 +segments = SEGMENT1 +group = GROUP1 +billingtags = TAG1 +size = SIZE2 [ftntfwservices1.txt] -cxp = US-EAST-2 +cxp = CXP1 blob - 9e36f8e18cb93c284485d5157164fe822f50940f blob + ee75767c6e6632c88629c36160ba526067d0a2aa --- config/single.cnf +++ config/single.cnf @@ -1,11 +1,6 @@ [internetconnectors1] -cxp = US-EAST-2 -size = MEDIUM -segments = Corporate -billingtags = 333 - -[internetconnectors2] -cxp = GERMANYWESTCENTRAL-AZURE-1 -segments = Corporate -billingtags = 333 -size = LARGE +cxp = CXP1 +size = SIZE2 +segments = SEGMENT1 +group = GROUP1 +billingtags = TAG1 blob - c7cb5352f2b33da8243f95774e31200bd36f0a04 blob + 877594121b484f2497ece5739ad29e581637f480 --- example.cnf +++ example.cnf @@ -15,6 +15,7 @@ CIDR_CXP = US-EAST-2 CXP1 = US-EAST-2 CXP2 = GERMANYWESTCENTRAL-AZURE-1 CXP3 = +CXP4 = [size] SIZE1 = SMALL SIZE2 = MEDIUM @@ -35,3 +36,4 @@ SEGMENT4 = TAG1 = 333 TAG2 = 343 TAG3 = +TAG4 = blob - 5cf185fb118d21ce89cd1fa1a5698cd7d73932df blob + 3c470f957fa7dfe0564a02572681f23f1a511b0e --- push.py +++ push.py @@ -4,6 +4,7 @@ # push.py # Version 0.1 - 20220617 - initial release # Version 0.2 - 20220620 - added collection of credentialId +# Version 0.3 - 20220708 - config everywhere!! # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above @@ -68,6 +69,7 @@ ALKIRA_USERNAME = alkira.get('alkira', 'ALKIRA_USERNAM ALKIRA_PASSWORD = alkira.get('alkira', 'ALKIRA_PASSWORD') ALKIRA_BASE_URI = f'https://{ALKIRA_TENANT}/api' AWS_SERVICE_USERNAME = alkira.get('services', 'AWS_SERVICE_USERNAME') +AZURE_SERVICE_USERNAME = alkira.get('services', 'AZURE_SERVICE_USERNAME') SERVICE_PASSWORD = alkira.get('services', 'SERVICE_PASSWORD') CIDR_NAME = alkira.get('globalcidr', 'CIDR_NAME') CIDR_DESCR = alkira.get('globalcidr', 'CIDR_DESCR') @@ -265,22 +267,29 @@ for connector in config.sections(): for key in ['cxp', 'size', 'group']: if key in body: logging.debug(f"JSON {key}: {body[key]}") - if key in section: + if key in section: + try: + if alkira.get(key, section[key]): + logging.debug(f"CNF CONFIG {key}: {alkira.get(key, section[key])}") + body[key] = alkira.get(key, section[key]) + except: + logging.debug(f"{key} not defined in main config") logging.debug(f"CONFIG {key}: {section[key]}") body[key] = section[key] for key in ['segments', 'billingTags']: if key in body: - logging.debug(f"JSON key: {body[key][0]}") - if key in section: + logging.debug(f"JSON {key}: {body[key][0]}") + if key in section: + try: + if alkira.get(key, section[key]): + logging.debug(f"CNF CONFIG {key}: {alkira.get(key, section[key])}") + body[key][0] = alkira.get(key, section[key]) + except: + logging.debug(f"{key} not defined in main config") logging.debug(f"CONFIG key: {section[key]}") body[key][0] = section[key] - if 'group' not in body: - if 'group' in section: - logging.debug(f"CONFIG group: {section['group']}") - body['group'] = section['group'] - if 'services' in connector_name and 'credentialId' in body and 'service_credentialid' in locals(): logging.debug(f'API credentialid: {service_credentialid}') body['credentialId'] = service_credentialid