diff --git a/Tutorials/python/Simple_Firewall/.meta_Process_Add_Filter_Rule b/Tutorials/python/Simple_Firewall/.meta_Process_Add_Filter_Rule
new file mode 100755
index 000000000..dcee55534
--- /dev/null
+++ b/Tutorials/python/Simple_Firewall/.meta_Process_Add_Filter_Rule
@@ -0,0 +1,31 @@
+
+
+
+
diff --git a/Tutorials/python/Simple_Firewall/.meta_Process_Create_Firewall_Service b/Tutorials/python/Simple_Firewall/.meta_Process_Create_Firewall_Service
new file mode 100755
index 000000000..ddd7fc0db
--- /dev/null
+++ b/Tutorials/python/Simple_Firewall/.meta_Process_Create_Firewall_Service
@@ -0,0 +1,31 @@
+
+
+
+
diff --git a/Tutorials/python/Simple_Firewall/.meta_Process_Delete_Service b/Tutorials/python/Simple_Firewall/.meta_Process_Delete_Service
new file mode 100755
index 000000000..59e69078f
--- /dev/null
+++ b/Tutorials/python/Simple_Firewall/.meta_Process_Delete_Service
@@ -0,0 +1,31 @@
+
+
+
+
diff --git a/Tutorials/python/Simple_Firewall/.meta_Simple_Firewall.xml b/Tutorials/python/Simple_Firewall/.meta_Simple_Firewall.xml
index b3547067d..52f5c6c80 100755
--- a/Tutorials/python/Simple_Firewall/.meta_Simple_Firewall.xml
+++ b/Tutorials/python/Simple_Firewall/.meta_Simple_Firewall.xml
@@ -7,7 +7,7 @@
DATE_MODIFICATION
- 1616511278773
+ 1630077255702
REPOSITORY
@@ -15,7 +15,7 @@
DATE_CREATION
- 1616511278764
+ 1630077255693
MODEL
diff --git a/Tutorials/python/Simple_Firewall/Process_Add_Filter_Rule/.meta_Tasks b/Tutorials/python/Simple_Firewall/Process_Add_Filter_Rule/.meta_Tasks
new file mode 100755
index 000000000..3021aa354
--- /dev/null
+++ b/Tutorials/python/Simple_Firewall/Process_Add_Filter_Rule/.meta_Tasks
@@ -0,0 +1,31 @@
+
+
+
+
diff --git a/Tutorials/python/Simple_Firewall/Process_Add_Filter_Rule/Tasks/.meta_Task_add_rule.py b/Tutorials/python/Simple_Firewall/Process_Add_Filter_Rule/Tasks/.meta_Task_add_rule.py
new file mode 100755
index 000000000..52338a078
--- /dev/null
+++ b/Tutorials/python/Simple_Firewall/Process_Add_Filter_Rule/Tasks/.meta_Task_add_rule.py
@@ -0,0 +1,35 @@
+
+
+
+
diff --git a/Tutorials/python/Simple_Firewall/Add_filter_Rule_add_rule.py b/Tutorials/python/Simple_Firewall/Process_Add_Filter_Rule/Tasks/Task_add_rule.py
similarity index 95%
rename from Tutorials/python/Simple_Firewall/Add_filter_Rule_add_rule.py
rename to Tutorials/python/Simple_Firewall/Process_Add_Filter_Rule/Tasks/Task_add_rule.py
index 5907923a1..350efbb4e 100755
--- a/Tutorials/python/Simple_Firewall/Add_filter_Rule_add_rule.py
+++ b/Tutorials/python/Simple_Firewall/Process_Add_Filter_Rule/Tasks/Task_add_rule.py
@@ -4,22 +4,19 @@
from msa_sdk.order import Order
from msa_sdk import util
-
# List all the parameters required by the task
dev_var = Variables()
dev_var.add('id')
-dev_var.add('icmp')
dev_var.add('src_ip')
dev_var.add('dst_port')
context = Variables.task_call(dev_var)
+
process_id = context['SERVICEINSTANCEID']
devices = context['devices']
for device in devices:
# extract the database ID
device_db_id = device['id'][-3:]
-
- if context['icmp'] == 'true': context['dst_port'] = 'null'
# build the Microservice JSON params for the CREATE
micro_service_vars_array = {"object_id": context['id'],
diff --git a/Tutorials/python/Simple_Firewall/Process_Create_Firewall_Service/.meta_Tasks b/Tutorials/python/Simple_Firewall/Process_Create_Firewall_Service/.meta_Tasks
new file mode 100755
index 000000000..821495430
--- /dev/null
+++ b/Tutorials/python/Simple_Firewall/Process_Create_Firewall_Service/.meta_Tasks
@@ -0,0 +1,31 @@
+
+
+
+
diff --git a/Tutorials/python/Simple_Firewall/Process_Create_Firewall_Service/Tasks/.meta_Task_select_devices.py b/Tutorials/python/Simple_Firewall/Process_Create_Firewall_Service/Tasks/.meta_Task_select_devices.py
new file mode 100755
index 000000000..8d1c22696
--- /dev/null
+++ b/Tutorials/python/Simple_Firewall/Process_Create_Firewall_Service/Tasks/.meta_Task_select_devices.py
@@ -0,0 +1,35 @@
+
+
+
+
diff --git a/Tutorials/python/Simple_Firewall/Create_Firewall_Service_Select_Devices.py b/Tutorials/python/Simple_Firewall/Process_Create_Firewall_Service/Tasks/Task_select_devices.py
similarity index 100%
rename from Tutorials/python/Simple_Firewall/Create_Firewall_Service_Select_Devices.py
rename to Tutorials/python/Simple_Firewall/Process_Create_Firewall_Service/Tasks/Task_select_devices.py
diff --git a/Tutorials/python/Simple_Firewall/Process_Delete_Service/.meta_Tasks b/Tutorials/python/Simple_Firewall/Process_Delete_Service/.meta_Tasks
new file mode 100755
index 000000000..68866a130
--- /dev/null
+++ b/Tutorials/python/Simple_Firewall/Process_Delete_Service/.meta_Tasks
@@ -0,0 +1,31 @@
+
+
+
+
diff --git a/Tutorials/python/Simple_Firewall/Process_Delete_Service/Tasks/.meta_Task_delete_service.py b/Tutorials/python/Simple_Firewall/Process_Delete_Service/Tasks/.meta_Task_delete_service.py
new file mode 100755
index 000000000..421db623e
--- /dev/null
+++ b/Tutorials/python/Simple_Firewall/Process_Delete_Service/Tasks/.meta_Task_delete_service.py
@@ -0,0 +1,35 @@
+
+
+
+
diff --git a/Tutorials/python/Simple_Firewall/Delete_Service_delete_service.py b/Tutorials/python/Simple_Firewall/Process_Delete_Service/Tasks/Task_delete_service.py
similarity index 100%
rename from Tutorials/python/Simple_Firewall/Delete_Service_delete_service.py
rename to Tutorials/python/Simple_Firewall/Process_Delete_Service/Tasks/Task_delete_service.py
diff --git a/Tutorials/python/Simple_Firewall/Simple_Firewall.xml b/Tutorials/python/Simple_Firewall/Simple_Firewall.xml
index f67b178b4..f13bbb27e 100644
--- a/Tutorials/python/Simple_Firewall/Simple_Firewall.xml
+++ b/Tutorials/python/Simple_Firewall/Simple_Firewall.xml
@@ -10,48 +10,42 @@
-
-
-
-
-
-
-
+
-
+
+ Delete Service
+ DELETE
+ 5
+
+
+ /opt/fmc_repository/Process/Tutorials/python/Simple_Firewall/Process_Delete_Service/Tasks
+ delete service
+
+
+
Create Firewall Service
CREATE
5
- false
-
- /opt/fmc_repository/Process/Tutorials/python/Simple_Firewall
- Select Devices
+
+
+ /opt/fmc_repository/Process/Tutorials/python/Simple_Firewall/Process_Create_Firewall_Service/Tasks
+ select devices
-
+
Add Filter Rule
UPDATE
5
- true
-
- /opt/fmc_repository/Process/Tutorials/python/Simple_Firewall
- add rule
-
-
-
- Delete Service
- DELETE
- 5
-
- /opt/fmc_repository/Process/Tutorials/python/Simple_Firewall
- delete service
+
+ /opt/fmc_repository/Process/Tutorials/python/Simple_Firewall/Process_Add_Filter_Rule/Tasks
+ add rule