creating entity entity types, ongoing work

pybis/src/python/pybis/entity_type.py

@@ -97,6 +97,9 @@ class EntityType:
 
         """
         pas = self.__dict__['_propertyAssignments']
+
+        # assign property type
+        property_type = self.openbis.get_property_type(property)
         new_assignment = {
             "section": section,
             "ordinal": ordinal,
@@ -104,26 +107,16 @@ class EntityType:
             "initialValueForExistingEntities": initialValueForExistingEntities,
             "showInEditView": showInEditView,
             "showRawValueInForms": showRawValueInForms,
-            "propertyType" : {
-                "permId": property.upper(),
-                "@type": "as.dto.property.id.PropertyTypePermId"
-            },
+            "propertyType": property_type.data,
             "@type": "as.dto.property.create.PropertyAssignmentCreation",
         }
-        if plugin is not None:
-            new_assignment['pluginId'] = {
-                "permId": plugin.upper(),
-                "@type": "as.dto.plugin.id.PluginPermId"
-            }
-        pas.append(new_assignment)
 
-    @property
-    def validationPlugin(self):
-        try:
-            return self.openbis.get_plugin(self._validationPlugin['name'])
-        except Exception:
-            pass
+        # assign plugin
+        if plugin is not None:
+            plugin_obj = self.openbis.get_plugin(plugin)
+            new_assignment['plugin'] = plugin_obj.data
 
+        pas.append(new_assignment)
 
     def revoke_property(self, 
         property, 
@@ -138,6 +131,16 @@ class EntityType:
         raise ValueError("not implemented yet")
 
 
+    @property
+    def validationPlugin(self):
+        """Returns a validation plugin object when called.
+        Returns None when no validation plugin is defined.
+        """
+        try:
+            return self.openbis.get_plugin(self._validationPlugin['name'])
+        except Exception:
+            pass
+
     def codes(self):
         codes = []
         for pa in self.data['propertyAssignments']: