Merge 4d6ba8a into 843c75d

OpenKMIP · Oct 6, 2016 · c273b54 · c273b54
2 parents 843c75d + 4d6ba8a
commit c273b54
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/kmip/services/server/engine.py b/kmip/services/server/engine.py
@@ -603,6 +603,8 @@ def _set_attribute_on_managed_object(self, managed_object, attribute):
                 for e in enums.CryptographicUsageMask:
                     if e.value & attribute_value.value:
                         value.append(e)
+            elif attribute_name == 'Operation Policy Name':
+                field = 'operation_policy_name'
 
             if field:
                 existing_value = getattr(managed_object, field)

diff --git a/kmip/tests/unit/services/server/test_engine.py b/kmip/tests/unit/services/server/test_engine.py
@@ -1505,6 +1505,10 @@ def test_create(self):
                         enums.CryptographicUsageMask.ENCRYPT,
                         enums.CryptographicUsageMask.DECRYPT
                     ]
+                ),
+                attribute_factory.create_attribute(
+                    enums.AttributeType.OPERATION_POLICY_NAME,
+                    'test'
                 )
             ]
         )
@@ -1552,6 +1556,7 @@ def test_create(self):
             enums.CryptographicUsageMask.DECRYPT,
             symmetric_key.cryptographic_usage_masks
         )
+        self.assertEqual('test', symmetric_key.operation_policy_name)
 
         self.assertEqual(uid, e._id_placeholder)
 
@@ -1822,6 +1827,7 @@ def test_create_key_pair(self):
             enums.CryptographicUsageMask.ENCRYPT,
             public_key.cryptographic_usage_masks
         )
+        self.assertEqual('default', public_key.operation_policy_name)
 
         # Retrieve the stored private key and verify all attributes were set
         # appropriately.
@@ -1846,6 +1852,7 @@ def test_create_key_pair(self):
             enums.CryptographicUsageMask.DECRYPT,
             private_key.cryptographic_usage_masks
         )
+        self.assertEqual('default', private_key.operation_policy_name)
 
         self.assertEqual(private_id, e._id_placeholder)
 
@@ -2442,6 +2449,10 @@ def test_register(self):
                         enums.CryptographicUsageMask.ENCRYPT,
                         enums.CryptographicUsageMask.DECRYPT
                     ]
+                ),
+                attribute_factory.create_attribute(
+                    enums.AttributeType.OPERATION_POLICY_NAME,
+                    'test'
                 )
             ]
         )
@@ -2507,6 +2518,7 @@ def test_register(self):
             enums.CryptographicUsageMask.DECRYPT,
             symmetric_key.cryptographic_usage_masks
         )
+        self.assertEqual('test', symmetric_key.operation_policy_name)
 
         self.assertEqual(uid, e._id_placeholder)