From b0655459b9c56f4356bc8b5665e589035de788d0 Mon Sep 17 00:00:00 2001
From: Stan Lagun <slagun@mirantis.com>
Date: Thu, 23 Apr 2015 02:41:37 +0300
Subject: [PATCH] Report correct Node capabilities to k8s

KubernetesCluster used to report 2 CPU cores and 4GB RAM
for each Node no matter what flavor was used for the Node.

This fix adds additional step to ask VM for its real capabilities
and provide those values during Node creation

Closes-Bug: #1447386
Change-Id: I786de0b5fcf5cf094397c8c88b2f03a88326b884
(cherry picked from commit dee685beaba7270b0258c8a5be2d028ecab6d2f8)
---
 .../package/Classes/KubernetesMinionNode.yaml |  9 +++--
 .../Resources/GetNodeCapabilities.template    | 38 +++++++++++++++++++
 .../Resources/scripts/getCpuCoresCount.sh     |  3 ++
 .../Resources/scripts/getMemoryBytes.sh       |  3 ++
 4 files changed, 49 insertions(+), 4 deletions(-)
 create mode 100644 Kubernetes/KubernetesCluster/package/Resources/GetNodeCapabilities.template
 create mode 100644 Kubernetes/KubernetesCluster/package/Resources/scripts/getCpuCoresCount.sh
 create mode 100644 Kubernetes/KubernetesCluster/package/Resources/scripts/getMemoryBytes.sh

diff --git a/Kubernetes/KubernetesCluster/package/Classes/KubernetesMinionNode.yaml b/Kubernetes/KubernetesCluster/package/Classes/KubernetesMinionNode.yaml
index b617026..bf62bb6 100644
--- a/Kubernetes/KubernetesCluster/package/Classes/KubernetesMinionNode.yaml
+++ b/Kubernetes/KubernetesCluster/package/Classes/KubernetesMinionNode.yaml
@@ -99,6 +99,10 @@ Methods:
 
   _registerNode:
     Body:
+      - $resources: new(sys:Resources)
+      - $template: $resources.yaml('GetNodeCapabilities.template')
+      - $capacity: $.instance.agent.call($template, $resources)
+
       - $nodeDefinition:
           kind: Node
           apiVersion: v1beta3
@@ -109,11 +113,8 @@ Methods:
           spec:
             externalID: $.id()
             status:
-              capacity:
-                cpu: 200
-                memory: 4145438720
+              capacity: $capacity
 
-      - $resources: new(sys:Resources)
       - $template: $resources.yaml('KubeRegisterNode.template').bind(dict(
             nodeDefinition => $nodeDefinition
           ))
diff --git a/Kubernetes/KubernetesCluster/package/Resources/GetNodeCapabilities.template b/Kubernetes/KubernetesCluster/package/Resources/GetNodeCapabilities.template
new file mode 100644
index 0000000..02309b6
--- /dev/null
+++ b/Kubernetes/KubernetesCluster/package/Resources/GetNodeCapabilities.template
@@ -0,0 +1,38 @@
+#  Licensed under the Apache License, Version 2.0 (the "License"); you may
+#  not use this file except in compliance with the License. You may obtain
+#  a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+
+FormatVersion: 2.0.0
+Version: 1.0.0
+Name: Get Node capabilities
+
+Body: |
+  return {
+    'cpu': int(getCpuCoresCount().stdout) * 100,
+    'memory': int(getMemoryBytes().stdout)
+  }
+
+Scripts:
+  getCpuCoresCount:
+    Type: Application
+    Version: 1.0.0
+    EntryPoint: getCpuCoresCount.sh
+    Options:
+      captureStdout: true
+      captureStderr: true
+
+  getMemoryBytes:
+    Type: Application
+    Version: 1.0.0
+    EntryPoint: getMemoryBytes.sh
+    Options:
+      captureStdout: true
+      captureStderr: true
diff --git a/Kubernetes/KubernetesCluster/package/Resources/scripts/getCpuCoresCount.sh b/Kubernetes/KubernetesCluster/package/Resources/scripts/getCpuCoresCount.sh
new file mode 100644
index 0000000..4bfb0a3
--- /dev/null
+++ b/Kubernetes/KubernetesCluster/package/Resources/scripts/getCpuCoresCount.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+nproc
\ No newline at end of file
diff --git a/Kubernetes/KubernetesCluster/package/Resources/scripts/getMemoryBytes.sh b/Kubernetes/KubernetesCluster/package/Resources/scripts/getMemoryBytes.sh
new file mode 100644
index 0000000..3092303
--- /dev/null
+++ b/Kubernetes/KubernetesCluster/package/Resources/scripts/getMemoryBytes.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+vmstat -s -SB | head -n1 | grep "[0-9]*" -o
\ No newline at end of file