diff --git a/.gitignore b/.gitignore index 3506120..893b25c 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ .terraform.lock.hcl terraform.tfstate* .terraform.tfstate.lock.info +.idea/ \ No newline at end of file diff --git a/modules/deploy/data/license.py b/modules/deploy/data/license.py index 1b8b67d..50684f1 100644 --- a/modules/deploy/data/license.py +++ b/modules/deploy/data/license.py @@ -10,7 +10,7 @@ from time import sleep import virl2_client as pcl - +from virl2_client.virl2_client import Version def set_license() -> str: nodes = os.getenv("CFG_LICENSE_NODES") or 0 @@ -23,9 +23,23 @@ def set_license() -> str: return "" regid = "regid.2019-10.com.cisco.CML_NODE_COUNT,1.0_2607650b-6ca8-46d5-81e5-e6688b7383c4" - client = pcl.ClientLibrary( - "localhost", username=admin_user, password=admin_pass, ssl_verify=False - ) + + version = getattr(pcl.ClientLibrary, "VERSION", None) + if version is not None and version >= Version("2.9.0"): + client = pcl.ClientLibrary( + "localhost", + username=admin_user, + password=admin_pass, + ssl_verify=False, + client_type="CloudCml" + ) + else: + client = pcl.ClientLibrary( + "localhost", + username=admin_user, + password=admin_pass, + ssl_verify=False, + ) try: client.licensing.deregister()