updating restPy migration files

RestApi/Python/Modules/ClassInheritance.py

@@ -7,7 +7,7 @@
      Your scripts will be instantiating objects using your classes.
      With inheritance, this allows your scripts to use all of OpenIxia functions
      and use your added functions in your classes.
-     This allows you to keep getting OpenIxia updates without interferring with 
+     This allows you to keep getting OpenIxia updates without interferring with
      your extended functions.
 
 """
@@ -20,10 +20,12 @@
 from IxNetRestApiPacketCapture import PacketCapture
 from IxNetRestApiQuickTest import QuickTest
 
+
 class Connection(Connect):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
+
 class Port_Mgmt(PortMgmt):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -37,14 +39,17 @@ def exportJsonConfig(self):
         # For enhancement or to fix a bug in exportJsonConfig().
         pass
 
+
 class Traffic_Config(Traffic):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
+
 class Protocol_Config(Protocol):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
+
 class Statistics_View(Statistics):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)

RestApi/Python/Modules/IxNetRestApiGlobals.py

@@ -1,15 +1,11 @@
-import re
-
-from IxNetRestApiProtocol import Protocol
-
 class Globals(object):
     def __init__(self, ixnObj=None):
         """
         Parameters
            ixnObj: <str>: The main connection object.
         """
         self.ixnObj = ixnObj
-        self.protocolObj = Protocol(ixnObj)
+        self.ixNetwork = ixnObj.ixNetwork
 
     def dhcpV4ClientStartStopRate(self, endpoint='startRate', **kwargs):
         """
@@ -19,7 +15,8 @@ def dhcpV4ClientStartStopRate(self, endpoint='startRate', **kwargs):
         Parameters
            endpoint: <str|object endpoint>: startRate|stopRate
 
-           **kwargs: Any attribute for the /globals/topology/dhcpv4client/startRate|stopRate endpoint.
+           **kwargs: Any attribute for the /globals/topology/dhcpv4client/
+           startRate|stopRate endpoint.
                      enabled = bool
                      interval = int
                      maxOutstanding = int
@@ -35,16 +32,16 @@ def dhcpV4ClientStartStopRate(self, endpoint='startRate', **kwargs):
                                                )
 
         """
-        restApi = '/globals/topology/dhcpv4client/{0}?links=true'.format(endpoint)
-
-        response = self.ixnObj.get(self.ixnObj.sessionUrl + restApi)
-        for key,value in response.json().items():
-            if key != 'links':
-                if bool(re.search('multivalue', str(value))) == True:
-                    if key in kwargs:
-                        multiValue = response.json()[key]
-                        self.ixnObj.patch(self.ixnObj.httpHeader+multiValue+"/singleValue", data={'value': kwargs[key]})
-                else:
-                    if key in kwargs:
-                        self.ixnObj.patch(self.ixnObj.sessionUrl + restApi, data={key: kwargs[key]})
-
+        rateObj = None
+
+        if endpoint == 'startRate':
+            rateObj = self.ixNetwork.Globals.Topology.Dhcpv4client.StartRate
+        if endpoint == 'stopRate':
+            rateObj = self.ixNetwork.Globals.Topology.Dhcpv4client.StopRate
+        for key, value in kwargs.items():
+            key = key[0].capitalize() + key[1:]
+            try:
+                multiValueObj = getattr(rateObj, key)
+                self.ixnObj.configMultivalue(multiValueObj, 'singlevalue', {'value': value})
+            except(ValueError, Exception):
+                setattr(rateObj, key, value)