Re: Review Request 22554: CLOUDSTACK-6909 - fix marvin's handling of SMB credentials for storage
---
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/22554/#review48858
---
Commit 2fdf789a28ce01571eabd5ccb8edfea72624ea3c in cloudstack's branch
refs/heads/4.4 from John Dilley
[ https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;h=2fdf789 ]
CLOUDSTACK-6909 - fix marvin's handling of SMB credentials for storage
Signed-off-by: Daan Hoogland d...@onecht.net
(cherry picked from commit 477a812a6f7aaab74122c11488713f417dfe4d89)
(cherry picked from commit 2498f65683bd529b2b03bac9a6cfd2fdbf65aca2)
- ASF Subversion and Git Services
On June 23, 2014, 3:53 p.m., John Dilley wrote:
---
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/22554/
---
(Updated June 23, 2014, 3:53 p.m.)
Review request for cloudstack and Santhosh Edukulla.
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/configGenerator.py 191f08e
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
}
]
}
Re: Review Request 22554: CLOUDSTACK-6909 - fix marvin's handling of SMB credentials for storage
On 25/06/14 11:30 pm, Daan Hoogland daan.hoogl...@gmail.com wrote: On Wed, Jun 25, 2014 at 7:58 PM, Santhosh Edukulla santhosh.eduku...@citrix.com wrote: ... Team uses 4.4-forward marvin to test the changes. You should really not test 4.4-forward, but 4.4! It is mainly about testing and fixing the Marvin framework. Didn¹t want to interfere with the current release. -abhi
Re: Review Request 22554: CLOUDSTACK-6909 - fix marvin's handling of SMB credentials for storage
if it is test code it will hardly interfere with the release, If it does it is extra important to know about it early. The only reason to not put them in the 4.4 branch is because you don't want them in the 4.4.0 release. On Thu, Jun 26, 2014 at 1:33 PM, Abhinandan Prateek abhinandan.prat...@citrix.com wrote: On 25/06/14 11:30 pm, Daan Hoogland daan.hoogl...@gmail.com wrote: On Wed, Jun 25, 2014 at 7:58 PM, Santhosh Edukulla santhosh.eduku...@citrix.com wrote: ... Team uses 4.4-forward marvin to test the changes. You should really not test 4.4-forward, but 4.4! It is mainly about testing and fixing the Marvin framework. Didn¹t want to interfere with the current release. -abhi -- Daan
Re: Review Request 22554: CLOUDSTACK-6909 - fix marvin's handling of SMB credentials for storage
+1! I’ve been slowly trying to figure out which part of the public marvin test infrastructure we can run against our test infrastructure (and then, later on, add our own tests to the public set…). Having some kind of a defined set of “these tests belong with and pass against 4.4.0 (in the citrix QA environment)” would be a _huge_ help. Cheers, Leo On 6/26/14, 3:21 PM, Daan Hoogland daan.hoogl...@gmail.com wrote: if it is test code it will hardly interfere with the release, If it does it is extra important to know about it early. The only reason to not put them in the 4.4 branch is because you don't want them in the 4.4.0 release. On Thu, Jun 26, 2014 at 1:33 PM, Abhinandan Prateek abhinandan.prat...@citrix.com wrote: On 25/06/14 11:30 pm, Daan Hoogland daan.hoogl...@gmail.com wrote: On Wed, Jun 25, 2014 at 7:58 PM, Santhosh Edukulla santhosh.eduku...@citrix.com wrote: ... Team uses 4.4-forward marvin to test the changes. You should really not test 4.4-forward, but 4.4! It is mainly about testing and fixing the Marvin framework. Didn¹t want to interfere with the current release. -abhi -- Daan
Re: Review Request 22554: CLOUDSTACK-6909 - fix marvin's handling of SMB credentials for storage
On June 24, 2014, 5:27 a.m., Santhosh Edukulla wrote:
tools/marvin/marvin/configGenerator.py, line 216
https://reviews.apache.org/r/22554/diff/3/?file=615070#file615070line216
All looks good now, please do a dry run on both master and 4.4-forward
i.e., deploy a datacenter atleast on simulator before pushing the changes?
Tested on 4.4-forward and master - please push this patch to both branches.
Thanks,
John
- John
---
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/22554/#review46495
---
On June 23, 2014, 3:53 p.m., John Dilley wrote:
---
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/22554/
---
(Updated June 23, 2014, 3:53 p.m.)
Review request for cloudstack and Santhosh Edukulla.
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/configGenerator.py 191f08e
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
Re: Review Request 22554: CLOUDSTACK-6909 - fix marvin's handling of SMB credentials for storage
---
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/22554/#review46635
---
Ship it!
Ship It!
- Santhosh Edukulla
On June 23, 2014, 3:53 p.m., John Dilley wrote:
---
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/22554/
---
(Updated June 23, 2014, 3:53 p.m.)
Review request for cloudstack and Santhosh Edukulla.
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/configGenerator.py 191f08e
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
Re: Review Request 22554: CLOUDSTACK-6909 - fix marvin's handling of SMB credentials for storage
---
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/22554/#review46656
---
Commit 477a812a6f7aaab74122c11488713f417dfe4d89 in cloudstack's branch
refs/heads/master from John Dilley
[ https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;h=477a812 ]
CLOUDSTACK-6909 - fix marvin's handling of SMB credentials for storage
Signed-off-by: Daan Hoogland d...@onecht.net
- ASF Subversion and Git Services
On June 23, 2014, 3:53 p.m., John Dilley wrote:
---
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/22554/
---
(Updated June 23, 2014, 3:53 p.m.)
Review request for cloudstack and Santhosh Edukulla.
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/configGenerator.py 191f08e
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
Re: Review Request 22554: CLOUDSTACK-6909 - fix marvin's handling of SMB credentials for storage
---
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/22554/#review46657
---
Ship it!
477a812a6f7aaab74122c11488713f417dfe4d89 on master
2498f65683bd529b2b03bac9a6cfd2fdbf65aca2 on 4.4-forward
doesn't apply cleanly on 4.4
- daan Hoogland
On June 23, 2014, 3:53 p.m., John Dilley wrote:
---
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/22554/
---
(Updated June 23, 2014, 3:53 p.m.)
Review request for cloudstack and Santhosh Edukulla.
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/configGenerator.py 191f08e
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
Re: Review Request 22554: CLOUDSTACK-6909 - fix marvin's handling of SMB credentials for storage
---
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/22554/#review46658
---
Commit 2498f65683bd529b2b03bac9a6cfd2fdbf65aca2 in cloudstack's branch
refs/heads/4.4-forward from John Dilley
[ https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;h=2498f65 ]
CLOUDSTACK-6909 - fix marvin's handling of SMB credentials for storage
Signed-off-by: Daan Hoogland d...@onecht.net
(cherry picked from commit 477a812a6f7aaab74122c11488713f417dfe4d89)
- ASF Subversion and Git Services
On June 23, 2014, 3:53 p.m., John Dilley wrote:
---
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/22554/
---
(Updated June 23, 2014, 3:53 p.m.)
Review request for cloudstack and Santhosh Edukulla.
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/configGenerator.py 191f08e
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
Re: Review Request 22554: CLOUDSTACK-6909 - fix marvin's handling of SMB credentials for storage
On Wed, Jun 25, 2014 at 7:58 PM, Santhosh Edukulla santhosh.eduku...@citrix.com wrote: ... Team uses 4.4-forward marvin to test the changes. You should really not test 4.4-forward, but 4.4! -- Daan
Re: Review Request 22554: CLOUDSTACK-6909 - fix marvin's handling of SMB credentials for storage
---
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/22554/
---
(Updated June 23, 2014, 3:53 p.m.)
Review request for cloudstack and Santhosh Edukulla.
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/configGenerator.py 191f08e
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
Re: Review Request 22554: CLOUDSTACK-6909 - fix marvin's handling of SMB credentials for storage
---
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/22554/
---
(Updated June 23, 2014, 3:52 p.m.)
Review request for cloudstack.
Changes
---
- Added details to primarystorage in configGenerator.py
- Updated details in primary storage to take a single dictionary, then format
it into a list afterwards
- Used lower case comparisons
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 (updated)
-
tools/marvin/marvin/configGenerator.py 191f08e
tools/marvin/marvin/deployDataCenter.py 22b78ab
Diff: https://reviews.apache.org/r/22554/diff/
Testing (updated)
---
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
Re: Review Request 22554: CLOUDSTACK-6909 - fix marvin's handling of SMB credentials for storage
---
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/22554/#review46495
---
tools/marvin/marvin/configGenerator.py
https://reviews.apache.org/r/22554/#comment81888
All looks good now, please do a dry run on both master and 4.4-forward
i.e., deploy a datacenter atleast on simulator before pushing the changes?
- Santhosh Edukulla
On June 23, 2014, 3:53 p.m., John Dilley wrote:
---
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/22554/
---
(Updated June 23, 2014, 3:53 p.m.)
Review request for cloudstack and Santhosh Edukulla.
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/configGenerator.py 191f08e
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
Re: Review Request 22554: CLOUDSTACK-6909 - fix marvin's handling of SMB credentials for storage
---
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
}
],
Re: Review Request 22554: CLOUDSTACK-6909 - fix marvin's handling of SMB credentials for storage
On June 17, 2014, 5:43 a.m., Santhosh Edukulla wrote:
tools/marvin/marvin/deployDataCenter.py, line 240
https://reviews.apache.org/r/22554/diff/2/?file=609404#file609404line240
Why specifically this?
Because primary.details is a JSONLoader class and primarycmd needs a
dictionary. This converts between them.
- John
---
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/22554/#review45910
---
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
}
]
}
Re: Review Request 22554: CLOUDSTACK-6909 - fix marvin's handling of SMB credentials for storage
---
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/22554/#review45910
---
tools/marvin/marvin/deployDataCenter.py
https://reviews.apache.org/r/22554/#comment81026
Why specifically this?
- 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
Review Request 22554: CLOUDSTACK-6909 - fix marvin's handling of SMB credentials for storage
---
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/22554/
---
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
Re: Review Request 22554: CLOUDSTACK-6909 - fix marvin's handling of SMB credentials for storage
---
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/22554/#review45598
---
tools/marvin/marvin/deployDataCenter.py
https://reviews.apache.org/r/22554/#comment80484
Just use in instead
- Santhosh Edukulla
On June 13, 2014, 9:17 a.m., John Dilley wrote:
---
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/22554/
---
(Updated June 13, 2014, 9:17 a.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
Re: Review Request 22554: CLOUDSTACK-6909 - fix marvin's handling of SMB credentials for storage
---
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.
Changes
---
Updated diff with Santhosh's comments
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 (updated)
-
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
