Sync bitbucket and Github

ansible_collections/netapp/elementsw/CHANGELOG.rst

@@ -5,6 +5,15 @@ NetApp ElementSW Collection Release Notes
 .. contents:: Topics
 
 
+v20.9.1
+=======
+
+Bugfixes
+--------
+
+- na_elementsw_node - improve error reporting when cluster name cannot be set because node is already active.
+- na_elementsw_schedule - missing imports TimeIntervalFrequency, Schedule, ScheduleInfo have been added back
+
 v20.9.0
 =======
 

ansible_collections/netapp/elementsw/README.md

@@ -19,10 +19,11 @@ Join our Slack Channel at [Netapp.io](http://netapp.io/slack)
 
 #Release Notes
 
-## 20.10.0
+## 20.9.1
 
 ### Bug Fixes
 - na_elementsw_node: improve error reporting when cluster name cannot be set because node is already active.
+- na_elementsw_schedule - missing imports TimeIntervalFrequency, Schedule, ScheduleInfo have been added back
 
 ## 20.9.0
 

ansible_collections/netapp/elementsw/changelogs/changelog.yaml

@@ -147,3 +147,14 @@ releases:
       name: na_elementsw_qos_policy
       namespace: ''
     release_date: '2020-09-02'
+  20.9.1:
+    changes:
+      bugfixes:
+      - na_elementsw_node - improve error reporting when cluster name cannot be set
+        because node is already active.
+      - na_elementsw_schedule - missing imports TimeIntervalFrequency, Schedule, ScheduleInfo
+        have been added back
+    fragments:
+    - DEVOPS-3174.yaml
+    - DEVOPS-3188.yaml
+    release_date: '2020-09-08'

ansible_collections/netapp/elementsw/changelogs/fragments/DEVOPS-3188.yaml

@@ -0,0 +1,2 @@
+bugfixes:
+  - na_elementsw_schedule - missing imports TimeIntervalFrequency, Schedule, ScheduleInfo have been added back

ansible_collections/netapp/elementsw/galaxy.yml

@@ -1,6 +1,6 @@
 namespace: "netapp"
 name: "elementsw"
-version: "20.10.0"
+version: "20.9.1"
 authors:
     - "NetApp Ansible Team <ng-ansibleteam@netapp.com>"
 license: "GPL-2.0-or-later"

ansible_collections/netapp/elementsw/plugins/module_utils/netapp.py

@@ -53,7 +53,7 @@
 except ImportError:
     HAS_SF_SDK = False
 
-COLLECTION_VERSION = "20.10.0"
+COLLECTION_VERSION = "20.9.1"
 
 
 def has_sf_sdk():

ansible_collections/netapp/elementsw/plugins/modules/na_elementsw_snapshot_schedule.py

@@ -188,6 +188,8 @@
 try:
     from solidfire.custom.models import DaysOfWeekFrequency, Weekday, DaysOfMonthFrequency
     from solidfire.common import ApiServerError
+    from solidfire.custom.models import TimeIntervalFrequency
+    from solidfire.models import Schedule, ScheduleInfo
 except ImportError:
     HAS_SF_SDK = False
 
@@ -369,7 +371,7 @@ def get_frequency(self):
                 params['minutes'] = self.time_interval_minutes
             if not params or sum(params.values()) == 0:
                 self.module.fail_json(msg='Specify at least one non zero value with TimeIntervalFrequency.')
-            frequency = netapp_utils.TimeIntervalFrequency(**params)
+            frequency = TimeIntervalFrequency(**params)
         return frequency
 
     def is_same_schedule_type(self, schedule_detail):
@@ -388,13 +390,13 @@ def create_schedule(self):
 
             # Create schedule
             name = self.name
-            schedule_info = netapp_utils.ScheduleInfo(
+            schedule_info = ScheduleInfo(
                 volume_ids=self.volumes,
                 snapshot_name=self.snapshot_name,
                 retention=self.retention
             )
 
-            sched = netapp_utils.Schedule(schedule_info, name, frequency)
+            sched = Schedule(schedule_info, name, frequency)
             sched.paused = self.paused
             sched.recurring = self.recurring
             sched.starting_date = self.starting_date