_gather_config: update config.json billing_provider_params *before* it gets saved to tarball (#217)

Issue: AAP-54267

Author: himdel

metrics_utility/automation_controller_billing/collector.py

@@ -66,13 +66,6 @@ def gather(self, dest=None, subset=None, since=None, until=None, billing_provide
 
             self._gather_json_collections()
 
-            # Extend the config collection to contain billing specific info:
-            config_collection = self.collections['config']
-            data = json.loads(config_collection.data)
-            data['billing_provider_params'] = billing_provider_params
-            config_collection._save_gathering(data)
-            # End of extension
-
             self._gather_csv_collections()
 
             self._process_packages()
@@ -83,6 +76,18 @@ def gather(self, dest=None, subset=None, since=None, until=None, billing_provide
 
             return self.all_tar_paths()
 
+    def _gather_config(self):
+        if not super()._gather_config():
+            return False
+
+        # Extend the config collection to contain billing specific info:
+        config_collection = self.collections['config']
+        data = json.loads(config_collection.data)
+        data['billing_provider_params'] = self.billing_provider_params
+        config_collection._save_gathering(data)
+
+        return True
+
     def _is_valid_license(self):
         # TODO: which license to check? Any license will do?
         return True