vim_network_name in vim conf; Re-ordering of VIM account standard parameters;fix...

Change-Id: I4a54591954ae6a227d0f0e1edc69b1e4826a9175
Signed-off-by: lombardof <flombardo@cnit.it>

diff --git a/vimhandler/template/config/aws.html b/vimhandler/template/config/aws.html
index 5bf7f0a..1eb8706 100644 (file)
--- a/vimhandler/template/config/aws.html
+++ b/vimhandler/template/config/aws.html
@@ -19,6 +19,16 @@
                 </div>
             </div>
         </div>
+        <div class="row">
+            <div class="form-group">
+                <label for="aws_vim_network_name" class="col-sm-4 control-label">VIM network name</label>
+                <div class="col-sm-6 input-group input-group-sm">
+                    <input disabled class="form-control config-input" id="aws_vim_network_name"
+                           name="config_vim_network_name"
+                           placeholder="vim_network_name">
+                </div>
+            </div>
+        </div>
         <div class="row">
             <div class="form-group">
                 <label for="aws_region_name" class="col-sm-4 control-label">Region name</label>
@@ -28,6 +38,11 @@
                 </div>
             </div>
         </div>
+
+
+    </div>
+
+    <div class="col-lg-6">
         <div class="row">
             <div class="form-group">
                 <label for="vpc_cidr_block" class="col-sm-4 control-label">VPC cidr block</label>
@@ -37,10 +52,6 @@
                 </div>
             </div>
         </div>
-
-    </div>
-
-    <div class="col-lg-6">
         <div class="row">
             <div class="form-group">
                 <label for="aws_security_groups" class="col-sm-4 control-label">Security groups</label>
@@ -70,5 +81,6 @@
             </div>
         </div>
     </div>
+
 </div>
 

diff --git a/vimhandler/template/config/aws_show.html b/vimhandler/template/config/aws_show.html
index 601c811..41397f7 100644 (file)
--- a/vimhandler/template/config/aws_show.html
+++ b/vimhandler/template/config/aws_show.html
@@ -3,25 +3,31 @@
         <div class="row">
             <label for="aws_sdn_ctrl" class="col-sm-4 control-label">SDN Controller</label>
             <div class="col-sm-6 input-group input-group-sm">
-                <p id="aws_sdn_ctrl"> {{ datacenter.sdn_ctrl|default:"---" }}</p>
+                <p id="aws_sdn_ctrl"> {{ datacenter.config.sdn_ctrl|default:"---" }}</p>
             </div>
         </div>
         <div class="row">
             <label for="aws_sdn_port_map" class="col-sm-4 control-label">SDN Port Mapping</label>
             <div class="col-sm-6 input-group input-group-sm">
-                <p id="aws_sdn_port_map"> {{ datacenter.sdn_port_map|default:"---" }}</p>
+                <p id="aws_sdn_port_map"> {{ datacenter.config.sdn_port_map|default:"---" }}</p>
+            </div>
+        </div>
+        <div class="row">
+            <label for="aws_vim_network_name" class="col-sm-4 control-label">VIM network name</label>
+            <div class="col-sm-6 input-group input-group-sm">
+                <p id="aws_vim_network_name"> {{ datacenter.config.vim_network_name|default:"---" }}</p>
             </div>
         </div>
         <div class="row">
             <label for="aws_region_name" class="col-sm-4 control-label">Region name</label>
             <div class="col-sm-6 input-group input-group-sm">
-                <p id="aws_region_name"> {{ datacenter.region_name|default:"---" }}</p>
+                <p id="aws_region_name"> {{ datacenter.config.region_name|default:"---" }}</p>
             </div>
         </div>
         <div class="row">
             <label for="vpc_cidr_block" class="col-sm-4 control-label">VPC cidr block</label>
             <div class="col-sm-6 input-group input-group-sm">
-                <p id="vpc_cidr_block"> {{ datacenter.vpc_cidr_block|default:"---" }}</p>
+                <p id="vpc_cidr_block"> {{ datacenter.config.vpc_cidr_block|default:"---" }}</p>
             </div>
         </div>
 
@@ -31,19 +37,19 @@
         <div class="row">
             <label for="aws_security_groups" class="col-sm-4 control-label">Security groups</label>
             <div class="col-sm-6 input-group input-group-sm">
-                <p id="aws_security_groups"> {{ datacenter.security_groups|default:"---" }}</p>
+                <p id="aws_security_groups"> {{ datacenter.config.security_groups|default:"---" }}</p>
             </div>
         </div>
         <div class="row">
             <label for="aws_key_pair" class="col-sm-4 control-label">Key pair</label>
             <div class="col-sm-6 input-group input-group-sm">
-                <p id="aws_key_pair"> {{ datacenter.key_pair|default:"---" }}</p>
+                <p id="aws_key_pair"> {{ datacenter.config.key_pair|default:"---" }}</p>
             </div>
         </div>
         <div class="row">
             <label for="aws_flavor_info" class="col-sm-4 control-label">Flavor info</label>
             <div class="col-sm-6 input-group input-group-sm">
-                <p id="aws_flavor_info"> {{ datacenter.flavor_info|default:"---" }}</p>
+                <p id="aws_flavor_info"> {{ datacenter.config.flavor_info|default:"---" }}</p>
             </div>
         </div>
     </div>

diff --git a/vimhandler/template/config/openstack.html b/vimhandler/template/config/openstack.html
index 6a52931..846cf10 100644 (file)
--- a/vimhandler/template/config/openstack.html
+++ b/vimhandler/template/config/openstack.html
@@ -21,6 +21,16 @@
                 </div>
             </div>
         </div>
+        <div class="row">
+            <div class="form-group">
+                <label for="ostack_vim_network_name" class="col-sm-4 control-label">VIM network name</label>
+                <div class="col-sm-6 input-group input-group-sm">
+                    <input disabled class="form-control config-input" id="ostack_vim_network_name"
+                           name="config_vim_network_name"
+                           placeholder="vim_network_name">
+                </div>
+            </div>
+        </div>
         <div class="row">
             <div class="form-group">
                 <label for="ostack_vim_type" class="col-sm-4 control-label">VIM type</label>
@@ -95,7 +105,11 @@
                 </div>
             </div>
         </div>
-        <div class="row">
+
+
+    </div>
+    <div class="col-lg-6">
+         <div class="row">
             <div class="form-group">
                 <label for="APIversion" class="col-sm-4 control-label">API version</label>
                 <div class="col-sm-6 input-group input-group-sm">
@@ -104,9 +118,6 @@
                 </div>
             </div>
         </div>
-
-    </div>
-    <div class="col-lg-6">
         <div class="row">
             <div class="form-group">
                 <label for="project_domain_id" class="col-sm-4 control-label">Project domain id</label>

diff --git a/vimhandler/template/config/openstack_show.html b/vimhandler/template/config/openstack_show.html
index 5388b69..e360997 100644 (file)
--- a/vimhandler/template/config/openstack_show.html
+++ b/vimhandler/template/config/openstack_show.html
@@ -5,55 +5,61 @@
         <div class="row">
             <label for="ostack_sdn_ctrl" class="col-sm-4 control-label">SDN Controller:</label>
             <div class="col-sm-6 input-group input-group-sm">
-                <p id="ostack_sdn_ctrl"> {{ datacenter.sdn_ctrl|default:"---" }}</p>
+                <p id="ostack_sdn_ctrl"> {{ datacenter.config.sdn_ctrl|default:"---" }}</p>
             </div>
         </div>
         <div class="row">
             <label for="ostack_ssdn_port_map" class="col-sm-4 control-label">SDN Port Mapping:</label>
             <div class="col-sm-6 input-group input-group-sm">
-                <p id="ostack_ssdn_port_map"> {{ datacenter.sdn_port_map|default:"---" }}</p>
+                <p id="ostack_ssdn_port_map"> {{ datacenter.config.sdn_port_map|default:"---" }}</p>
+            </div>
+        </div>
+         <div class="row">
+            <label for="ostack_vim_network_name" class="col-sm-4 control-label">VIM network name</label>
+            <div class="col-sm-6 input-group input-group-sm">
+                <p id="ostack_vim_network_name"> {{ datacenter.config.vim_network_name|default:"---" }}</p>
             </div>
         </div>
         <div class="row">
             <label for="ostack_security_groups" class="col-sm-4 control-label">Security Groups:</label>
             <div class="col-sm-6 input-group input-group-sm">
-                <p id="ostack_security_groups"> {{ datacenter.security_groups|default:"---" }}</p>
+                <p id="ostack_security_groups"> {{ datacenter.config.security_groups|default:"---" }}</p>
             </div>
         </div>
         <div class="row">
             <label for="availability_zone" class="col-sm-4 control-label">Availability Zone:</label>
             <div class="col-sm-6 input-group input-group-sm">
-                <p id="availability_zone"> {{ datacenter.availability_zone|default:"---" }}</p>
+                <p id="availability_zone"> {{ datacenter.config.availability_zone|default:"---" }}</p>
             </div>
         </div>
         <div class="row">
             <label for="ostack_region_name" class="col-sm-4 control-label">Region Name:</label>
             <div class="col-sm-6 input-group input-group-sm">
-                <p id="ostack_region_name"> {{ datacenter.region_name|default:"---" }}</p>
+                <p id="ostack_region_name"> {{ datacenter.config.region_name|default:"---" }}</p>
             </div>
         </div>
         <div class="row">
             <label for="option_insecure" class="col-sm-4 control-label">Insecure:</label>
             <div class="col-sm-6 input-group input-group-sm">
-                <p id="option_insecure"> {{ datacenter.insecure|default:"---" }}</p>
+                <p id="option_insecure"> {{ datacenter.config.insecure|default:"---" }}</p>
             </div>
         </div>
         <div class="row">
             <label for="use_existing_flavors" class="col-sm-4 control-label">Use existing flavors:</label>
             <div class="col-sm-6 input-group input-group-sm">
-                <p id="use_existing_flavors"> {{ datacenter.use_existing_flavors|default:"---" }}</p>
+                <p id="use_existing_flavors"> {{ datacenter.config.use_existing_flavors|default:"---" }}</p>
             </div>
         </div>
         <div class="row">
             <label for="use_internal_endpoint" class="col-sm-4 control-label">Use internal endpoint:</label>
             <div class="col-sm-6 input-group input-group-sm">
-                <p id="use_internal_endpoint"> {{ datacenter.use_internal_endpoint|default:"---" }}</p>
+                <p id="use_internal_endpoint"> {{ datacenter.config.use_internal_endpoint|default:"---" }}</p>
             </div>
         </div>
         <div class="row">
             <label for="APIversion" class="col-sm-4 control-label">API version:</label>
             <div class="col-sm-6 input-group input-group-sm">
-                <p id="APIversion"> {{ datacenter.APIversion|default:"---" }}</p>
+                <p id="APIversion"> {{ datacenter.config.APIversion|default:"---" }}</p>
             </div>
         </div>
 
@@ -63,61 +69,61 @@
 
             <label for="project_domain_id" class="col-sm-4 control-label">Project domain id:</label>
             <div class="col-sm-6 input-group input-group-sm">
-                <p id="project_domain_id"> {{ datacenter.project_domain_id|default:"---" }}</p>
+                <p id="project_domain_id"> {{ datacenter.config.project_domain_id|default:"---" }}</p>
             </div>
         </div>
         <div class="row">
 
             <label for="project_domain_name" class="col-sm-4 control-label">Project domain name:</label>
             <div class="col-sm-6 input-group input-group-sm">
-                <p id="project_domain_name"> {{ datacenter.project_domain_name|default:"---" }}</p>
+                <p id="project_domain_name"> {{ datacenter.config.project_domain_name|default:"---" }}</p>
             </div>
         </div>
         <div class="row">
 
             <label for="user_domain_id" class="col-sm-4 control-label">User domain id:</label>
             <div class="col-sm-6 input-group input-group-sm">
-                <p id="user_domain_id"> {{ datacenter.user_domain_id|default:"---" }}</p>
+                <p id="user_domain_id"> {{ datacenter.config.user_domain_id|default:"---" }}</p>
             </div>
         </div>
         <div class="row">
             <label for="user_domain_name" class="col-sm-4 control-label">User domain name:</label>
             <div class="col-sm-6 input-group input-group-sm">
-                <p id="user_domain_name"> {{ datacenter.user_domain_name|default:"---" }}</p>
+                <p id="user_domain_name"> {{ datacenter.config.user_domain_name|default:"---" }}</p>
             </div>
         </div>
         <div class="row">
 
             <label for="keypair" class="col-sm-4 control-label">Keypair:</label>
             <div class="col-sm-6 input-group input-group-sm">
-                <p id="keypair"> {{ datacenter.keypair|default:"---" }}</p></div>
+                <p id="keypair"> {{ datacenter.config.keypair|default:"---" }}</p></div>
         </div>
         <div class="row">
 
             <label for="dataplane_physical_net" class="col-sm-4 control-label">Dataplane physical net:</label>
             <div class="col-sm-6 input-group input-group-sm">
-                <p id="dataplane_physical_net"> {{ datacenter.dataplane_physical_net|default:"---" }}</p>
+                <p id="dataplane_physical_net"> {{ datacenter.config.dataplane_physical_net|default:"---" }}</p>
             </div>
         </div>
         <div class="row">
 
             <label for="use_floating_ip" class="col-sm-4 control-label">Use floating ip:</label>
             <div class="col-sm-6 input-group input-group-sm">
-                <p id="use_floating_ip"> {{ datacenter.use_floating_ip|default:"---" }}</p>
+                <p id="use_floating_ip"> {{ datacenter.config.use_floating_ip|default:"---" }}</p>
             </div>
         </div>
         <div class="row">
 
             <label for="dataplane_net_vlan_range" class="col-sm-4 control-label">Dataplane net vlan range:</label>
             <div class="col-sm-6 input-group input-group-sm">
-                <p id="dataplane_net_vlan_range"> {{ datacenter.dataplane_net_vlan_range|default:"---" }}</p>
+                <p id="dataplane_net_vlan_range"> {{ datacenter.config.dataplane_net_vlan_range|default:"---" }}</p>
             </div>
         </div>
         <div class="row">
 
             <label for="microversion" class="col-sm-4 control-label">Microversion:</label>
             <div class="col-sm-6 input-group input-group-sm">
-                <p id="microversion"> {{ datacenter.microversion|default:"---" }}</p></div>
+                <p id="microversion"> {{ datacenter.config.microversion|default:"---" }}</p></div>
         </div>
     </div>
 </div>

diff --git a/vimhandler/template/config/openvim.html b/vimhandler/template/config/openvim.html
index e5a67aa..b5cba2f 100644 (file)
--- a/vimhandler/template/config/openvim.html
+++ b/vimhandler/template/config/openvim.html
@@ -19,5 +19,15 @@
                 </div>
             </div>
         </div>
+        <div class="row">
+            <div class="form-group">
+                <label for="ov_vim_network_name" class="col-sm-4 control-label">VIM network name</label>
+                <div class="col-sm-6 input-group input-group-sm">
+                    <input disabled class="form-control config-input" id="ov_vim_network_name"
+                           name="config_vim_network_name"
+                           placeholder="vim_network_name">
+                </div>
+            </div>
+        </div>
     </div>
 </div>
\ No newline at end of file

diff --git a/vimhandler/template/config/openvim_show.html b/vimhandler/template/config/openvim_show.html
index afc1b9d..81207a9 100644 (file)
--- a/vimhandler/template/config/openvim_show.html
+++ b/vimhandler/template/config/openvim_show.html
@@ -14,5 +14,11 @@
                 <p id="ov_sdn_port_map"> {{ datacenter.sdn_port_map|default:"---" }}</p>
             </div>
         </div>
+        <div class="row">
+            <label for="ov_vim_network_name" class="col-sm-4 control-label">VIM network name</label>
+            <div class="col-sm-6 input-group input-group-sm">
+                <p id="ov_vim_network_name"> {{ datacenter.config.vim_network_name|default:"---" }}</p>
+            </div>
+        </div>
     </div>
 </div>

diff --git a/vimhandler/template/config/vmware.html b/vimhandler/template/config/vmware.html
index 9f01387..48a246b 100644 (file)
--- a/vimhandler/template/config/vmware.html
+++ b/vimhandler/template/config/vmware.html
@@ -21,13 +21,15 @@
         </div>
         <div class="row">
             <div class="form-group">
-                <label for="orgname" class="col-sm-4 control-label">Org. name</label>
+                <label for="vmware_vim_network_name" class="col-sm-4 control-label">VIM network name</label>
                 <div class="col-sm-6 input-group input-group-sm">
-                    <input disabled class="form-control config-input" id="orgname" name="config_orgname"
-                           placeholder="orgname">
+                    <input disabled class="form-control config-input" id="vmware_vim_network_name"
+                           name="config_vim_network_name"
+                           placeholder="vim_network_name">
                 </div>
             </div>
         </div>
+
         <div class="row">
             <div class="form-group">
                 <label for="admin_username" class="col-sm-4 control-label">Admin username</label>
@@ -77,6 +79,15 @@
         </div>
     </div>
     <div class="col-lg-6">
+        <div class="row">
+            <div class="form-group">
+                <label for="orgname" class="col-sm-4 control-label">Org. name</label>
+                <div class="col-sm-6 input-group input-group-sm">
+                    <input disabled class="form-control config-input" id="orgname" name="config_orgname"
+                           placeholder="orgname">
+                </div>
+            </div>
+        </div>
         <div class="row">
             <div class="form-group">
                 <label for="vcenter_ip" class="col-sm-4 control-label">Vcenter ip</label>

diff --git a/vimhandler/template/config/vmware_show.html b/vimhandler/template/config/vmware_show.html
index 8b98043..4345046 100644 (file)
--- a/vimhandler/template/config/vmware_show.html
+++ b/vimhandler/template/config/vmware_show.html
@@ -5,103 +5,110 @@
 
             <label for="vmware_sdn_ctrl" class="col-sm-4 control-label">SDN Controller</label>
             <div class="col-sm-6 input-group input-group-sm">
-                <p id="vmware_sdn_ctrl"> {{ datacenter.sdn_ctrl|default:"---" }}</p>
+                <p id="vmware_sdn_ctrl"> {{ datacenter.config.sdn_ctrl|default:"---" }}</p>
             </div>
         </div>
         <div class="row">
 
             <label for="vmware_sdn_port_map" class="col-sm-4 control-label">SDN Port Mapping</label>
             <div class="col-sm-6 input-group input-group-sm">
-                <p id="vmware_sdn_port_map"> {{ datacenter.sdn_port_map|default:"---" }}</p>
+                <p id="vmware_sdn_port_map"> {{ datacenter.config.sdn_port_map|default:"---" }}</p>
             </div>
         </div>
         <div class="row">
-
-            <label for="orgname" class="col-sm-4 control-label">Org. name</label>
+            <label for="vmware_vim_network_name" class="col-sm-4 control-label">VIM network name</label>
             <div class="col-sm-6 input-group input-group-sm">
-                <p id="orgname"> {{ datacenter.orgname|default:"---" }}</p>
+                <p id="vmware_vim_network_name"> {{ datacenter.config.vim_network_name|default:"---" }}</p>
             </div>
         </div>
+
         <div class="row">
 
             <label for="admin_username" class="col-sm-4 control-label">Admin username</label>
             <div class="col-sm-6 input-group input-group-sm">
-                <p id="admin_username"> {{ datacenter.admin_username|default:"---" }}</p>
+                <p id="admin_username"> {{ datacenter.config.admin_username|default:"---" }}</p>
             </div>
         </div>
         <div class="row">
 
             <label for="admin_password" class="col-sm-4 control-label">Admin password</label>
             <div class="col-sm-6 input-group input-group-sm">
-                <p id="admin_password"> {{ datacenter.admin_password|default:"---" }}</p>
+                <p id="admin_password"> {{ datacenter.config.admin_password|default:"---" }}</p>
             </div>
         </div>
         <div class="row">
 
             <label for="nsx_manager" class="col-sm-4 control-label">Nsx manager</label>
             <div class="col-sm-6 input-group input-group-sm">
-                <p id="nsx_manager"> {{ datacenter.nsx_manager|default:"---" }}</p>
+                <p id="nsx_manager"> {{ datacenter.config.nsx_manager|default:"---" }}</p>
             </div>
         </div>
         <div class="row">
 
             <label for="nsx_user" class="col-sm-4 control-label">Nsx user</label>
             <div class="col-sm-6 input-group input-group-sm">
-                <p id="nsx_user"> {{ datacenter.nsx_user|default:"---" }}</p>
+                <p id="nsx_user"> {{ datacenter.config.nsx_user|default:"---" }}</p>
             </div>
         </div>
         <div class="row">
 
             <label for="nsx_password" class="col-sm-4 control-label">Nsx password</label>
             <div class="col-sm-6 input-group input-group-sm">
-                <p id="nsx_password"> {{ datacenter.nsx_password|default:"---" }}</p>
+                <p id="nsx_password"> {{ datacenter.config.nsx_password|default:"---" }}</p>
             </div>
         </div>
     </div>
     <div class="col-lg-6">
+        <div class="row">
+
+            <label for="orgname" class="col-sm-4 control-label">Org. name</label>
+            <div class="col-sm-6 input-group input-group-sm">
+                <p id="orgname"> {{ datacenter.config.orgname|default:"---" }}</p>
+            </div>
+        </div>
         <div class="row">
 
             <label for="vcenter_ip" class="col-sm-4 control-label">Vcenter ip</label>
             <div class="col-sm-6 input-group input-group-sm">
-                <p id="vcenter_ip"> {{ datacenter.vcenter_ip|default:"---" }}</p>
+                <p id="vcenter_ip"> {{ datacenter.config.vcenter_ip|default:"---" }}</p>
             </div>
         </div>
         <div class="row">
 
             <label for="vcenter_port" class="col-sm-4 control-label">Vcenter port</label>
             <div class="col-sm-6 input-group input-group-sm">
-                <p id="vcenter_port"> {{ datacenter.vcenter_port|default:"---" }}</p></div>
+                <p id="vcenter_port"> {{ datacenter.config.vcenter_port|default:"---" }}</p></div>
         </div>
         <div class="row">
 
             <label for="vcenter_user" class="col-sm-4 control-label">Vcenter user</label>
             <div class="col-sm-6 input-group input-group-sm">
-                <p id="vcenter_user"> {{ datacenter.vcenter_user|default:"---" }}</p></div>
+                <p id="vcenter_user"> {{ datacenter.config.vcenter_user|default:"---" }}</p></div>
         </div>
         <div class="row">
 
             <label for="vcenter_password" class="col-sm-4 control-label">Vcenter password</label>
             <div class="col-sm-6 input-group input-group-sm">
-                <p id="vcenter_password"> {{ datacenter.vcenter_password|default:"---" }}</p>
+                <p id="vcenter_password"> {{ datacenter.config.vcenter_password|default:"---" }}</p>
             </div>
         </div>
         <div class="row">
 
             <label for="vrops_site" class="col-sm-4 control-label">Vrops site</label>
             <div class="col-sm-6 input-group input-group-sm">
-                <p id="vrops_site"> {{ datacenter.vrops_site|default:"---" }}</p></div>
+                <p id="vrops_site"> {{ datacenter.config.vrops_site|default:"---" }}</p></div>
         </div>
         <div class="row">
 
             <label for="vrops_user" class="col-sm-4 control-label">Vrops user</label>
             <div class="col-sm-6 input-group input-group-sm">
-                <p id="vrops_user"> {{ datacenter.vrops_user|default:"---" }}</p></div>
+                <p id="vrops_user"> {{ datacenter.config.vrops_user|default:"---" }}</p></div>
         </div>
         <div class="row">
 
             <label for="vrops_password" class="col-sm-4 control-label">Vrops password</label>
             <div class="col-sm-6 input-group input-group-sm">
-                <p id="vrops_password"> {{ datacenter.vrops_password|default:"---" }}</p>
+                <p id="vrops_password"> {{ datacenter.config.vrops_password|default:"---" }}</p>
             </div>
         </div>
     </div>

diff --git a/vimhandler/template/modal/vim_details.html b/vimhandler/template/modal/vim_details.html
index cb0bfa6..014c5d9 100644 (file)
--- a/vimhandler/template/modal/vim_details.html
+++ b/vimhandler/template/modal/vim_details.html
@@ -4,7 +4,7 @@
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                     <span aria-hidden="true">×</span></button>
-                <h4 class="modal-title" >Vim Details</h4>
+                <h4 class="modal-title" >VIM Details</h4>
             </div>
 
             <div class="modal-body" id="modal_show_vim_body">

diff --git a/vimhandler/template/vim_create.html b/vimhandler/template/vim_create.html
index 7ad54af..a68527e 100644 (file)
--- a/vimhandler/template/vim_create.html
+++ b/vimhandler/template/vim_create.html
@@ -19,7 +19,7 @@
 
 {% block breadcrumb_body %}
     {{ block.super }}
-    <li><a href="{% url 'vim:list' %}">Vims</a></li>
+    <li><a href="{% url 'vim:list' %}">VIMS</a></li>
 {% endblock %}
 
 {% block content_body %}
@@ -51,47 +51,49 @@
                                 </div>
                                 <div class="row">
                                     <div class="form-group">
-                                        <label for="vim_user" class="col-sm-3 control-label">Vim Username*</label>
+                                        <label for="vim_type" class="col-sm-3 control-label">Type*</label>
                                         <div class="col-sm-6 input-group input-group-sm">
-                                            <input class="form-control" id="vim_user" name="vim_user"
-                                                   placeholder="Vim Username" required>
+                                            <select id="vim_type" name="vim_type" class="form-control"
+                                                    onchange="toggleConfig(this)">
+                                                <option value="openvim">OpenVIM</option>
+                                                <option value="openstack">Openstack</option>
+                                                <option value="vmware">VMware vCD</option>
+                                                <option value="aws">AWS</option>
+                                            </select>
                                         </div>
                                     </div>
                                 </div>
                                 <div class="row">
                                     <div class="form-group">
-                                        <label for="vim_password" class="col-sm-3 control-label">Vim Password*</label>
+                                        <label for="vim_url" class="col-sm-3 control-label">VIM URL*</label>
                                         <div class="col-sm-6 input-group input-group-sm">
-                                            <input type="password" class="form-control" id="vim_password"
-                                                   name="vim_password" placeholder="Vim Password" required>
+                                            <input type="url" class="form-control" id="vim_url" name="vim_url"
+                                                   placeholder="VIM URL" required>
                                         </div>
                                     </div>
                                 </div>
                                 <div class="row">
                                     <div class="form-group">
-                                        <label for="vim_url" class="col-sm-3 control-label">Vim URL*</label>
+                                        <label for="vim_user" class="col-sm-3 control-label">VIM Username*</label>
                                         <div class="col-sm-6 input-group input-group-sm">
-                                            <input type="url" class="form-control" id="vim_url" name="vim_url"
-                                                   placeholder="Vim URL" required>
+                                            <input class="form-control" id="vim_user" name="vim_user"
+                                                   placeholder="VIM Username" required>
                                         </div>
                                     </div>
                                 </div>
                                 <div class="row">
                                     <div class="form-group">
-                                        <label for="vim_type" class="col-sm-3 control-label">Type*</label>
+                                        <label for="vim_password" class="col-sm-3 control-label">VIM Password*</label>
                                         <div class="col-sm-6 input-group input-group-sm">
-                                            <select id="vim_type" name="vim_type" class="form-control"
-                                                    onchange="toggleConfig(this)">
-                                                <option value="openvim">OpenVIM</option>
-                                                <option value="openstack">Openstack</option>
-                                                <option value="vmware">VMware vCD</option>
-                                                <option value="aws">AWS</option>
-                                            </select>
+                                            <input type="password" class="form-control" id="vim_password"
+                                                   name="vim_password" placeholder="VIM Password" required>
                                         </div>
                                     </div>
                                 </div>
 
 
+
+
                             </div>
                             <div class="col-lg-6">
                                 <div class="row">

diff --git a/vimhandler/template/vim_list.html b/vimhandler/template/vim_list.html
index dddde82..08a64a0 100644 (file)
--- a/vimhandler/template/vim_list.html
+++ b/vimhandler/template/vim_list.html
@@ -19,7 +19,7 @@
 
 {% block breadcrumb_body %}
     {{ block.super }}
-    <li><a href="{% url 'vim:list' %}">Vims</a></li>
+    <li><a href="{% url 'vim:list' %}">VIMS</a></li>
 {% endblock %}
 
 {% block content_body %}

diff --git a/vimhandler/template/vim_show.html b/vimhandler/template/vim_show.html
index 2cc533e..cc796e2 100644 (file)
--- a/vimhandler/template/vim_show.html
+++ b/vimhandler/template/vim_show.html
@@ -36,7 +36,7 @@
 
 {% block breadcrumb_body %}
     {{ block.super }}
-    <li><a href="{% url 'vim:list' %}">Vims</a></li>
+    <li><a href="{% url 'vim:list' %}">VIMS</a></li>
 {% endblock %}
 
 {% block content_body %}
@@ -63,13 +63,13 @@
                             </div>
                         </div>
                         <div class="row">
-                            <label for="vim_user" class="col-sm-3 control-label">Vim Username</label>
+                            <label for="vim_user" class="col-sm-3 control-label">VIM Username</label>
                             <div class="col-sm-6 input-group input-group-sm">
                                 <p id="vim_user"> {{datacenter.vim_user|default:"---" }}</p>
                             </div>
                         </div>
                         <div class="row">
-                            <label for="vim_url" class="col-sm-3 control-label">Vim URL</label>
+                            <label for="vim_url" class="col-sm-3 control-label">VIM URL</label>
                             <div class="col-sm-6 input-group input-group-sm">
                                 <p id="vim_url"> {{datacenter.vim_url|default:"---" }}</p>
                             </div>