From 376004cf5b95a9528c199b03d3ac2545d352323c Mon Sep 17 00:00:00 2001
From: yas <45549-yas@users.noreply.drupalcode.org>
Date: Tue, 11 Apr 2023 01:43:58 -0700
Subject: [PATCH] Issue #3353296 by yas, Xiaohua Guan: Fix the message "added
an interface" to "added to a port"
---
.../openstack/src/Service/OpenStackOperationsService.php | 8 ++++----
.../templates/OpenStack-ATDD-03-14-OperateRouters.feature | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/modules/cloud_service_providers/openstack/src/Service/OpenStackOperationsService.php b/modules/cloud_service_providers/openstack/src/Service/OpenStackOperationsService.php
index 1a05ccf5de..6d81c758c1 100644
--- a/modules/cloud_service_providers/openstack/src/Service/OpenStackOperationsService.php
+++ b/modules/cloud_service_providers/openstack/src/Service/OpenStackOperationsService.php
@@ -1718,12 +1718,12 @@ class OpenStackOperationsService implements OpenStackOperationsServiceInterface
$result = $this->ec2Service->addRouterInterface($params);
if ($result === NULL) {
- $this->processOperationErrorStatus($entity, 'added an interface');
+ $this->processOperationErrorStatus($entity, 'added to a a port');
return FALSE;
}
if (!empty($result['SendToWorker'])) {
- $this->processOperationStatus($entity, 'added an interface remotely');
+ $this->processOperationStatus($entity, 'added to a port remotely');
return TRUE;
}
@@ -1742,7 +1742,7 @@ class OpenStackOperationsService implements OpenStackOperationsServiceInterface
]);
if (empty($ports)) {
- $this->processOperationErrorStatus($entity, 'added an interface');
+ $this->processOperationErrorStatus($entity, 'added to a port');
return FALSE;
}
@@ -1757,7 +1757,7 @@ class OpenStackOperationsService implements OpenStackOperationsServiceInterface
]);
}
- $this->processOperationStatus($entity, 'added an interface');
+ $this->processOperationStatus($entity, 'added to a port');
$this->clearCacheValues($entity->getCacheTags());
$this->dispatchSaveEvent($entity);
diff --git a/modules/cloud_service_providers/openstack/tests/src/Behat/features/templates/OpenStack-ATDD-03-14-OperateRouters.feature b/modules/cloud_service_providers/openstack/tests/src/Behat/features/templates/OpenStack-ATDD-03-14-OperateRouters.feature
index 29d2ba8d49..c8d5f30c5b 100644
--- a/modules/cloud_service_providers/openstack/tests/src/Behat/features/templates/OpenStack-ATDD-03-14-OperateRouters.feature
+++ b/modules/cloud_service_providers/openstack/tests/src/Behat/features/templates/OpenStack-ATDD-03-14-OperateRouters.feature
@@ -105,7 +105,7 @@ Feature: Create, read, update and delete a router for OpenStack as an "authentic
And I enter "{{ router_internal_interface_ip }}" for "IP address"
And I press "Add interface"
Then the url should match "/clouds/openstack/{{ cloud_context }}/router/.*/interface"
- And I should see the success message "has been added an interface"
+ And I should see the success message "has been added to a port"
And I should see "{{ router_internal_interface_ip }}"
And I should see neither error nor warning messages
--
GitLab