apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-03 04:12:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Moved Dao and VO files to different packages

Browse Source
This commit is contained in:
Harikrishna Patnala 2020-06-04 12:00:07 +05:30
parent a4ec86a652
commit 8b23ea90b8
10 changed files with 12 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/VsphereStoragePolicyVO.java → engine/schema/src/main/java/com/cloud/dc/VsphereStoragePolicyVO.java
View File

@ -14,7 +14,7 @@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
package com.cloud.hypervisor.vmware;
package com.cloud.dc;;
import com.cloud.utils.DateUtil;
import com.cloud.utils.db.GenericDao;

4
plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/dao/VsphereStoragePolicyDao.java → engine/schema/src/main/java/com/cloud/dc/dao/VsphereStoragePolicyDao.java
View File

@ -14,9 +14,9 @@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
package com.cloud.hypervisor.vmware.dao;
package com.cloud.dc.dao;
import com.cloud.hypervisor.vmware.VsphereStoragePolicyVO;
import com.cloud.dc.VsphereStoragePolicyVO;
import com.cloud.utils.db.GenericDao;
public interface VsphereStoragePolicyDao extends GenericDao<VsphereStoragePolicyVO, Long> {

4
plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/dao/VsphereStoragePolicyDaoImpl.java → engine/schema/src/main/java/com/cloud/dc/dao/VsphereStoragePolicyDaoImpl.java
View File

@ -14,9 +14,9 @@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
package com.cloud.hypervisor.vmware.dao;
package com.cloud.dc.dao;
import com.cloud.hypervisor.vmware.VsphereStoragePolicyVO;
import com.cloud.dc.VsphereStoragePolicyVO;
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;

1
engine/schema/src/main/resources/META-INF/cloudstack/core/spring-engine-schema-core-daos-context.xml
View File

@ -295,4 +295,5 @@
<bean id="directDownloadCertificateHostMapDaoImpl" class="org.apache.cloudstack.direct.download.DirectDownloadCertificateHostMapDaoImpl" />
<bean id="templateOVFPropertiesDaoImpl" class="com.cloud.storage.dao.TemplateOVFPropertiesDaoImpl" />
<bean id="routerHealthCheckResultsDaoImpl" class="com.cloud.network.dao.RouterHealthCheckResultDaoImpl" />
<bean id="VsphereStoragePolicyDaoImpl" class="com.cloud.dc.dao.VsphereStoragePolicyDaoImpl" />
</beans>

1
plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/VmwareDatacenterService.java
View File

@ -19,6 +19,7 @@ package com.cloud.hypervisor.vmware;
import java.util.List;
import com.cloud.dc.VsphereStoragePolicy;
import org.apache.cloudstack.api.command.admin.zone.AddVmwareDcCmd;
import org.apache.cloudstack.api.command.admin.zone.ImportVsphereStoragePoliciesCmd;
import org.apache.cloudstack.api.command.admin.zone.ListVmwareDcsCmd;

31
plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/VsphereStoragePolicy.java
View File

@ -1,31 +0,0 @@
// 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 com.cloud.hypervisor.vmware;
import org.apache.cloudstack.api.Identity;
import org.apache.cloudstack.api.InternalIdentity;
public interface VsphereStoragePolicy extends Identity, InternalIdentity {
long getZoneId();
String getPolicyId();
String getName();
String getDescription();
}

6
plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
View File

@ -38,9 +38,9 @@ import java.util.concurrent.TimeUnit;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
import com.cloud.hypervisor.vmware.VsphereStoragePolicy;
import com.cloud.hypervisor.vmware.VsphereStoragePolicyVO;
import com.cloud.hypervisor.vmware.dao.VsphereStoragePolicyDao;
import com.cloud.dc.VsphereStoragePolicy;
import com.cloud.dc.VsphereStoragePolicyVO;
import com.cloud.dc.dao.VsphereStoragePolicyDao;
import com.cloud.hypervisor.vmware.mo.PbmProfileManagerMO;
import com.vmware.pbm.PbmProfile;
import org.apache.cloudstack.api.command.admin.zone.AddVmwareDcCmd;

2
plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/ImportVsphereStoragePoliciesCmd.java
View File

@ -18,6 +18,7 @@
package org.apache.cloudstack.api.command.admin.zone;
import com.cloud.dc.DataCenter;
import com.cloud.dc.VsphereStoragePolicy;
import com.cloud.event.EventTypes;
import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.InsufficientCapacityException;
@ -25,7 +26,6 @@ import com.cloud.exception.NetworkRuleConflictException;
import com.cloud.exception.ResourceAllocationException;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.hypervisor.vmware.VmwareDatacenterService;
import com.cloud.hypervisor.vmware.VsphereStoragePolicy;
import org.apache.cloudstack.acl.RoleType;
import org.apache.cloudstack.api.APICommand;

2
plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/response/ImportVsphereStoragePoliciesResponse.java
View File

@ -16,7 +16,7 @@
// under the License.
package org.apache.cloudstack.api.response;
import com.cloud.hypervisor.vmware.VsphereStoragePolicy;
import com.cloud.dc.VsphereStoragePolicy;
import com.cloud.serializer.Param;
import com.google.gson.annotations.SerializedName;
import org.apache.cloudstack.api.ApiConstants;

1
plugins/hypervisors/vmware/src/main/resources/META-INF/cloudstack/core/spring-vmware-core-context.xml
View File

@ -36,7 +36,6 @@
<bean id="VmwareDatacenterZoneMapDaoImpl"
class="com.cloud.hypervisor.vmware.dao.VmwareDatacenterZoneMapDaoImpl" />
<bean id="LegacyZoneDaoImpl" class="com.cloud.hypervisor.vmware.dao.LegacyZoneDaoImpl" />
<bean id="VsphereStoragePolicyDaoImpl" class="com.cloud.hypervisor.vmware.dao.VsphereStoragePolicyDaoImpl" />
<bean id="ciscoNexusVSMDeviceDaoImpl" class="com.cloud.network.dao.CiscoNexusVSMDeviceDaoImpl" />