From: KIRAN KASHALKAR <kiran.kashalkar@riftio.com>
Date: Thu, 22 Sep 2016 18:22:12 +0000 (+0200)
Subject: Merge "Bug 46 fixedgit status"
X-Git-Tag: v1.0.0~6
X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FUI.git;a=commitdiff_plain;h=71c8bf54e57ac5b4b0e0a45581aeb3bde3e70f00;hp=fc2e34e3d2079712c40e44fa024c109ae067709f

Merge "Bug 46 fixedgit status"
---

diff --git a/skyquake/plugins/about/CMakeLists.txt b/skyquake/plugins/about/CMakeLists.txt
index bc6917551..d4233d349 100644
--- a/skyquake/plugins/about/CMakeLists.txt
+++ b/skyquake/plugins/about/CMakeLists.txt
@@ -36,6 +36,7 @@ cmake_minimum_required(VERSION 2.8)
 
 rift_externalproject_add(
   about
+  DEPENDS skyquake
   SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}
   CONFIGURE_COMMAND echo
   BUILD_COMMAND
diff --git a/skyquake/plugins/about/scripts/install.sh b/skyquake/plugins/about/scripts/install.sh
index da5936dd6..79369139b 100755
--- a/skyquake/plugins/about/scripts/install.sh
+++ b/skyquake/plugins/about/scripts/install.sh
@@ -37,7 +37,7 @@ cp -Lrf $source_dir/public $dest_dir/plugins/$plugin/.
 cp -Lrf $source_dir/config.json $dest_dir/plugins/$plugin/.
 cp -Lrf $source_dir/routes.js $dest_dir/plugins/$plugin/.
 cp -Lrp $source_dir/api $dest_dir/plugins/$plugin/.
-tar -cf $dest_dir/plugins/$plugin/node_modules.tar $source_dir/node_modules $source_dir/package.json
+tar -cf $dest_dir/plugins/$plugin/node_modules.tar node_modules package.json -C $source_dir
 #cp -Lrp $source_dir/node_modules $dest_dir/plugins/$plugin/.
 mkdir -p $bcache_dir/plugins/$plugin
 cp -Lrf $source_dir/public $bcache_dir/plugins/$plugin/.
diff --git a/skyquake/plugins/accounts/CMakeLists.txt b/skyquake/plugins/accounts/CMakeLists.txt
index 4caa15795..aaf6ad9c7 100644
--- a/skyquake/plugins/accounts/CMakeLists.txt
+++ b/skyquake/plugins/accounts/CMakeLists.txt
@@ -36,6 +36,7 @@ cmake_minimum_required(VERSION 2.8)
 
 rift_externalproject_add(
   accounts
+  DEPENDS skyquake
   SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}
   CONFIGURE_COMMAND echo
   BUILD_COMMAND
diff --git a/skyquake/plugins/accounts/scripts/install.sh b/skyquake/plugins/accounts/scripts/install.sh
index 2b5fdb11a..846dad7c8 100755
--- a/skyquake/plugins/accounts/scripts/install.sh
+++ b/skyquake/plugins/accounts/scripts/install.sh
@@ -37,7 +37,7 @@ cp -Lrf $source_dir/public $dest_dir/plugins/$plugin/.
 cp -Lrf $source_dir/config.json $dest_dir/plugins/$plugin/.
 cp -Lrf $source_dir/routes.js $dest_dir/plugins/$plugin/.
 cp -Lrp $source_dir/api $dest_dir/plugins/$plugin/.
-tar -cf $dest_dir/plugins/$plugin/node_modules.tar $source_dir/node_modules $source_dir/package.json
+tar -cf $dest_dir/plugins/$plugin/node_modules.tar node_modules package.json -C $source_dir
 #cp -Lrp $source_dir/node_modules $dest_dir/plugins/$plugin/.
 mkdir -p $bcache_dir/plugins/$plugin
 cp -Lrf $source_dir/public $bcache_dir/plugins/$plugin/.
diff --git a/skyquake/plugins/composer/CMakeLists.txt b/skyquake/plugins/composer/CMakeLists.txt
index 9db080f43..d9277b73b 100644
--- a/skyquake/plugins/composer/CMakeLists.txt
+++ b/skyquake/plugins/composer/CMakeLists.txt
@@ -36,6 +36,7 @@ cmake_minimum_required(VERSION 2.8)
 
 rift_externalproject_add(
   composer
+  DEPENDS skyquake
   SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}
   CONFIGURE_COMMAND echo
   BUILD_COMMAND
diff --git a/skyquake/plugins/composer/scripts/install.sh b/skyquake/plugins/composer/scripts/install.sh
index abba7f595..76e5e753b 100755
--- a/skyquake/plugins/composer/scripts/install.sh
+++ b/skyquake/plugins/composer/scripts/install.sh
@@ -37,12 +37,12 @@ cp -Lrf $source_dir/public $dest_dir/plugins/$plugin/.
 cp -Lrf $source_dir/config.json $dest_dir/plugins/$plugin/.
 cp -Lrf $source_dir/routes.js $dest_dir/plugins/$plugin/.
 cp -Lrp $source_dir/api $dest_dir/plugins/$plugin/.
-tar -cf $dest_dir/plugins/$plugin/node_modules.tar $source_dir/node_modules $source_dir/package.json
+tar -cf $dest_dir/plugins/$plugin/node_modules.tar node_modules package.json -C $source_dir
 #cp -Lrp $source_dir/node_modules $dest_dir/plugins/$plugin/.
 mkdir -p $bcache_dir/plugins/$plugin
 cp -Lrf $source_dir/public $bcache_dir/plugins/$plugin/.
 cp -Lrf $source_dir/config.json $bcache_dir/plugins/$plugin/.
 cp -Lrf $source_dir/routes.js $bcache_dir/plugins/$plugin/.
 cp -Lrp $source_dir/api $bcache_dir/plugins/$plugin/.
-tar -cf $bcache_dir/plugins/$plugin/node_modules.tar $source_dir/node_modules $source_dir/package.json
+tar -cf $bcache_dir/plugins/$plugin/node_modules.tar node_modules package.json -C $source_dir
 #cp -Lrp $source_dir/node_modules $bcache_dir/plugins/$plugin/.
diff --git a/skyquake/plugins/config/CMakeLists.txt b/skyquake/plugins/config/CMakeLists.txt
index 9e1fe306d..e12d4fd2f 100644
--- a/skyquake/plugins/config/CMakeLists.txt
+++ b/skyquake/plugins/config/CMakeLists.txt
@@ -22,6 +22,7 @@ cmake_minimum_required(VERSION 2.8)
 
 rift_externalproject_add(
   config
+  DEPENDS skyquake
   SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}
   CONFIGURE_COMMAND echo
   BUILD_COMMAND
diff --git a/skyquake/plugins/config/scripts/install.sh b/skyquake/plugins/config/scripts/install.sh
index 9e6c59eaf..ca3d9cad6 100755
--- a/skyquake/plugins/config/scripts/install.sh
+++ b/skyquake/plugins/config/scripts/install.sh
@@ -23,7 +23,7 @@ cp -Lrf $source_dir/public $dest_dir/plugins/$plugin/.
 cp -Lrf $source_dir/config.json $dest_dir/plugins/$plugin/.
 cp -Lrf $source_dir/routes.js $dest_dir/plugins/$plugin/.
 cp -Lrp $source_dir/api $dest_dir/plugins/$plugin/.
-tar -cf $dest_dir/plugins/$plugin/node_modules.tar $source_dir/node_modules $source_dir/package.json
+tar -cf $dest_dir/plugins/$plugin/node_modules.tar node_modules package.json -C $source_dir
 #cp -Lrp $source_dir/node_modules $dest_dir/plugins/$plugin/.
 mkdir -p $bcache_dir/plugins/$plugin
 cp -Lrf $source_dir/public $bcache_dir/plugins/$plugin/.
diff --git a/skyquake/plugins/debug/CMakeLists.txt b/skyquake/plugins/debug/CMakeLists.txt
index 6d2e56de6..20ff171fe 100644
--- a/skyquake/plugins/debug/CMakeLists.txt
+++ b/skyquake/plugins/debug/CMakeLists.txt
@@ -36,6 +36,7 @@ cmake_minimum_required(VERSION 2.8)
 
 rift_externalproject_add(
   debug
+  DEPENDS skyquake
   SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}
   CONFIGURE_COMMAND echo
   BUILD_COMMAND
diff --git a/skyquake/plugins/debug/scripts/install.sh b/skyquake/plugins/debug/scripts/install.sh
index a14b9bd9c..6e27c8659 100755
--- a/skyquake/plugins/debug/scripts/install.sh
+++ b/skyquake/plugins/debug/scripts/install.sh
@@ -37,7 +37,7 @@ cp -Lrf $source_dir/public $dest_dir/plugins/$plugin/.
 cp -Lrf $source_dir/config.json $dest_dir/plugins/$plugin/.
 cp -Lrf $source_dir/routes.js $dest_dir/plugins/$plugin/.
 cp -Lrp $source_dir/api $dest_dir/plugins/$plugin/.
-tar -cf $dest_dir/plugins/$plugin/node_modules.tar $source_dir/node_modules $source_dir/package.json
+tar -cf $dest_dir/plugins/$plugin/node_modules.tar node_modules package.json -C $source_dir
 #cp -Lrp $source_dir/node_modules $dest_dir/plugins/$plugin/.
 mkdir -p $bcache_dir/plugins/$plugin
 cp -Lrf $source_dir/public $bcache_dir/plugins/$plugin/.
diff --git a/skyquake/plugins/goodbyeworld/CMakeLists.txt b/skyquake/plugins/goodbyeworld/CMakeLists.txt
index 773e1bd26..414bed0f1 100644
--- a/skyquake/plugins/goodbyeworld/CMakeLists.txt
+++ b/skyquake/plugins/goodbyeworld/CMakeLists.txt
@@ -36,6 +36,7 @@ cmake_minimum_required(VERSION 2.8)
 
 rift_externalproject_add(
   goodbyeworld
+  DEPENDS skyquake
   SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}
   CONFIGURE_COMMAND echo
   BUILD_COMMAND
diff --git a/skyquake/plugins/helloworld/CMakeLists.txt b/skyquake/plugins/helloworld/CMakeLists.txt
index 921c1aadb..b78f22e1e 100644
--- a/skyquake/plugins/helloworld/CMakeLists.txt
+++ b/skyquake/plugins/helloworld/CMakeLists.txt
@@ -36,6 +36,7 @@ cmake_minimum_required(VERSION 2.8)
 
 rift_externalproject_add(
   helloworld
+  DEPENDS skyquake
   SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}
   CONFIGURE_COMMAND echo
   BUILD_COMMAND
diff --git a/skyquake/plugins/launchpad/CMakeLists.txt b/skyquake/plugins/launchpad/CMakeLists.txt
index 2917c8df4..e9026e922 100644
--- a/skyquake/plugins/launchpad/CMakeLists.txt
+++ b/skyquake/plugins/launchpad/CMakeLists.txt
@@ -36,6 +36,7 @@ cmake_minimum_required(VERSION 2.8)
 
 rift_externalproject_add(
   launchpad
+  DEPENDS skyquake
   SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}
   CONFIGURE_COMMAND echo
   BUILD_COMMAND
diff --git a/skyquake/plugins/launchpad/scripts/install.sh b/skyquake/plugins/launchpad/scripts/install.sh
index 79fb26b44..ac8bff88d 100755
--- a/skyquake/plugins/launchpad/scripts/install.sh
+++ b/skyquake/plugins/launchpad/scripts/install.sh
@@ -37,7 +37,7 @@ cp -Lrf $source_dir/public $dest_dir/plugins/$plugin/.
 cp -Lrf $source_dir/config.json $dest_dir/plugins/$plugin/.
 cp -Lrf $source_dir/routes.js $dest_dir/plugins/$plugin/.
 cp -Lrp $source_dir/api $dest_dir/plugins/$plugin/.
-tar -cf $dest_dir/plugins/$plugin/node_modules.tar $source_dir/node_modules $source_dir/package.json
+tar -cf $dest_dir/plugins/$plugin/node_modules.tar node_modules package.json -C $source_dir
 #cp -Lrp $source_dir/node_modules $dest_dir/plugins/$plugin/.
 mkdir -p $bcache_dir/plugins/$plugin
 cp -Lrf $source_dir/public $bcache_dir/plugins/$plugin/.
diff --git a/skyquake/plugins/launchpad/src/instantiate/instantiateInputParams.jsx b/skyquake/plugins/launchpad/src/instantiate/instantiateInputParams.jsx
index 4db4a63bd..ec40ccfc1 100644
--- a/skyquake/plugins/launchpad/src/instantiate/instantiateInputParams.jsx
+++ b/skyquake/plugins/launchpad/src/instantiate/instantiateInputParams.jsx
@@ -420,8 +420,9 @@ export default class InstantiateInputParams extends Component {
 
             {
               sshKeysRef.map(function(ref, i) {
+                let keyref = JSON.stringify(ref)
                 return (
-                  <div key={i} className="inputControls inputControls-sshkeys">
+                  <div key={keyref.name + '-' + i} className="inputControls inputControls-sshkeys">
                     <label>
                       <div>
                       <SelectOption
@@ -434,13 +435,13 @@ export default class InstantiateInputParams extends Component {
                         })}
                         ref="keyPairSelection"
                         initial={false}
-                        defaultValue={sshKeysList[0].name}
-                        onChange={self.props.updateSshKeyRef(i)}>
+                        defaultValue={keyref.name || sshKeysList[0].name}
+                        onChange={props.sshFn.updateKeyRef(i)}>
                       </SelectOption>
                       </div>
                     </label>
                     <label>
-                      <span onClick={self.props.updateSshKeyRef(i, true)} className="removeInput">
+                      <span onClick={props.sshFn.updateKeyRef(i, true)} className="removeInput">
                         <img src={imgRemove} />
                         Remove
                       </span>
@@ -452,7 +453,7 @@ export default class InstantiateInputParams extends Component {
             <div className="inputControls inputControls-sshkeys ">
               <label style={{display: 'flex', 'flexDirection': 'row'}}>
               SSH KEY PAIR
-                <span onClick={self.props.updateSshKeyRef().bind(null, {target:{value: JSON.stringify(sshKeysList[0])}})} className="addInput">
+                <span onClick={props.sshFn.updateKeyRef().bind(null, {target:{value: JSON.stringify(sshKeysList[0])}})} className="addInput">
                   <img src={imgAdd} />
                   ADD
                 </span>
diff --git a/skyquake/plugins/launchpad/src/instantiate/instantiateParameters.jsx b/skyquake/plugins/launchpad/src/instantiate/instantiateParameters.jsx
index 5546b2550..0e5fa1fbb 100644
--- a/skyquake/plugins/launchpad/src/instantiate/instantiateParameters.jsx
+++ b/skyquake/plugins/launchpad/src/instantiate/instantiateParameters.jsx
@@ -78,6 +78,9 @@ class Instantiate extends Component {
 
             ipProfileList={this.props.ipProfiles}
 
+            sshKeysList={this.props.sshKeysList}
+            sshKeysRef={this.props.sshKeysRef}
+
             dnsServers={this.props.dnsServers}
 
             usersList = {this.props.usersList}
diff --git a/skyquake/plugins/launchpad/src/ssh_keys/sshKeyStore.js b/skyquake/plugins/launchpad/src/ssh_keys/sshKeyStore.js
index 400c0968e..7ae421b8c 100644
--- a/skyquake/plugins/launchpad/src/ssh_keys/sshKeyStore.js
+++ b/skyquake/plugins/launchpad/src/ssh_keys/sshKeyStore.js
@@ -1,5 +1,5 @@
 /*
- * 
+ *
  *   Copyright 2016 RIFT.IO Inc
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
@@ -174,10 +174,8 @@ export default class SshKeyStore {
         return {key: payload.key, name: payload.name};
     }
     validate(data) {
-        for (let k in data) {
-            if((data[k].trim() == '') || ((/[^\w _-]/).test(data[k]))) {
-                return false;
-            }
+        if((data['name'].trim() == '') || ((/[^\w _-]/).test(data['name']))) {
+            return false;
         }
         return true;
     }
diff --git a/skyquake/plugins/logging/CMakeLists.txt b/skyquake/plugins/logging/CMakeLists.txt
index 1bf296398..fafe77709 100644
--- a/skyquake/plugins/logging/CMakeLists.txt
+++ b/skyquake/plugins/logging/CMakeLists.txt
@@ -36,6 +36,7 @@ cmake_minimum_required(VERSION 2.8)
 
 rift_externalproject_add(
   logging
+  DEPENDS skyquake
   SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}
   CONFIGURE_COMMAND echo
   BUILD_COMMAND
diff --git a/skyquake/plugins/logging/scripts/install.sh b/skyquake/plugins/logging/scripts/install.sh
index 1eac1a111..e6fdb86ff 100755
--- a/skyquake/plugins/logging/scripts/install.sh
+++ b/skyquake/plugins/logging/scripts/install.sh
@@ -37,7 +37,7 @@ cp -Lrf $source_dir/public $dest_dir/plugins/$plugin/.
 cp -Lrf $source_dir/config.json $dest_dir/plugins/$plugin/.
 cp -Lrf $source_dir/routes.js $dest_dir/plugins/$plugin/.
 cp -Lrp $source_dir/api $dest_dir/plugins/$plugin/.
-tar -cf $dest_dir/plugins/$plugin/node_modules.tar $source_dir/node_modules $source_dir/package.json
+tar -cf $dest_dir/plugins/$plugin/node_modules.tar node_modules package.json -C $source_dir
 #cp -Lrp $source_dir/node_modules $dest_dir/plugins/$plugin/.
 mkdir -p $bcache_dir/plugins/$plugin
 cp -Lrf $source_dir/public $bcache_dir/plugins/$plugin/.