Add friendly name in both Python clients

Author: artemlos

cryptolens_python2.py

@@ -208,7 +208,7 @@ class Key:
     @staticmethod
     def activate(token, rsa_pub_key, product_id, key, machine_code, fields_to_return = 0,\
                  metadata = False, floating_time_interval = 0,\
-                 max_overdraft = 0):
+                 max_overdraft = 0, friendly_name=None):
 
         """
         Calls the Activate method in Web API 3 and returns a tuple containing
@@ -229,6 +229,8 @@ def activate(token, rsa_pub_key, product_id, key, machine_code, fields_to_return
                                                   "metadata":metadata,\
                                                   "FloatingTimeInterval": floating_time_interval,\
                                                   "MaxOverdraft": max_overdraft,\
+                                                  "FriendlyName" : friendly_name,\
+                                                  "ModelVersion" : 2,\
                                                   "Sign":"True",\
                                                   "SignMethod":1}))
         except HTTPError as e:
@@ -418,12 +420,13 @@ def IsOnRightMachine(license_key, is_floating_license = False, allow_overdraft=F
 import time
 
 class ActivatedMachine:
-    def __init__(self, IP, Mid, Time):
+    def __init__(self, IP, Mid, Time, FriendlyName = ""):
         self.IP = IP
         self.Mid = Mid
 
         # TODO: check if time is int, and convert to datetime in this case.
         self.Time = Time
+        self.FriendlyName = FriendlyName
 
 class LicenseKey:
 

licensing/methods.py

@@ -22,7 +22,7 @@ class Key:
     @staticmethod
     def activate(token, rsa_pub_key, product_id, key, machine_code, fields_to_return = 0,\
                  metadata = False, floating_time_interval = 0,\
-                 max_overdraft = 0):
+                 max_overdraft = 0, friendly_name = None):
 
         """
         Calls the Activate method in Web API 3 and returns a tuple containing
@@ -43,6 +43,8 @@ def activate(token, rsa_pub_key, product_id, key, machine_code, fields_to_return
                                                   "metadata":metadata,\
                                                   "FloatingTimeInterval": floating_time_interval,\
                                                   "MaxOverdraft": max_overdraft,\
+                                                  "FriendlyName" : friendly_name,\
+                                                  "ModelVersion": 2 ,\
                                                   "Sign":"True",\
                                                   "SignMethod":1}))
         except HTTPError as e:

licensing/models.py

@@ -14,12 +14,13 @@
 from licensing.internal import HelperMethods
 
 class ActivatedMachine:
-    def __init__(self, IP, Mid, Time):
+    def __init__(self, IP, Mid, Time, FriendlyName=""):
         self.IP = IP
         self.Mid = Mid
 
         # TODO: check if time is int, and convert to datetime in this case.
         self.Time = Time
+        self.FriendlyName = FriendlyName
 
 class LicenseKey:
 

setup.py

@@ -2,7 +2,7 @@
 setup(
   name = 'licensing',         # How you named your package folder (MyLib)
   packages = ['licensing'],   # Chose the same as "name"
-  version = '0.16',      # Start with a small number and increase it with every change you make
+  version = '0.17',      # Start with a small number and increase it with every change you make
   license='MIT',        # Chose a license from here: https://help.github.com/articles/licensing-a-repository
   description = 'Client library for Cryptolens licensing Web API.',   # Give a short description about your library
   author = 'Cryptolens AB',                   # Type in your name

test.py

@@ -8,12 +8,15 @@
 from licensing.models import *
 from licensing.methods import Key, Helpers
 
+import socket
+
 #from cryptolens_python2 import *
 pubKey = "<RSAKeyValue><Modulus>sGbvxwdlDbqFXOMlVUnAF5ew0t0WpPW7rFpI5jHQOFkht/326dvh7t74RYeMpjy357NljouhpTLA3a6idnn4j6c3jmPWBkjZndGsPL4Bqm+fwE48nKpGPjkj4q/yzT4tHXBTyvaBjA8bVoCTnu+LiC4XEaLZRThGzIn5KQXKCigg6tQRy0GXE13XYFVz/x1mjFbT9/7dS8p85n8BuwlY5JvuBIQkKhuCNFfrUxBWyu87CFnXWjIupCD2VO/GbxaCvzrRjLZjAngLCMtZbYBALksqGPgTUN7ZM24XbPWyLtKPaXF2i4XRR9u6eTj5BfnLbKAU5PIVfjIS+vNYYogteQ==</Modulus><Exponent>AQAB</Exponent></RSAKeyValue>"
 #HelperMethods.ironpython2730_legacy = True
 res = Key.activate(token="WyIyNzMyIiwiYmx6NlJ6ZzdaWjFScmxFVFNCc283YTJyUG5kQURMZ0hucW1YdUZxKyJd",\
                    rsa_pub_key=pubKey,\
-                   product_id=3349, key="ICVLD-VVSZR-ZTICT-YKGXL", machine_code=Helpers.GetMachineCode())
+                   product_id=3349, key="ICVLD-VVSZR-ZTICT-YKGXL", machine_code=Helpers.GetMachineCode(),\
+                   friendly_name=socket.gethostname())
 
 if res[0] == None or not Helpers.IsOnRightMachine(res[0]):
     print("An error occured: {0}".format(res[1]))