Merge "Bug 65 resolved."

diff --git a/skyquake/plugins/launchpad/src/instantiate/instantiateInputParams.jsx b/skyquake/plugins/launchpad/src/instantiate/instantiateInputParams.jsx
index ec40ccf..dc40ed6 100644 (file)
--- a/skyquake/plugins/launchpad/src/instantiate/instantiateInputParams.jsx
+++ b/skyquake/plugins/launchpad/src/instantiate/instantiateInputParams.jsx
@@ -305,8 +305,14 @@ export default class InstantiateInputParams extends Component {
     );
   }
   ipProfilesHTML = (props) => {
+    let vldHasIPprofile = false;
+    props.vlds && props.vlds.map(function(v){
+      if(v.type == 'ip-profile-ref') {
+        vldHasIPprofile = true;
+      }
+    })
     let ipProfileList = props.ipProfileList;
-    return ipProfileList &&
+    return ipProfileList && vldHasIPprofile &&
       (
       <div className="configure-nsd_section">
         <h3 className="launchpadCard_title">IP Profiles</h3>

diff --git a/skyquake/scripts/launch_ui.sh b/skyquake/scripts/launch_ui.sh
index 9b6b122..5a8f175 100755 (executable)
--- a/skyquake/scripts/launch_ui.sh
+++ b/skyquake/scripts/launch_ui.sh
@@ -36,9 +36,9 @@ start_servers() {
        echo "Running Node.js Skyquake server. HTTPS Enabled: ${ENABLE_HTTPS}"
        cd ..
        if [ ! -z "${ENABLE_HTTPS}" ]; then
-               forever start -a -l /dev/null -o out.log -e err.log skyquake.js --enable-https --keyfile-path="${KEYFILE_PATH}" --certfile-path="${CERTFILE_PATH}"
+               forever start -a -l forever.log -o out.log -e err.log skyquake.js       --enable-https --keyfile-path="${KEYFILE_PATH}" --certfile-path="${CERTFILE_PATH}"
        else
-               forever start -a -l /dev/null -o out.log -e err.log skyquake.js
+               forever start -a -l forever.log -o out.log -e err.log skyquake.js
        fi
 }