etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.5' 

* 4.5:
  CLOUDSTACK-7355 - test_netscaler_configs.py uses hardcoded NetScaler credentials
This commit is contained in:
SrikanteswaraRao Talluri 2014-11-14 16:58:31 +05:30
parent 0fd5475593 3609f60447
commit 44663a868b
2 changed files with 399 additions and 1046 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1435
test/integration/component/test_netscaler_configs.py
View File

File diff suppressed because it is too large Load Diff

10
tools/marvin/marvin/config/test_data.py
View File

@ -304,9 +304,13 @@ test_data = {
"lbdevicecapacity": 2,
"port": 22
},
"network_without_acl": {
"name": "TestNetwork",
"displaytext": "TestNetwork",
"netscaler_network": {
"name": "Netscaler",
"displaytext": "Netscaler",
},
"network_without_acl": {
"name": "TestNetwork",
"displaytext": "TestNetwork",
},
"virtual_machine": {
"displayname": "Test VM",