diff --git a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/VsphereStoragePolicyVO.java b/engine/schema/src/main/java/com/cloud/dc/VsphereStoragePolicyVO.java similarity index 98% rename from plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/VsphereStoragePolicyVO.java rename to engine/schema/src/main/java/com/cloud/dc/VsphereStoragePolicyVO.java index 13c46784f19..591455ed8a6 100644 --- a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/VsphereStoragePolicyVO.java +++ b/engine/schema/src/main/java/com/cloud/dc/VsphereStoragePolicyVO.java @@ -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; diff --git a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/dao/VsphereStoragePolicyDao.java b/engine/schema/src/main/java/com/cloud/dc/dao/VsphereStoragePolicyDao.java similarity index 90% rename from plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/dao/VsphereStoragePolicyDao.java rename to engine/schema/src/main/java/com/cloud/dc/dao/VsphereStoragePolicyDao.java index 14f77af9bd8..907ab201818 100644 --- a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/dao/VsphereStoragePolicyDao.java +++ b/engine/schema/src/main/java/com/cloud/dc/dao/VsphereStoragePolicyDao.java @@ -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 { diff --git a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/dao/VsphereStoragePolicyDaoImpl.java b/engine/schema/src/main/java/com/cloud/dc/dao/VsphereStoragePolicyDaoImpl.java similarity index 94% rename from plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/dao/VsphereStoragePolicyDaoImpl.java rename to engine/schema/src/main/java/com/cloud/dc/dao/VsphereStoragePolicyDaoImpl.java index 291daae11f8..4b2fd234132 100644 --- a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/dao/VsphereStoragePolicyDaoImpl.java +++ b/engine/schema/src/main/java/com/cloud/dc/dao/VsphereStoragePolicyDaoImpl.java @@ -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; diff --git a/engine/schema/src/main/resources/META-INF/cloudstack/core/spring-engine-schema-core-daos-context.xml b/engine/schema/src/main/resources/META-INF/cloudstack/core/spring-engine-schema-core-daos-context.xml index 9ab5774b301..052a3dfc205 100644 --- a/engine/schema/src/main/resources/META-INF/cloudstack/core/spring-engine-schema-core-daos-context.xml +++ b/engine/schema/src/main/resources/META-INF/cloudstack/core/spring-engine-schema-core-daos-context.xml @@ -295,4 +295,5 @@ + diff --git a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/VmwareDatacenterService.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/VmwareDatacenterService.java index 7810cb38632..6e69009b62f 100644 --- a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/VmwareDatacenterService.java +++ b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/VmwareDatacenterService.java @@ -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; diff --git a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/VsphereStoragePolicy.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/VsphereStoragePolicy.java deleted file mode 100644 index 102bdaa3c04..00000000000 --- a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/VsphereStoragePolicy.java +++ /dev/null @@ -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(); -} diff --git a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java index c25189786b5..85b7beeec69 100644 --- a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java +++ b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java @@ -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; diff --git a/plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/ImportVsphereStoragePoliciesCmd.java b/plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/ImportVsphereStoragePoliciesCmd.java index b0e1d82a02e..cf950003d5b 100644 --- a/plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/ImportVsphereStoragePoliciesCmd.java +++ b/plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/ImportVsphereStoragePoliciesCmd.java @@ -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; diff --git a/plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/response/ImportVsphereStoragePoliciesResponse.java b/plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/response/ImportVsphereStoragePoliciesResponse.java index 82baf080348..a2227fb8e7f 100644 --- a/plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/response/ImportVsphereStoragePoliciesResponse.java +++ b/plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/response/ImportVsphereStoragePoliciesResponse.java @@ -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; diff --git a/plugins/hypervisors/vmware/src/main/resources/META-INF/cloudstack/core/spring-vmware-core-context.xml b/plugins/hypervisors/vmware/src/main/resources/META-INF/cloudstack/core/spring-vmware-core-context.xml index 406a6976b9a..a2d8314bfb8 100644 --- a/plugins/hypervisors/vmware/src/main/resources/META-INF/cloudstack/core/spring-vmware-core-context.xml +++ b/plugins/hypervisors/vmware/src/main/resources/META-INF/cloudstack/core/spring-vmware-core-context.xml @@ -36,7 +36,6 @@ -