This is an automated email from the ASF dual-hosted git repository. pearl11594 pushed a commit to branch netris-fixes in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/netris-fixes by this push: new 8cc1a96a5e1 rename response parameter name 8cc1a96a5e1 is described below commit 8cc1a96a5e13892d9039c608b7ca8bbf18300e6a Author: Pearl Dsilva <pearl1...@gmail.com> AuthorDate: Fri Aug 1 14:13:06 2025 -0400 rename response parameter name --- .../api/response/NetrisProviderResponse.java | 26 ++++++---------------- .../service/NetrisProviderServiceImpl.java | 2 +- ui/public/locales/en.json | 1 + ui/src/views/infra/network/ServiceProvidersTab.vue | 2 +- 4 files changed, 10 insertions(+), 21 deletions(-) diff --git a/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/api/response/NetrisProviderResponse.java b/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/api/response/NetrisProviderResponse.java index d130c3a7372..4dc9b6b3030 100644 --- a/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/api/response/NetrisProviderResponse.java +++ b/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/api/response/NetrisProviderResponse.java @@ -41,13 +41,9 @@ public class NetrisProviderResponse extends BaseResponse { @Param(description = "Zone name to which the Netris Provider is associated with") private String zoneName; - @SerializedName(ApiConstants.HOST_NAME) - @Param(description = "Netris Provider hostname or IP address") - private String hostname; - - @SerializedName(ApiConstants.PORT) - @Param(description = "Netris Provider port") - private String port; + @SerializedName(ApiConstants.NETRIS_URL) + @Param(description = "Netris Provider URL") + private String netrisUrl; @SerializedName(ApiConstants.SITE_NAME) @Param(description = "Netris Provider site") @@ -93,20 +89,12 @@ public class NetrisProviderResponse extends BaseResponse { this.zoneName = zoneName; } - public String getHostname() { - return hostname; - } - - public void setHostname(String hostname) { - this.hostname = hostname; - } - - public String getPort() { - return port; + public String getNetrisUrl() { + return netrisUrl; } - public void setPort(String port) { - this.port = port; + public void setNetrisUrl(String netrisUrl) { + this.netrisUrl = netrisUrl; } public String getSiteName() { diff --git a/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/service/NetrisProviderServiceImpl.java b/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/service/NetrisProviderServiceImpl.java index 14a845e1c3a..57714e4787c 100644 --- a/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/service/NetrisProviderServiceImpl.java +++ b/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/service/NetrisProviderServiceImpl.java @@ -184,7 +184,7 @@ public class NetrisProviderServiceImpl implements NetrisProviderService { NetrisProviderResponse response = new NetrisProviderResponse(); response.setName(provider.getName()); response.setUuid(provider.getUuid()); - response.setHostname(provider.getUrl()); + response.setNetrisUrl(provider.getUrl()); response.setZoneId(zone.getUuid()); response.setZoneName(zone.getName()); response.setSiteName(provider.getSiteName()); diff --git a/ui/public/locales/en.json b/ui/public/locales/en.json index 97421ff8e50..6c78a7cc2f0 100644 --- a/ui/public/locales/en.json +++ b/ui/public/locales/en.json @@ -1610,6 +1610,7 @@ "label.netmask": "Netmask", "label.netris": "Netris", "label.netristag": "Netris tag", +"label.netrisurl": "Netris URL", "label.netris.provider": "Netris Provider", "label.netris.provider.name": "Netris provider name", "label.netris.provider.username": "Netris provider username", diff --git a/ui/src/views/infra/network/ServiceProvidersTab.vue b/ui/src/views/infra/network/ServiceProvidersTab.vue index f446ee26333..1aff9db5f32 100644 --- a/ui/src/views/infra/network/ServiceProvidersTab.vue +++ b/ui/src/views/infra/network/ServiceProvidersTab.vue @@ -1169,7 +1169,7 @@ export default { value: (record) => { return record.zoneid } } }, - columns: ['name', 'hostname', 'port', 'site', 'tenantname', 'netristag'] + columns: ['name', 'netrisurl', 'site', 'tenantname', 'netristag'] } ] }