Create DHCP relay command and execute request

Author: nvazquez

plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/agent/api/CreateDhcpRelayCommand.java

@@ -0,0 +1,40 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package org.apache.cloudstack.agent.api;
+
+import java.util.List;
+
+public class CreateDhcpRelayCommand extends NsxCommand {
+
+    private String dhcpRelayName;
+    private List<String> serverAddresses;
+
+    public CreateDhcpRelayCommand(String zoneName, Long zoneId, String accountName, Long accountId,
+                                  String dhcpRelayName, List<String> serverAddresses) {
+        super(zoneName, zoneId, accountName, accountId);
+        this.dhcpRelayName = dhcpRelayName;
+        this.serverAddresses = serverAddresses;
+    }
+
+    public String getDhcpRelayName() {
+        return dhcpRelayName;
+    }
+
+    public List<String> getServerAddresses() {
+        return serverAddresses;
+    }
+}

plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/resource/NsxResource.java

@@ -31,12 +31,14 @@
 
 import com.vmware.nsx.model.TransportZone;
 import com.vmware.nsx.model.TransportZoneListResult;
+import com.vmware.nsx_policy.infra.DhcpRelayConfigs;
 import com.vmware.nsx_policy.infra.Segments;
 import com.vmware.nsx_policy.infra.Sites;
 import com.vmware.nsx_policy.infra.Tier1s;
 import com.vmware.nsx_policy.infra.sites.EnforcementPoints;
 import com.vmware.nsx_policy.infra.tier_0s.LocaleServices;
 import com.vmware.nsx_policy.model.ApiError;
+import com.vmware.nsx_policy.model.DhcpRelayConfig;
 import com.vmware.nsx_policy.model.EnforcementPointListResult;
 import com.vmware.nsx_policy.model.LocaleServicesListResult;
 import com.vmware.nsx_policy.model.Segment;
@@ -47,6 +49,7 @@
 import com.vmware.vapi.std.errors.Error;
 import org.apache.cloudstack.NsxAnswer;
 import org.apache.cloudstack.StartupNsxCommand;
+import org.apache.cloudstack.agent.api.CreateDhcpRelayCommand;
 import org.apache.cloudstack.agent.api.CreateNsxSegmentCommand;
 import org.apache.cloudstack.agent.api.CreateNsxTier1GatewayCommand;
 import org.apache.cloudstack.agent.api.DeleteNsxSegmentCommand;
@@ -128,6 +131,8 @@ public Answer executeRequest(Command cmd) {
             return executeRequest((CreateNsxSegmentCommand) cmd);
         }  else if (cmd instanceof CreateNsxTier1GatewayCommand) {
             return executeRequest((CreateNsxTier1GatewayCommand) cmd);
+        } else if (cmd instanceof CreateDhcpRelayCommand) {
+            return executeRequest((CreateDhcpRelayCommand) cmd);
         } else {
             return Answer.createUnsupportedCommandAnswer(cmd);
         }
@@ -235,6 +240,29 @@ public boolean configure(String name, Map<String, Object> params) throws Configu
         return true;
     }
 
+    private Answer executeRequest(CreateDhcpRelayCommand cmd) {
+        String dhcpRelayName = cmd.getDhcpRelayName();
+        List<String> addresses = cmd.getServerAddresses();
+        String msg = String.format("Creating DHCP relay with name %s for addresses %s", dhcpRelayName, addresses);
+        LOGGER.debug(msg);
+
+        try {
+            DhcpRelayConfigs service = (DhcpRelayConfigs) nsxService.apply(DhcpRelayConfigs.class);
+            DhcpRelayConfig config = new DhcpRelayConfig.Builder()
+                    .setServerAddresses(addresses)
+                    .setId(dhcpRelayName)
+                    .setDisplayName(dhcpRelayName)
+                    .build();
+            service.patch(dhcpRelayName, config);
+        } catch (Error error) {
+            ApiError ae = error.getData()._convertTo(ApiError.class);
+            msg = String.format("Error creating the DHCP relay with name %s: %s", dhcpRelayName, ae.getErrorMessage());
+            LOGGER.error(msg);
+            return new NsxAnswer(cmd, new CloudRuntimeException(ae.getErrorMessage()));
+        }
+        return new NsxAnswer(cmd, true, "");
+    }
+
     private Answer executeRequest(ReadyCommand cmd) {
         return new ReadyAnswer(cmd);
     }