From ed3dcb7516acc8bb2e0946fa9a94833e37820f6f Mon Sep 17 00:00:00 2001 From: Seena Moshiri Gilani Date: Thu, 28 Oct 2021 22:55:57 +0330 Subject: [PATCH 1/6] Makes code a bit cleaner and more readable --- FMC_Functions.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/FMC_Functions.py b/FMC_Functions.py index 34a1653..8259def 100644 --- a/FMC_Functions.py +++ b/FMC_Functions.py @@ -37,8 +37,9 @@ def GET_DOMAIN_UUID(IP,AUTH_TOKEN): if (status_code == 200): #print("GET successful. Response data --> ") json_resp = json.loads(resp) - domain_uuid=json_resp["items"][0]["uuid"] - domain_name=json_resp["items"][0]["name"] + domain = json_resp["items"][0] + domain_uuid = domain["uuid"] + domain_name = domain["name"] return domain_name,domain_uuid else: r.raise_for_status() From ed5aa61441f1c7c599b68b1acaa116779fd768ec Mon Sep 17 00:00:00 2001 From: Seena Moshiri Gilani Date: Thu, 28 Oct 2021 22:57:38 +0330 Subject: [PATCH 2/6] Removes unused 'import' statements --- FMC_Functions.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/FMC_Functions.py b/FMC_Functions.py index 8259def..808add8 100644 --- a/FMC_Functions.py +++ b/FMC_Functions.py @@ -1,5 +1,4 @@ def GET_AUTH_TOKEN(IP,USERNAME,PASSWORD): - import json import sys import requests server = "https://"+IP @@ -79,7 +78,6 @@ def GET_ACP_LIST(IP,DOMAIN_UUID,TOKEN_ID): ########################################################################################################################## def GET_ACCESSRULE_LIST(IP,DOMAIN_UUID,TOKEN_ID,ACCESS_POLICY_ID): import json - import sys import requests server = "https://"+IP ACP_ID=ACCESS_POLICY_ID @@ -109,7 +107,6 @@ def GET_ACCESSRULE_LIST(IP,DOMAIN_UUID,TOKEN_ID,ACCESS_POLICY_ID): ########################################################################################################################## def GET_ACCESSRULE_DETAIL(IP,DOMAIN_UUID,TOKEN_ID,ACCESS_POLICY_ID,RULE_ID): import json - import sys import requests server = "https://"+IP ACP_ID=ACCESS_POLICY_ID @@ -141,7 +138,6 @@ def GET_ACCESSRULE_DETAIL(IP,DOMAIN_UUID,TOKEN_ID,ACCESS_POLICY_ID,RULE_ID): def GET_OBJ_NETWORKS(IP,DOMAIN_UUID,TOKEN_ID,TYPE): # type variable could be 4 values : hosts,networks,networkaddresses(includes hosts and networks),ranges import json - import sys import requests r = None server="https://"+IP @@ -171,7 +167,6 @@ def GET_OBJ_NETWORKS(IP,DOMAIN_UUID,TOKEN_ID,TYPE): def GET_NETWORKS_GROUPS(IP,DOMAIN_UUID,TOKEN_ID): # type variable could be 4 values : hosts,networks,networkaddresses(includes hosts and networks),ranges import json - import sys import requests r = None server="https://"+IP From 2b816be4af24c1f936bc1cf64663fd04708de1db Mon Sep 17 00:00:00 2001 From: Seena Moshiri Gilani Date: Thu, 28 Oct 2021 23:00:21 +0330 Subject: [PATCH 3/6] Fixes typo mistakes with print (Capital P) --- GET_OBJECTS.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/GET_OBJECTS.py b/GET_OBJECTS.py index dadc6ae..f7e2b11 100644 --- a/GET_OBJECTS.py +++ b/GET_OBJECTS.py @@ -32,7 +32,7 @@ "value" : item["value"], }) -Print("List of Network Objects(JSON Format) : ") +print("List of Network Objects(JSON Format) : ") for i in OBJECT_DETAIL_LIST: print(i) ########################################################### @@ -52,7 +52,7 @@ "value" : item["objects"], }) -Print("List of Network group Objects(JSON Format) : ") +print("List of Network group Objects(JSON Format) : ") for item in GROUP_OBJ_DETAIL_LIST: print(item) print("###############") From d37fdda5936f31166ca5517f9134aef06ad4029b Mon Sep 17 00:00:00 2001 From: Seena Moshiri Gilani Date: Thu, 28 Oct 2021 23:02:04 +0330 Subject: [PATCH 4/6] Removes irrelevant comments --- GET_OBJECTS.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/GET_OBJECTS.py b/GET_OBJECTS.py index f7e2b11..425ecf7 100644 --- a/GET_OBJECTS.py +++ b/GET_OBJECTS.py @@ -9,9 +9,6 @@ ## Main program ## import json SERVER_IP="172.16.71.21" -#comment for credentials -##another edit for credentials -#also another comment USERNAME="admin" PASSWORD="P@ssw0rd" #Generate Token From 5d3f5ec029d582b0b922210d8f9637de03c9f4b7 Mon Sep 17 00:00:00 2001 From: Seena Moshiri Gilani Date: Thu, 28 Oct 2021 23:03:33 +0330 Subject: [PATCH 5/6] Changes default value for IP, USERNAME, PASSWORD --- GET_OBJECTS.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/GET_OBJECTS.py b/GET_OBJECTS.py index 425ecf7..1121b64 100644 --- a/GET_OBJECTS.py +++ b/GET_OBJECTS.py @@ -8,9 +8,9 @@ import time ## Main program ## import json -SERVER_IP="172.16.71.21" -USERNAME="admin" -PASSWORD="P@ssw0rd" +SERVER_IP="SERVER_IP" +USERNAME="SERVER_USERNAME" +PASSWORD="SERVER_PASSWORD" #Generate Token token=GET_AUTH_TOKEN(SERVER_IP,USERNAME,PASSWORD) print(token) From 0a9fd178dcaadf9d1ce6a816b1bcb9759e20e4fd Mon Sep 17 00:00:00 2001 From: Seena Moshiri Gilani Date: Thu, 28 Oct 2021 23:06:43 +0330 Subject: [PATCH 6/6] Removes unused import and from statements from GET_OBJECTS.py --- GET_OBJECTS.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/GET_OBJECTS.py b/GET_OBJECTS.py index 1121b64..3d95d26 100644 --- a/GET_OBJECTS.py +++ b/GET_OBJECTS.py @@ -1,13 +1,8 @@ -from FMC_Functions import GET_ACP_LIST -from FMC_Functions import GET_ACCESSRULE_LIST -from FMC_Functions import GET_ACCESSRULE_DETAIL from FMC_Functions import GET_AUTH_TOKEN from FMC_Functions import GET_DOMAIN_UUID from FMC_Functions import GET_OBJ_NETWORKS from FMC_Functions import GET_NETWORKS_GROUPS -import time ## Main program ## -import json SERVER_IP="SERVER_IP" USERNAME="SERVER_USERNAME" PASSWORD="SERVER_PASSWORD"