api/server: revert changes on updatePhysicalNetwork

Author: weizhouapache

api/src/main/java/com/cloud/network/NetworkService.java

@@ -155,7 +155,7 @@ PhysicalNetwork createPhysicalNetwork(Long zoneId, String vnetRange, String netw
 
     Pair<List<? extends PhysicalNetwork>, Integer> searchPhysicalNetworks(Long id, Long zoneId, String keyword, Long startIndex, Long pageSize, String name);
 
-    PhysicalNetwork updatePhysicalNetwork(Long id, String networkSpeed, List<String> tags, String newVnetRangeString, String state, Map<String, String> externalDetails);
+    PhysicalNetwork updatePhysicalNetwork(Long id, String networkSpeed, List<String> tags, String newVnetRangeString, String state);
 
     boolean deletePhysicalNetwork(Long id);
 

api/src/main/java/org/apache/cloudstack/api/command/admin/network/UpdatePhysicalNetworkCmd.java

@@ -17,7 +17,6 @@
 package org.apache.cloudstack.api.command.admin.network;
 
 import java.util.List;
-import java.util.Map;
 
 
 import org.apache.cloudstack.api.APICommand;
@@ -54,12 +53,6 @@ public class UpdatePhysicalNetworkCmd extends BaseAsyncCmd {
     @Parameter(name = ApiConstants.VLAN, type = CommandType.STRING, description = "The VLAN for the physical Network")
     private String vlan;
 
-    @Parameter(name = ApiConstants.EXTERNAL_DETAILS,
-            type = CommandType.MAP,
-            description = "Details in key/value pairs to be added to the extension-resource mapping. Use the format externaldetails[i].<key>=<value>. Example: externaldetails[0].endpoint.url=https://example.com",
-            since = "4.23.0")
-    protected Map externalDetails;
-
     /////////////////////////////////////////////////////
     /////////////////// Accessors ///////////////////////
     /////////////////////////////////////////////////////
@@ -84,10 +77,6 @@ public String getVlan() {
         return vlan;
     }
 
-    public Map<String, String> getExternalDetails() {
-        return convertDetailsToMap(externalDetails);
-    }
-
     /////////////////////////////////////////////////////
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
@@ -99,7 +88,7 @@ public long getEntityOwnerId() {
 
     @Override
     public void execute() {
-        PhysicalNetwork result = _networkService.updatePhysicalNetwork(getId(), getNetworkSpeed(), getTags(), getVlan(), getState(), getExternalDetails());
+        PhysicalNetwork result = _networkService.updatePhysicalNetwork(getId(), getNetworkSpeed(), getTags(), getVlan(), getState());
         if (result != null) {
             PhysicalNetworkResponse response = _responseGenerator.createPhysicalNetworkResponse(result);
             response.setResponseName(getCommandName());

plugins/network-elements/juniper-contrail/src/test/java/org/apache/cloudstack/network/contrail/management/ManagementServerMock.java

@@ -328,7 +328,7 @@ private void locatePhysicalNetwork() {
             }
         }
         if (_znet.getState() != PhysicalNetwork.State.Enabled) {
-            _znet = _networkService.updatePhysicalNetwork(_znet.getId(), null, null, null, PhysicalNetwork.State.Enabled.toString(), null);
+            _znet = _networkService.updatePhysicalNetwork(_znet.getId(), null, null, null, PhysicalNetwork.State.Enabled.toString());
         }
 
         // Ensure that the physical network supports Guest traffic.

server/src/main/java/com/cloud/network/NetworkServiceImpl.java

@@ -68,7 +68,6 @@
 import org.apache.cloudstack.api.response.AcquirePodIpCmdResponse;
 import org.apache.cloudstack.context.CallContext;
 import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
-import org.apache.cloudstack.extension.ExtensionResourceMap;
 import org.apache.cloudstack.framework.extensions.manager.ExtensionsManager;
 import org.apache.cloudstack.framework.config.ConfigKey;
 import org.apache.cloudstack.framework.config.Configurable;
@@ -4376,7 +4375,7 @@ public Pair<List<? extends PhysicalNetwork>, Integer> searchPhysicalNetworks(Lon
     @Override
     @DB
     @ActionEvent(eventType = EventTypes.EVENT_PHYSICAL_NETWORK_UPDATE, eventDescription = "updating physical network", async = true)
-    public PhysicalNetwork updatePhysicalNetwork(Long id, String networkSpeed, List<String> tags, String newVnetRange, String state, Map<String, String> externalDetails) {
+    public PhysicalNetwork updatePhysicalNetwork(Long id, String networkSpeed, List<String> tags, String newVnetRange, String state) {
 
         // verify input parameters
         PhysicalNetworkVO network = _physicalNetworkDao.findById(id);
@@ -4431,28 +4430,6 @@ public PhysicalNetwork updatePhysicalNetwork(Long id, String networkSpeed, List<
         }
         _physicalNetworkDao.update(id, network);
 
-        // If external details provided, and an extension is registered on this physical network,
-        // update the extension_resource_map_details accordingly.
-        try {
-            if (externalDetails != null && !externalDetails.isEmpty()) {
-                Pair<Boolean, ExtensionResourceMap> needDetailsUpdateMapPair =
-                        extensionsManager.extensionResourceMapDetailsNeedUpdate(id,
-                                ExtensionResourceMap.ResourceType.PhysicalNetwork, externalDetails);
-                if (Boolean.TRUE.equals(needDetailsUpdateMapPair.first())) {
-                    ExtensionResourceMap extensionResourceMap = needDetailsUpdateMapPair.second();
-                    if (extensionResourceMap == null) {
-                        throw new InvalidParameterValueException(
-                                String.format("Physical network: %s is not registered with any extension, details cannot be updated",
-                                        network.getId()));
-                    }
-                    extensionsManager.updateExtensionResourceMapDetails(extensionResourceMap.getId(), externalDetails);
-                }
-            }
-        } catch (Exception e) {
-            // Log warning but don't fail the update
-            logger.warn("Failed to update external details for physical network {}: {}", id, e.getMessage());
-        }
-
         return network;
 
     }

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

@@ -47,9 +47,7 @@
 import org.apache.cloudstack.api.command.user.network.UpdateNetworkCmd;
 import org.apache.cloudstack.context.CallContext;
 import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
-import org.apache.cloudstack.extension.ExtensionResourceMap;
 import org.apache.cloudstack.framework.config.ConfigKey;
-import org.apache.cloudstack.framework.extensions.manager.ExtensionsManager;
 import org.apache.cloudstack.network.RoutedIpv4Manager;
 import org.junit.After;
 import org.junit.Assert;
@@ -240,9 +238,6 @@ public class NetworkServiceImplTest {
     @Mock
     private NsxProviderDao nsxProviderDao;
 
-    @Mock
-    ExtensionsManager extensionsManager;
-
     private static Date beforeDate;
 
     private static Date afterDate;
@@ -327,7 +322,6 @@ public void setup() throws Exception {
         service.networkHelper = networkHelper;
         service._ipAddrMgr = ipAddressManagerMock;
         service.nsxProviderDao = nsxProviderDao;
-        ReflectionTestUtils.setField(service, "extensionsManager", extensionsManager);
         callContextMocked = Mockito.mockStatic(CallContext.class);
         CallContext callContextMock = Mockito.mock(CallContext.class);
         callContextMocked.when(CallContext::current).thenReturn(callContextMock);
@@ -1336,67 +1330,4 @@ public void addProjectNetworksConditionToSearch_includesSpecificProjectWhenProje
         Mockito.verify(accountJoin).addAnd("type", SearchCriteria.Op.EQ, Account.Type.PROJECT);
         Mockito.verify(sc).addAnd("id", SearchCriteria.Op.SC, accountJoin);
     }
-
-    // -----------------------------------------------------------------------
-    // Tests for updatePhysicalNetwork extension external details handling
-    // -----------------------------------------------------------------------
-
-    @Test
-    public void updatePhysicalNetworkUpdatesExtensionResourceMapDetailsWhenDetailsProvided() {
-        Long physNetId = 100L;
-        PhysicalNetworkVO physNet = Mockito.mock(PhysicalNetworkVO.class);
-        Mockito.when(physicalNetworkDao.findById(physNetId)).thenReturn(physNet);
-        Mockito.when(physicalNetworkDao.update(Mockito.anyLong(), any())).thenReturn(true);
-
-        Map<String, String> externalDetails = Map.of("host", "10.0.0.1", "port", "443");
-
-        ExtensionResourceMap resourceMap = Mockito.mock(ExtensionResourceMap.class);
-        Mockito.when(resourceMap.getId()).thenReturn(50L);
-        Pair<Boolean, ExtensionResourceMap> pair =
-                new Pair<>(true, resourceMap);
-        Mockito.when(extensionsManager.extensionResourceMapDetailsNeedUpdate(physNetId,
-                ExtensionResourceMap.ResourceType.PhysicalNetwork, externalDetails))
-                .thenReturn(pair);
-
-        service.updatePhysicalNetwork(physNetId, null, null, null, null, externalDetails);
-
-        Mockito.verify(extensionsManager).updateExtensionResourceMapDetails(50L, externalDetails);
-    }
-
-    @Test
-    public void updatePhysicalNetworkDoesNotUpdateExtensionWhenNoDetailsChange() {
-        Long physNetId = 101L;
-        PhysicalNetworkVO physNet = Mockito.mock(PhysicalNetworkVO.class);
-        Mockito.when(physicalNetworkDao.findById(physNetId)).thenReturn(physNet);
-        Mockito.when(physicalNetworkDao.update(Mockito.anyLong(), any())).thenReturn(true);
-
-        Map<String, String> externalDetails = Map.of("host", "10.0.0.2");
-
-        Pair<Boolean, ExtensionResourceMap> pair =
-                new Pair<>(false, null);
-        Mockito.when(extensionsManager.extensionResourceMapDetailsNeedUpdate(physNetId,
-                ExtensionResourceMap.ResourceType.PhysicalNetwork, externalDetails))
-                .thenReturn(pair);
-
-        service.updatePhysicalNetwork(physNetId, null, null, null, null, externalDetails);
-
-        Mockito.verify(extensionsManager, Mockito.never()).updateExtensionResourceMapDetails(Mockito.anyLong(), any());
-    }
-
-    @Test
-    public void updatePhysicalNetworkLogsWarningWhenExtensionUpdateFailsButDoesNotThrow() {
-        Long physNetId = 102L;
-        PhysicalNetworkVO physNet = Mockito.mock(PhysicalNetworkVO.class);
-        Mockito.when(physicalNetworkDao.findById(physNetId)).thenReturn(physNet);
-        Mockito.when(physicalNetworkDao.update(Mockito.anyLong(), any())).thenReturn(true);
-
-        Map<String, String> externalDetails = Map.of("host", "10.0.0.3");
-
-        Mockito.when(extensionsManager.extensionResourceMapDetailsNeedUpdate(physNetId,
-                ExtensionResourceMap.ResourceType.PhysicalNetwork, externalDetails))
-                .thenThrow(new RuntimeException("Test exception"));
-
-        // Should not throw
-        service.updatePhysicalNetwork(physNetId, null, null, null, null, externalDetails);
-    }
 }

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

@@ -61,7 +61,7 @@ public void updatePhysicalNetworkTest() {
         when(_datacenterDao.findById(anyLong())).thenReturn(datacentervo);
         when(_physicalNetworkDao.update(anyLong(), any(physicalNetworkVO.getClass()))).thenReturn(true);
         when(_datacenterVnetDao.listVnetsByPhysicalNetworkAndDataCenter(anyLong(), anyLong())).thenReturn(existingRange);
-        networkService.updatePhysicalNetwork(1l, null, null, "524-524,525-530", null, null);
+        networkService.updatePhysicalNetwork(1l, null, null, "524-524,525-530", null);
         txn.close("updatePhysicalNetworkTest");
         verify(physicalNetworkVO).setVnet(argumentCaptor.capture());
         assertEquals("524-530", argumentCaptor.getValue());

server/src/test/java/com/cloud/vpc/MockNetworkManagerImpl.java

@@ -345,7 +345,7 @@ public Pair<List<? extends PhysicalNetwork>, Integer> searchPhysicalNetworks(Lon
      * @see com.cloud.network.NetworkService#updatePhysicalNetwork(java.lang.Long, java.lang.String, java.util.List, java.lang.String, java.lang.String)
      */
     @Override
-    public PhysicalNetwork updatePhysicalNetwork(Long id, String networkSpeed, List<String> tags, String newVnetRangeString, String state, Map<String, String> externalDetails) {
+    public PhysicalNetwork updatePhysicalNetwork(Long id, String networkSpeed, List<String> tags, String newVnetRangeString, String state) {
         // TODO Auto-generated method stub
         return null;
     }