Yeah - it needs to be deleted. Could you please do that? Marvin is where all the bug fixes, patches and packaging changes go in in the future.
Thanks Jason for the patch! ----- Original Message ----- From: Edison Su Sent: Friday, June 22, 2012 10:55 PM To: cloudstack-dev@incubator.apache.org <cloudstack-dev@incubator.apache.org>; 'jason.bausew...@tier3.com' <jason.bausew...@tier3.com> Cc: Prasanna Santhanam Subject: RE: patch for python test client configGenerator.py Applied, thanks! Prasanna, do we still need tools/testClient folder? Seems you already copy the code to tools/marvin/marvin. > -----Original Message----- > From: Jason Bausewein [mailto:jason.bausew...@tier3.com] > Sent: Friday, June 22, 2012 9:59 AM > To: cloudstack-dev@incubator.apache.org > Subject: patch for python test client configGenerator.py > > I have a small patch for the configGenerator.py in the test client. I > needed to change the case in the sim url so the SimulatorDiscover will > detect the simulator hosts. > > Thanks, > Jason > > diff --git a/tools/testClient/configGenerator.py > b/tools/testClient/configGenerator.py > index a5bf0ea..52373bf 100644 > --- a/tools/testClient/configGenerator.py > +++ b/tools/testClient/configGenerator.py > @@ -198,8 +198,8 @@ def describe_setup_in_basic_mode(): > h.password = "password" > memory = 8*1024*1024*1024 > localstorage=1*1024*1024*1024*1024 > - #h.url = > "http://Sim/%d%d%d%d/cpucore=1&cpuspeed=8000&memory=%d&localstorage=%d"; > %(l,i,j,k,memory,localstorage) > - h.url = "http://Sim/%d%d%d%d"%(l,i,j,k) > + #h.url = > "http://sim/%d%d%d%d/cpucore=1&cpuspeed=8000&memory=%d&localstorage=%d"; > %(l,i,j,k,memory,localstorage) > + h.url = "http://sim/%d%d%d%d"%(l,i,j,k) > c.hosts.append(h) > > '''add 2 primary storages''' > @@ -297,8 +297,8 @@ def describe_setup_in_advanced_mode(): > h.password = "password" > memory = 8*1024*1024*1024 > localstorage=1*1024*1024*1024*1024 > - #h.url = > "http://Sim/%d%d%d%d/cpucore=1&cpuspeed=8000&memory=%d&localstorage=%d"; > %(l,i,j,k,memory,localstorage) > - h.url = "http://Sim/%d%d%d%d"%(l,i,j,k) > + #h.url = > "http://sim/%d%d%d%d/cpucore=1&cpuspeed=8000&memory=%d&localstorage=%d"; > %(l,i,j,k,memory,localstorage) > + h.url = "http://sim/%d%d%d%d"%(l,i,j,k) > c.hosts.append(h) > > '''add 2 primary storages''' >
