Further refining code by deleting unused original implementatation code.

Signed-off-by: Tanya <tatyana@il.ibm.com>

nca/Resources/PolicyResources/CalicoNetworkPolicy.py

@@ -37,17 +37,15 @@ def __init__(self, src_peers, dst_peers, action, props):
         self.props_copy = ConnectivityProperties()
 
     def __eq__(self, other):
-        return self.src_peers == other.src_peers and self.dst_peers == other.dst_peers and \
-            self.props == other.props and self.action == other.action
+        return self.props == other.props and self.action == other.action
 
     def contained_in(self, other):
         """
         :param CalicoPolicyRule other: Another rule
         :return: Whether all connections specified by 'self' are also specified by 'other' (regardless of action)
         :rtype: bool
         """
-        return self.src_peers.issubset(other.src_peers) and self.dst_peers.issubset(other.dst_peers) and \
-            self.props.contained_in(other.props)
+        return self.props.contained_in(other.props)
 
     @staticmethod
     def action_str_to_action_type(action_str):

nca/Resources/PolicyResources/GatewayPolicy.py

@@ -24,15 +24,15 @@ def __init__(self, peer_set, props):
         self.props_copy = ConnectivityProperties()
 
     def __eq__(self, other):
-        return self.peer_set == other.peer_set and self.props == other.props
+        return self.props == other.props
 
     def contained_in(self, other):
         """
         :param GatewayPolicyRule other: Another rule
         :return: whether the self rule is contained in the other rule (self doesn't allow anything that other does not)
         :type: bool
         """
-        return self.peer_set.issubset(other.peer_set) and self.props.contained_in(other.props)
+        return self.props.contained_in(other.props)
 
 
 class GatewayPolicy(NetworkPolicy):

nca/Resources/PolicyResources/IstioNetworkPolicy.py

@@ -25,15 +25,15 @@ def __init__(self, peer_set, props):
         self.props_copy = ConnectivityProperties()
 
     def __eq__(self, other):
-        return self.peer_set == other.peer_set and self.props == other.props
+        return self.props == other.props
 
     def contained_in(self, other):
         """
         :param IstioPolicyRule other: Another rule
         :return: whether the self rule is contained in the other rule (self doesn't allow anything that other does not)
         :type: bool
         """
-        return self.peer_set.issubset(other.peer_set) and self.props.contained_in(other.props)
+        return self.props.contained_in(other.props)
 
 
 class IstioNetworkPolicy(NetworkPolicy):

nca/Resources/PolicyResources/K8sNetworkPolicy.py

@@ -22,15 +22,15 @@ def __init__(self, peer_set, props):
         self.props_copy = ConnectivityProperties()
 
     def __eq__(self, other):
-        return self.peer_set == other.peer_set and self.props == other.props
+        return self.props == other.props
 
     def contained_in(self, other):
         """
         :param K8sPolicyRule other: Another rule
         :return: whether the self rule is contained in the other rule (self doesn't allow anything that other does not)
         :type: bool
         """
-        return self.peer_set.issubset(other.peer_set) and self.props.contained_in(other.props)
+        return self.props.contained_in(other.props)
 
 
 class K8sNetworkPolicy(NetworkPolicy):