Merge remote-tracking branch 'origin/MQE-326-multi-stores' into sprint-develop

Author: jilu1

etc/di.xml

@@ -49,24 +49,6 @@
         </arguments>
     </type>
     <type name="Magento\FunctionalTestingFramework\Util\ModuleResolver\SequenceSorter" />
-    <type name="Magento\FunctionalTestingFramework\Generate\GeneratePage">
-        <arguments>
-            <argument name="configData" xsi:type="object">Magento\FunctionalTestingFramework\Page\Config\Data</argument>
-        </arguments>
-    </type>
-    <type name="Magento\FunctionalTestingFramework\Generate\GenerateBlock">
-        <arguments>
-            <argument name="configData" xsi:type="object">Magento\FunctionalTestingFramework\Block\Config\Data</argument>
-        </arguments>
-    </type>
-    <type name="Magento\FunctionalTestingFramework\Generate\Pool">
-        <arguments>
-            <argument name="pool" xsi:type="array">
-                <item name="page" xsi:type="object">Magento\FunctionalTestingFramework\Generate\GeneratePage</item>
-                <item name="block" xsi:type="object">Magento\FunctionalTestingFramework\Generate\GenerateBlock</item>
-            </argument>
-        </arguments>
-    </type>
     <!--
     Array item can be of any type just like an argument, including array type itself, which creates circular dependency.
     Proxy is used to resolve the circular dependency, so that array items undergo the same interpretation as arguments.
@@ -176,7 +158,7 @@
 
     <!-- Configuration for Data Operation Metadata.xml -->
 
-    <type name="Magento\FunctionalTestingFramework\DataGenerator\Parsers\OperationMetadataParser">
+    <type name="Magento\FunctionalTestingFramework\DataGenerator\Parsers\OperationDefinitionParser">
         <arguments>
             <argument name="metadata" xsi:type="object">Magento\FunctionalTestingFramework\DataProfile\Config\Metadata</argument>
         </arguments>
@@ -198,7 +180,7 @@
             <argument name="schemaLocator" xsi:type="object">Magento\FunctionalTestingFramework\Config\SchemaLocator\Metadata</argument>
             <argument name="idAttributes" xsi:type="array">
                 <item name="/config/operation" xsi:type="string">name</item>
-                <item name="/config/operation/entry" xsi:type="string">key</item>
+                <item name="/config/operation/field" xsi:type="string">key</item>
                 <item name="/config/operation/array" xsi:type="string">key</item>
                 <item name="/config/operation/object" xsi:type="string">key</item>
             </argument>