Browse Source

UI fixes added

Change-Id: I8406b7daa5fc667edbe827f65de2d71aed629124
Nikita Koshikov 4 years ago
parent
commit
433b965085
1 changed files with 66 additions and 30 deletions
  1. 66
    30
      environment_config.yaml

+ 66
- 30
environment_config.yaml View File

@@ -1,73 +1,109 @@
1 1
 attributes:
2
-  install_type:
2
+  use_gbp:
3
+    type: "checkbox"
4
+    weight: 30
5
+    value: false
6
+    label: "Group-Based Policy"
7
+    description: "Enable/Disable Group-Based Policy installation"
8
+    restrictions:
9
+      - condition: "not (cluster:net_provider == 'neutron' and (networking_parameters:segmentation_type == 'vlan' or networking_parameters:segmentation_type == 'gre'))"
10
+        action: disable
11
+  use_apic:
12
+    type: "checkbox"
13
+    weight: 31
14
+    value: false
15
+    label: "APIC Driver"
16
+    description: "Enable/Disable APIC API Controller"
17
+    restrictions:
18
+      - condition: "not (cluster:net_provider == 'neutron' and networking_parameters:segmentation_type == 'vlan')"
19
+        action: disable
20
+  driver_type:
3 21
     type: "radio"
4
-    weight: 20
5
-    value: "apic"
6
-    label: "Cisco SDN install type"
22
+    weight: 33
23
+    value: "ML2"
24
+    label: "APIC Driver mode"
25
+    restrictions:
26
+      - condition: "settings:cisco_aci.use_apic.value != true"
27
+        action: disable
7 28
     values:
8
-      - data: "apic"
9
-        label: "Generic APIC ML2 driver"
10
-        description: "Core Cisco ML2 Neutron plugin"
11
-      - data: "gbp"
12
-        label: "GBP module and Mapping driver"
13
-        description: "Description ...."
14
-      - data: "apic_with_gbp"
15
-        label: "GBP module and APIC driver"
16
-        description: "Description ..."
29
+      - data: "ML2"
30
+        label: "ML2"
31
+        description: "ML2 Driver"
32
+      - data: "GBP"
33
+        label: "GBP"
34
+        description: "Group-Based Policy Driver"
35
+        restrictions:
36
+          - condition: "settings:cisco_aci.use_gbp.value != true"
37
+            action: disable
17 38
   apic_hosts:
18 39
     value: '10.0.0.100'
19 40
     label: 'APIC Host'
20 41
     description: 'Comma­separated list of Cisco APIC IP addresses'
21
-    weight: 31
42
+    weight: 41
22 43
     type: "text"
44
+    restrictions:
45
+      - condition: "settings:cisco_aci.use_apic.value != true"
46
+        action: disable
23 47
   apic_username:
24 48
     value: 'admin'
25 49
     label: 'APIC Username'
26 50
     description: 'Username for Cisco APIC; usually admin is used to allow configuration for multiple tenants'
27
-    weight: 32
51
+    weight: 42
28 52
     type: "text"
29 53
     regex:
30 54
       source: '\S'
31 55
       error: "Error field cannot be empty"
56
+    restrictions:
57
+      - condition: "settings:cisco_aci.use_apic.value != true"
58
+        action: disable
32 59
   apic_password:
33 60
     value: 'password'
34 61
     label: 'APIC Password'
35 62
     description: 'Password for the Cisco APIC user identified by the username'
36
-    weight: 33
63
+    weight: 43
37 64
     type: "password"
38 65
     regex:
39 66
       source: '\S'
40 67
       error: "Error field cannot be empty"
68
+    restrictions:
69
+      - condition: "settings:cisco_aci.use_apic.value != true"
70
+        action: disable
41 71
   use_lldp:
42 72
     type: "checkbox"
43
-    weight: 40
44
-    value: true
73
+    weight: 50
74
+    value: false
45 75
     label: "Use lldp"
46 76
     description: "Try to automatically discover hosts"
47 77
     restrictions:
48
-        #- condition: "settings:cisco_aci.install_type.value != \"apic\""
49
-        # action: disable
78
+      - condition: "settings:cisco_aci.use_apic.value != true"
79
+        action: disable
50 80
   static_config:
51 81
     type: "textarea"
52
-    weight: 41
82
+    weight: 51
53 83
     value: ""
54 84
     label: "Static config"
55 85
     description: "Example:\n[apic_switch:201]\ncompute11,compute21=1/10\ncompute12=1/11\n"
56 86
     restrictions:
57
-        - condition: "settings:cisco_aci.use_lldp.value != false"
58
-          action: disable
87
+      - condition: "settings:cisco_aci.use_lldp.value != false or settings:cisco_aci.use_apic.value != true"
88
+        action: disable
59 89
   additional_config:
60 90
     type: "textarea"
61
-    weight: 42
91
+    weight: 52
62 92
     value: ""
63 93
     label: "Additional config"
64 94
     description: "Example:\n[DEFAULT]\napic_vpc_pairs=201:202,203:204"
65
-  create_ext_net:
95
+    restrictions:
96
+      - condition: "settings:cisco_aci.use_apic.value != true"
97
+        action: disable
98
+  ext_net_enable:
66 99
     type: "checkbox"
67 100
     weight: 70
68 101
     value: false
69 102
     label: "Configure external network"
70 103
     description: "Create external neutron network"
104
+    restrictions:
105
+      - condition: "settings:cisco_aci.use_apic.value != true"
106
+        action: disable
71 107
   ext_net_name:
72 108
     type: "text"
73 109
     weight: 71
@@ -75,7 +111,7 @@ attributes:
75 111
     label: "Network name:"
76 112
     description: "External network name"
77 113
     restrictions:
78
-        - condition: "settings:cisco_aci.create_ext_net.value == false"
114
+        - condition: "settings:cisco_aci.ext_net_enable.value == false"
79 115
           action: hide
80 116
   ext_net_subnet:
81 117
     type: "text"
@@ -84,7 +120,7 @@ attributes:
84 120
     label: "Subnet range:"
85 121
     description: "CIDR for external network"
86 122
     restrictions:
87
-        - condition: "settings:cisco_aci.create_ext_net.value == false"
123
+        - condition: "settings:cisco_aci.ext_net_enable.value == false"
88 124
           action: hide
89 125
   ext_net_gateway:
90 126
     type: "text"
@@ -93,7 +129,7 @@ attributes:
93 129
     label: "Gateway IP:"
94 130
     description: "IP address of the external gateway"
95 131
     restrictions:
96
-        - condition: "settings:cisco_aci.create_ext_net.value == false"
132
+        - condition: "settings:cisco_aci.ext_net_enable.value == false"
97 133
           action: hide
98 134
   ext_net_switch:
99 135
     type: "text"
@@ -102,7 +138,7 @@ attributes:
102 138
     label: "Switch ID:"
103 139
     description: "Switch ID from Cisco APIC"
104 140
     restrictions:
105
-        - condition: "settings:cisco_aci.create_ext_net.value == false"
141
+        - condition: "settings:cisco_aci.ext_net_enable.value == false"
106 142
           action: hide
107 143
   ext_net_port:
108 144
     type: "text"
@@ -111,5 +147,5 @@ attributes:
111 147
     label: "Port ID:"
112 148
     description: "Switch port to which the external router is connected"
113 149
     restrictions:
114
-        - condition: "settings:cisco_aci.create_ext_net.value == false"
150
+        - condition: "settings:cisco_aci.ext_net_enable.value == false"
115 151
           action: hide

Loading…
Cancel
Save