From 74d6cee1cb9a084828a5462b5fa4a4dddfb28fb2 Mon Sep 17 00:00:00 2001 From: lombardof Date: Fri, 25 May 2018 17:08:11 +0200 Subject: [PATCH] vim_network_name in vim conf; Re-ordering of VIM account standard parameters;fix vim show Change-Id: I4a54591954ae6a227d0f0e1edc69b1e4826a9175 Signed-off-by: lombardof --- vimhandler/template/config/aws.html | 20 +++++++-- vimhandler/template/config/aws_show.html | 20 +++++---- vimhandler/template/config/openstack.html | 19 +++++++-- .../template/config/openstack_show.html | 42 +++++++++++-------- vimhandler/template/config/openvim.html | 10 +++++ vimhandler/template/config/openvim_show.html | 6 +++ vimhandler/template/config/vmware.html | 17 ++++++-- vimhandler/template/config/vmware_show.html | 41 ++++++++++-------- vimhandler/template/modal/vim_details.html | 2 +- vimhandler/template/vim_create.html | 38 +++++++++-------- vimhandler/template/vim_list.html | 2 +- vimhandler/template/vim_show.html | 6 +-- 12 files changed, 147 insertions(+), 76 deletions(-) diff --git a/vimhandler/template/config/aws.html b/vimhandler/template/config/aws.html index 5bf7f0a..1eb8706 100644 --- a/vimhandler/template/config/aws.html +++ b/vimhandler/template/config/aws.html @@ -19,6 +19,16 @@ +
+
+ +
+ +
+
+
@@ -28,6 +38,11 @@
+ + + + +
@@ -37,10 +52,6 @@
- - - -
@@ -70,5 +81,6 @@
+ diff --git a/vimhandler/template/config/aws_show.html b/vimhandler/template/config/aws_show.html index 601c811..41397f7 100644 --- a/vimhandler/template/config/aws_show.html +++ b/vimhandler/template/config/aws_show.html @@ -3,25 +3,31 @@
-

{{ datacenter.sdn_ctrl|default:"---" }}

+

{{ datacenter.config.sdn_ctrl|default:"---" }}

-

{{ datacenter.sdn_port_map|default:"---" }}

+

{{ datacenter.config.sdn_port_map|default:"---" }}

+
+
+
+ +
+

{{ datacenter.config.vim_network_name|default:"---" }}

-

{{ datacenter.region_name|default:"---" }}

+

{{ datacenter.config.region_name|default:"---" }}

-

{{ datacenter.vpc_cidr_block|default:"---" }}

+

{{ datacenter.config.vpc_cidr_block|default:"---" }}

@@ -31,19 +37,19 @@
-

{{ datacenter.security_groups|default:"---" }}

+

{{ datacenter.config.security_groups|default:"---" }}

-

{{ datacenter.key_pair|default:"---" }}

+

{{ datacenter.config.key_pair|default:"---" }}

-

{{ datacenter.flavor_info|default:"---" }}

+

{{ datacenter.config.flavor_info|default:"---" }}

diff --git a/vimhandler/template/config/openstack.html b/vimhandler/template/config/openstack.html index 6a52931..846cf10 100644 --- a/vimhandler/template/config/openstack.html +++ b/vimhandler/template/config/openstack.html @@ -21,6 +21,16 @@ +
+
+ +
+ +
+
+
@@ -95,7 +105,11 @@
-
+ + +
+
+
@@ -104,9 +118,6 @@
- -
-
diff --git a/vimhandler/template/config/openstack_show.html b/vimhandler/template/config/openstack_show.html index 5388b69..e360997 100644 --- a/vimhandler/template/config/openstack_show.html +++ b/vimhandler/template/config/openstack_show.html @@ -5,55 +5,61 @@
-

{{ datacenter.sdn_ctrl|default:"---" }}

+

{{ datacenter.config.sdn_ctrl|default:"---" }}

-

{{ datacenter.sdn_port_map|default:"---" }}

+

{{ datacenter.config.sdn_port_map|default:"---" }}

+
+
+
+ +
+

{{ datacenter.config.vim_network_name|default:"---" }}

-

{{ datacenter.security_groups|default:"---" }}

+

{{ datacenter.config.security_groups|default:"---" }}

-

{{ datacenter.availability_zone|default:"---" }}

+

{{ datacenter.config.availability_zone|default:"---" }}

-

{{ datacenter.region_name|default:"---" }}

+

{{ datacenter.config.region_name|default:"---" }}

-

{{ datacenter.insecure|default:"---" }}

+

{{ datacenter.config.insecure|default:"---" }}

-

{{ datacenter.use_existing_flavors|default:"---" }}

+

{{ datacenter.config.use_existing_flavors|default:"---" }}

-

{{ datacenter.use_internal_endpoint|default:"---" }}

+

{{ datacenter.config.use_internal_endpoint|default:"---" }}

-

{{ datacenter.APIversion|default:"---" }}

+

{{ datacenter.config.APIversion|default:"---" }}

@@ -63,61 +69,61 @@
-

{{ datacenter.project_domain_id|default:"---" }}

+

{{ datacenter.config.project_domain_id|default:"---" }}

-

{{ datacenter.project_domain_name|default:"---" }}

+

{{ datacenter.config.project_domain_name|default:"---" }}

-

{{ datacenter.user_domain_id|default:"---" }}

+

{{ datacenter.config.user_domain_id|default:"---" }}

-

{{ datacenter.user_domain_name|default:"---" }}

+

{{ datacenter.config.user_domain_name|default:"---" }}

-

{{ datacenter.keypair|default:"---" }}

+

{{ datacenter.config.keypair|default:"---" }}

-

{{ datacenter.dataplane_physical_net|default:"---" }}

+

{{ datacenter.config.dataplane_physical_net|default:"---" }}

-

{{ datacenter.use_floating_ip|default:"---" }}

+

{{ datacenter.config.use_floating_ip|default:"---" }}

-

{{ datacenter.dataplane_net_vlan_range|default:"---" }}

+

{{ datacenter.config.dataplane_net_vlan_range|default:"---" }}

-

{{ datacenter.microversion|default:"---" }}

+

{{ datacenter.config.microversion|default:"---" }}

diff --git a/vimhandler/template/config/openvim.html b/vimhandler/template/config/openvim.html index e5a67aa..b5cba2f 100644 --- a/vimhandler/template/config/openvim.html +++ b/vimhandler/template/config/openvim.html @@ -19,5 +19,15 @@ +
+
+ +
+ +
+
+
\ 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 --- a/vimhandler/template/config/openvim_show.html +++ b/vimhandler/template/config/openvim_show.html @@ -14,5 +14,11 @@

{{ datacenter.sdn_port_map|default:"---" }}

+
+ +
+

{{ datacenter.config.vim_network_name|default:"---" }}

+
+
diff --git a/vimhandler/template/config/vmware.html b/vimhandler/template/config/vmware.html index 9f01387..48a246b 100644 --- a/vimhandler/template/config/vmware.html +++ b/vimhandler/template/config/vmware.html @@ -21,13 +21,15 @@
- +
- +
+
@@ -77,6 +79,15 @@
+
+
+ +
+ +
+
+
diff --git a/vimhandler/template/config/vmware_show.html b/vimhandler/template/config/vmware_show.html index 8b98043..4345046 100644 --- a/vimhandler/template/config/vmware_show.html +++ b/vimhandler/template/config/vmware_show.html @@ -5,103 +5,110 @@
-

{{ datacenter.sdn_ctrl|default:"---" }}

+

{{ datacenter.config.sdn_ctrl|default:"---" }}

-

{{ datacenter.sdn_port_map|default:"---" }}

+

{{ datacenter.config.sdn_port_map|default:"---" }}

- - +
-

{{ datacenter.orgname|default:"---" }}

+

{{ datacenter.config.vim_network_name|default:"---" }}

+
-

{{ datacenter.admin_username|default:"---" }}

+

{{ datacenter.config.admin_username|default:"---" }}

-

{{ datacenter.admin_password|default:"---" }}

+

{{ datacenter.config.admin_password|default:"---" }}

-

{{ datacenter.nsx_manager|default:"---" }}

+

{{ datacenter.config.nsx_manager|default:"---" }}

-

{{ datacenter.nsx_user|default:"---" }}

+

{{ datacenter.config.nsx_user|default:"---" }}

-

{{ datacenter.nsx_password|default:"---" }}

+

{{ datacenter.config.nsx_password|default:"---" }}

+
+ + +
+

{{ datacenter.config.orgname|default:"---" }}

+
+
-

{{ datacenter.vcenter_ip|default:"---" }}

+

{{ datacenter.config.vcenter_ip|default:"---" }}

-

{{ datacenter.vcenter_port|default:"---" }}

+

{{ datacenter.config.vcenter_port|default:"---" }}

-

{{ datacenter.vcenter_user|default:"---" }}

+

{{ datacenter.config.vcenter_user|default:"---" }}

-

{{ datacenter.vcenter_password|default:"---" }}

+

{{ datacenter.config.vcenter_password|default:"---" }}

-

{{ datacenter.vrops_site|default:"---" }}

+

{{ datacenter.config.vrops_site|default:"---" }}

-

{{ datacenter.vrops_user|default:"---" }}

+

{{ datacenter.config.vrops_user|default:"---" }}

-

{{ datacenter.vrops_password|default:"---" }}

+

{{ datacenter.config.vrops_password|default:"---" }}

diff --git a/vimhandler/template/modal/vim_details.html b/vimhandler/template/modal/vim_details.html index cb0bfa6..014c5d9 100644 --- a/vimhandler/template/modal/vim_details.html +++ b/vimhandler/template/modal/vim_details.html @@ -4,7 +4,7 @@
-

Vim Details

+

VIM Details

diff --git a/vimhandler/template/vim_create.html b/vimhandler/template/vim_create.html index 7ad54af..a68527e 100644 --- a/vimhandler/template/vim_create.html +++ b/vimhandler/template/vim_create.html @@ -19,7 +19,7 @@ {% block breadcrumb_body %} {{ block.super }} -
  • Vims
    • +
  • VIMS
    • {% endblock %} {% block content_body %} @@ -51,47 +51,49 @@
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    + +
    diff --git a/vimhandler/template/vim_list.html b/vimhandler/template/vim_list.html index dddde82..08a64a0 100644 --- a/vimhandler/template/vim_list.html +++ b/vimhandler/template/vim_list.html @@ -19,7 +19,7 @@ {% block breadcrumb_body %} {{ block.super }} -
  • Vims
    • +
  • VIMS
    • {% endblock %} {% block content_body %} diff --git a/vimhandler/template/vim_show.html b/vimhandler/template/vim_show.html index 2cc533e..cc796e2 100644 --- a/vimhandler/template/vim_show.html +++ b/vimhandler/template/vim_show.html @@ -36,7 +36,7 @@ {% block breadcrumb_body %} {{ block.super }} -
  • Vims
    • +
  • VIMS
    • {% endblock %} {% block content_body %} @@ -63,13 +63,13 @@
    - +

    {{datacenter.vim_user|default:"---" }}

    - +

    {{datacenter.vim_url|default:"---" }}

    -- 2.25.1