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

[osm/LW-UI.git] / vimhandler / template / config / vmware_show.html

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>