From 7fa84e8ec7a384b68bf57e1664cbb05436c10bdf Mon Sep 17 00:00:00 2001 From: "patchback[bot]" <45432694+patchback[bot]@users.noreply.github.com> Date: Fri, 29 Sep 2023 12:59:04 +0200 Subject: [PATCH] [PR #7323/53978b74 backport][stable-7] nmap: fix get_option calls (#7329) nmap: fix get_option calls (#7323) Fix get_option calls. (cherry picked from commit 53978b7440f965aae8dede12899d1dc6761e3402) Co-authored-by: Felix Fontein --- changelogs/fragments/7323-nmap.yml | 2 ++ plugins/inventory/nmap.py | 30 +++++++++++++++--------------- 2 files changed, 17 insertions(+), 15 deletions(-) create mode 100644 changelogs/fragments/7323-nmap.yml diff --git a/changelogs/fragments/7323-nmap.yml b/changelogs/fragments/7323-nmap.yml new file mode 100644 index 0000000000..763a990650 --- /dev/null +++ b/changelogs/fragments/7323-nmap.yml @@ -0,0 +1,2 @@ +bugfixes: + - "nmap inventory plugin - fix ``get_option`` calls (https://github.com/ansible-collections/community.general/pull/7323)." diff --git a/plugins/inventory/nmap.py b/plugins/inventory/nmap.py index 2c96850202..7fa92ae979 100644 --- a/plugins/inventory/nmap.py +++ b/plugins/inventory/nmap.py @@ -201,43 +201,43 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable): # setup command cmd = [self._nmap] - if self.get_option['sudo']: + if self.get_option('sudo'): cmd.insert(0, 'sudo') - if self.get_option['port']: + if self.get_option('port'): cmd.append('-p') - cmd.append(self.get_option['port']) + cmd.append(self.get_option('port')) - if not self.get_option['ports']: + if not self.get_option('ports'): cmd.append('-sP') - if self.get_option['ipv4'] and not self.get_option['ipv6']: + if self.get_option('ipv4') and not self.get_option('ipv6'): cmd.append('-4') - elif self.get_option['ipv6'] and not self.get_option['ipv4']: + elif self.get_option('ipv6') and not self.get_option('ipv4'): cmd.append('-6') - elif not self.get_option['ipv6'] and not self.get_option['ipv4']: + elif not self.get_option('ipv6') and not self.get_option('ipv4'): raise AnsibleParserError('One of ipv4 or ipv6 must be enabled for this plugin') - if self.get_option['exclude']: + if self.get_option('exclude'): cmd.append('--exclude') - cmd.append(','.join(self.get_option['exclude'])) + cmd.append(','.join(self.get_option('exclude'))) - if self.get_option['dns_resolve']: + if self.get_option('dns_resolve'): cmd.append('-n') - if self.get_option['udp_scan']: + if self.get_option('udp_scan'): cmd.append('-sU') - if self.get_option['icmp_timestamp']: + if self.get_option('icmp_timestamp'): cmd.append('-PP') - if self.get_option['open']: + if self.get_option('open'): cmd.append('--open') - if not self.get_option['use_arp_ping']: + if not self.get_option('use_arp_ping'): cmd.append('--disable-arp-ping') - cmd.append(self.get_option['address']) + cmd.append(self.get_option('address')) try: # execute p = Popen(cmd, stdout=PIPE, stderr=PIPE)