Merge pull request #42 from Tufin/Development

Development

Author: schercav

pytos/common/definitions/xml_tags.py

@@ -310,6 +310,7 @@ class Elements:
     ENFORCEDON = "enforcedOn"
     EXCLUDE_ANY = "exclude_any"
     EXCLUSION = "exclusion"
+    EXCLUSIONS = "exclusions"
     EXEMPTED_TRAFFIC = "exempted_traffic"
     EXEMPTED_TRAFFIC_LIST = "exempted_traffic_list"
     EXPIRATION_DATE = "expiration_date"
@@ -681,6 +682,10 @@ class Elements:
     STEP = "step"
     STEP_NAME = "step_name"
     STEPS = "steps"
+    SUB_POLICY = "sub_policy"
+    SUB_POLICY_GLOBAL = "sub_policy_global"
+    SUB_POLICY_SHARED = "sub_policy_shared"
+    SUB_POLICY_UID = "sub_policy_uid"
     SUB_POLICY_NAME = "sub_policy_name"
     SUBNET = "subnet"
     SUBNET_MASK = "subnet_mask"

pytos/securetrack/xml_objects/rest/rules.py

@@ -274,6 +274,10 @@ def __init__(self, num_id, uid, cp_uid, order, binding, action, comment, dst_net
         self.additional_parameters = kwargs['additional_parameters']
         self.applications = kwargs['applications']
         self.rule_text = kwargs['rule_text']
+        self.sub_policy = kwargs['sub_policy']
+        self.sub_policy_global = kwargs['sub_policy_global']
+        self.sub_policy_shared = kwargs['sub_policy_shared']
+        self.sub_policy_uid = kwargs['sub_policy_uid']
         super().__init__(xml_tags.Elements.RULE)
 
     def _key(self):
@@ -334,6 +338,11 @@ def from_xml_node(cls, xml_node):
         install_node = get_xml_node(xml_node, xml_tags.Elements.INSTALL, True)
         install = Install.from_xml_node(install_node) if install_node else None
 
+        sub_policy = get_xml_text_value(xml_node, xml_tags.Elements.SUB_POLICY)
+        sub_policy_global = get_xml_text_value(xml_node, xml_tags.Elements.SUB_POLICY_GLOBAL)
+        sub_policy_shared = get_xml_text_value(xml_node, xml_tags.Elements.SUB_POLICY_SHARED)
+        sub_policy_uid  = get_xml_text_value(xml_node, xml_tags.Elements.SUB_POLICY_UID)
+
         src_zones = [Flat_XML_Object_Base(xml_tags.Elements.SRC_ZONE, content=s_zone.text) for s_zone in xml_node.iter(tag=xml_tags.Elements.SRC_ZONE)]
         dst_zones = [Flat_XML_Object_Base(xml_tags.Elements.DST_ZONE, content=d_zone.text) for d_zone in xml_node.iter(tag=xml_tags.Elements.DST_ZONE)]
         additional_parameters = create_tagless_xml_objects_list(xml_node, xml_tags.Elements.ADDITIONAL_PARAMETER, AdditionalParameter)
@@ -344,7 +353,8 @@ def from_xml_node(cls, xml_node):
                    dst_services, dst_services_negated, disabled, external, name, rule_number, src_networks,
                    src_networks_negated, src_services_negated, track, rule_type, documentation, device_id, implicit,
                    application, vpn, install, src_zones, dst_zones, rule_type_type, rule_text=rule_text,
-                   additional_parameters=additional_parameters, applications=applications)
+                   additional_parameters=additional_parameters, applications=applications, sub_policy=sub_policy,
+                   sub_policy_global=sub_policy_global, sub_policy_shared=sub_policy_shared, sub_policy_uid=sub_policy_uid)
 
     def __str__(self):
         src_negated, dst_negated, srv_negated = "", "", ""
@@ -1096,8 +1106,9 @@ def as_netaddr_obj(self):
 
 class Base_Network_Object(Network_Object):
     def __init__(self, display_name, is_global, connection_id, name, service_type, members, uid, device_id, comment,
-                 implicit):
+                 implicit, exclusions):
         self.members = members
+        self.exclusions = exclusions
         self.uid = uid
         super().__init__(xml_tags.Elements.NETWORK_OBJECT, display_name, is_global, connection_id, name, service_type,
                          device_id, comment, implicit)
@@ -1122,11 +1133,18 @@ def from_xml_node(cls, xml_node):
             member_name = get_xml_text_value(member_node, xml_tags.Elements.NAME)
             member_uid = get_xml_text_value(member_node, xml_tags.Elements.UID)
             members.append(Base_Object(xml_tags.Elements.MEMBER, member_name, member_display_name, member_id, member_uid))
+        exclusions = XML_List(xml_tags.Elements.EXCLUSIONS, [])
+        for exclusion_node in xml_node.iter(tag=xml_tags.Elements.EXCLUSION):
+            exclusion_id = get_xml_int_value(exclusion_node, xml_tags.Elements.ID)
+            exclusion_display_name = get_xml_text_value(exclusion_node, xml_tags.Elements.DISPLAY_NAME)
+            exclusion_name = get_xml_text_value(exclusion_node, xml_tags.Elements.NAME)
+            exclusion_uid = get_xml_text_value(exclusion_node, xml_tags.Elements.UID)
+            exclusions.append(Base_Object(xml_tags.Elements.EXCLUSION, exclusion_name, exclusion_display_name, exclusion_id, exclusion_uid))
         device_id = get_xml_int_value(xml_node, xml_tags.Elements.DEVICE_ID)
         comment = get_xml_text_value(xml_node, xml_tags.Elements.COMMENT)
         implicit = get_xml_text_value(xml_node, xml_tags.Elements.IMPLICIT)
         return cls(display_name, is_global, connection_id, name, service_type, members, uid, device_id, comment,
-                   implicit)
+                   implicit, exclusions)
 
     def __str__(self):
         spacer = 4 * " "
@@ -1139,18 +1157,18 @@ def __str__(self):
 
 class Group_Network_Object(Base_Network_Object):
     def __init__(self, display_name, is_global, connection_id, name, service_type, members, uid, device_id, comment,
-                 implicit):
+                 implicit, exclusions):
         self.set_attrib(xml_tags.Attributes.XSI_TYPE, xml_tags.Attributes.NETWORK_OBJECT_TYPE_GROUP)
         super().__init__(display_name, is_global, connection_id, name, service_type, members, uid, device_id, comment,
-                         implicit)
+                         implicit, exclusions)
 
 
 class Cloud_Network_Object(Base_Network_Object):
     def __init__(self, display_name, is_global, connection_id, name, service_type, members, uid, device_id, comment,
-                 implicit):
+                 implicit, exclusions):
         self.set_attrib(xml_tags.Attributes.XSI_TYPE, xml_tags.Attributes.NETWORK_OBJECT_TYPE_CLOUD)
         super().__init__(display_name, is_global, connection_id, name, service_type, members, uid, device_id, comment,
-                         implicit)
+                         implicit, exclusions)
 
 
 class DomainNetworkObject(Network_Object):