create securityPolicy for collection test

Author: michaelhtm

test/e2e/tests/test_collection.py

@@ -24,19 +24,22 @@
 from e2e import service_marker, CRD_GROUP, CRD_VERSION, load_resource
 from e2e.replacement_values import REPLACEMENT_VALUES
 from e2e import collection
+from e2e.tests.test_security_policy import simple_security_policy
 
 COLLECTION_RESOURCE_PLURAL = "collections"
 DELETE_WAIT_AFTER_SECONDS = 10
 CHECK_STATUS_WAIT_SECONDS = 30
 MODIFY_WAIT_AFTER_SECONDS = 30
 INITIAL_DESCRIPTION = "Initial Description"
-UPDATED_DESCRIPTION = "UPDATEd Description"
+UPDATED_DESCRIPTION = "Updated Description"
 
 
-@pytest.fixture(scope="module")
-def simple_collection():
+@pytest.fixture
+def simple_collection(simple_security_policy):
+    # EncryptionType securityPolicy is required to create Collection resource
+    _, _ = simple_security_policy
+    
     collection_name = random_suffix_name("my-collection", 24)
-
     replacements = REPLACEMENT_VALUES.copy()
     replacements['COLLECTION_NAME'] = collection_name
     replacements['DESCRIPTION'] = "Initial Description"
@@ -92,10 +95,14 @@ def test_crud(self, simple_collection):
         desired_tags = cr['spec']['tags']
         tags.assert_ack_system_tags(
             tags=latest_tags,
+            key_member_name='key',
+            value_member_name='value'
         )
         tags.assert_equal_without_ack_tags(
             expected=desired_tags,
             actual=latest_tags,
+            key_member_name='key',
+            value_member_name='value'
         )
 
         # Update the collection
@@ -131,8 +138,12 @@ def test_crud(self, simple_collection):
         desired_tags = cr['spec']['tags']
         tags.assert_ack_system_tags(
             tags=latest_tags,
+            key_member_name='key',
+            value_member_name='value'
         )
         tags.assert_equal_without_ack_tags(
             expected=desired_tags,
             actual=latest_tags,
+            key_member_name='key',
+            value_member_name='value'
         )

test/e2e/tests/test_security_policy.py

@@ -41,22 +41,28 @@
 UPDATED_NETWORK_POLICY = '[{"Rules": [{"ResourceType": "collection","Resource": ["collection/*"]},{"ResourceType": "dashboard","Resource": ["collection/logs*"]}],"AllowFromPublic": true}]'
 
 
-
 @pytest.fixture
 def simple_security_policy(request):
     sp_name = random_suffix_name("my-security-policy", 24)
     marker = request.node.get_closest_marker("resource_data")
-    assert marker is not None
-    data = marker.args[0]
-    # either encryption or network
-    assert 'type' in data
-    assert 'policy' in data
+    # We want to default to an encryptionPolicy that applies to all collections
+    # when no marker is provided. This will allow us to create SecurityPolicy
+    # seamlessly when testing Collections
+    sp_type = "encryption"
+    sp_policy = UPDATED_ENCRYPTION_POLICY
+    if marker is not None:
+        data = marker.args[0]
+        # either encryption or network
+        assert 'type' in data
+        sp_type = data['type']
+        assert 'policy' in data
+        sp_policy = data['policy']
 
     replacements = REPLACEMENT_VALUES.copy()
     replacements['SECURITY_POLICY_NAME'] = sp_name
     replacements['SECURITY_POLICY_DESCRIPTION'] = INITIAL_DESCRIPTION
-    replacements['SECURITY_POLICY_TYPE'] = data['type']
-    replacements['SECURITY_POLICY'] = data['policy']
+    replacements['SECURITY_POLICY_TYPE'] = sp_type
+    replacements['SECURITY_POLICY'] = sp_policy
 
     resource_data = load_resource(
         "security_policy",