Merge "Remove strict checking of encryption type"

Author: Jenkins

neutronclient/neutron/v2_0/vpn/ikepolicy.py

@@ -60,10 +60,7 @@ def add_known_arguments(self, parser):
                    'Default:sha1'))
         parser.add_argument(
             '--encryption-algorithm',
-            default='aes-128', choices=['3des',
-                                        'aes-128',
-                                        'aes-192',
-                                        'aes-256'],
+            default='aes-128',
             help=_('Encryption algorithm in lowercase, default:aes-128'))
         parser.add_argument(
             '--phase1-negotiation-mode',

neutronclient/neutron/v2_0/vpn/ipsecpolicy.py

@@ -62,10 +62,7 @@ def add_known_arguments(self, parser):
             help=_('Authentication algorithm in lowercase, default:sha1'))
         parser.add_argument(
             '--encryption-algorithm',
-            default='aes-128', choices=['3des',
-                                        'aes-128',
-                                        'aes-192',
-                                        'aes-256'],
+            default='aes-128',
             help=_('Encryption algorithm in lowercase, default:aes-128'))
         parser.add_argument(
             '--encapsulation-mode',