[UI] Zone wizard creation improvements - rename hostname to url and remove port for Netris Provider (apache#77)

* [UI] Zone wizard creation improvements - rename hostname to url and remove port for Netris Provider

* Fix schema column for url instead of hostname

Author: nvazquez

api/src/main/java/com/cloud/network/netris/NetrisProvider.java

@@ -22,8 +22,7 @@
 public interface NetrisProvider extends InternalIdentity, Identity {
     long getZoneId();
     String getName();
-    String getHostname();
-    String getPort();
+    String getUrl();
     String getUsername();
     String getSiteName();
     String getTenantName();

engine/schema/src/main/java/com/cloud/network/dao/NetrisProviderDaoImpl.java

@@ -36,7 +36,7 @@ public NetrisProviderDaoImpl() {
                 SearchCriteria.Op.EQ);
         allFieldsSearch.and("uuid", allFieldsSearch.entity().getUuid(),
                 SearchCriteria.Op.EQ);
-        allFieldsSearch.and("hostname", allFieldsSearch.entity().getHostname(),
+        allFieldsSearch.and("hostname", allFieldsSearch.entity().getUrl(),
                 SearchCriteria.Op.EQ);
         allFieldsSearch.and("zone_id", allFieldsSearch.entity().getZoneId(),
                 SearchCriteria.Op.EQ);

engine/schema/src/main/java/com/cloud/network/element/NetrisProviderVO.java

@@ -48,11 +48,8 @@ public class NetrisProviderVO implements NetrisProvider {
     @Column(name = "host_id")
     private long hostId;
 
-    @Column(name = "hostname")
-    private String hostname;
-
-    @Column(name = "port")
-    private String port;
+    @Column(name = "url")
+    private String url;
 
     @Column(name = "username")
     private String username;
@@ -124,21 +121,12 @@ public void setHostId(long hostId) {
     }
 
     @Override
-    public String getHostname() {
-        return hostname;
+    public String getUrl() {
+        return url;
     }
 
-    public void setHostname(String hostname) {
-        this.hostname = hostname;
-    }
-
-    @Override
-    public String getPort() {
-        return port;
-    }
-
-    public void setPort(String port) {
-        this.port = port;
+    public void setUrl(String url) {
+        this.url = url;
     }
 
     @Override
@@ -202,8 +190,7 @@ public static final class Builder {
         private long zoneId;
         private long hostId;
         private String name;
-        private String hostname;
-        private String port;
+        private String url;
         private String username;
         private String password;
         private String siteName;
@@ -229,13 +216,8 @@ public Builder setName(String name) {
             return this;
         }
 
-        public Builder setHostname(String hostname) {
-            this.hostname = hostname;
-            return this;
-        }
-
-        public Builder setPort(String port) {
-            this.port = port;
+        public Builder setUrl(String url) {
+            this.url = url;
             return this;
         }
 
@@ -270,8 +252,7 @@ public NetrisProviderVO build() {
             provider.setHostId(this.hostId);
             provider.setUuid(UUID.randomUUID().toString());
             provider.setName(this.name);
-            provider.setHostname(this.hostname);
-            provider.setPort(this.port);
+            provider.setUrl(this.url);
             provider.setUsername(this.username);
             provider.setPassword(this.password);
             provider.setSiteName(this.siteName);

engine/schema/src/main/resources/META-INF/db/schema-41910to42000.sql

@@ -433,8 +433,7 @@ CREATE TABLE `cloud`.`netris_providers` (
     `zone_id` bigint unsigned NOT NULL COMMENT 'Zone ID',
     `host_id` bigint unsigned NOT NULL COMMENT 'Host ID',
     `name` varchar(40),
-    `hostname` varchar(255) NOT NULL,
-    `port` varchar(255),
+    `url` varchar(255) NOT NULL,
     `username` varchar(255) NOT NULL,
     `password` varchar(255) NOT NULL,
     `site_name` varchar(255) NOT NULL,

plugins/network-elements/netris/src/main/java/org/apache/cloudstack/api/command/AddNetrisProviderCmd.java

@@ -50,11 +50,8 @@ public class AddNetrisProviderCmd extends BaseCmd {
     @Parameter(name = ApiConstants.NAME, type = CommandType.STRING, required = true, description = "Netris provider name")
     private String name;
 
-    @Parameter(name = ApiConstants.HOST_NAME, type = CommandType.STRING, required = true, description = "Netris provider hostname / IP address")
-    private String hostname;
-
-    @Parameter(name = ApiConstants.PORT, type = CommandType.STRING, description = "Netris provider port")
-    private String port;
+    @Parameter(name = ApiConstants.URL, type = CommandType.STRING, required = true, description = "Netris provider URL")
+    private String url;
 
     @Parameter(name = ApiConstants.USERNAME, type = CommandType.STRING, required = true, description = "Username to log into Netris")
     private String username;
@@ -83,12 +80,8 @@ public String getName() {
         return name;
     }
 
-    public String getHostname() {
-        return hostname;
-    }
-
-    public String getPort() {
-        return port;
+    public String getUrl() {
+        return url;
     }
 
     public String getUsername() {

plugins/network-elements/netris/src/main/java/org/apache/cloudstack/resource/NetrisResource.java

@@ -59,7 +59,7 @@ public class NetrisResource implements ServerResource {
     protected Logger logger = LogManager.getLogger(getClass());
 
     private String name;
-    protected String hostname;
+    protected String endpointUrl;
     protected String username;
     protected String password;
     protected String guid;
@@ -182,9 +182,9 @@ public void setRunLevel(int level) {
 
     @Override
     public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
-        hostname = (String) params.get("hostname");
-        if (hostname == null) {
-            throw new ConfigurationException("Missing Netris hostname from params: " + params);
+        endpointUrl = (String) params.get("url");
+        if (endpointUrl == null) {
+            throw new ConfigurationException("Missing Netris provider URL from params: " + params);
         }
 
         username = (String) params.get("username");
@@ -222,7 +222,7 @@ public boolean configure(String name, Map<String, Object> params) throws Configu
             throw new ConfigurationException("Unable to find the Netris admin tenant name");
         }
 
-        netrisApiClient = new NetrisApiClientImpl(hostname, username, password, siteName, adminTenantName);
+        netrisApiClient = new NetrisApiClientImpl(endpointUrl, username, password, siteName, adminTenantName);
         return netrisApiClient.isSessionAlive();
     }
 

plugins/network-elements/netris/src/main/java/org/apache/cloudstack/service/NetrisProviderServiceImpl.java

@@ -80,8 +80,7 @@ public class NetrisProviderServiceImpl implements NetrisProviderService {
     public NetrisProvider addProvider(AddNetrisProviderCmd cmd) {
         final Long zoneId = cmd.getZoneId();
         final String name = cmd.getName();
-        final String hostname = cmd.getHostname();
-        final String port = cmd.getPort();
+        final String url = cmd.getUrl();
         final String username = cmd.getUsername();
         final String password = cmd.getPassword();
         final String tenantName = cmd.getTenantName();
@@ -92,8 +91,7 @@ public NetrisProvider addProvider(AddNetrisProviderCmd cmd) {
         params.put("guid", UUID.randomUUID().toString());
         params.put("zoneId", zoneId.toString());
         params.put("name", name);
-        params.put("hostname", hostname);
-        params.put("port", port);
+        params.put("url", url);
         params.put("username", username);
         params.put("password", password);
         params.put("siteName", siteName);
@@ -105,16 +103,15 @@ public NetrisProvider addProvider(AddNetrisProviderCmd cmd) {
 
         NetrisResource netrisResource = new NetrisResource();
         try {
-            netrisResource.configure(hostname, hostdetails);
+            netrisResource.configure(url, hostdetails);
             final Host host = resourceManager.addHost(zoneId, netrisResource, netrisResource.getType(), params);
             if (host != null) {
                 netrisProvider = Transaction.execute((TransactionCallback<NetrisProviderVO>) status -> {
                     NetrisProviderVO netrisProviderVO = new NetrisProviderVO.Builder()
                             .setZoneId(zoneId)
                             .setHostId(host.getId())
                             .setName(name)
-                            .setPort(port)
-                            .setHostname(hostname)
+                            .setUrl(url)
                             .setUsername(username)
                             .setPassword(password)
                             .setSiteName(siteName)
@@ -187,8 +184,7 @@ public NetrisProviderResponse createNetrisProviderResponse(NetrisProvider provid
         NetrisProviderResponse response = new NetrisProviderResponse();
         response.setName(provider.getName());
         response.setUuid(provider.getUuid());
-        response.setHostname(provider.getHostname());
-        response.setPort(provider.getPort());
+        response.setHostname(provider.getUrl());
         response.setZoneId(zone.getUuid());
         response.setZoneName(zone.getName());
         response.setSiteName(provider.getSiteName());

ui/public/locales/en.json

@@ -1488,13 +1488,12 @@
 "label.netristag": "Netris tag",
 "label.netris.provider": "Netris Provider",
 "label.netris.provider.name": "Netris provider name",
-"label.netris.provider.hostname": "Netris provider hostname",
-"label.netris.provider.port": "Netris provider port",
 "label.netris.provider.username": "Netris provider username",
 "label.netris.provider.password": "Netris provider password",
 "label.netris.provider.site": "Netris provider Site name",
 "label.netris.provider.tenant.name": "Netris provider Admin Tenant name",
 "label.netris.provider.tag": "Netris Tag",
+"label.netris.provider.url": "Netris provider URL",
 "label.netscaler": "NetScaler",
 "label.netscaler.mpx": "NetScaler MPX LoadBalancer",
 "label.netscaler.sdx": "NetScaler SDX LoadBalancer",
@@ -3229,7 +3228,7 @@
 "message.installwizard.tooltip.configureguesttraffic.guestnetmask": "The netmask in use on the subnet that the guests should use.",
 "message.installwizard.tooltip.configureguesttraffic.gueststartip": "The range of IP addresses that will be available for allocation to guests in this zone. If one NIC is used, these IPs should be in the same CIDR as the pod CIDR.",
 "message.installwizard.tooltip.netris.provider.name": "Netris Provider name is required",
-"message.installwizard.tooltip.netris.provider.hostname": "Netris Provider hostname / IP address not provided",
+"message.installwizard.tooltip.netris.provider.url": "Netris Provider URL not provided",
 "message.installwizard.tooltip.netris.provider.username": "Netris Provider username not provided",
 "message.installwizard.tooltip.netris.provider.password": "Netris Provider password not provided",
 "message.installwizard.tooltip.netris.provider.site": "Netris Provider Site name not provided",

ui/src/views/infra/zone/ZoneWizardLaunchZone.vue

@@ -1120,8 +1120,7 @@ export default {
         if (!this.stepData.stepMove.includes('addNetrisProvider')) {
           const providerParams = {}
           providerParams.name = this.prefillContent?.netrisName || ''
-          providerParams.hostname = this.prefillContent?.hostname || ''
-          providerParams.port = this.prefillContent?.netrisPort || ''
+          providerParams.url = this.prefillContent?.url || ''
           providerParams.username = this.prefillContent?.username || ''
           providerParams.password = this.prefillContent?.password || ''
           providerParams.zoneid = this.stepData.zoneReturned.id

ui/src/views/infra/zone/ZoneWizardNetworkSetupStep.vue

@@ -484,17 +484,11 @@ export default {
           required: true
         },
         {
-          title: 'label.netris.provider.hostname',
-          key: 'hostname',
-          placeHolder: 'message.installwizard.tooltip.netris.provider.hostname',
+          title: 'label.netris.provider.url',
+          key: 'url',
+          placeHolder: 'message.installwizard.tooltip.netris.provider.url',
           required: true
         },
-        {
-          title: 'label.netris.provider.port',
-          key: 'netrisPort',
-          placeHolder: 'message.installwizard.tooltip.netris.provider.port',
-          required: false
-        },
         {
           title: 'label.netris.provider.username',
           key: 'username',