|
2 | 2 | cloudStack.installWizard = { |
3 | 3 | // Check if install wizard should be invoked |
4 | 4 | check: function(args) { |
5 | | - args.response.success({ |
6 | | - doInstall: false |
| 5 | + $.ajax({ |
| 6 | + url: createURL('listZones'), |
| 7 | + dataType: 'json', |
| 8 | + async: true, |
| 9 | + success: function(data) { |
| 10 | + args.response.success({ |
| 11 | + doInstall: !data.listzonesresponse.zone |
| 12 | + }); |
| 13 | + } |
7 | 14 | }); |
8 | | - |
9 | | - // $.ajax({ |
10 | | - // url: createURL('listZones'), |
11 | | - // dataType: 'json', |
12 | | - // async: true, |
13 | | - // success: function(data) { |
14 | | - // args.response.success({ |
15 | | - // doInstall: !data.listzonesresponse.zone |
16 | | - // }); |
17 | | - // } |
18 | | - // }); |
19 | 15 | }, |
20 | 16 |
|
21 | 17 | changeUser: function(args) { |
|
88 | 84 | * Step 1: add zone |
89 | 85 | */ |
90 | 86 | var createZone = function(args) { |
91 | | - debugger; |
92 | 87 | $.ajax({ |
93 | 88 | url: createURL('createZone'), |
94 | 89 | data: { |
95 | 90 | name: data.zone.name, |
96 | 91 | networktype: 'Basic', |
| 92 | + dns1: data.zone.dns1, |
| 93 | + dns2: data.zone.dns2, |
97 | 94 | internaldns1: data.zone.internaldns1, |
98 | 95 | internaldns2: data.zone.internaldns2 |
99 | 96 | }, |
|
116 | 113 | $.ajax({ |
117 | 114 | url: createURL('createPod'), |
118 | 115 | data: { |
119 | | - name: data['pod-name'], |
| 116 | + name: data.pod['pod-name'], |
120 | 117 | zoneid: args.data.zone.id, |
121 | | - gateway: data['pod-gateway'], |
122 | | - netmask: data['pod-netmask'], |
123 | | - startip: data['pod-ip-range-start'], |
124 | | - endip: data['pod-ip-range-end'] |
| 118 | + gateway: data.pod['pod-gateway'], |
| 119 | + netmask: data.pod['pod-netmask'], |
| 120 | + startip: data.pod['pod-ip-range-start'], |
| 121 | + endip: data.pod['pod-ip-range-end'] |
125 | 122 | }, |
126 | 123 | dataType: 'json', |
127 | 124 | async: true, |
|
144 | 141 | data: { |
145 | 142 | zoneid: args.data.zone.id, |
146 | 143 | vlan: 'untagged', |
147 | | - gateway: data['guest-gateway'], |
148 | | - netmask: data['guest-netmask'], |
149 | | - startip: data['guest-ip-range-start'], |
150 | | - endip: data['guest-ip-range-end'] |
| 144 | + gateway: data.zoneIPRange['guest-gateway'], |
| 145 | + netmask: data.zoneIPRange['guest-netmask'], |
| 146 | + startip: data.zoneIPRange['guest-ip-range-start'], |
| 147 | + endip: data.zoneIPRange['guest-ip-range-end'] |
151 | 148 | }, |
152 | 149 | dataType: 'json', |
153 | 150 | async: true, |
|
0 commit comments