Revert "cleanup security model"

This reverts commit 911fb9c.

Author: petercrocker

models/examples/security/infrastructure_security.yml

@@ -6,7 +6,7 @@ generics:
     namespace: Security
     description: "Generic Security Address."
     label: "Security Address"
-    human_friendly_id: ["name__value"]
+    default_filter: name__value
     order_by:
       - "name__value"
     display_labels:
@@ -24,7 +24,7 @@ nodes:
     namespace: Infra
     description: "IP Address"
     label: "IP Address"
-    human_friendly_id: ["address__value"]
+    default_filter: address__value
     order_by:
       - "address__value"
     display_labels:
@@ -37,7 +37,18 @@ nodes:
         unique: true
     relationships:
       - name: organization
-        peer: OrganizationGeneric
+        peer: CoreOrganization
+        optional: true
+        cardinality: one
+        kind: Attribute
+
+      - name: status
+        peer: BuiltinStatus
+        optional: false
+        cardinality: one
+        kind: Attribute
+      - name: role
+        peer: BuiltinRole
         optional: true
         cardinality: one
         kind: Attribute
@@ -51,27 +62,31 @@ nodes:
     namespace: Infra
     description: "IPv4 or IPv6 network (with mask)"
     label: "Prefix"
-    human_friendly_id: ["prefix__value"]
-    order_by:
-      - "prefix__value"
-    display_labels:
-      - prefix__value
+    default_filter: name__value
     inherit_from:
       - "SecurityAddress"
+    order_by:
+      - name__value
+    display_labels:
+      - name__value
     attributes:
       - name: prefix
         kind: IPNetwork
-        unique: true
-    relationships:
-      - name: organization
-        peer: OrganizationGeneric
+      - name: name
+        kind: Text
+      - name: description
+        kind: Text
         optional: true
+    relationships:
+      - name: status
+        peer: BuiltinStatus
+        optional: false
         cardinality: one
         kind: Attribute
-      - name: tags
-        peer: BuiltinTag
+      - name: role
+        peer: BuiltinRole
         optional: true
-        cardinality: many
+        cardinality: one
         kind: Attribute
 
   - name: IPRange
@@ -95,6 +110,17 @@ nodes:
         identifier: security_iprange__end_address
         cardinality: one
         kind: Attribute
+
+      - name: status
+        peer: BuiltinStatus
+        optional: false
+        cardinality: one
+        kind: Attribute
+      - name: role
+        peer: BuiltinRole
+        optional: true
+        cardinality: one
+        kind: Attribute
       - name: tags
         peer: BuiltinTag
         optional: true
@@ -112,6 +138,16 @@ nodes:
     order_by:
       - name__value
     relationships:
+      - name: status
+        peer: BuiltinStatus
+        optional: false
+        cardinality: one
+        kind: Attribute
+      - name: role
+        peer: BuiltinRole
+        optional: true
+        cardinality: one
+        kind: Attribute
       - name: tags
         peer: BuiltinTag
         optional: true
@@ -162,6 +198,11 @@ nodes:
         optional: false
         cardinality: one
         kind: Attribute
+      - name: role
+        peer: BuiltinRole
+        optional: true
+        cardinality: one
+        kind: Attribute
       - name: tags
         peer: BuiltinTag
         optional: true
@@ -183,6 +224,11 @@ nodes:
         kind: Text
         optional: true
     relationships:
+      - name: role
+        peer: BuiltinRole
+        optional: true
+        cardinality: one
+        kind: Attribute
       - name: tags
         peer: BuiltinTag
         optional: true
@@ -234,6 +280,17 @@ nodes:
         identifier: security_rule__destination_applications
         peer: SecurityApplication
         cardinality: many
+
+      - name: status
+        peer: BuiltinStatus
+        optional: false
+        cardinality: one
+        kind: Attribute
+      - name: role
+        peer: BuiltinRole
+        optional: true
+        cardinality: one
+        kind: Attribute
       - name: tags
         peer: BuiltinTag
         optional: true