AC-9138::Fedex Ship API upgrade from SOAP to REST - Fix Integration Test

Author: Atul-glo35265

app/code/Magento/Fedex/Model/Carrier.php

@@ -930,8 +930,8 @@ public function getTracking($trackings) : \Magento\Shipping\Model\Tracking\Resul
      */
     protected function _getUrl($endpoint = null) : string
     {
-        $url = $this->getConfigFlag('rest_sandbox_mode') ? $this->getConfigData('rest_sandbox_webservices_url')
-            : $this->getConfigData('rest_production_webservices_url');
+        $url = $this->getConfigFlag('sandbox_mode') ? $this->getConfigData('sandbox_webservices_url')
+            : $this->getConfigData('production_webservices_url');
 
         return $endpoint ? $url  . $endpoint : $url;
     }

app/code/Magento/Fedex/etc/adminhtml/system.xml

@@ -45,22 +45,22 @@
                     <label>Secret Key</label>
                     <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
                 </field>
-                <field id="rest_sandbox_mode" translate="label" type="select" sortOrder="70" showInDefault="1" showInWebsite="1" canRestore="1">
+                <field id="sandbox_mode" translate="label" type="select" sortOrder="70" showInDefault="1" showInWebsite="1" canRestore="1">
                     <label>Sandbox Mode</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
-                <field id="rest_production_webservices_url" translate="label" type="text" sortOrder="80" showInDefault="1" showInWebsite="1" canRestore="1">
+                <field id="production_webservices_url" translate="label" type="text" sortOrder="80" showInDefault="1" showInWebsite="1" canRestore="1">
                     <label>Web-Services URL (Production)</label>
                     <backend_model>Magento\Fedex\Model\Config\Backend\FedexUrl</backend_model>
                     <depends>
-                        <field id="rest_sandbox_mode">0</field>
+                        <field id="sandbox_mode">0</field>
                     </depends>
                 </field>
-                <field id="rest_sandbox_webservices_url" translate="label" type="text" sortOrder="90" showInDefault="1" showInWebsite="1" canRestore="1">
+                <field id="sandbox_webservices_url" translate="label" type="text" sortOrder="90" showInDefault="1" showInWebsite="1" canRestore="1">
                     <label>Web-Services URL (Sandbox)</label>
                     <backend_model>Magento\Fedex\Model\Config\Backend\FedexUrl</backend_model>
                     <depends>
-                        <field id="rest_sandbox_mode">1</field>
+                        <field id="sandbox_mode">1</field>
                     </depends>
                 </field>
                 <field id="pickup_type" translate="label" type="select" sortOrder="100" showInDefault="1" showInWebsite="1" canRestore="1">

app/code/Magento/Fedex/etc/config.xml

@@ -26,9 +26,9 @@
                 <account backend_model="Magento\Config\Model\Config\Backend\Encrypted" />
                 <api_key backend_model="Magento\Config\Model\Config\Backend\Encrypted" />
                 <secret_key backend_model="Magento\Config\Model\Config\Backend\Encrypted" />
-                <rest_sandbox_mode>0</rest_sandbox_mode>
-                <rest_production_webservices_url><![CDATA[https://apis.fedex.com/]]></rest_production_webservices_url>
-                <rest_sandbox_webservices_url><![CDATA[https://apis-sandbox.fedex.com/]]></rest_sandbox_webservices_url>
+                <sandbox_mode>0</sandbox_mode>
+                <production_webservices_url><![CDATA[https://apis.fedex.com/]]></production_webservices_url>
+                <sandbox_webservices_url><![CDATA[https://apis-sandbox.fedex.com/]]></sandbox_webservices_url>
                 <pickup_type>DROPOFF_AT_FEDEX_LOCATION</pickup_type>
                 <shipment_requesttype>0</shipment_requesttype>
                 <active>0</active>

app/code/Magento/Fedex/etc/di.xml

@@ -10,9 +10,8 @@
         <arguments>
             <argument name="sensitive" xsi:type="array">
                 <item name="carriers/fedex/account" xsi:type="string">1</item>
-                <item name="carriers/fedex/key" xsi:type="string">1</item>
-                <item name="carriers/fedex/meter_number" xsi:type="string">1</item>
-                <item name="carriers/fedex/password" xsi:type="string">1</item>
+                <item name="carriers/fedex/api_key" xsi:type="string">1</item>
+                <item name="carriers/fedex/secret_key" xsi:type="string">1</item>
                 <item name="carriers/fedex/production_webservices_url" xsi:type="string">1</item>
                 <item name="carriers/fedex/sandbox_webservices_url" xsi:type="string">1</item>
                 <item name="carriers/fedex/smartpost_hubid" xsi:type="string">1</item>