Skip to content

Commit 6b91349

Browse files
brogand93brogand93
committed
Add VPC tests
1 parent 174c798 commit 6b91349

File tree

9 files changed

+679
-4
lines changed

9 files changed

+679
-4
lines changed

‎ec2stack/providers/cloudstack/vpcs.py‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,9 @@ def _create_vpc_request():
3333
@return: Response.
3434
"""
3535
args = {'command': 'createVPC'}
36-
id = uuid.uuid1()
37-
args['name'] = id
38-
args['id'] = id
39-
args['displaytext'] = id
36+
name = uuid.uuid1()
37+
args['name'] = name
38+
args['displaytext'] = name
4039
args['zoneid'] = zones.get_zone(
4140
current_app.config['CLOUDSTACK_DEFAULT_ZONE'])['id']
4241
args['vpcofferingid'] = current_app.config['VPC_OFFERING_ID']

‎tests/controller_tests.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,7 @@ def test_bad_request_on_provider_error(self):
162162
data['Signature'] = generate_signature(data, 'POST', 'localhost', '/')
163163

164164
get = mock.Mock()
165+
get.return_value.text = '{}'
165166
get.return_value.status_code = 401
166167

167168
with mock.patch('requests.get', get):

‎tests/data/create_vpc_invalid_cidr.json‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"createvpcresponse": {
3+
"errorcode": 431,
4+
"uuidlist": [],
5+
"cserrorcode": 4350,
6+
"errortext": "Invalid CIDR specified 192.168.0.2/33"
7+
}
8+
}

‎tests/data/valid_create_vpc.json‎

Lines changed: 112 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,112 @@
1+
{
2+
"queryasyncjobresultresponse": {
3+
"jobprocstatus": 0,
4+
"created": "2014-07-17T20:07:33+0100",
5+
"cmd": "org.apache.cloudstack.api.command.admin.vpc.CreateVPCCmdByAdmin",
6+
"userid": "7c7fae5a-0d1c-11e4-9f4d-080027939f80",
7+
"jobstatus": 1,
8+
"jobid": "24158408-b62e-4592-a236-d1f5d27f0f02",
9+
"jobresultcode": 0,
10+
"jobresulttype": "object",
11+
"jobresult": {
12+
"vpc": {
13+
"account": "admin",
14+
"domainid": "7c7c7604-0d1c-11e4-9f4d-080027939f80",
15+
"name": "9b68e9ac-0de5-11e4-8bc0-080027b0df8c",
16+
"service": [
17+
{
18+
"name": "PortForwarding",
19+
"provider": [
20+
{
21+
"name": "VpcVirtualRouter"
22+
}
23+
]
24+
},
25+
{
26+
"name": "StaticNat",
27+
"provider": [
28+
{
29+
"name": "VpcVirtualRouter"
30+
}
31+
]
32+
},
33+
{
34+
"name": "SourceNat",
35+
"provider": [
36+
{
37+
"name": "VpcVirtualRouter"
38+
}
39+
]
40+
},
41+
{
42+
"name": "UserData",
43+
"provider": [
44+
{
45+
"name": "VpcVirtualRouter"
46+
}
47+
]
48+
},
49+
{
50+
"name": "Dhcp",
51+
"provider": [
52+
{
53+
"name": "VpcVirtualRouter"
54+
}
55+
]
56+
},
57+
{
58+
"name": "NetworkACL",
59+
"provider": [
60+
{
61+
"name": "VpcVirtualRouter"
62+
}
63+
]
64+
},
65+
{
66+
"name": "Dns",
67+
"provider": [
68+
{
69+
"name": "VpcVirtualRouter"
70+
}
71+
]
72+
},
73+
{
74+
"name": "Vpn",
75+
"provider": [
76+
{
77+
"name": "VpcVirtualRouter"
78+
}
79+
]
80+
},
81+
{
82+
"name": "Lb",
83+
"provider": [
84+
{
85+
"name": "VpcVirtualRouter"
86+
},
87+
{
88+
"name": "InternalLbVm"
89+
}
90+
]
91+
}
92+
],
93+
"fordisplay": true,
94+
"id": "af27429e-301c-458c-956b-b67e67c83e34",
95+
"tags": [],
96+
"domain": "ROOT",
97+
"zoneid": "c0d14920-09ae-4943-9717-6ab6c0b52de1",
98+
"regionlevelvpc": false,
99+
"state": "Enabled",
100+
"distributedvpcrouter": false,
101+
"displaytext": "9b68e9ac-0de5-11e4-8bc0-080027b0df8c",
102+
"networkdomain": "cs2sandbox.simulator",
103+
"vpcofferingid": "feef70e6-4d3a-438e-98c4-814527f97850",
104+
"cidr": "192.168.0.2/24",
105+
"zonename": "Sandbox-simulator",
106+
"restartrequired": false,
107+
"network": []
108+
}
109+
},
110+
"accountid": "7c7c8e5a-0d1c-11e4-9f4d-080027939f80"
111+
}
112+
}

‎tests/data/valid_delete_vpc.json‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"queryasyncjobresultresponse": {
3+
"jobprocstatus": 0,
4+
"created": "2014-07-17T20:13:24+0100",
5+
"cmd": "org.apache.cloudstack.api.command.user.vpc.DeleteVPCCmd",
6+
"userid": "7c7fae5a-0d1c-11e4-9f4d-080027939f80",
7+
"jobstatus": 1,
8+
"jobid": "fa5b1c82-a52c-4d03-947e-3f371e8e02ad",
9+
"jobresultcode": 0,
10+
"jobresulttype": "object",
11+
"jobresult": {
12+
"success": true
13+
},
14+
"accountid": "7c7c8e5a-0d1c-11e4-9f4d-080027939f80"
15+
}
16+
}

‎tests/data/valid_describe_vpc.json‎

Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
{
2+
"listvpcsresponse": {
3+
"count": 3,
4+
"vpc": [
5+
{
6+
"account": "admin",
7+
"domainid": "7c7c7604-0d1c-11e4-9f4d-080027939f80",
8+
"name": "examplevpc",
9+
"service": [
10+
{
11+
"name": "PortForwarding",
12+
"provider": [
13+
{
14+
"name": "VpcVirtualRouter"
15+
}
16+
]
17+
},
18+
{
19+
"name": "StaticNat",
20+
"provider": [
21+
{
22+
"name": "VpcVirtualRouter"
23+
}
24+
]
25+
},
26+
{
27+
"name": "SourceNat",
28+
"provider": [
29+
{
30+
"name": "VpcVirtualRouter"
31+
}
32+
]
33+
},
34+
{
35+
"name": "UserData",
36+
"provider": [
37+
{
38+
"name": "VpcVirtualRouter"
39+
}
40+
]
41+
},
42+
{
43+
"name": "Dhcp",
44+
"provider": [
45+
{
46+
"name": "VpcVirtualRouter"
47+
}
48+
]
49+
},
50+
{
51+
"name": "NetworkACL",
52+
"provider": [
53+
{
54+
"name": "VpcVirtualRouter"
55+
}
56+
]
57+
},
58+
{
59+
"name": "Dns",
60+
"provider": [
61+
{
62+
"name": "VpcVirtualRouter"
63+
}
64+
]
65+
},
66+
{
67+
"name": "Vpn",
68+
"provider": [
69+
{
70+
"name": "VpcVirtualRouter"
71+
}
72+
]
73+
},
74+
{
75+
"name": "Lb",
76+
"provider": [
77+
{
78+
"name": "VpcVirtualRouter"
79+
},
80+
{
81+
"name": "InternalLbVm"
82+
}
83+
]
84+
}
85+
],
86+
"fordisplay": true,
87+
"id": "examplevpc",
88+
"tags": [],
89+
"domain": "ROOT",
90+
"zoneid": "c0d14920-09ae-4943-9717-6ab6c0b52de1",
91+
"regionlevelvpc": false,
92+
"state": "Enabled",
93+
"distributedvpcrouter": false,
94+
"displaytext": "9b68e9ac-0de5-11e4-8bc0-080027b0df8c",
95+
"networkdomain": "cs2sandbox.simulator",
96+
"vpcofferingid": "feef70e6-4d3a-438e-98c4-814527f97850",
97+
"cidr": "192.168.0.2/24",
98+
"zonename": "Sandbox-simulator",
99+
"restartrequired": false,
100+
"network": []
101+
}
102+
]
103+
}
104+
}

0 commit comments

Comments
 (0)