Commit 300b1dd5 authored by Ioannis Tsafaras's avatar Ioannis Tsafaras
Browse files

Merge pull request #275 from gouzouni625/various-small

Bug No4: Various small
parents ce77ff46 f22777ea
......@@ -60,7 +60,12 @@
</div>
<div class="row">
<div class="form-group col-sm-6">
<label for="name1"> Name of Lamdba Instance (*): </label>
{{#tool-tip}}
<label for="name1"> Name of Lamdba Instance (*) </label>
<i class="fa fa-info-circle has-tooltip"
data-tooltip-content="<center>
This is the name that will appear in the list of Lambda Instances on this Service-VM</center>"></i>
{{/tool-tip}}
{{input type="text" value=instanceName placeholder="Lambda Instance name" size="50" class="form-control" required="true"}}
{{#each model.newLambdaInstance.errors.instanceName as |error|}}
<div class="alert alert-danger alert-dismissable">
......@@ -69,7 +74,12 @@
{{/each}}
</div>
<div class="form-group col-sm-6">
<label for="name1"> Name of Master Node (*): </label>
{{#tool-tip}}
<label for="name1"> Name of Master Node (*) </label>
<i class="fa fa-info-circle has-tooltip"
data-tooltip-content="<center>
This is the name that will appear in the Master node machine listed in ~okeanos cyclades UI</center>"></i>
{{/tool-tip}}
{{input type="text" value=masterName placeholder="Master node name" size="50" class="form-control" required="true"}}
{{#each model.newLambdaInstance.errors.masterName as |error|}}
<div class="alert alert-danger alert-dismissable">
......@@ -80,7 +90,12 @@
</div>
<div class="row">
<div class="form-group col-sm-8">
<label for="okeanos_project" class="col-sm-6">~okeanos Project (*):</label>
{{#tool-tip}}
<label for="okeanos_project">~okeanos Project (*)</label>
<i class="fa fa-info-circle has-tooltip"
data-tooltip-content="<center>
This is the ~okeanos project that will provide the needed quotas for the creation of the Lambda Instance</center>"></i>
{{/tool-tip}}
<select name="okeanos_project" class="form-control" onchange={{action "selectFromDropDownList" "selectedProjectName"}}>
{{#each model.userOkeanosProjects as |project|}}
<option value={{project.name}}>{{project.name}} (VMs: {{project.vm}}, CPUs: {{project.cpu}}, RAM: {{normalize-bytes project.ram}}, Disk: {{normalize-bytes project.disk}}, Floating IPs: {{project.floating_ip}}, Private Networks: {{project.private_network}})</option>
......@@ -89,7 +104,11 @@
<span id="helpBlock" class="help-block">Select a project</span>
</div> <!--class="col-sm-6"-->
<div class="form-group col-sm-3">
<label for="slaves">Number of slaves:</label>
{{#tool-tip}}
<label for="slaves">Number of slaves</label>
<i class="fa fa-info-circle has-tooltip"
data-tooltip-content="<center>The number of Slave nodes on the new Lambda Instance</center>"></i>
{{/tool-tip}}
{{input type="number" value=selectedNumberOfSlaves min=1 max=(math-op selectedProjectVMs '-' 1) name="slaves" class="form-control" change=(action "selectFromDropDownList" "selectedNumberOfSlaves")}}
<span id="helpBlock" class="help-block">Select the number of slaves</span>
</div> <!--class="form-group col-sm-3"-->
......@@ -98,13 +117,21 @@
<style>.tokenfield.form-control { height: auto; }</style>
<div class="row">
<div class="form-group col-sm-6 {{if conflictingKafkaTopics 'has-error'}}">
<label for="kafka_topics">Apache Kafka input topics:</label>
{{#tool-tip}}
<label for="kafka_topics">Apache Kafka input topics</label>
<i class="fa fa-info-circle has-tooltip"
data-tooltip-content="<center>An Apache Kafka topic is a category or feed name to which messages are published. The topics entered in this field can be used to send messages to a Lambda Instance. For more information, please visit kafka.apache.org</center>"></i>
{{/tool-tip}}
{{kafka-topics topics=kafkaInputTopics id="kafka-input-topics"}}
<span id="helpBlock" class="help-block">Names of Apache Kafka input topics<br>
Default input topic, if no names are given: "input"</span>
</div>
<div class="form-group col-sm-6 pull-right {{if conflictingKafkaTopics 'has-error'}}">
<label for="kafka_topics">Apache Kafka output topics:</label>
{{#tool-tip}}
<label for="kafka_topics">Apache Kafka output topics</label>
<i class="fa fa-info-circle has-tooltip"
data-tooltip-content="<center>An Apache Kafka topic is a category or feed name to which messages are published. The topics entered in this field can be used to read messages from a Lambda Instance. For more information, please visit kafka.apache.org</center>"></i>
{{/tool-tip}}
{{kafka-topics topics=kafkaOutputTopics id="kafka-output-topics"}}
<span id="helpBlock" class="help-block">Names of Apache Kafka output topics<br>
Default output topics, if no names are given: "batch-output", "stream-output"</span>
......@@ -112,7 +139,11 @@
</div><!--row-->
<div class="row">
<div class="form-group col-sm-3">
<label for="public_key_name">Public SSH keys (*):</label>
{{#tool-tip}}
<label for="public_key_name">Public SSH keys (*)</label>
<i class="fa fa-info-circle has-tooltip"
data-tooltip-content="<center>The chosen public ssh keys will be injected into the root user of the Master node of this Lambda Instance thus giving you the ability to ssh into this VM</center>"></i>
{{/tool-tip}}
<select required="required" multiple name="public_key_name" class="form-control">
{{#each model.userPublicKeys as |publicKey|}}
<option value={{publicKey.name}}>{{publicKey.name}}</option>
......@@ -152,7 +183,7 @@
{{/if}}
{{/each}}
</select>
<span id="helpBlock" class="help-block">We recommend using 4 CPUs</span>
<span id="helpBlock" class="help-block">We recommend using at least 4 CPUs</span>
</div> <!--class="col-sm-4"-->
<div class="form-group col-sm-4">
<label for="ram_master" >Amount or RAM memory on Master Node: </label>
......@@ -169,7 +200,7 @@
{{/if}}
{{/each}}
</select>
<span id="helpBlock" class="help-block">We recommend using 4096MB of RAM</span>
<span id="helpBlock" class="help-block">We recommend using at least 4096MB of RAM</span>
</div><!--class="form-group col-sm-6"-->
<div class="form-group col-sm-4">
<label for="disk_master"> Size of hard disk on Master Node: </label>
......@@ -186,7 +217,7 @@
{{/if}}
{{/each}}
</select>
<span id="helpBlock" class="help-block">We recommend using 20GB of hard disk</span>
<span id="helpBlock" class="help-block">We recommend using at least 20GB of hard disk</span>
</div>
</div><!--row-->
</div><!--box-body-->
......@@ -217,7 +248,7 @@
{{/if}}
{{/each}}
</select>
<span id="helpBlock" class="help-block">We recommend using 4 CPUs</span>
<span id="helpBlock" class="help-block">We recommend using at least 4 CPUs</span>
</div> <!--class="col-sm-4"-->
<div class="form-group col-sm-4">
<label for="ram_slave" >Amount or RAM memory on each Slave Node:</label>
......@@ -234,7 +265,7 @@
{{/if}}
{{/each}}
</select>
<span id="helpBlock" class="help-block">We recommend using 4096MB of RAM</span>
<span id="helpBlock" class="help-block">We recommend using at least 4096MB of RAM</span>
</div><!--class="form-group col-sm-4"-->
<div class="form-group col-sm-4">
......@@ -252,7 +283,7 @@
{{/if}}
{{/each}}
</select>
<span id="helpBlock" class="help-block">We recommend using 20GB of hard disk</span>
<span id="helpBlock" class="help-block">We recommend using at least 20GB of hard disk</span>
</div>
</div><!--row-->
</div><!--box-body-->
......
......@@ -54,7 +54,8 @@
This page contains information regarding the lambda instance:<strong> {{model.instance.name}} </strong><br>
You can view its details, <i>start, stop or delete</i> it.<br> In addition, you can browse the deployed application(s)
onto this lambda instance and <i>deploy, start, stop or undeploy</i> them.<br> The visible buttons represent the available
actions you may take depending on the <i>status</i> of the lambda instance.
actions you may take depending on the <i>status</i> of the lambda instance.<br>
You can find answers to frequently asked questions such as "How to view the results of my Application" at <a href="https://lambda.grnet.gr/faqs">this</a> link.
</div>
{{#if (logical-op 'or'
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment