From 75a6de754890a1a00b957db20494fb364b47525d Mon Sep 17 00:00:00 2001
From: Polina-Gubina <Polina.Gubina@t-systems.com>
Date: Tue, 4 May 2021 16:10:19 +0300
Subject: [PATCH] Some fixes in test

---
 plugins/modules/dns_zone.py                   | 8 ++++----
 tests/integration/targets/dns/tasks/main.yaml | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/plugins/modules/dns_zone.py b/plugins/modules/dns_zone.py
index 60831d3b..0b6d9c8a 100644
--- a/plugins/modules/dns_zone.py
+++ b/plugins/modules/dns_zone.py
@@ -55,12 +55,12 @@
     default: public
   zone_type:
     description:
-       - Zone type: primary or secondary.
+       - Primary or secondary type.
        - This parameter is disabled, it only provides compatibility with openstack.cloud colection.
     choices: [primary, secondary]
     type: str
   masters:
-    description:  
+    description:
        - Master nameservers (only applies if zone_type is secondary).
        - This parameter is disabled, it only provides compatibility with openstack.cloud colection.
     type: list
@@ -149,7 +149,7 @@ def run(self):
         query = {}
 
         if self.params['type'] == 'private':
-            query['type'] = self.params['type']
+            query['zone_type'] = self.params['type']
         query['name_or_id'] = self.params['name']
         query['ignore_missing'] = True
         zo = self.conn.dns.find_zone(**query)
@@ -206,7 +206,7 @@ def run(self):
                             message=('No Router found with name or id: %s' %
                                      self.params['router'])
                         )
-                attrs['type'] = self.params['type']
+                attrs['zone_type'] = self.params['type']
                 if self.params['description']:
                     attrs['description'] = self.params['description']
                 if self.params['email']:
diff --git a/tests/integration/targets/dns/tasks/main.yaml b/tests/integration/targets/dns/tasks/main.yaml
index 9e85bed6..399d8f34 100644
--- a/tests/integration/targets/dns/tasks/main.yaml
+++ b/tests/integration/targets/dns/tasks/main.yaml
@@ -15,9 +15,9 @@
         fl_ip: "{{ fl.floating_ip.floating_ip_address }}"
         ptrdname: "{{ ( prefix + 'dns.com.' ) }}"
         description: "{{ ( prefix + 'description-dns' ) }}"
-        zone_public_name: "{{ ( prefix + '-dnszone.com.' ) }}"
-        zone_private_name: "{{ ( prefix + '-dnszone.com.' ) }}"
-        rs_name: "{{ ( prefix + '-rs.' + prefix + '-dnszone.com.' ) }}"
+        zone_public_name: "{{ ( prefix + '-dnszonepublic.com.' ) }}"
+        zone_private_name: "{{ ( prefix + '-dnszoneprivate.com.' ) }}"
+        rs_name: "{{ ( prefix + '-rs.' + prefix + '-dnszonepublic.com.' ) }}"
         network_name: "{{ ( prefix + '-dnsnetwork' )}}"
         subnet_name: "{{ ( prefix + '-dnssubnet' )}}"
         router_name: "{{ ( prefix + '-dnsrouter' )}}"