Support Server triads - Network License Management

Author: Prabhakar Kumar

README.md

@@ -4,7 +4,7 @@
 [![codecov](https://codecov.io/gh/mathworks/jupyter-matlab-proxy/branch/main/graph/badge.svg?token=ZW3SESKCSS)](https://codecov.io/gh/mathworks/jupyter-matlab-proxy)
 The `jupyter-matlab-proxy` Python® package allows you to integrate MATLAB® with Jupyter®. The MATLAB integration for Jupyter enables you to open a MATLAB desktop in a web browser tab, directly from your Jupyter environment. This is not a kernel integration.
 
-The MATLAB Integration for Jupyter is under active development and you might find issues with the MATLAB graphical user interface. For support or to report issues, see the [Feedback](#feedback) section.
+The MATLAB Integration for Jupyter is under active development and you might find issues with the MATLAB graphical user interface. For support or to report issues, see the [Feedback](https://github.com/mathworks/jupyter-matlab-proxy#feedback) section.
 
 
 ## Use the MATLAB Integration for Jupyter
@@ -19,7 +19,7 @@ Once you have a Jupyter environment with the `jupyter-matlab-proxy` package inst
   <img width="600" src="https://github.com/mathworks/jupyter-matlab-proxy/raw/main/img/combined_launchers.png">
 </p>
 
-3. If prompted to do so, enter credentials for a MathWorks account associated with a MATLAB license. If you are using a network license manager, change to the _Network License Manager_ tab and enter the license server address instead. To determine the appropriate method for your license type, consult [MATLAB Licensing Info](./MATLAB-Licensing-Info.md).
+3. If prompted to do so, enter credentials for a MathWorks account associated with a MATLAB license. If you are using a network license manager, change to the _Network License Manager_ tab and enter the license server address instead. To determine the appropriate method for your license type, consult [MATLAB Licensing Info](https://github.com/mathworks/jupyter-matlab-proxy/blob/main/MATLAB-Licensing-Info.md).
 
 <p align="center">
   <img width="400" src="https://github.com/mathworks/jupyter-matlab-proxy/raw/main/img/licensing_GUI.png">

gui/src/components/LicensingGatherer/NLM.js

@@ -6,7 +6,14 @@ import {
     fetchSetLicensing
 } from '../../actionCreators';
 
-const connStrRegex = /^\d+@(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9-]*[A-Za-z0-9])$/
+// Regular expression to match port@hostname,
+// where port is any number and hostname is alphanumeric
+// Regex FOR 
+//      Start of Line, Any number of 0-9 digits , @, any number of nonwhite space characters with "- _ ." allowed, and EOL
+// IS:
+// ^[0-9]+[@](\w|\_|\-|\.)+$
+// Server triad is of the form : port@host1,port@host2,port@host3
+const connStrRegex = /^[\d]+@[\w|\-|\_|\.]+$|^[\d]+@[\w|\-|\_|\.]+,[\d]+@[\w|\-|\_|\.]+,[\d]+@[\w|\-|\_|\.]+$/
 
 function validateInput(str) {
     return connStrRegex.test(str);

jupyter_matlab_proxy/util/mwi_validators.py

@@ -34,7 +34,9 @@ def validate_mlm_license_file(nlm_conn_str):
     # Regular expression to match port@hostname,
     # where port is any number and hostname is alphanumeric
     # regex = Start of Line, Any number of 0-9 digits , @, any number of nonwhite space characters with "- _ ." allowed
-    regex = "^[0-9]+[@](\w|\_|\-|\.)+$"
+    # "^[0-9]+[@](\w|\_|\-|\.)+$"
+    # Server triad is of the form : port@host1,port@host2,port@host3
+    regex = "(^[0-9]+[@](\w|\_|\-|\.)+$)|(^[0-9]+[@](\w|\_|\-|\.)+),([0-9]+[@](\w|\_|\-|\.)+),([0-9]+[@](\w|\_|\-|\.)+$)"
     if not re.search(regex, nlm_conn_str):
         logger.debug("NLM info is not in the form of port@hostname")
         if not os.path.isfile(nlm_conn_str):

tests/util/test_mwi_validators.py

@@ -29,6 +29,17 @@ def test_validate_mlm_license_file_for_valid_server_syntax(monkeypatch):
     assert conn_str == license_manager_address
 
 
+def test_validate_mlm_license_file_for_valid_server_triad_syntax(monkeypatch):
+    """Check if port@hostname passes validation"""
+    env_name = mwi_env.get_env_name_network_license_manager()
+    license_manager_address = (
+        "[email protected]_any-alphanumeric,[email protected]_any-alphanumeric,[email protected]_any-alphanumeric"
+    )
+    monkeypatch.setenv(env_name, license_manager_address)
+    conn_str = mwi_validators.validate_mlm_license_file(os.getenv(env_name))
+    assert conn_str == license_manager_address
+
+
 def test_get_with_environment_variables(monkeypatch):
     """Check if path to license file passes validation"""
     env_name = mwi_env.get_env_name_network_license_manager()