CLOUDSTACK-9074: Naming convention fix and network guest types support

Author: nvazquez

api/src/org/apache/cloudstack/api/response/NicResponse.java

@@ -104,11 +104,11 @@ public class NicResponse extends BaseResponse {
 
     @SerializedName("nsxlogicalswitch")
     @Param(description = "Id of the NSX Logical Switch (if NSX based), null otherwise", since="4.6.0")
-    private String nsxlogicalswitch;
+    private String nsxLogicalSwitch;
 
     @SerializedName("nsxlogicalswitchport")
     @Param(description = "Id of the NSX Logical Switch Port (if NSX based), null otherwise", since="4.6.0")
-    private String nsxlogicalswitchport;
+    private String nsxLogicalSwitchPort;
 
     public void setVmId(String vmId) {
         this.vmId = vmId;
@@ -213,12 +213,12 @@ public void setSecondaryIps(List<NicSecondaryIpResponse> ipList) {
         this.secondaryIps = ipList;
     }
 
-    public void setNsxlogicalswitch(String nsxlogicalswitch) {
-        this.nsxlogicalswitch = nsxlogicalswitch;
+    public void setNsxLogicalSwitch(String nsxLogicalSwitch) {
+        this.nsxLogicalSwitch = nsxLogicalSwitch;
     }
 
-    public void setNsxlogicalswitchport(String nsxlogicalswitchport) {
-        this.nsxlogicalswitchport = nsxlogicalswitchport;
+    public void setNsxLogicalSwitchPort(String nsxLogicalSwitchPort) {
+        this.nsxLogicalSwitchPort = nsxLogicalSwitchPort;
     }
 
 }

plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/guru/NiciraNvpGuestNetworkGuru.java

@@ -113,14 +113,23 @@ public NiciraNvpGuestNetworkGuru() {
     protected boolean canHandle(final NetworkOffering offering, final NetworkType networkType, final PhysicalNetwork physicalNetwork) {
         // This guru handles only Guest Isolated network that supports Source nat service
         if (networkType == NetworkType.Advanced && isMyTrafficType(offering.getTrafficType())
-                && (offering.getGuestType() == Network.GuestType.Isolated || offering.getGuestType() == Network.GuestType.Shared)
+                && supportedGuestTypes(offering, Network.GuestType.Isolated, Network.GuestType.Shared)
                 && isMyIsolationMethod(physicalNetwork) && ntwkOfferingSrvcDao.areServicesSupportedByNetworkOffering(offering.getId(), Service.Connectivity)) {
             return true;
         } else {
             return false;
         }
     }
 
+    private boolean supportedGuestTypes(NetworkOffering offering, GuestType... types) {
+        for (GuestType guestType : types) {
+            if (offering.getGuestType().equals(guestType)){
+                return true;
+            }
+        }
+        return false;
+    }
+
     @Override
     public Network design(final NetworkOffering offering, final DeploymentPlan plan, final Network userSpecified, final Account owner) {
         // Check of the isolation type of the related physical network is supported

server/src/com/cloud/api/ApiResponseHelper.java

@@ -3470,10 +3470,10 @@ public NicResponse createNicResponse(Nic result) {
 
         if (result instanceof NicVO){
             if (((NicVO)result).getNsxLogicalSwitchUuid() != null){
-                response.setNsxlogicalswitch(((NicVO)result).getNsxLogicalSwitchUuid());
+                response.setNsxLogicalSwitch(((NicVO)result).getNsxLogicalSwitchUuid());
             }
             if (((NicVO)result).getNsxLogicalSwitchPortUuid() != null){
-                response.setNsxlogicalswitchport(((NicVO)result).getNsxLogicalSwitchPortUuid());
+                response.setNsxLogicalSwitchPort(((NicVO)result).getNsxLogicalSwitchPortUuid());
             }
         }
         return response;