From 1d0fc0a3e0488afef5d6cd5e155adc5ffd0f9b9b Mon Sep 17 00:00:00 2001
From: Tetiana Lashchova <tlashchova@mirantis.com>
Date: Fri, 17 Jun 2016 14:32:06 +0300
Subject: [PATCH] Fix usage of id() and super() methods in Docker apps

Change-Id: Ieb34aee28b796adfceebca0c825d05de02cf37ac
Closes-Bug: #1593682
---
 Applications/Grafana/package/Classes/DockerGrafana.yaml       | 2 +-
 Applications/GuestBook/package/Classes/GuestBook.yaml         | 2 +-
 Applications/Orion/package/Classes/DockerOrion.yaml           | 2 +-
 .../package/Classes/DockerStandaloneHost.yaml                 | 4 ++--
 Kubernetes/KubernetesPod/package/Classes/KubernetesPod.yaml   | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Applications/Grafana/package/Classes/DockerGrafana.yaml b/Applications/Grafana/package/Classes/DockerGrafana.yaml
index 5ee6bb9..086f44e 100644
--- a/Applications/Grafana/package/Classes/DockerGrafana.yaml
+++ b/Applications/Grafana/package/Classes/DockerGrafana.yaml
@@ -49,7 +49,7 @@ Methods:
   deploy:
     Body:
       - $.influxDB.deploy()
-      - $.super($.deploy())
+      - super($, $.deploy())
 
 
   getContainer:
diff --git a/Applications/GuestBook/package/Classes/GuestBook.yaml b/Applications/GuestBook/package/Classes/GuestBook.yaml
index e52f1cc..65ec598 100644
--- a/Applications/GuestBook/package/Classes/GuestBook.yaml
+++ b/Applications/GuestBook/package/Classes/GuestBook.yaml
@@ -55,7 +55,7 @@ Methods:
           publish => false,
           redisMaster => $this.redisMaster)
       - $.redisSlave.deploy()
-      - $.super($.deploy())
+      - super($, $.deploy())
 
 
   getContainer:
diff --git a/Applications/Orion/package/Classes/DockerOrion.yaml b/Applications/Orion/package/Classes/DockerOrion.yaml
index 63925df..ebafe8f 100644
--- a/Applications/Orion/package/Classes/DockerOrion.yaml
+++ b/Applications/Orion/package/Classes/DockerOrion.yaml
@@ -38,7 +38,7 @@ Methods:
   deploy:
     Body:
       - $.mongodb.deploy()
-      - $.super($.deploy())
+      - super($, $.deploy())
 
   getContainer:
     Body:
diff --git a/DockerStandaloneHost/package/Classes/DockerStandaloneHost.yaml b/DockerStandaloneHost/package/Classes/DockerStandaloneHost.yaml
index 51c5879..d0beb15 100644
--- a/DockerStandaloneHost/package/Classes/DockerStandaloneHost.yaml
+++ b/DockerStandaloneHost/package/Classes/DockerStandaloneHost.yaml
@@ -272,7 +272,7 @@ Methods:
       - applicationName:
           Contract: $.string().notNull()
     Body:
-      - Return: format('{0}-{1}', $applicationName, $.id())
+      - Return: format('{0}-{1}', $applicationName, id($))
 
 
   _removeApplicationEndpoints:
@@ -304,4 +304,4 @@ Methods:
 
   getInternalScopeId:
     Body:
-      Return: $.id()
+      Return: id($)
diff --git a/Kubernetes/KubernetesPod/package/Classes/KubernetesPod.yaml b/Kubernetes/KubernetesPod/package/Classes/KubernetesPod.yaml
index 81efb52..9c64b37 100644
--- a/Kubernetes/KubernetesPod/package/Classes/KubernetesPod.yaml
+++ b/Kubernetes/KubernetesPod/package/Classes/KubernetesPod.yaml
@@ -305,7 +305,7 @@ Methods:
 
   getInternalScopeId:
     Body:
-      Return: $.kubernetesCluster.id()
+      Return: id($.kubernetesCluster)
 
   scalePodDown:
     Usage: Action