----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/22554/#review46363 -----------------------------------------------------------
tools/marvin/marvin/deployDataCenter.py <https://reviews.apache.org/r/22554/#comment81701> Why we need to have multiple dictionaries for details in config, look for details option under secondary storage json object. We can have a similar details structure here for primary storage as well. tools/marvin/marvin/deployDataCenter.py <https://reviews.apache.org/r/22554/#comment81702> There is no details structure equivalent mentioned under configGenerator.py, please check. It can be dynamically added, but its good to provide the class declaration as per config. Check secondary storage class and respective details. tools/marvin/marvin/deployDataCenter.py <https://reviews.apache.org/r/22554/#comment81700> Do a lower() comparison, it will help even otherwise with different cases. - Santhosh Edukulla On June 13, 2014, 4:53 p.m., John Dilley wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/22554/ > ----------------------------------------------------------- > > (Updated June 13, 2014, 4:53 p.m.) > > > Review request for cloudstack. > > > Bugs: CLOUDSTACK-6909 > https://issues.apache.org/jira/browse/CLOUDSTACK-6909 > > > Repository: cloudstack-git > > > Description > ------- > > Fix marvin's handling of details field for primary and secondary storage to > cope with SMB credentials. This allows Hyper-V to work. > > > Diffs > ----- > > tools/marvin/marvin/deployDataCenter.py 22b78ab > > Diff: https://reviews.apache.org/r/22554/diff/ > > > Testing > ------- > > Tested deploydataCenter with this JSON: > > { > "dbSvr":{ > "dbSvr":"10.220.137.39", > "passwd":"cloud", > "db":"cloud", > "port":3306, > "user":"cloud" > }, > "zones":[ > { > "name":"XenRT-Zone-0", > "guestcidraddress":"192.168.200.0/24", > "dns1":"10.220.160.11", > "physical_networks":[ > { > "XRT_VLANRangeSize":10, > "name":"AdvPhyNetwork", > "providers":[ > { > "broadcastdomainrange":"ZONE", > "name":"VirtualRouter" > }, > { > "broadcastdomainrange":"ZONE", > "name":"VpcVirtualRouter" > }, > { > "broadcastdomainrange":"ZONE", > "name":"InternalLbVm" > } > ], > "broadcastdomainrange":"Zone", > "vlan":"3000-3009", > "traffictypes":[ > { > "typ":"Guest" > }, > { > "typ":"Management" > }, > { > "typ":"Public" > } > ], > "isolationmethods":[ > "VLAN" > ] > } > ], > "ipranges":[ > { > "startip":"10.220.164.0", > "endip":"10.220.164.9", > "netmask":"255.255.240.0", > "XRT_GuestIPRangeSize":10, > "gateway":"10.220.160.1" > } > ], > "networktype":"Advanced", > "pods":[ > { > "XRT_PodIPRangeSize":10, > "name":"XenRT-Zone-0-Pod-0", > "endip":"10.220.164.39", > "startip":"10.220.164.30", > "netmask":"255.255.240.0", > "clusters":[ > { > "XRT_HyperVHostIds":"0", > "clustername":"XenRT-Zone-0-Pod-0-Cluster-0", > "hypervisor":"hyperv", > "primaryStorages":[ > { > "url":"cifs://10.220.163.45/storage/primary", > "name":"XenRT-Zone-0-Pod-0-Primary-Store", > "details":[ > { > "user":"Administrator" > }, > { > "password":"xenroot01T" > }, > { > "domain":"XSQA" > } > ] > } > ], > "clustertype":"CloudManaged", > "hosts":[ > { > "url":"http://10.220.163.45";, > "username":"root", > "password":"xenroot" > } > ], > "XRT_Hosts":1 > } > ], > "gateway":"10.220.160.1" > } > ], > "internaldns1":"10.220.160.11", > "secondaryStorages":[ > { > "url":"cifs://10.220.163.45/storage/secondary", > "details":{ > "domain":"XSQA", > "password":"xenroot01T", > "user":"Administrator" > }, > "provider":"SMB" > } > ] > } > ], > "mgtSvr":[ > { > "mgtSvrIp":"10.220.137.39", > "passwd":"xenroot", > "port":8096, > "user":"root" > } > ] > } > > > Thanks, > > John Dilley > >
