Updated Branches: refs/heads/master 6227ba635 -> 2ba27db0c
CLOUDSTACK 2233: Automation test cases for Add Remove Networks to VM Signed-off-by: Girish Shilamkar <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2ba27db0 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2ba27db0 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2ba27db0 Branch: refs/heads/master Commit: 2ba27db0cea55665acc3344bc31d3931c7545f35 Parents: 6227ba6 Author: Gaurav Aradhye <[email protected]> Authored: Mon Nov 25 13:15:49 2013 +0530 Committer: Girish Shilamkar <[email protected]> Committed: Mon Nov 25 13:15:49 2013 +0530 ---------------------------------------------------------------------- tools/marvin/marvin/integration/lib/base.py | 6 +++++- tools/marvin/setup.py | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2ba27db0/tools/marvin/marvin/integration/lib/base.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/integration/lib/base.py b/tools/marvin/marvin/integration/lib/base.py index b03c552..bce1327 100755 --- a/tools/marvin/marvin/integration/lib/base.py +++ b/tools/marvin/marvin/integration/lib/base.py @@ -530,11 +530,15 @@ class VirtualMachine: cmd.id = volume.id return apiclient.detachVolume(cmd) - def add_nic(self, apiclient, networkId): + def add_nic(self, apiclient, networkId, ipaddress=None): """Add a NIC to a VM""" cmd = addNicToVirtualMachine.addNicToVirtualMachineCmd() cmd.virtualmachineid = self.id cmd.networkid = networkId + + if ipaddress: + cmd.ipaddress = ipaddress + return apiclient.addNicToVirtualMachine(cmd) def remove_nic(self, apiclient, nicId): http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2ba27db0/tools/marvin/setup.py ---------------------------------------------------------------------- diff --git a/tools/marvin/setup.py b/tools/marvin/setup.py index eeed3bf..9ce3951 100644 --- a/tools/marvin/setup.py +++ b/tools/marvin/setup.py @@ -51,7 +51,8 @@ setup(name="Marvin", "mysql-connector-python", "requests", "paramiko", - "nose" + "nose", + "ddt >= 0.4.0" ], py_modules=['marvin.marvinPlugin'], zip_safe=False,
