Allow changing endpoint type when editing firewall rule

Change-Id: I555c8358496732b09f908ff467900ca1318d5761 Closes-Bug: #1782985 (cherry picked from commit ba80f1c)
Juniper · Jul 24, 2018 · fba436c · fba436c
1 parent 1e8b56c
commit fba436c
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/o11nplugin-contrail-core/src/main/kotlin/net/juniper/contrail/vro/model/Utils.kt b/o11nplugin-contrail-core/src/main/kotlin/net/juniper/contrail/vro/model/Utils.kt
@@ -262,8 +262,8 @@ class Utils {
     ): FirewallRuleEndpointType {
         val anyWorkload = type == EndpointType.AnyWorkload.value
         val tagNames = if (type == EndpointType.Tag.value && tags != null) tags.map { tagToString(it) } else listOf()
-        val virtualNetworkFqn = virtualNetwork?.FQN
-        val addressGroupFqn = addressGroup?.FQN
+        val virtualNetworkFqn = if (type == EndpointType.VirtualNetwork.value) virtualNetwork?.FQN else null
+        val addressGroupFqn = if (type == EndpointType.AddressGroup.value) addressGroup?.FQN else null
         return FirewallRuleEndpointType(null, virtualNetworkFqn, addressGroupFqn, tagNames, null, anyWorkload)
     }