Merge "Add ability set vm_to_heat_api_insecure parameter"
diff --git a/runtest/salttest/modules/openstack/neutronv2.sls b/runtest/salttest/modules/openstack/neutronv2/init.sls
similarity index 90%
rename from runtest/salttest/modules/openstack/neutronv2.sls
rename to runtest/salttest/modules/openstack/neutronv2/init.sls
index f75854b..7ce3ec2 100644
--- a/runtest/salttest/modules/openstack/neutronv2.sls
+++ b/runtest/salttest/modules/openstack/neutronv2/init.sls
@@ -1,3 +1,6 @@
+include:
+ - runtest.salttest.modules.openstack.neutronv2.routers
+
{%- set neutron_test_network = 'NeutronTestNetwork' %}
{%- set neutron_bulk_test_network = 'NeutronTestBulkNetworks' %}
{%- set neutron_test_subnet = 'NeutronTestSubnet' %}
@@ -136,3 +139,16 @@
- {{ neutron_bulk_test_network }}
- kwargs:
cloud_name: admin_identity
+
+neutronv2_agent_list:
+ module.run:
+ - name: neutronv2.agent_list
+ - kwargs:
+ cloud_name: admin_identity
+
+neutronv2_agent_list_dhcp:
+ module.run:
+ - name: neutronv2.agent_list
+ - kwargs:
+ cloud_name: admin_identity
+ agent_type: "DHCP agent"
diff --git a/runtest/salttest/modules/openstack/neutronv2/routers.sls b/runtest/salttest/modules/openstack/neutronv2/routers.sls
new file mode 100644
index 0000000..a74bf71
--- /dev/null
+++ b/runtest/salttest/modules/openstack/neutronv2/routers.sls
@@ -0,0 +1,41 @@
+{%- set neutron_test_router = 'NeutronTestRouter' %}
+
+neutronv2_router_create:
+ module.run:
+ - name: neutronv2.router_create
+ - kwargs:
+ cloud_name: admin_identity
+ name: {{ neutron_test_router }}
+ admin_state_up: True
+
+neutronv2_router_list:
+ module.run:
+ - name: neutronv2.router_list
+ - kwargs:
+ cloud_name: admin_identity
+
+neutronv2_router_get_details:
+ module.run:
+ - name: neutronv2.router_get_details
+ - args:
+ - {{ neutron_test_router }}
+ - kwargs:
+ cloud_name: admin_identity
+
+neutronv2_router_update:
+ module.run:
+ - name: neutronv2.router_update
+ - args:
+ - {{ neutron_test_router }}
+ - kwargs:
+ cloud_name: admin_identity
+ description: NeutronTestrouterDescription
+ admin_state_up: False
+
+neutronv2_router_delete:
+ module.run:
+ - name: neutronv2.router_delete
+ - args:
+ - {{ neutron_test_router }}
+ - kwargs:
+ cloud_name: admin_identity