marvin_refactor: create takes factories not reqd args

- Let all entities inherit from CloudStackEntity
- create and list are classmethods since they work without need for an
  entity to exist
- create takes only factories by default. no need for long param list.
    Entitiy.create(apiclient) will give entity out of default factory
- Use entityFactory.attributes() to init entities

Signed-off-by: Prasanna Santhanam <tsp@apache.org>

tools/marvin/marvin/integration/lib/base/Account.py

@@ -15,18 +15,28 @@
 # specific language governing permissions and limitations
 # under the License.
 from . import CloudStackEntity
+
 class Account(CloudStackEntity):
 
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
     def enable(self, apiclient, **kwargs):
         pass
 
     def lock(self, apiclient, account, domainid, **kwargs):
         pass
 
-    def create(self, apiclient, AccountFactory, username, firstname, lastname, accounttype, password, email, **kwargs):
-        pass
+    @classmethod
+    def create(cls, apiclient, AccountFactory, **kwargs):
+        cmd = createAccount.createAccountCmd()
+        [setattr(cmd, factoryKey, factoryValue) for factoryKey, factoryValue in AccountFactory.attributes()]
+        [setattr(cmd, key, value) for key,value in kwargs.items]
+        return Account(apiclient.createAccount(cmd).__dict__)
 
-    def list(self, apiclient, **kwargs):
+    @classmethod
+    def list(cls, apiclient, **kwargs):
         pass
 
     def update(self, apiclient, newname, **kwargs):

tools/marvin/marvin/integration/lib/base/AccountFromProject.py

@@ -17,5 +17,9 @@
 from . import CloudStackEntity
 class AccountFromProject(CloudStackEntity):
 
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
     def delete(self, apiclient, projectid, account, **kwargs):
         pass

tools/marvin/marvin/integration/lib/base/AccountToProject.py

@@ -17,5 +17,9 @@
 from . import CloudStackEntity
 class AccountToProject(CloudStackEntity):
 
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
     def add(self, apiclient, projectid, **kwargs):
         pass

tools/marvin/marvin/integration/lib/base/Alerts.py

@@ -17,5 +17,10 @@
 from . import CloudStackEntity
 class Alerts(CloudStackEntity):
 
-    def list(self, apiclient, **kwargs):
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
+    @classmethod
+    def list(cls, apiclient, **kwargs):
         pass

tools/marvin/marvin/integration/lib/base/ApiLimit.py

@@ -17,6 +17,10 @@
 from . import CloudStackEntity
 class ApiLimit(CloudStackEntity):
 
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
     def reset(self, apiclient, **kwargs):
         pass
 

tools/marvin/marvin/integration/lib/base/Apis.py

@@ -17,5 +17,10 @@
 from . import CloudStackEntity
 class Apis(CloudStackEntity):
 
-    def list(self, apiclient, **kwargs):
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
+    @classmethod
+    def list(cls, apiclient, **kwargs):
         pass

tools/marvin/marvin/integration/lib/base/AsyncJobResult.py

@@ -17,5 +17,9 @@
 from . import CloudStackEntity
 class AsyncJobResult(CloudStackEntity):
 
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
     def query(self, apiclient, jobid, **kwargs):
         pass

tools/marvin/marvin/integration/lib/base/AsyncJobs.py

@@ -17,5 +17,10 @@
 from . import CloudStackEntity
 class AsyncJobs(CloudStackEntity):
 
-    def list(self, apiclient, **kwargs):
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
+    @classmethod
+    def list(cls, apiclient, **kwargs):
         pass

tools/marvin/marvin/integration/lib/base/AutoScalePolicies.py

@@ -17,5 +17,10 @@
 from . import CloudStackEntity
 class AutoScalePolicies(CloudStackEntity):
 
-    def list(self, apiclient, **kwargs):
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
+    @classmethod
+    def list(cls, apiclient, **kwargs):
         pass

tools/marvin/marvin/integration/lib/base/AutoScalePolicy.py

@@ -17,7 +17,12 @@
 from . import CloudStackEntity
 class AutoScalePolicy(CloudStackEntity):
 
-    def create(self, apiclient, AutoScalePolicyFactory, action, duration, conditionids, **kwargs):
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
+    @classmethod
+    def create(cls, apiclient, AutoScalePolicyFactory, **kwargs):
         pass
 
     def update(self, apiclient, id, **kwargs):

tools/marvin/marvin/integration/lib/base/AutoScaleVmGroup.py

@@ -17,13 +17,19 @@
 from . import CloudStackEntity
 class AutoScaleVmGroup(CloudStackEntity):
 
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
     def enable(self, apiclient, id, **kwargs):
         pass
 
-    def create(self, apiclient, AutoScaleVmGroupFactory, scaledownpolicyids, maxmembers, scaleuppolicyids, vmprofileid, minmembers, lbruleid, **kwargs):
+    @classmethod
+    def create(cls, apiclient, AutoScaleVmGroupFactory, **kwargs):
         pass
 
-    def list(self, apiclient, **kwargs):
+    @classmethod
+    def list(cls, apiclient, **kwargs):
         pass
 
     def update(self, apiclient, id, **kwargs):

tools/marvin/marvin/integration/lib/base/AutoScaleVmProfile.py

@@ -17,10 +17,16 @@
 from . import CloudStackEntity
 class AutoScaleVmProfile(CloudStackEntity):
 
-    def create(self, apiclient, AutoScaleVmProfileFactory, zoneid, serviceofferingid, templateid, **kwargs):
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
+    @classmethod
+    def create(cls, apiclient, AutoScaleVmProfileFactory, **kwargs):
         pass
 
-    def list(self, apiclient, **kwargs):
+    @classmethod
+    def list(cls, apiclient, **kwargs):
         pass
 
     def update(self, apiclient, id, **kwargs):

tools/marvin/marvin/integration/lib/base/Capabilities.py

@@ -17,5 +17,10 @@
 from . import CloudStackEntity
 class Capabilities(CloudStackEntity):
 
-    def list(self, apiclient):
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
+    @classmethod
+    def list(cls, apiclient):
         pass

tools/marvin/marvin/integration/lib/base/Capacity.py

@@ -17,5 +17,10 @@
 from . import CloudStackEntity
 class Capacity(CloudStackEntity):
 
-    def list(self, apiclient, **kwargs):
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
+    @classmethod
+    def list(cls, apiclient, **kwargs):
         pass

tools/marvin/marvin/integration/lib/base/CloudIdentifier.py

@@ -17,5 +17,9 @@
 from . import CloudStackEntity
 class CloudIdentifier(CloudStackEntity):
 
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
     def get(self, apiclient, userid, **kwargs):
         pass

tools/marvin/marvin/integration/lib/base/Cluster.py

@@ -17,10 +17,15 @@
 from . import CloudStackEntity
 class Cluster(CloudStackEntity):
 
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
     def add(self, apiclient, clustername, hypervisor, zoneid, clustertype, podid, **kwargs):
         pass
 
-    def list(self, apiclient, **kwargs):
+    @classmethod
+    def list(cls, apiclient, **kwargs):
         pass
 
     def update(self, apiclient, id, **kwargs):

tools/marvin/marvin/integration/lib/base/Condition.py

@@ -17,10 +17,16 @@
 from . import CloudStackEntity
 class Condition(CloudStackEntity):
 
-    def create(self, apiclient, ConditionFactory, threshold, relationaloperator, counterid, **kwargs):
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
+    @classmethod
+    def create(cls, apiclient, ConditionFactory, **kwargs):
         pass
 
-    def list(self, apiclient, **kwargs):
+    @classmethod
+    def list(cls, apiclient, **kwargs):
         pass
 
     def delete(self, apiclient, id, **kwargs):

tools/marvin/marvin/integration/lib/base/Config.py

@@ -17,5 +17,9 @@
 from . import CloudStackEntity
 class Config(CloudStackEntity):
 
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
     def ldap(self, apiclient, queryfilter, hostname, searchbase, **kwargs):
         pass

tools/marvin/marvin/integration/lib/base/Configuration.py

@@ -17,7 +17,12 @@
 from . import CloudStackEntity
 class Configuration(CloudStackEntity):
 
-    def list(self, apiclient, **kwargs):
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
+    @classmethod
+    def list(cls, apiclient, **kwargs):
         pass
 
     def update(self, apiclient, name, **kwargs):

tools/marvin/marvin/integration/lib/base/Counter.py

@@ -17,10 +17,16 @@
 from . import CloudStackEntity
 class Counter(CloudStackEntity):
 
-    def create(self, apiclient, CounterFactory, source, name, value, **kwargs):
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
+    @classmethod
+    def create(cls, apiclient, CounterFactory, **kwargs):
         pass
 
-    def list(self, apiclient, **kwargs):
+    @classmethod
+    def list(cls, apiclient, **kwargs):
         pass
 
     def delete(self, apiclient, id, **kwargs):

tools/marvin/marvin/integration/lib/base/CustomCertificate.py

@@ -17,5 +17,9 @@
 from . import CloudStackEntity
 class CustomCertificate(CloudStackEntity):
 
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
     def upload(self, apiclient, domainsuffix, certificate, **kwargs):
         pass

tools/marvin/marvin/integration/lib/base/DefaultZoneForAccount.py

@@ -17,5 +17,9 @@
 from . import CloudStackEntity
 class DefaultZoneForAccount(CloudStackEntity):
 
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
     def mark(self, apiclient, account, domainid, zoneid, **kwargs):
         pass

tools/marvin/marvin/integration/lib/base/DiskOffering.py

@@ -17,10 +17,16 @@
 from . import CloudStackEntity
 class DiskOffering(CloudStackEntity):
 
-    def create(self, apiclient, DiskOfferingFactory, displaytext, name, **kwargs):
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
+    @classmethod
+    def create(cls, apiclient, DiskOfferingFactory, **kwargs):
         pass
 
-    def list(self, apiclient, **kwargs):
+    @classmethod
+    def list(cls, apiclient, **kwargs):
         pass
 
     def update(self, apiclient, id, **kwargs):

tools/marvin/marvin/integration/lib/base/Domain.py

@@ -17,10 +17,16 @@
 from . import CloudStackEntity
 class Domain(CloudStackEntity):
 
-    def create(self, apiclient, DomainFactory, name, **kwargs):
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
+    @classmethod
+    def create(cls, apiclient, DomainFactory, **kwargs):
         pass
 
-    def list(self, apiclient, **kwargs):
+    @classmethod
+    def list(cls, apiclient, **kwargs):
         pass
 
     def update(self, apiclient, id, **kwargs):

tools/marvin/marvin/integration/lib/base/DomainChildren.py

@@ -17,5 +17,10 @@
 from . import CloudStackEntity
 class DomainChildren(CloudStackEntity):
 
-    def list(self, apiclient, **kwargs):
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
+    @classmethod
+    def list(cls, apiclient, **kwargs):
         pass

tools/marvin/marvin/integration/lib/base/EventTypes.py

@@ -17,5 +17,10 @@
 from . import CloudStackEntity
 class EventTypes(CloudStackEntity):
 
-    def list(self, apiclient):
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
+    @classmethod
+    def list(cls, apiclient):
         pass

tools/marvin/marvin/integration/lib/base/Events.py

@@ -17,5 +17,10 @@
 from . import CloudStackEntity
 class Events(CloudStackEntity):
 
-    def list(self, apiclient, **kwargs):
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
+    @classmethod
+    def list(cls, apiclient, **kwargs):
         pass

tools/marvin/marvin/integration/lib/base/FirewallRule.py

@@ -17,10 +17,16 @@
 from . import CloudStackEntity
 class FirewallRule(CloudStackEntity):
 
-    def create(self, apiclient, FirewallRuleFactory, protocol, ipaddressid, **kwargs):
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
+    @classmethod
+    def create(cls, apiclient, FirewallRuleFactory, **kwargs):
         pass
 
-    def list(self, apiclient, **kwargs):
+    @classmethod
+    def list(cls, apiclient, **kwargs):
         pass
 
     def delete(self, apiclient, id, **kwargs):

tools/marvin/marvin/integration/lib/base/FromLoadBalancerRule.py

@@ -17,5 +17,9 @@
 from . import CloudStackEntity
 class FromLoadBalancerRule(CloudStackEntity):
 
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
     def remove(self, apiclient, id, virtualmachineids, **kwargs):
         pass

tools/marvin/marvin/integration/lib/base/Host.py

@@ -17,10 +17,15 @@
 from . import CloudStackEntity
 class Host(CloudStackEntity):
 
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
     def add(self, apiclient, username, podid, url, hypervisor, zoneid, password, **kwargs):
         pass
 
-    def list(self, apiclient, **kwargs):
+    @classmethod
+    def list(cls, apiclient, **kwargs):
         pass
 
     def update(self, apiclient, id, **kwargs):

tools/marvin/marvin/integration/lib/base/HostForMaintenance.py

@@ -17,5 +17,9 @@
 from . import CloudStackEntity
 class HostForMaintenance(CloudStackEntity):
 
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
     def prepare(self, apiclient, id, **kwargs):
         pass

tools/marvin/marvin/integration/lib/base/HostMaintenance.py

@@ -17,5 +17,9 @@
 from . import CloudStackEntity
 class HostMaintenance(CloudStackEntity):
 
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
     def cancel(self, apiclient, id, **kwargs):
         pass

tools/marvin/marvin/integration/lib/base/HostPassword.py

@@ -17,5 +17,9 @@
 from . import CloudStackEntity
 class HostPassword(CloudStackEntity):
 
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
     def update(self, apiclient, username, password, **kwargs):
         pass

tools/marvin/marvin/integration/lib/base/HypervisorCapabilities.py

@@ -17,7 +17,12 @@
 from . import CloudStackEntity
 class HypervisorCapabilities(CloudStackEntity):
 
-    def list(self, apiclient, **kwargs):
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
+    @classmethod
+    def list(cls, apiclient, **kwargs):
         pass
 
     def update(self, apiclient, **kwargs):

tools/marvin/marvin/integration/lib/base/Hypervisors.py

@@ -17,5 +17,10 @@
 from . import CloudStackEntity
 class Hypervisors(CloudStackEntity):
 
-    def list(self, apiclient, **kwargs):
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
+    @classmethod
+    def list(cls, apiclient, **kwargs):
         pass

tools/marvin/marvin/integration/lib/base/InstanceGroup.py

@@ -17,10 +17,16 @@
 from . import CloudStackEntity
 class InstanceGroup(CloudStackEntity):
 
-    def create(self, apiclient, InstanceGroupFactory, name, **kwargs):
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
+    @classmethod
+    def create(cls, apiclient, InstanceGroupFactory, **kwargs):
         pass
 
-    def list(self, apiclient, **kwargs):
+    @classmethod
+    def list(cls, apiclient, **kwargs):
         pass
 
     def update(self, apiclient, id, **kwargs):

tools/marvin/marvin/integration/lib/base/IpAddress.py

@@ -17,6 +17,10 @@
 from . import CloudStackEntity
 class IpAddress(CloudStackEntity):
 
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
     def disassociate(self, apiclient, id, **kwargs):
         pass
 

tools/marvin/marvin/integration/lib/base/IpForwardingRule.py

@@ -17,10 +17,16 @@
 from . import CloudStackEntity
 class IpForwardingRule(CloudStackEntity):
 
-    def create(self, apiclient, IpForwardingRuleFactory, startport, protocol, ipaddressid, **kwargs):
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
+    @classmethod
+    def create(cls, apiclient, IpForwardingRuleFactory, **kwargs):
         pass
 
-    def list(self, apiclient, **kwargs):
+    @classmethod
+    def list(cls, apiclient, **kwargs):
         pass
 
     def delete(self, apiclient, id, **kwargs):

tools/marvin/marvin/integration/lib/base/Iso.py

@@ -17,13 +17,18 @@
 from . import CloudStackEntity
 class Iso(CloudStackEntity):
 
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
     def copy(self, apiclient, sourcezoneid, id, destzoneid, **kwargs):
         pass
 
     def register(self, apiclient, url, displaytext, name, zoneid, **kwargs):
         pass
 
-    def list(self, apiclient, **kwargs):
+    @classmethod
+    def list(cls, apiclient, **kwargs):
         pass
 
     def update(self, apiclient, id, **kwargs):

tools/marvin/marvin/integration/lib/base/IsoPermissions.py

@@ -17,7 +17,12 @@
 from . import CloudStackEntity
 class IsoPermissions(CloudStackEntity):
 
-    def list(self, apiclient, id, **kwargs):
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
+    @classmethod
+    def list(cls, apiclient, **kwargs):
         pass
 
     def update(self, apiclient, id, **kwargs):

tools/marvin/marvin/integration/lib/base/LBStickinessPolicies.py

@@ -17,5 +17,10 @@
 from . import CloudStackEntity
 class LBStickinessPolicies(CloudStackEntity):
 
-    def list(self, apiclient, lbruleid, **kwargs):
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
+    @classmethod
+    def list(cls, apiclient, **kwargs):
         pass

tools/marvin/marvin/integration/lib/base/LBStickinessPolicy.py

@@ -17,7 +17,12 @@
 from . import CloudStackEntity
 class LBStickinessPolicy(CloudStackEntity):
 
-    def create(self, apiclient, LBStickinessPolicyFactory, lbruleid, methodname, name, **kwargs):
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
+    @classmethod
+    def create(cls, apiclient, LBStickinessPolicyFactory, **kwargs):
         pass
 
     def delete(self, apiclient, id, **kwargs):

tools/marvin/marvin/integration/lib/base/LoadBalancerRule.py

@@ -17,10 +17,16 @@
 from . import CloudStackEntity
 class LoadBalancerRule(CloudStackEntity):
 
-    def create(self, apiclient, LoadBalancerRuleFactory, publicport, name, algorithm, privateport, **kwargs):
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
+    @classmethod
+    def create(cls, apiclient, LoadBalancerRuleFactory, **kwargs):
         pass
 
-    def list(self, apiclient, **kwargs):
+    @classmethod
+    def list(cls, apiclient, **kwargs):
         pass
 
     def update(self, apiclient, id, **kwargs):

tools/marvin/marvin/integration/lib/base/LoadBalancerRuleInstances.py

@@ -17,5 +17,10 @@
 from . import CloudStackEntity
 class LoadBalancerRuleInstances(CloudStackEntity):
 
-    def list(self, apiclient, id, **kwargs):
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
+    @classmethod
+    def list(cls, apiclient, **kwargs):
         pass

tools/marvin/marvin/integration/lib/base/Network.py

@@ -17,10 +17,16 @@
 from . import CloudStackEntity
 class Network(CloudStackEntity):
 
-    def create(self, apiclient, NetworkFactory, displaytext, name, networkofferingid, zoneid, **kwargs):
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
+    @classmethod
+    def create(cls, apiclient, NetworkFactory, **kwargs):
         pass
 
-    def list(self, apiclient, **kwargs):
+    @classmethod
+    def list(cls, apiclient, **kwargs):
         pass
 
     def update(self, apiclient, id, **kwargs):

tools/marvin/marvin/integration/lib/base/NetworkACL.py

@@ -17,10 +17,16 @@
 from . import CloudStackEntity
 class NetworkACL(CloudStackEntity):
 
-    def create(self, apiclient, NetworkACLFactory, networkid, protocol, **kwargs):
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
+    @classmethod
+    def create(cls, apiclient, NetworkACLFactory, **kwargs):
         pass
 
-    def list(self, apiclient, **kwargs):
+    @classmethod
+    def list(cls, apiclient, **kwargs):
         pass
 
     def delete(self, apiclient, id, **kwargs):

tools/marvin/marvin/integration/lib/base/NetworkDevice.py

@@ -17,10 +17,15 @@
 from . import CloudStackEntity
 class NetworkDevice(CloudStackEntity):
 
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
     def add(self, apiclient, **kwargs):
         pass
 
-    def list(self, apiclient, **kwargs):
+    @classmethod
+    def list(cls, apiclient, **kwargs):
         pass
 
     def delete(self, apiclient, id, **kwargs):

tools/marvin/marvin/integration/lib/base/NetworkOffering.py

@@ -17,10 +17,16 @@
 from . import CloudStackEntity
 class NetworkOffering(CloudStackEntity):
 
-    def create(self, apiclient, NetworkOfferingFactory, guestiptype, traffictype, displaytext, name, supportedservices, **kwargs):
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
+    @classmethod
+    def create(cls, apiclient, NetworkOfferingFactory, **kwargs):
         pass
 
-    def list(self, apiclient, **kwargs):
+    @classmethod
+    def list(cls, apiclient, **kwargs):
         pass
 
     def update(self, apiclient, **kwargs):

tools/marvin/marvin/integration/lib/base/NetworkServiceProvider.py

@@ -17,10 +17,15 @@
 from . import CloudStackEntity
 class NetworkServiceProvider(CloudStackEntity):
 
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
     def add(self, apiclient, physicalnetworkid, name, **kwargs):
         pass
 
-    def list(self, apiclient, **kwargs):
+    @classmethod
+    def list(cls, apiclient, **kwargs):
         pass
 
     def update(self, apiclient, id, **kwargs):

tools/marvin/marvin/integration/lib/base/NiciraNvpDevice.py

@@ -17,10 +17,15 @@
 from . import CloudStackEntity
 class NiciraNvpDevice(CloudStackEntity):
 
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
     def add(self, apiclient, username, physicalnetworkid, password, hostname, transportzoneuuid, **kwargs):
         pass
 
-    def list(self, apiclient, **kwargs):
+    @classmethod
+    def list(cls, apiclient, **kwargs):
         pass
 
     def delete(self, apiclient, nvpdeviceid, **kwargs):

tools/marvin/marvin/integration/lib/base/NiciraNvpDeviceNetworks.py

@@ -17,5 +17,10 @@
 from . import CloudStackEntity
 class NiciraNvpDeviceNetworks(CloudStackEntity):
 
-    def list(self, apiclient, nvpdeviceid, **kwargs):
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
+    @classmethod
+    def list(cls, apiclient, **kwargs):
         pass

tools/marvin/marvin/integration/lib/base/OsCategories.py

@@ -17,5 +17,10 @@
 from . import CloudStackEntity
 class OsCategories(CloudStackEntity):
 
-    def list(self, apiclient, **kwargs):
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
+    @classmethod
+    def list(cls, apiclient, **kwargs):
         pass

tools/marvin/marvin/integration/lib/base/OsTypes.py

@@ -17,5 +17,10 @@
 from . import CloudStackEntity
 class OsTypes(CloudStackEntity):
 
-    def list(self, apiclient, **kwargs):
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
+    @classmethod
+    def list(cls, apiclient, **kwargs):
         pass

tools/marvin/marvin/integration/lib/base/PasswordForVirtualMachine.py

@@ -17,5 +17,9 @@
 from . import CloudStackEntity
 class PasswordForVirtualMachine(CloudStackEntity):
 
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
     def reset(self, apiclient, id, **kwargs):
         pass

tools/marvin/marvin/integration/lib/base/PhysicalNetwork.py

@@ -17,10 +17,16 @@
 from . import CloudStackEntity
 class PhysicalNetwork(CloudStackEntity):
 
-    def create(self, apiclient, PhysicalNetworkFactory, name, zoneid, **kwargs):
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
+    @classmethod
+    def create(cls, apiclient, PhysicalNetworkFactory, **kwargs):
         pass
 
-    def list(self, apiclient, **kwargs):
+    @classmethod
+    def list(cls, apiclient, **kwargs):
         pass
 
     def update(self, apiclient, id, **kwargs):

tools/marvin/marvin/integration/lib/base/Pod.py

@@ -17,10 +17,16 @@
 from . import CloudStackEntity
 class Pod(CloudStackEntity):
 
-    def create(self, apiclient, PodFactory, startip, netmask, zoneid, gateway, name, **kwargs):
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
+    @classmethod
+    def create(cls, apiclient, PodFactory, **kwargs):
         pass
 
-    def list(self, apiclient, **kwargs):
+    @classmethod
+    def list(cls, apiclient, **kwargs):
         pass
 
     def update(self, apiclient, id, **kwargs):

tools/marvin/marvin/integration/lib/base/PortForwardingRule.py

@@ -17,10 +17,16 @@
 from . import CloudStackEntity
 class PortForwardingRule(CloudStackEntity):
 
-    def create(self, apiclient, PortForwardingRuleFactory, publicport, virtualmachineid, protocol, ipaddressid, privateport, **kwargs):
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
+    @classmethod
+    def create(cls, apiclient, PortForwardingRuleFactory, **kwargs):
         pass
 
-    def list(self, apiclient, **kwargs):
+    @classmethod
+    def list(cls, apiclient, **kwargs):
         pass
 
     def update(self, apiclient, publicport, protocol, ipaddressid, privateport, **kwargs):

tools/marvin/marvin/integration/lib/base/PrivateGateway.py

@@ -17,10 +17,16 @@
 from . import CloudStackEntity
 class PrivateGateway(CloudStackEntity):
 
-    def create(self, apiclient, PrivateGatewayFactory, netmask, vlan, ipaddress, gateway, vpcid, **kwargs):
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
+    @classmethod
+    def create(cls, apiclient, PrivateGatewayFactory, **kwargs):
         pass
 
-    def list(self, apiclient, **kwargs):
+    @classmethod
+    def list(cls, apiclient, **kwargs):
         pass
 
     def delete(self, apiclient, id, **kwargs):

tools/marvin/marvin/integration/lib/base/Project.py

@@ -17,13 +17,19 @@
 from . import CloudStackEntity
 class Project(CloudStackEntity):
 
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
     def suspend(self, apiclient, id, **kwargs):
         pass
 
-    def create(self, apiclient, ProjectFactory, displaytext, name, **kwargs):
+    @classmethod
+    def create(cls, apiclient, ProjectFactory, **kwargs):
         pass
 
-    def list(self, apiclient, **kwargs):
+    @classmethod
+    def list(cls, apiclient, **kwargs):
         pass
 
     def update(self, apiclient, id, **kwargs):

tools/marvin/marvin/integration/lib/base/ProjectAccounts.py

@@ -17,5 +17,10 @@
 from . import CloudStackEntity
 class ProjectAccounts(CloudStackEntity):
 
-    def list(self, apiclient, projectid, **kwargs):
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
+    @classmethod
+    def list(cls, apiclient, **kwargs):
         pass

tools/marvin/marvin/integration/lib/base/ProjectInvitation.py

@@ -17,7 +17,12 @@
 from . import CloudStackEntity
 class ProjectInvitation(CloudStackEntity):
 
-    def list(self, apiclient, **kwargs):
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
+    @classmethod
+    def list(cls, apiclient, **kwargs):
         pass
 
     def update(self, apiclient, projectid, **kwargs):

tools/marvin/marvin/integration/lib/base/PublicIpAddresses.py

@@ -17,5 +17,10 @@
 from . import CloudStackEntity
 class PublicIpAddresses(CloudStackEntity):
 
-    def list(self, apiclient, **kwargs):
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
+    @classmethod
+    def list(cls, apiclient, **kwargs):
         pass

tools/marvin/marvin/integration/lib/base/RemoteAccessVpn.py

@@ -17,10 +17,16 @@
 from . import CloudStackEntity
 class RemoteAccessVpn(CloudStackEntity):
 
-    def create(self, apiclient, RemoteAccessVpnFactory, publicipid, **kwargs):
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
+    @classmethod
+    def create(cls, apiclient, RemoteAccessVpnFactory, **kwargs):
         pass
 
-    def list(self, apiclient, publicipid, **kwargs):
+    @classmethod
+    def list(cls, apiclient, **kwargs):
         pass
 
     def delete(self, apiclient, publicipid, **kwargs):

tools/marvin/marvin/integration/lib/base/Remove.py

@@ -17,5 +17,9 @@
 from . import CloudStackEntity
 class Remove(CloudStackEntity):
 
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
     def ldap(self, apiclient):
         pass

tools/marvin/marvin/integration/lib/base/ResourceCount.py

@@ -17,5 +17,9 @@
 from . import CloudStackEntity
 class ResourceCount(CloudStackEntity):
 
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
     def update(self, apiclient, domainid, **kwargs):
         pass

tools/marvin/marvin/integration/lib/base/ResourceLimit.py

@@ -17,7 +17,12 @@
 from . import CloudStackEntity
 class ResourceLimit(CloudStackEntity):
 
-    def list(self, apiclient, **kwargs):
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
+    @classmethod
+    def list(cls, apiclient, **kwargs):
         pass
 
     def update(self, apiclient, resourcetype, **kwargs):

tools/marvin/marvin/integration/lib/base/Router.py

@@ -17,10 +17,15 @@
 from . import CloudStackEntity
 class Router(CloudStackEntity):
 
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
     def destroy(self, apiclient, id, **kwargs):
         pass
 
-    def list(self, apiclient, **kwargs):
+    @classmethod
+    def list(cls, apiclient, **kwargs):
         pass
 
     def stop(self, apiclient, id, **kwargs):

tools/marvin/marvin/integration/lib/base/S3.py

@@ -17,8 +17,13 @@
 from . import CloudStackEntity
 class S3(CloudStackEntity):
 
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
     def add(self, apiclient, secretkey, accesskey, bucket, **kwargs):
         pass
 
-    def list(self, apiclient, **kwargs):
+    @classmethod
+    def list(cls, apiclient, **kwargs):
         pass

tools/marvin/marvin/integration/lib/base/SSHKeyPair.py

@@ -17,13 +17,19 @@
 from . import CloudStackEntity
 class SSHKeyPair(CloudStackEntity):
 
-    def create(self, apiclient, SSHKeyPairFactory, name, **kwargs):
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
+    @classmethod
+    def create(cls, apiclient, SSHKeyPairFactory, **kwargs):
         pass
 
     def register(self, apiclient, publickey, name, **kwargs):
         pass
 
-    def list(self, apiclient, **kwargs):
+    @classmethod
+    def list(cls, apiclient, **kwargs):
         pass
 
     def delete(self, apiclient, name, **kwargs):

tools/marvin/marvin/integration/lib/base/SecondaryStorage.py

@@ -17,5 +17,9 @@
 from . import CloudStackEntity
 class SecondaryStorage(CloudStackEntity):
 
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
     def add(self, apiclient, url, **kwargs):
         pass

tools/marvin/marvin/integration/lib/base/SecurityGroup.py

@@ -17,10 +17,16 @@
 from . import CloudStackEntity
 class SecurityGroup(CloudStackEntity):
 
-    def create(self, apiclient, SecurityGroupFactory, name, **kwargs):
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
+    @classmethod
+    def create(cls, apiclient, SecurityGroupFactory, **kwargs):
         pass
 
-    def list(self, apiclient, **kwargs):
+    @classmethod
+    def list(cls, apiclient, **kwargs):
         pass
 
     def delete(self, apiclient, **kwargs):

tools/marvin/marvin/integration/lib/base/SecurityGroupEgress.py

@@ -17,6 +17,10 @@
 from . import CloudStackEntity
 class SecurityGroupEgress(CloudStackEntity):
 
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
     def authorize(self, apiclient, **kwargs):
         pass
 

tools/marvin/marvin/integration/lib/base/SecurityGroupIngress.py

@@ -17,6 +17,10 @@
 from . import CloudStackEntity
 class SecurityGroupIngress(CloudStackEntity):
 
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
     def authorize(self, apiclient, **kwargs):
         pass
 

tools/marvin/marvin/integration/lib/base/ServiceForRouter.py

@@ -17,5 +17,9 @@
 from . import CloudStackEntity
 class ServiceForRouter(CloudStackEntity):
 
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
     def change(self, apiclient, id, serviceofferingid, **kwargs):
         pass

tools/marvin/marvin/integration/lib/base/ServiceForSystemVm.py

@@ -17,5 +17,9 @@
 from . import CloudStackEntity
 class ServiceForSystemVm(CloudStackEntity):
 
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
     def change(self, apiclient, id, serviceofferingid, **kwargs):
         pass

tools/marvin/marvin/integration/lib/base/ServiceForVirtualMachine.py

@@ -17,5 +17,9 @@
 from . import CloudStackEntity
 class ServiceForVirtualMachine(CloudStackEntity):
 
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
     def change(self, apiclient, id, serviceofferingid, **kwargs):
         pass

tools/marvin/marvin/integration/lib/base/ServiceOffering.py

@@ -17,10 +17,16 @@
 from . import CloudStackEntity
 class ServiceOffering(CloudStackEntity):
 
-    def create(self, apiclient, ServiceOfferingFactory, displaytext, memory, cpunumber, name, cpuspeed, **kwargs):
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
+    @classmethod
+    def create(cls, apiclient, ServiceOfferingFactory, **kwargs):
         pass
 
-    def list(self, apiclient, **kwargs):
+    @classmethod
+    def list(cls, apiclient, **kwargs):
         pass
 
     def update(self, apiclient, id, **kwargs):

tools/marvin/marvin/integration/lib/base/Snapshot.py

@@ -17,10 +17,16 @@
 from . import CloudStackEntity
 class Snapshot(CloudStackEntity):
 
-    def create(self, apiclient, SnapshotFactory, volumeid, **kwargs):
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
+    @classmethod
+    def create(cls, apiclient, SnapshotFactory, **kwargs):
         pass
 
-    def list(self, apiclient, **kwargs):
+    @classmethod
+    def list(cls, apiclient, **kwargs):
         pass
 
     def delete(self, apiclient, id, **kwargs):

tools/marvin/marvin/integration/lib/base/SnapshotPolicies.py

@@ -17,7 +17,12 @@
 from . import CloudStackEntity
 class SnapshotPolicies(CloudStackEntity):
 
-    def list(self, apiclient, volumeid, **kwargs):
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
+    @classmethod
+    def list(cls, apiclient, **kwargs):
         pass
 
     def delete(self, apiclient, **kwargs):

tools/marvin/marvin/integration/lib/base/SnapshotPolicy.py

@@ -17,5 +17,10 @@
 from . import CloudStackEntity
 class SnapshotPolicy(CloudStackEntity):
 
-    def create(self, apiclient, SnapshotPolicyFactory, timezone, maxsnaps, schedule, volumeid, intervaltype, **kwargs):
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
+    @classmethod
+    def create(cls, apiclient, SnapshotPolicyFactory, **kwargs):
         pass

tools/marvin/marvin/integration/lib/base/StaticNat.py

@@ -17,6 +17,10 @@
 from . import CloudStackEntity
 class StaticNat(CloudStackEntity):
 
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
     def enable(self, apiclient, ipaddressid, virtualmachineid, **kwargs):
         pass
 

tools/marvin/marvin/integration/lib/base/StaticRoute.py

@@ -17,10 +17,16 @@
 from . import CloudStackEntity
 class StaticRoute(CloudStackEntity):
 
-    def create(self, apiclient, StaticRouteFactory, gatewayid, cidr, **kwargs):
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
+    @classmethod
+    def create(cls, apiclient, StaticRouteFactory, **kwargs):
         pass
 
-    def list(self, apiclient, **kwargs):
+    @classmethod
+    def list(cls, apiclient, **kwargs):
         pass
 
     def delete(self, apiclient, id, **kwargs):

tools/marvin/marvin/integration/lib/base/StorageMaintenance.py

@@ -17,6 +17,10 @@
 from . import CloudStackEntity
 class StorageMaintenance(CloudStackEntity):
 
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
     def cancel(self, apiclient, id, **kwargs):
         pass
 

tools/marvin/marvin/integration/lib/base/StorageNetworkIpRange.py

@@ -17,10 +17,16 @@
 from . import CloudStackEntity
 class StorageNetworkIpRange(CloudStackEntity):
 
-    def create(self, apiclient, StorageNetworkIpRangeFactory, startip, netmask, gateway, podid, **kwargs):
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
+    @classmethod
+    def create(cls, apiclient, StorageNetworkIpRangeFactory, **kwargs):
         pass
 
-    def list(self, apiclient, **kwargs):
+    @classmethod
+    def list(cls, apiclient, **kwargs):
         pass
 
     def update(self, apiclient, id, **kwargs):

tools/marvin/marvin/integration/lib/base/StoragePool.py

@@ -17,10 +17,16 @@
 from . import CloudStackEntity
 class StoragePool(CloudStackEntity):
 
-    def create(self, apiclient, StoragePoolFactory, url, zoneid, clusterid, name, podid, **kwargs):
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
+    @classmethod
+    def create(cls, apiclient, StoragePoolFactory, **kwargs):
         pass
 
-    def list(self, apiclient, **kwargs):
+    @classmethod
+    def list(cls, apiclient, **kwargs):
         pass
 
     def update(self, apiclient, id, **kwargs):

tools/marvin/marvin/integration/lib/base/SupportedNetworkServices.py

@@ -17,5 +17,10 @@
 from . import CloudStackEntity
 class SupportedNetworkServices(CloudStackEntity):
 
-    def list(self, apiclient, **kwargs):
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
+    @classmethod
+    def list(cls, apiclient, **kwargs):
         pass

tools/marvin/marvin/integration/lib/base/Swift.py

@@ -17,8 +17,13 @@
 from . import CloudStackEntity
 class Swift(CloudStackEntity):
 
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
     def add(self, apiclient, url, **kwargs):
         pass
 
-    def list(self, apiclient, **kwargs):
+    @classmethod
+    def list(cls, apiclient, **kwargs):
         pass

tools/marvin/marvin/integration/lib/base/SystemVm.py

@@ -17,13 +17,18 @@
 from . import CloudStackEntity
 class SystemVm(CloudStackEntity):
 
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
     def migrate(self, apiclient, hostid, virtualmachineid, **kwargs):
         pass
 
     def stop(self, apiclient, id, **kwargs):
         pass
 
-    def list(self, apiclient, **kwargs):
+    @classmethod
+    def list(cls, apiclient, **kwargs):
         pass
 
     def reboot(self, apiclient, id, **kwargs):

tools/marvin/marvin/integration/lib/base/Tags.py

@@ -17,10 +17,16 @@
 from . import CloudStackEntity
 class Tags(CloudStackEntity):
 
-    def create(self, apiclient, TagsFactory, resourcetype, resourceids, tags, **kwargs):
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
+    @classmethod
+    def create(cls, apiclient, TagsFactory, **kwargs):
         pass
 
-    def list(self, apiclient, **kwargs):
+    @classmethod
+    def list(cls, apiclient, **kwargs):
         pass
 
     def delete(self, apiclient, resourcetype, resourceids, **kwargs):

tools/marvin/marvin/integration/lib/base/Template.py

@@ -17,16 +17,22 @@
 from . import CloudStackEntity
 class Template(CloudStackEntity):
 
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
     def prepare(self, apiclient, zoneid, templateid, **kwargs):
         pass
 
-    def create(self, apiclient, TemplateFactory, displaytext, name, ostypeid, **kwargs):
+    @classmethod
+    def create(cls, apiclient, TemplateFactory, **kwargs):
         pass
 
     def register(self, apiclient, name, format, url, hypervisor, zoneid, displaytext, ostypeid, **kwargs):
         pass
 
-    def list(self, apiclient, templatefilter, **kwargs):
+    @classmethod
+    def list(cls, apiclient, **kwargs):
         pass
 
     def update(self, apiclient, id, **kwargs):

tools/marvin/marvin/integration/lib/base/TemplatePermissions.py

@@ -17,7 +17,12 @@
 from . import CloudStackEntity
 class TemplatePermissions(CloudStackEntity):
 
-    def list(self, apiclient, id, **kwargs):
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
+    @classmethod
+    def list(cls, apiclient, **kwargs):
         pass
 
     def update(self, apiclient, id, **kwargs):

tools/marvin/marvin/integration/lib/base/ToLoadBalancerRule.py

@@ -17,5 +17,9 @@
 from . import CloudStackEntity
 class ToLoadBalancerRule(CloudStackEntity):
 
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
     def assign(self, apiclient, id, virtualmachineids, **kwargs):
         pass

tools/marvin/marvin/integration/lib/base/TrafficMonitor.py

@@ -17,10 +17,15 @@
 from . import CloudStackEntity
 class TrafficMonitor(CloudStackEntity):
 
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
     def add(self, apiclient, url, zoneid, **kwargs):
         pass
 
-    def list(self, apiclient, zoneid, **kwargs):
+    @classmethod
+    def list(cls, apiclient, **kwargs):
         pass
 
     def delete(self, apiclient, id, **kwargs):

tools/marvin/marvin/integration/lib/base/TrafficType.py

@@ -17,10 +17,15 @@
 from . import CloudStackEntity
 class TrafficType(CloudStackEntity):
 
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
     def add(self, apiclient, traffictype, physicalnetworkid, **kwargs):
         pass
 
-    def list(self, apiclient, physicalnetworkid, **kwargs):
+    @classmethod
+    def list(cls, apiclient, **kwargs):
         pass
 
     def update(self, apiclient, id, **kwargs):

tools/marvin/marvin/integration/lib/base/TrafficTypeImplementors.py

@@ -17,5 +17,10 @@
 from . import CloudStackEntity
 class TrafficTypeImplementors(CloudStackEntity):
 
-    def list(self, apiclient, **kwargs):
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
+    @classmethod
+    def list(cls, apiclient, **kwargs):
         pass

tools/marvin/marvin/integration/lib/base/UsageRecords.py

@@ -17,7 +17,12 @@
 from . import CloudStackEntity
 class UsageRecords(CloudStackEntity):
 
-    def list(self, apiclient, startdate, enddate, **kwargs):
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
+    @classmethod
+    def list(cls, apiclient, **kwargs):
         pass
 
     def generate(self, apiclient, startdate, enddate, **kwargs):

tools/marvin/marvin/integration/lib/base/UsageTypes.py

@@ -17,5 +17,10 @@
 from . import CloudStackEntity
 class UsageTypes(CloudStackEntity):
 
-    def list(self, apiclient):
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
+    @classmethod
+    def list(cls, apiclient):
         pass

tools/marvin/marvin/integration/lib/base/User.py

@@ -17,6 +17,10 @@
 from . import CloudStackEntity
 class User(CloudStackEntity):
 
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
     def enable(self, apiclient, id, **kwargs):
         pass
 
@@ -26,10 +30,12 @@ class User(CloudStackEntity):
     def lock(self, apiclient, id, **kwargs):
         pass
 
-    def create(self, apiclient, UserFactory, username, account, firstname, lastname, password, email, **kwargs):
+    @classmethod
+    def create(cls, apiclient, UserFactory, **kwargs):
         pass
 
-    def list(self, apiclient, **kwargs):
+    @classmethod
+    def list(cls, apiclient, **kwargs):
         pass
 
     def update(self, apiclient, id, **kwargs):

tools/marvin/marvin/integration/lib/base/UserKeys.py

@@ -17,5 +17,9 @@
 from . import CloudStackEntity
 class UserKeys(CloudStackEntity):
 
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
     def register(self, apiclient, id, **kwargs):
         pass

tools/marvin/marvin/integration/lib/base/VMPassword.py

@@ -17,5 +17,9 @@
 from . import CloudStackEntity
 class VMPassword(CloudStackEntity):
 
+    def __init__(self, items):
+        self.__dict__.update(items)
+
+
     def get(self, apiclient, id, **kwargs):
         pass