From cc1d5eb5be01b8f5f7b9d630abc9292415d7d90f Mon Sep 17 00:00:00 2001
From: Stan Lagun <slagun@mirantis.com>
Date: Wed, 25 Mar 2015 03:52:53 +0300
Subject: [PATCH] Fixes instance FIP assignment

YAQL expression for FIP resource were incorrect and left as is (as a string).
Thus  there were single resource for FIP with incorrect name instead of resource
per VM

Change-Id: Ieecdfdb0a7fbad82ef4344b4bac1a55656991e9e
Closes-Bug: #1435787
Closes-Bug: #1435961
---
 meta/io.murano/Classes/resources/ExistingNeutronNetwork.yaml | 2 +-
 meta/io.murano/Classes/resources/NeutronNetwork.yaml         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/io.murano/Classes/resources/ExistingNeutronNetwork.yaml b/meta/io.murano/Classes/resources/ExistingNeutronNetwork.yaml
index ac2a9d08..8683508e 100644
--- a/meta/io.murano/Classes/resources/ExistingNeutronNetwork.yaml
+++ b/meta/io.murano/Classes/resources/ExistingNeutronNetwork.yaml
@@ -98,7 +98,7 @@ Workflow:
       - If: $assignFloatingIp
         Then:
           - $floatingIpNeRef: $._externalNetworkId
-          - $fipName: format('fip-{0}-{1}'. $.id(), $instance.name)
+          - $fipName: format('fip-{0}-{1}', $.id(), $instance.name)
 
       - Return: $.joinInstanceToNetwork(
             instance => $instance,
diff --git a/meta/io.murano/Classes/resources/NeutronNetwork.yaml b/meta/io.murano/Classes/resources/NeutronNetwork.yaml
index 00299b26..962997a2 100644
--- a/meta/io.murano/Classes/resources/NeutronNetwork.yaml
+++ b/meta/io.murano/Classes/resources/NeutronNetwork.yaml
@@ -116,7 +116,7 @@ Methods:
       - If: $assignFloatingIp
         Then:
           - $extNetId: $._getExternalNetId()
-          - $fipName: format('fip-{0}-{1}'. $.id(), $instance.name)
+          - $fipName: format('fip-{0}-{1}', $.id(), $instance.name)
 
       - $result: $.joinInstanceToNetwork(
             instance => $instance,