Merge remote-tracking branch 'upstream/master' into coding-styles

bt5/erp5_wendelin_data_lake_ingestion/SkinTemplateItem/portal_skins/erp5_wendelin_data_lake/Alarm_dataLakeHandleAnalysis.py

 portal = context.getPortalObject()
-portal.DataLake_stopIngestionList()
-portal.DataLake_createDataAnalysisList()
-portal.DataLake_executeDataAnalysisList()
+portal.ERP5Site_stopIngestionListForDataLake()
+portal.ERP5Site_createDataAnalysisListForDataLake()
+portal.ERP5Site_executeDataAnalysisListForDataLake()

bt5/erp5_wendelin_data_lake_ingestion/SkinTemplateItem/portal_skins/erp5_wendelin_data_lake/ERP5Site_stopIngestionList.xml → bt5/erp5_wendelin_data_lake_ingestion/SkinTemplateItem/portal_skins/erp5_wendelin_data_lake/ERP5Site_createDataAnalysisListForDataLake.xml

@@ -54,7 +54,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>ERP5Site_stopIngestionList</string> </value>
+            <value> <string>ERP5Site_createDataAnalysisListForDataLake</string> </value>
         </item>
       </dictionary>
     </pickle>

bt5/erp5_wendelin_data_lake_ingestion/SkinTemplateItem/portal_skins/erp5_wendelin_data_lake/ERP5Site_executeDataAnalysisList.xml → bt5/erp5_wendelin_data_lake_ingestion/SkinTemplateItem/portal_skins/erp5_wendelin_data_lake/ERP5Site_executeDataAnalysisListForDataLake.xml

@@ -54,7 +54,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>ERP5Site_executeDataAnalysisList</string> </value>
+            <value> <string>ERP5Site_executeDataAnalysisListForDataLake</string> </value>
         </item>
       </dictionary>
     </pickle>

bt5/erp5_wendelin_data_lake_ingestion/SkinTemplateItem/portal_skins/erp5_wendelin_data_lake/ERP5Site_createDataAnalysisList.xml → bt5/erp5_wendelin_data_lake_ingestion/SkinTemplateItem/portal_skins/erp5_wendelin_data_lake/ERP5Site_stopIngestionListForDataLake.xml

@@ -54,7 +54,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>ERP5Site_createDataAnalysisList</string> </value>
+            <value> <string>ERP5Site_stopIngestionListForDataLake</string> </value>
         </item>
       </dictionary>
     </pickle>

bt5/erp5_wendelin_data_lake_ingestion/TestTemplateItem/portal_components/test.erp5.testDataLakeIngestion.py

@@ -181,7 +181,7 @@ class TestDataIngestion(SecurityTestCase):
     self.tic()
 
     # call explicitly alarm so all 4 Data Streams are validated and published
-    self.portal.portal_alarms.wendelin_handle_analysis.Alarm_handleAnalysis()
+    self.portal.portal_alarms.wendelin_data_lake_handle_analysis.Alarm_dataLakeHandleAnalysis()
     self.tic()
 
     # check resulting Data Streams
@@ -306,7 +306,7 @@ class TestDataIngestion(SecurityTestCase):
     self.tic()
 
     # call explicitly alarm to process and validate the ingestion
-    self.portal.portal_alarms.wendelin_handle_analysis.Alarm_handleAnalysis()
+    self.portal.portal_alarms.wendelin_data_lake_handle_analysis.Alarm_dataLakeHandleAnalysis()
     self.tic()
 
     ingestion_reference = self.REF_DATASET + self.REFERENCE_SEPARATOR + reference + self.CSV
@@ -329,9 +329,9 @@ class TestDataIngestion(SecurityTestCase):
       Check all data analysis and data transformations are well configured
     """
     # call two times the alarm (1. create analysis 2. run analysis)
-    self.portal.portal_alarms.wendelin_handle_analysis.Alarm_handleAnalysis()
+    self.portal.portal_alarms.wendelin_data_lake_handle_analysis.Alarm_dataLakeHandleAnalysis()
     self.tic()
-    self.portal.portal_alarms.wendelin_handle_analysis.Alarm_handleAnalysis()
+    self.portal.portal_alarms.wendelin_data_lake_handle_analysis.Alarm_dataLakeHandleAnalysis()
     self.tic()
 
   def test_10_checkDataSetDataStreamRelation(self):

bt5/erp5_wendelin_data_lake_ingestion/TestTemplateItem/portal_components/test.erp5.testDataLakeIngestion.xml

@@ -6,12 +6,6 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_recorded_property_dict</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
-        </item>
         <item>
             <key> <string>default_reference</string> </key>
             <value> <string>testDataLakeIngestion</string> </value>
@@ -45,10 +39,7 @@
         <item>
             <key> <string>text_content_warning_message</string> </key>
             <value>
-              <tuple>
-                <string>W:106, 34: Unused variable \'i\' (unused-variable)</string>
-                <string>W:106, 76: Unused variable \'j\' (unused-variable)</string>
-              </tuple>
+              <tuple/>
             </value>
         </item>
         <item>
@@ -58,28 +49,13 @@
         <item>
             <key> <string>workflow_history</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
             </value>
         </item>
       </dictionary>
     </pickle>
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <global name="PersistentMapping" module="Persistence.mapping"/>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>data</string> </key>
-            <value>
-              <dictionary/>
-            </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
@@ -92,7 +68,7 @@
                 <item>
                     <key> <string>component_validation_workflow</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -101,7 +77,7 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="4" aka="AAAAAAAAAAQ=">
+  <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
     </pickle>