From 43c2ecba6a04cc121375a541d817343c33ebe235 Mon Sep 17 00:00:00 2001
From: Sagar Paul <sagpaul@redhat.com>
Date: Tue, 26 Apr 2022 01:18:42 +0530
Subject: updated references of base plugins to netcommon (#232)
updated references of base plugins to netcommon
SUMMARY
Minimum required ansible.netcommon version is 2.5.1
Updated base plugin references to ansible.netcommon
ISSUE TYPE
Feature Pull Request
COMPONENT NAME
ADDITIONAL INFORMATION
Reviewed-by: Nathaniel Case <this.is@nathanielca.se>
---
changelogs/fragments/netcommon_ref_update.yaml | 4 ++++
galaxy.yml | 2 +-
plugins/cliconf/vyos.py | 4 +++-
plugins/terminal/vyos.py | 4 +++-
4 files changed, 11 insertions(+), 3 deletions(-)
create mode 100644 changelogs/fragments/netcommon_ref_update.yaml
diff --git a/changelogs/fragments/netcommon_ref_update.yaml b/changelogs/fragments/netcommon_ref_update.yaml
new file mode 100644
index 00000000..f28c6e18
--- /dev/null
+++ b/changelogs/fragments/netcommon_ref_update.yaml
@@ -0,0 +1,4 @@
+---
+major_changes:
+ - "Minimum required ansible.netcommon version is 2.5.1."
+ - "Updated base plugin references to ansible.netcommon."
diff --git a/galaxy.yml b/galaxy.yml
index ceaed7a3..a51c0db2 100644
--- a/galaxy.yml
+++ b/galaxy.yml
@@ -2,7 +2,7 @@
authors:
- Ansible Network Community (ansible-network)
dependencies:
- "ansible.netcommon": ">=2.0.1"
+ "ansible.netcommon": ">=2.5.1"
license_file: LICENSE
name: vyos
description: Ansible Network Collection for VYOS devices.
diff --git a/plugins/cliconf/vyos.py b/plugins/cliconf/vyos.py
index b1a55b1c..f2064d7c 100644
--- a/plugins/cliconf/vyos.py
+++ b/plugins/cliconf/vyos.py
@@ -54,7 +54,9 @@ from ansible_collections.ansible.netcommon.plugins.module_utils.network.common.c
from ansible_collections.ansible.netcommon.plugins.module_utils.network.common.utils import (
to_list,
)
-from ansible.plugins.cliconf import CliconfBase
+from ansible_collections.ansible.netcommon.plugins.plugin_utils.cliconf_base import (
+ CliconfBase,
+)
class Cliconf(CliconfBase):
diff --git a/plugins/terminal/vyos.py b/plugins/terminal/vyos.py
index 850e5283..ef036ac8 100644
--- a/plugins/terminal/vyos.py
+++ b/plugins/terminal/vyos.py
@@ -23,8 +23,10 @@ __metaclass__ = type
import os
import re
-from ansible.plugins.terminal import TerminalBase
from ansible.errors import AnsibleConnectionFailure
+from ansible_collections.ansible.netcommon.plugins.plugin_utils.terminal_base import (
+ TerminalBase,
+)
class TerminalModule(TerminalBase):
--
cgit v1.2.3