|
86 | 86 | }); |
87 | 87 |
|
88 | 88 | } else { //non-portable IP which has only one NIC |
89 | | - /* |
90 | | - var nic = $.grep(instance.nic, function(nic) { |
91 | | - return nic.networkid == network.id; |
92 | | - })[0]; |
93 | | - */ |
94 | | - |
95 | 89 | // Get NIC IPs |
96 | 90 | $.ajax({ |
97 | 91 | url: createURL('listNics'), |
|
170 | 164 | }); |
171 | 165 |
|
172 | 166 | } else { //non-portable IP which has only one NIC |
173 | | - /* |
174 | | - var nic = $.grep(instance.nic, function(nic) { |
175 | | - return nic.networkid == network.id; |
176 | | - })[0]; |
177 | | - */ |
178 | | - |
179 | 167 | // Get NIC IPs |
180 | 168 | $.ajax({ |
181 | 169 | url: createURL('listNics'), |
|
1993 | 1981 | $.ajax({ |
1994 | 1982 | url: createURL('listZones'), |
1995 | 1983 | data: dataObj, |
1996 | | - // id: args.context.networks[0].zoneid |
1997 | | - // }, |
1998 | 1984 | async: false, |
1999 | 1985 | success: function(json) { |
2000 | 1986 | zoneObj = json.listzonesresponse.zone[0]; |
|
3557 | 3543 | } |
3558 | 3544 | } |
3559 | 3545 |
|
3560 | | - /*$.ajax({ |
3561 | | - url: createURL('assignCertToLoadBalancer'), |
3562 | | - data: {certid: certificateData.certificate, lbruleid: lbID}, |
3563 | | - success: function(data) { |
3564 | | - var jobID = data.assigncerttoloadbalancerresponse.jobid; |
3565 | | - var lbProtocolCreated = false; |
3566 | | -
|
3567 | | - args.response.success({ |
3568 | | - _custom: { |
3569 | | - jobId: jobID |
3570 | | - }, |
3571 | | - notification: { |
3572 | | - label: 'label.add.certificate', |
3573 | | - poll: function(args) { |
3574 | | - var complete = args.complete; |
3575 | | - var error = args.error; |
3576 | | -
|
3577 | | - pollAsyncJobResult({ |
3578 | | - _custom: { |
3579 | | - jobId: jobID |
3580 | | - }, |
3581 | | - complete: function(args) { |
3582 | | - if (lbProtocolCreated) return; |
3583 | | -
|
3584 | | - lbProtocolCreated = true; |
3585 | | -
|
3586 | | - if (certificateData && certificateData.certificate) { |
3587 | | - cloudStack.lbCertificatePolicy.actions.add(lbID, certificateData, complete, error); |
3588 | | - } else { |
3589 | | - complete(); |
3590 | | - } |
3591 | | - }, |
3592 | | - error: error |
3593 | | - }); |
3594 | | - } |
3595 | | - } |
3596 | | - }); |
3597 | | - }, |
3598 | | - error: function(data) { |
3599 | | - args.response.error(parseXMLHttpResponse(data)); |
3600 | | - } |
3601 | | - });*/ |
3602 | | - |
3603 | 3546 | $.ajax({ |
3604 | 3547 | url: createURL('assignToLoadBalancerRule'), |
3605 | 3548 | data: inputData, |
|
5972 | 5915 | docID: 'helpVPNGatewayIKEDH', |
5973 | 5916 | select: function(args) { |
5974 | 5917 | var items = []; |
5975 | | - // StrongSwan now requires a DH group to be specified... |
5976 | | - //items.push({ |
5977 | | - // id: '', |
5978 | | - // description: _l('label.none') |
5979 | | - //}); |
5980 | 5918 | items.push({ |
5981 | 5919 | id: 'modp1536', |
5982 | 5920 | description: 'Group 5(modp1536)' |
|
0 commit comments