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

Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Sebastien Goasguen 2013-12-16 10:24:13 +01:00
parent 9a707a92c5 75f4f55c35
commit 09a45d402e
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/integration/component/test_egress_fw_rules.py
View File

@ -35,7 +35,8 @@ from marvin.integration.lib.common import (get_domain,
rebootRouter,
list_routers,
wait_for_cleanup,
cleanup_resources)
cleanup_resources,
list_virtual_machines)
from marvin.cloudstackAPI.createEgressFirewallRule import createEgressFirewallRuleCmd
from marvin.cloudstackAPI.deleteEgressFirewallRule import deleteEgressFirewallRuleCmd