Merge remote-tracking branch 'arcticfoxes/B2B-1816' into 2.4-develop-pr

Author: joanhe

dev/tests/integration/framework/Magento/TestFramework/Helper/Amqp.php

@@ -18,6 +18,7 @@ class Amqp
     const CONFIG_PATH_PASSWORD = 'queue/amqp/password';
     const DEFAULT_MANAGEMENT_PROTOCOL = 'http';
     const DEFAULT_MANAGEMENT_PORT = '15672';
+    const DEFAULT_VIRTUALHOST = '/';
 
     /**
      * @var Curl
@@ -30,12 +31,15 @@ class Amqp
     private $deploymentConfig;
 
     /**
-     * RabbitMQ API host
-     *
      * @var string
      */
     private $host;
 
+    /**
+     * @var string
+     */
+    private $virtualHost;
+
     /**
      * Initialize dependencies.
      * @param \Magento\Framework\App\DeploymentConfig $deploymentConfig
@@ -59,6 +63,7 @@ public function __construct(
             $this->deploymentConfig->get(self::CONFIG_PATH_HOST),
             defined('RABBITMQ_MANAGEMENT_PORT') ? RABBITMQ_MANAGEMENT_PORT : self::DEFAULT_MANAGEMENT_PORT
         );
+        $this->virtualHost = defined('RABBITMQ_VIRTUALHOST') ? RABBITMQ_VIRTUALHOST : self::DEFAULT_VIRTUALHOST;
     }
 
     /**
@@ -82,7 +87,7 @@ public function isAvailable(): bool
      */
     public function getExchanges()
     {
-        $this->curl->get($this->host . 'exchanges');
+        $this->curl->get($this->host . 'exchanges/' . urlencode($this->virtualHost));
         $data = $this->curl->getBody();
         $data = json_decode($data, true);
         $output = [];
@@ -100,7 +105,7 @@ public function getExchanges()
      */
     public function getExchangeBindings($name)
     {
-        $this->curl->get($this->host . 'exchanges/%2f/' . $name . '/bindings/source');
+        $this->curl->get($this->host . 'exchanges/' . urlencode($this->virtualHost) . '/' . $name . '/bindings/source');
         $data = $this->curl->getBody();
         return json_decode($data, true);
     }
@@ -112,7 +117,7 @@ public function getExchangeBindings($name)
      */
     public function getConnections()
     {
-        $this->curl->get($this->host . 'connections');
+        $this->curl->get($this->host . 'vhosts/' . urlencode($this->virtualHost) . '/connections');
         $data = $this->curl->getBody();
         $data = json_decode($data, true);
         $output = [];
@@ -137,7 +142,10 @@ public function clearQueue(string $name, int $numMessages = 50)
             "encoding" => "auto",
             "truncate" => 50000
         ];
-        $this->curl->post($this->host . 'queue/%2f/' . $name . '/get', json_encode($body));
+        $this->curl->post(
+            $this->host . 'queue/' . urlencode($this->virtualHost) . '/' . $name . '/get',
+            json_encode($body)
+        );
         return $this->curl->getBody();
     }
 

dev/tests/integration/phpunit.xml.dist

@@ -82,6 +82,7 @@
         <!-- Connection parameters for RabbitMQ tests -->
         <!--<const name="RABBITMQ_MANAGEMENT_PROTOCOL" value="https"/>-->
         <!--<const name="RABBITMQ_MANAGEMENT_PORT" value="15672"/>-->
+        <!--<const name="RABBITMQ_VIRTUALHOST" value="/"/>-->
         <!--<const name="TESTS_PARALLEL_RUN" value="1"/>-->
         <const name="USE_OVERRIDE_CONFIG" value="enabled"/>
     </php>

dev/tests/integration/testsuite/Magento/Framework/MessageQueue/TopologyTest.php

@@ -83,11 +83,12 @@ public function testTopologyInstallation(array $expectedConfig, array $bindingCo
      */
     public function exchangeDataProvider(): array
     {
+        $virtualHost = defined('RABBITMQ_VIRTUALHOST') ? RABBITMQ_VIRTUALHOST : Amqp::DEFAULT_VIRTUALHOST;
         return [
             'magento-topic-based-exchange1' => [
                 'exchangeConfig' => [
                     'name' => 'magento-topic-based-exchange1',
-                    'vhost' => '/',
+                    'vhost' => $virtualHost,
                     'type' => 'topic',
                     'durable' => true,
                     'auto_delete' => false,
@@ -99,7 +100,7 @@ public function exchangeDataProvider(): array
                 'bindingConfig' => [
                     [
                         'source' => 'magento-topic-based-exchange1',
-                        'vhost' => '/',
+                        'vhost' => $virtualHost,
                         'destination' => 'topic-queue1',
                         'destination_type' => 'queue',
                         'routing_key' => 'anotherTopic1',
@@ -112,7 +113,7 @@ public function exchangeDataProvider(): array
             'magento-topic-based-exchange2' => [
                 'exchangeConfig' => [
                     'name' => 'magento-topic-based-exchange2',
-                    'vhost' => '/',
+                    'vhost' => $virtualHost,
                     'type' => 'topic',
                     'durable' => true,
                     'auto_delete' => false,
@@ -125,7 +126,7 @@ public function exchangeDataProvider(): array
                 'bindingConfig' => [
                     [
                         'source' => 'magento-topic-based-exchange2',
-                        'vhost' => '/',
+                        'vhost' => $virtualHost,
                         'destination' => 'topic-queue2',
                         'destination_type' => 'queue',
                         'routing_key' => 'anotherTopic2',
@@ -140,7 +141,7 @@ public function exchangeDataProvider(): array
             'magento-topic-based-exchange3' => [
                 'exchangeConfig' => [
                     'name' => 'magento-topic-based-exchange3',
-                    'vhost' => '/',
+                    'vhost' => $virtualHost,
                     'type' => 'topic',
                     'durable' => false,
                     'auto_delete' => true,
@@ -152,7 +153,7 @@ public function exchangeDataProvider(): array
             'magento-topic-based-exchange4' => [
                 'exchangeConfig' => [
                     'name' => 'magento-topic-based-exchange4',
-                    'vhost' => '/',
+                    'vhost' => $virtualHost,
                     'type' => 'topic',
                     'durable' => true,
                     'auto_delete' => false,
@@ -162,7 +163,7 @@ public function exchangeDataProvider(): array
                 'bindingConfig' => [
                     [
                         'source' => 'magento-topic-based-exchange4',
-                        'vhost' => '/',
+                        'vhost' => $virtualHost,
                         'destination' => 'topic-queue1',
                         'destination_type' => 'queue',
                         'routing_key' => '#',
@@ -172,7 +173,7 @@ public function exchangeDataProvider(): array
                     ],
                     [
                         'source' => 'magento-topic-based-exchange4',
-                        'vhost' => '/',
+                        'vhost' => $virtualHost,
                         'destination' => 'topic-queue2',
                         'destination_type' => 'queue',
                         'routing_key' => '*.*.*',