Add icons for Contrail security objects.

Change-Id: Ibf8dad7324a64890335dc048939d14ffbfac7e63
Closes-Bug: #1772594
(cherry picked from commit c480d81)

o11nplugin-contrail-config/buildNumber.properties

@@ -1,3 +1,3 @@
 #maven.buildNumber.plugin properties file
-#Wed Jun 06 17:32:42 CEST 2018
-buildNumber=1423
+#Fri Jun 08 13:56:38 CEST 2018
+buildNumber=1434

o11nplugin-contrail-config/src/main/kotlin/net/juniper/contrail/vro/config/DisplayConfig.kt

@@ -4,6 +4,8 @@
 
 package net.juniper.contrail.vro.config
 
+import net.juniper.contrail.api.types.* // ktlint-disable no-wildcard-imports
+
 val hiddenProperties = setOf(
     "parentUuid",
     "parentType",
@@ -29,9 +31,41 @@ val String.displayedName get() = when (this) {
 }
 
 val String.position get() =
-    cleanedDisplayedProperty.propertyPosition
+    cleanedDisplayedProperty.propertyOrder
+
+private val orderList = listOf(
+    VirtualNetwork::class.java,
+    NetworkIpam::class.java,
+    FloatingIpPool::class.java,
+    VirtualMachineInterface::class.java,
+
+    NetworkPolicy::class.java,
+    SecurityGroup::class.java,
+
+    ApplicationPolicySet::class.java,
+    FirewallPolicy::class.java,
+    FirewallRule::class.java,
+    ServiceGroup::class.java,
+    AddressGroup::class.java,
+
+    Project::class.java,
+    PolicyManagement::class.java,
+    Tag::class.java,
+    ServiceTemplate::class.java,
+
+    ServiceInstance::class.java,
+    PortTuple::class.java,
+    ServiceHealthCheck::class.java
+)
+
+private val orders = orderList.asSequence()
+    .mapIndexed { index, clazz -> Pair(clazz, index) }
+    .associateBy({ it.first }, { it.second })
+
+val Class<*>.order get() =
+    orders[this] ?: orders.size
 
-private val String.propertyPosition get() = when (this) {
+private val String.propertyOrder get() = when (this) {
     "name" -> 0
     "displayName" -> 1
     "uuid" -> 2

o11nplugin-contrail-generator/src/main/kotlin/net/juniper/contrail/vro/generator/model/ModelGenerator.kt

@@ -9,6 +9,7 @@ import net.juniper.contrail.vro.config.PropertyClass
 import net.juniper.contrail.vro.config.div
 import net.juniper.contrail.vro.config.ProjectInfo
 import net.juniper.contrail.vro.config.isRootClass
+import net.juniper.contrail.vro.config.order
 import net.juniper.contrail.vro.generator.generatedPackageName
 import net.juniper.contrail.vro.generator.generatedSourcesRoot
 import net.juniper.contrail.vro.generator.templatesInClassPath
@@ -24,7 +25,8 @@ fun generateModel(
     val relations = definition.relations
     val forwardRelations = definition.forwardRelations
     val propertyRelations = definition.propertyRelations
-    val rootClasses = modelClasses.filter { it.isRootClass }
+    val rootClasses = modelClasses.asSequence()
+        .filter { it.isRootClass }.sortedBy { it.order }.toList()
 
     val relationsModel = generateRelationsModel(relations, forwardRelations, propertyRelations, rootClasses)
     val customMappingModel = generateCustomMappingModel(info, pluginClasses, rootClasses, propertyClasses, relations, forwardRelations, propertyRelations)

o11nplugin-contrail-generator/src/main/kotlin/net/juniper/contrail/vro/generator/model/Relation.kt

@@ -22,6 +22,7 @@ import net.juniper.contrail.vro.config.isInReversedRelationTo
 import net.juniper.contrail.vro.config.isModelClassName
 import net.juniper.contrail.vro.config.nameWithoutGetAndBackRefs
 import net.juniper.contrail.vro.config.objectReferenceAttributeClass
+import net.juniper.contrail.vro.config.order
 import net.juniper.contrail.vro.config.pluginName
 import net.juniper.contrail.vro.config.pluralize
 import net.juniper.contrail.vro.config.propertyName
@@ -73,17 +74,21 @@ class PropertyRelation (
 }
 
 fun List<ObjectClass>.generateRelations() = asSequence()
-    .flatMap { it.relations() }.toList()
+    .sortedBy { it.order }
+    .flatMap { it.relations() }
+    .toList()
 
 private fun ObjectClass.relations() = methods.asSequence()
     .filter { it.isChildReferenceGetter }
     .map { it.childClassName }.filterNotNull()
     .filter { it.isModelClassName }
     .map { it.asObjectClass }.filterNotNull()
+    .sortedBy { it.order }
     .map { Relation(this, it) }
 
 fun List<ObjectClass>.generateReferenceRelations(): List<ForwardRelation> =
     asSequence()
+        .sortedBy { it.order }
         .flatMap { it.refRelations }
         .filter { contains(it.childClass) }
         .toList()
@@ -110,6 +115,7 @@ private val ObjectClass.refRelations: Sequence<ForwardRelation> get() =
         .filter { ! it.isBackRef }
         .map { ForwardRelation(this, it) }
         .filter { it.childName isDisplayableChildOf it.parentName }
+        .sortedBy { it.childClass.order }
 
 private val ObjectClass.referenceMethods: Sequence<Method> get() =
     declaredMethods.asSequence()