NSX: fix segment profile cloning and strengthen tests

Signed-off-by: Dogface2k <100990646+Dogface2k@users.noreply.github.com>

Author: Dogface2k

plugins/network-elements/nsx/src/test/java/org/apache/cloudstack/service/NsxApiClientTest.java

@@ -23,6 +23,7 @@
 import com.vmware.nsx.model.ClusterStatus;
 import com.vmware.nsx.model.ControllerClusterStatus;
 import com.vmware.nsx_policy.Infra;
+import com.vmware.nsx_policy.InfraStub;
 import com.vmware.nsx_policy.infra.IpDiscoveryProfiles;
 import com.vmware.nsx_policy.infra.LbAppProfiles;
 import com.vmware.nsx_policy.infra.LbMonitorProfiles;
@@ -52,7 +53,12 @@
 import com.vmware.nsx_policy.model.SegmentDiscoveryProfileBindingMap;
 import com.vmware.nsx_policy.model.SegmentSecurityProfile;
 import com.vmware.vapi.bindings.Service;
+import com.vmware.vapi.bindings.StubConfiguration;
 import com.vmware.vapi.bindings.Structure;
+import com.vmware.vapi.core.ApiProvider;
+import com.vmware.vapi.core.AsyncHandle;
+import com.vmware.vapi.core.MethodResult;
+import com.vmware.vapi.data.DataValue;
 import com.vmware.vapi.std.errors.Error;
 import com.vmware.vapi.std.errors.NotFound;
 import org.apache.cloudstack.resource.NsxLoadBalancerMember;
@@ -118,7 +124,8 @@ public void testCreateGroupForSegment() {
 
     @Test
     public void testCreateSegmentBindsConfiguredProfiles() {
-        Infra infraService = Mockito.mock(Infra.class);
+        ApiProvider apiProvider = Mockito.mock(ApiProvider.class);
+        Infra infraService = Mockito.spy(new InfraStub(apiProvider, new StubConfiguration()));
         IpDiscoveryProfiles ipProfiles = Mockito.mock(IpDiscoveryProfiles.class);
         MacDiscoveryProfiles macProfiles = Mockito.mock(MacDiscoveryProfiles.class);
         SegmentSecurityProfiles securityProfiles = Mockito.mock(SegmentSecurityProfiles.class);
@@ -138,6 +145,11 @@ public void testCreateSegmentBindsConfiguredProfiles() {
         when(ipProfile.getPath()).thenReturn("/infra/ip-discovery-profiles/ip-profile");
         when(macProfile.getPath()).thenReturn("/infra/mac-discovery-profiles/mac-profile");
         when(securityProfile.getPath()).thenReturn("/infra/segment-security-profiles/security-profile");
+        Mockito.doAnswer(invocation -> {
+            AsyncHandle<MethodResult> asyncHandle = invocation.getArgument(4);
+            asyncHandle.setResult(MethodResult.EMPTY);
+            return null;
+        }).when(apiProvider).invoke(anyString(), eq("patch"), any(DataValue.class), any(), any());
         ArgumentCaptor<com.vmware.nsx_policy.model.Infra> infraCaptor =
                 ArgumentCaptor.forClass(com.vmware.nsx_policy.model.Infra.class);
 
@@ -146,6 +158,7 @@ public void testCreateSegmentBindsConfiguredProfiles() {
                 "ip-profile", "mac-profile", "security-profile");
 
         verify(infraService).patch(infraCaptor.capture(), eq(false));
+        verify(apiProvider).invoke(anyString(), eq("patch"), any(DataValue.class), any(), any());
         verify(nsxService, never()).apply(Segments.class);
         Assert.assertEquals("Infra", infraCaptor.getValue().getResourceType());
         Assert.assertEquals(1, infraCaptor.getValue().getChildren().size());

server/src/test/java/com/cloud/network/NetworkServiceImplTest.java

@@ -688,12 +688,30 @@ public void testMatchingNsxSegmentProfilesAllowOfferingUpgrade() {
     public void testDifferentNsxSegmentProfilesRejectOfferingUpgrade() {
         long oldOfferingId = 1L;
         long newOfferingId = 2L;
+        long networkId = 3L;
+        Network network = Mockito.mock(Network.class);
+        NetworkOfferingVO oldOffering = Mockito.mock(NetworkOfferingVO.class);
+        NetworkOfferingVO newOffering = Mockito.mock(NetworkOfferingVO.class);
+        Mockito.when(network.getId()).thenReturn(networkId);
+        Mockito.when(networkOfferingDao.findByIdIncludingRemoved(oldOfferingId)).thenReturn(oldOffering);
+        Mockito.when(networkOfferingDao.findById(newOfferingId)).thenReturn(newOffering);
+        Mockito.when(oldOffering.getGuestType()).thenReturn(Network.GuestType.Isolated);
+        Mockito.when(newOffering.getGuestType()).thenReturn(Network.GuestType.Isolated);
+        Mockito.when(oldOffering.getTrafficType()).thenReturn(Networks.TrafficType.Guest);
+        Mockito.when(newOffering.getTrafficType()).thenReturn(Networks.TrafficType.Guest);
+        Mockito.when(ipAddressDao.listByAssociatedNetwork(networkId, null)).thenReturn(List.of());
+        Mockito.when(networkModel.getNetworkOfferingServiceProvidersMap(newOfferingId)).thenReturn(new HashMap<>());
         Mockito.when(networkModel.getNtwkOffDetails(oldOfferingId)).thenReturn(Map.of(
                 NetworkOffering.Detail.NsxMacDiscoveryProfileId, "old-mac-profile"));
+        Mockito.when(networkModel.getNtwkOffDetails(newOfferingId)).thenReturn(Map.of(
+                NetworkOffering.Detail.NsxMacDiscoveryProfileId, "old-mac-profile"));
+
+        Assert.assertTrue(service.canUpgrade(network, oldOfferingId, newOfferingId));
+
         Mockito.when(networkModel.getNtwkOffDetails(newOfferingId)).thenReturn(Map.of(
                 NetworkOffering.Detail.NsxMacDiscoveryProfileId, "new-mac-profile"));
 
-        Assert.assertFalse(service.haveMatchingNsxSegmentProfiles(oldOfferingId, newOfferingId));
+        Assert.assertFalse(service.canUpgrade(network, oldOfferingId, newOfferingId));
     }
 
     @Test

ui/src/views/offering/CloneNetworkOffering.vue

@@ -978,9 +978,9 @@ export default {
         if (r.details.macaddresschanges) this.form.macaddresschanges = r.details.macaddresschanges
         if (r.details.forgedtransmits) this.form.forgedtransmits = r.details.forgedtransmits
         if (r.details.maclearning) this.form.maclearning = r.details.maclearning
-        if (r.details.nsxipdiscoveryprofileid) this.form.nsxipdiscoveryprofileid = r.details.nsxipdiscoveryprofileid
-        if (r.details.nsxmacdiscoveryprofileid) this.form.nsxmacdiscoveryprofileid = r.details.nsxmacdiscoveryprofileid
-        if (r.details.nsxsegmentsecurityprofileid) this.form.nsxsegmentsecurityprofileid = r.details.nsxsegmentsecurityprofileid
+        if (r.details.NsxIpDiscoveryProfileId) this.form.nsxipdiscoveryprofileid = r.details.NsxIpDiscoveryProfileId
+        if (r.details.NsxMacDiscoveryProfileId) this.form.nsxmacdiscoveryprofileid = r.details.NsxMacDiscoveryProfileId
+        if (r.details.NsxSegmentSecurityProfileId) this.form.nsxsegmentsecurityprofileid = r.details.NsxSegmentSecurityProfileId
       }
 
       this.forVpc = r.forvpc || false