Merge "Add aggressive negotiation mode for ikepolicy"

neutron_vpnaas_dashboard/dashboards/project/vpn/forms.py

@@ -128,11 +128,10 @@ class UpdateIKEPolicy(forms.SelfHandlingForm):
                  ('group5', _('group5')),
                  ('group14', _('group14'))],
         required=False)
-    # Currently this field has only one choice, so mark it as readonly.
     phase1_negotiation_mode = forms.ThemableChoiceField(
         label=_("IKE Phase1 negotiation mode"),
-        choices=[('main', 'main')],
-        widget=forms.TextInput(attrs={'readonly': 'readonly'}),
+        choices=[('main', 'main'),
+                 ('aggressive', 'aggressive')],
         required=False)
 
     failure_url = 'horizon:project:vpn:index'

neutron_vpnaas_dashboard/dashboards/project/vpn/templates/vpn/_add_ike_policy_help.html

@@ -14,7 +14,7 @@
   <dt>{% trans 'Perfect Forward Secrecy' %}</dt>
   <dd>{% trans 'PFS limited to using Diffie-Hellman groups 2, 5 (default) and 14.' %}</dd>
   <dt>{% trans 'IKE Phase 1 negotiation mode' %}</dt>
-  <dd>{% trans "Limited to 'main' mode only." %}</dd>
+  <dd>{% trans "Phase 1 negotiation mode limited to using 'main' and 'aggressive'." %}</dd>
 </dl>
 
 <p>{% trans "All fields are optional." %}</p>

neutron_vpnaas_dashboard/dashboards/project/vpn/tests.py

@@ -92,12 +92,12 @@ class VPNTests(test.TestCase):
     def test_index_vpnservices(self):
         self.setup_mocks()
 
-        res = self.client.get(self.INDEX_URL)
+        res = self.client.get(self.INDEX_URL + '?tab=vpntabs__vpnservices')
 
         self.assertTemplateUsed(res, '%s/vpn/index.html'
                                 % self.DASHBOARD)
         self.assertTemplateUsed(res, 'horizon/common/_detail_table.html')
-        self.assertEqual(len(res.context['table'].data),
+        self.assertEqual(len(res.context['vpnservicestable_table'].data),
                          len(self.vpnservices.list()))
         self.check_mocks()
 

neutron_vpnaas_dashboard/dashboards/project/vpn/workflows.py

@@ -282,11 +282,10 @@ class AddIKEPolicyAction(workflows.Action):
         self.fields['pfs'].choices = pfs_choices
         self.fields['pfs'].initial = "group5"
 
-        phase1_neg_mode_choices = [("main", "main")]
+        phase1_neg_mode_choices = [("main", "main"),
+                                   ("aggressive", "aggressive")]
         self.fields[
             'phase1_negotiation_mode'].choices = phase1_neg_mode_choices
-        # Currently this field has only one choice, so mark it as readonly.
-        self.fields['phase1_negotiation_mode'].widget.attrs['readonly'] = True
 
     class Meta(object):
         name = _("Add New IKE Policy")

neutron_vpnaas_dashboard/test/test_data/vpnaas_data.py

@@ -101,6 +101,21 @@ def data(TEST):
                       'encryption_algorithm': 'aes-256',
                       'ike_version': 'v1',
                       'lifetime': {'units': 'seconds', 'value': 3600},
+                      'phase1_negotiation_mode': 'aggressive',
+                      'pfs': 'group5',
+                      'ipsecsiteconns': []}
+    TEST.api_ikepolicies.add(ikepolicy_dict)
+    TEST.ikepolicies.add(vpn.IKEPolicy(ikepolicy_dict))
+
+    # 3rd IKE policy
+    ikepolicy_dict = {'id': 'a1f009b7-0ffa-43a7-ba19-dcabb0b4c983',
+                      'tenant_id': '1',
+                      'name': 'ikepolicy_3',
+                      'description': 'ikepolicy description',
+                      'auth_algorithm': 'sha1',
+                      'encryption_algorithm': 'aes-256',
+                      'ike_version': 'v1',
+                      'lifetime': {'units': 'seconds', 'value': 3600},
                       'phase1_negotiation_mode': 'main',
                       'pfs': 'group5',
                       'ipsecsiteconns': []}

releasenotes/notes/add-aggressive-negotiation-mode-ad665f5cfda2e08b.yaml

@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    The ``phase1 negotiation mode`` supports the ``aggressive`` option for IKE
+    policy.