Skip to content

Commit 9c4d20c

Browse files
author
Alena Prokharchyk
committed
Revert "Return isolation methods as a part of listPhysicalNetworks call"
This reverts commit 316f23e.
1 parent 316f23e commit 9c4d20c

4 files changed

Lines changed: 4 additions & 54 deletions

File tree

‎engine/schema/src/com/cloud/network/dao/PhysicalNetworkIsolationMethodDao.java‎

Lines changed: 0 additions & 39 deletions
This file was deleted.

‎engine/schema/src/com/cloud/network/dao/PhysicalNetworkIsolationMethodDaoImpl.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,16 @@
2020

2121
import org.springframework.stereotype.Component;
2222

23+
import com.cloud.utils.db.GenericDao;
2324
import com.cloud.utils.db.GenericDaoBase;
2425
import com.cloud.utils.db.GenericSearchBuilder;
2526
import com.cloud.utils.db.SearchBuilder;
2627
import com.cloud.utils.db.SearchCriteria;
2728
import com.cloud.utils.db.SearchCriteria.Op;
2829

2930
@Component
30-
public class PhysicalNetworkIsolationMethodDaoImpl extends GenericDaoBase<PhysicalNetworkIsolationMethodVO, Long> implements PhysicalNetworkIsolationMethodDao {
31+
public class PhysicalNetworkIsolationMethodDaoImpl extends GenericDaoBase<PhysicalNetworkIsolationMethodVO, Long> implements
32+
GenericDao<PhysicalNetworkIsolationMethodVO, Long> {
3133
private final GenericSearchBuilder<PhysicalNetworkIsolationMethodVO, String> IsolationMethodSearch;
3234
private final SearchBuilder<PhysicalNetworkIsolationMethodVO> AllFieldsSearch;
3335

@@ -45,23 +47,20 @@ protected PhysicalNetworkIsolationMethodDaoImpl() {
4547
AllFieldsSearch.done();
4648
}
4749

48-
@Override
4950
public List<String> getAllIsolationMethod(long physicalNetworkId) {
5051
SearchCriteria<String> sc = IsolationMethodSearch.create();
5152
sc.setParameters("physicalNetworkId", physicalNetworkId);
5253

5354
return customSearch(sc, null);
5455
}
5556

56-
@Override
5757
public String getIsolationMethod(long physicalNetworkId) {
5858
SearchCriteria<String> sc = IsolationMethodSearch.create();
5959
sc.setParameters("physicalNetworkId", physicalNetworkId);
6060

6161
return customSearch(sc, null).get(0);
6262
}
6363

64-
@Override
6564
public int clearIsolationMethods(long physicalNetworkId) {
6665
SearchCriteria<PhysicalNetworkIsolationMethodVO> sc = AllFieldsSearch.create();
6766
sc.setParameters("physicalNetworkId", physicalNetworkId);

‎server/src/com/cloud/api/ApiDBUtils.java‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,6 @@
181181
import com.cloud.network.dao.NetworkRuleConfigVO;
182182
import com.cloud.network.dao.NetworkVO;
183183
import com.cloud.network.dao.PhysicalNetworkDao;
184-
import com.cloud.network.dao.PhysicalNetworkIsolationMethodDao;
185184
import com.cloud.network.dao.PhysicalNetworkServiceProviderDao;
186185
import com.cloud.network.dao.PhysicalNetworkServiceProviderVO;
187186
import com.cloud.network.dao.PhysicalNetworkTrafficTypeDao;
@@ -410,7 +409,6 @@ public class ApiDBUtils {
410409
static ResourceMetaDataService s_resourceDetailsService;
411410
static HostGpuGroupsDao s_hostGpuGroupsDao;
412411
static VGPUTypesDao s_vgpuTypesDao;
413-
static PhysicalNetworkIsolationMethodDao s_pNtwkIsolatinoMethodsDao;
414412

415413
@Inject
416414
private ManagementServer ms;
@@ -633,8 +631,6 @@ public class ApiDBUtils {
633631
private HostGpuGroupsDao hostGpuGroupsDao;
634632
@Inject
635633
private VGPUTypesDao vgpuTypesDao;
636-
@Inject
637-
private PhysicalNetworkIsolationMethodDao pNtwkIsolatinoMethodsDao;
638634

639635
@PostConstruct
640636
void init() {
@@ -749,7 +745,6 @@ void init() {
749745
s_resourceDetailsService = resourceDetailsService;
750746
s_hostGpuGroupsDao = hostGpuGroupsDao;
751747
s_vgpuTypesDao = vgpuTypesDao;
752-
s_pNtwkIsolatinoMethodsDao = pNtwkIsolatinoMethodsDao;
753748
}
754749

755750
// ///////////////////////////////////////////////////////////
@@ -1840,9 +1835,4 @@ public static boolean isAdmin(Account account) {
18401835
public static List<ResourceTagJoinVO> listResourceTagViewByResourceUUID(String resourceUUID, ResourceObjectType resourceType) {
18411836
return s_tagJoinDao.listBy(resourceUUID, resourceType);
18421837
}
1843-
1844-
public static List<String> getIsolationMethodsForPhysicalNtwk(long pNtwkId) {
1845-
return s_pNtwkIsolatinoMethodsDao.getAllIsolationMethod(pNtwkId);
1846-
}
1847-
18481838
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2197,7 +2197,7 @@ public PhysicalNetworkResponse createPhysicalNetworkResponse(PhysicalNetwork res
21972197
if (result.getBroadcastDomainRange() != null) {
21982198
response.setBroadcastDomainRange(result.getBroadcastDomainRange().toString());
21992199
}
2200-
response.setIsolationMethods(ApiDBUtils.getIsolationMethodsForPhysicalNtwk(result.getId()));
2200+
response.setIsolationMethods(result.getIsolationMethods());
22012201
response.setTags(result.getTags());
22022202
if (result.getState() != null) {
22032203
response.setState(result.getState().toString());

0 commit comments

Comments
 (0)