adding all installation options

pygluu/kubernetes/gui/app.py

@@ -72,6 +72,13 @@ def main():
         web logs and socketio is disabled to avoid mixing with system logs
         this make easier to read system logs.
     """
+    parser = argparse.ArgumentParser()
+    parser.add_argument("-H", "--host", action="store", default="0.0.0.0")
+    parser.add_argument("-p", "--port", action="store", default="5000")
+    parser.add_argument("-d", "--debug", type=bool, action="store",
+                        default=False,
+                        help="Enable/Disable debug (default: false)")
+
     args = parse_args()
     host = args.host
     port = args.port

pygluu/kubernetes/gui/forms/configuration.py

@@ -61,7 +61,7 @@ class ConfigurationForm(FlaskForm):
         "oxTrust Password",
         widget=PasswordInput(hide_value=False),
         validators=[InputRequired(),
-                    password_requirement_check],
+                    password_requirement_check()],
         description="Password is randomly generated with 6 characters contain "
                     "number, uppercase letter, lower case letter and symbol")
     admin_pw_confirm = StringField(
@@ -86,7 +86,7 @@ class ConfigurationForm(FlaskForm):
 
     # override ldap_pw validators
     if settings.get("PERSISTENCE_BACKEND") in ("hybrid", "ldap"):
-        ldap_pw.validators = [InputRequired(), password_requirement_check]
+        ldap_pw.validators = [InputRequired(), password_requirement_check()]
     else:
         ldap_pw.validators = [Optional()]
         ldap_pw.render_kw = {"disabled": "disabled"}

pygluu/kubernetes/gui/forms/couchbase.py

@@ -83,7 +83,7 @@ class CouchbaseForm(FlaskForm):
     couchbase_password = StringField(
         "Couchbase password",
         widget=PasswordInput(hide_value=False),
-        validators=[InputRequired(), password_requirement_check],
+        validators=[InputRequired(), password_requirement_check()],
         description="Password is randomly generated with 6 characters contain "
                     "number, uppercase letter, lower case letter and symbol")
     couchbase_password_confirmation = StringField(

pygluu/kubernetes/gui/forms/gluugateway.py

@@ -58,7 +58,7 @@ class GluuGatewayForm(FlaskForm):
         "Kong Postgress Password",
         widget=PasswordInput(hide_value=False),
         validators=[RequiredIfFieldEqualTo("install_gluu_gateway", "Y"),
-                    password_requirement_check],
+                    password_requirement_check()],
         description="Password is randomly generated with 6 characters contain "
                     "number, uppercase letter, lower case letter and symbol")
     kong_pg_password_confirm = StringField(
@@ -79,7 +79,7 @@ class GluuGatewayForm(FlaskForm):
         "Gluu Gateway UI postgres password",
         widget=PasswordInput(hide_value=False),
         validators=[RequiredIfFieldEqualTo("install_gluu_gateway", "Y"),
-                    password_requirement_check],
+                    password_requirement_check()],
         description="Password is randomly generated with 6 characters contain "
                     "number, uppercase letter, lower case letter and symbol")
     gluu_gateway_ui_pg_password_confirm = StringField(

pygluu/kubernetes/gui/forms/helm.py

@@ -0,0 +1,30 @@
+"""
+pygluu.kubernetes.gui.forms.helm
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+This module contains helpers to interact with user's inputs for helm gui form.
+
+License terms and conditions for Gluu Cloud Native Edition:
+https://www.apache.org/licenses/LICENSE-2.0
+"""
+from flask_wtf import FlaskForm
+from wtforms import StringField
+from wtforms.validators import InputRequired, Optional
+
+
+class HelmForm(FlaskForm):
+    gluu_helm_release_name = StringField("Please enter Gluu helm name",
+                                         default="gluu",
+                                         validators=[InputRequired()])
+    nginx_ingress_release_name = StringField("Please enter nginx-ingress helm name",
+                                             default="ningress",
+                                             validators=[InputRequired()])
+    nginx_ingress_namespace = StringField("Please enter nginx-ingress helm namespace",
+                                          default="ingress-nginx",
+                                          validators=[InputRequired()])
+    kong_helm_release_name = StringField("Please enter Gluu Gateway helm name",
+                                         default="gluu-gateway",
+                                         validators=[Optional()])
+    gluu_gateway_ui_helm_release_name = StringField("Please enter Gluu Gateway UI helm name",
+                                                    default="gluu-gateway-ui",
+                                                    validators=[Optional()])

pygluu/kubernetes/gui/forms/helpers.py

@@ -70,20 +70,24 @@
 }
 
 
-def password_requirement_check(form, field):
+def password_requirement_check():
     """
     Password Requirement validation,
     password required contain at least one digit,
     uppercase letter, lower case and symbol
     """
-    regex_bool = re.match(
-        '^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*\W)[a-zA-Z0-9\S]{6,}$',
-        field.data)
-    if not regex_bool:
-        raise ValidationError(
-            "Password does not meet requirements. "
-            "The password must contain one digit, one uppercase "
-            "letter, one lower case letter and one symbol")
+    message = "Password does not meet requirements. "\
+              "The password must contain one digit, one uppercase "\
+              "letter, one lower case letter and one symbol"
+
+    def _password_requirement_check(form, field):
+        regex_bool = re.match(
+            '^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*\W)[a-zA-Z0-9\S]{6,}$',
+            field.data)
+        if not regex_bool:
+            raise ValidationError(message)
+
+    return _password_requirement_check
 
 
 class RequiredIfFieldEqualTo(DataRequired):

pygluu/kubernetes/gui/forms/jackrabbit.py

@@ -54,7 +54,7 @@ class JackrabbitForm(FlaskForm):
         "Jackrabbit Admin Password",
         widget=PasswordInput(hide_value=False),
         validators=[InputRequired(),
-                    password_requirement_check])
+                    password_requirement_check()])
     jackrabbit_admin_password_confirmation = StringField(
         "Jackrabbit Admin Password Confirmation",
         widget=PasswordInput(hide_value=False),
@@ -71,7 +71,7 @@ class JackrabbitForm(FlaskForm):
     jackrabbit_pg_password = StringField("Jackrabbit PG Password",
                                          widget=PasswordInput(hide_value=False),
                                          validators=[RequiredIfFieldEqualTo("jackrabbit_cluster", "Y"),
-                                                     password_requirement_check])
+                                                     password_requirement_check()])
     jackrabbit_pg_password_confirmation = StringField(
         "Jackrabbit PG Password Confirmation",
         widget=PasswordInput(hide_value=False),

pygluu/kubernetes/gui/forms/postgres.py

@@ -22,11 +22,11 @@ class PostgresForm(FlaskForm):
     postgres_url (string|required|default: postgres.postgres.svc.cluster.local  )
     """
     postgres_namespace = StringField(
-        "Please enter number of replicas for postgres",
+        "Please enter a namespace for postgres",
         default="postgres",
         validators=[InputRequired()])
     postgres_replicas = IntegerField(
-        "Please enter a namespace for postgres",
+        "Please enter number of replicas for postgres",
         default=3,
         validators=[InputRequired()])
     postgres_url = StringField(

pygluu/kubernetes/gui/forms/upgrade.py

@@ -0,0 +1,34 @@
+"""
+pygluu.kubernetes.gui.forms.upgrade
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+This module contains helpers to interact with user's input for gui gluu upgrade form
+
+License terms and conditions for Gluu Cloud Native Edition:
+https://www.apache.org/licenses/LICENSE-2.0
+"""
+from flask_wtf import FlaskForm
+from wtforms import RadioField
+from wtforms.validators import  DataRequired
+
+from pygluu.kubernetes.helpers import get_supported_versions
+
+
+class UpgradeForm(FlaskForm):
+    """
+    Gluu upgrade form
+
+    Fields :
+        gluu_version (string|required)
+    """
+    versions, version_number = get_supported_versions()
+    supported_versions = []
+
+    for k, v in versions.items():
+        supported_versions.append((k, k))
+
+    upgrade_target_version = RadioField(
+        "Please enter the version to upgrade Gluu to",
+        choices=supported_versions,
+        default=version_number,
+        validators=[DataRequired(message="Please select version")])