Merge pull request #593 from vmware/refactor/305-restructure-vrops-co…

…mponents [artifact-manager,plugins,installer] (#305) Restructure Aria Operations components
vmware · Jan 17, 2025 · de01f4f · de01f4f
2 parents 4ad97a6 + 23e4f1c
commit de01f4f
Show file tree

Hide file tree

Showing 76 changed files with 1,904 additions and 1,665 deletions.
diff --git a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/IMPORTANT.md b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/IMPORTANT.md
@@ -7,7 +7,7 @@ The structure of this folder is being reworked. Classes are being moved based on
 - [x] Aria Automation
 - [ ] Aria Orchestrator
 - [ ] Aria Logs
-- [ ] Aria Operations
+- [x] Aria Operations
 - [ ] SSH
 - [ ] vCD
 - [ ] CS

diff --git a/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/PackageStoreFactory.java b/common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/PackageStoreFactory.java
@@ -26,7 +26,11 @@
 import org.slf4j.LoggerFactory;
 
 import com.vmware.pscoe.iac.artifact.aria.automation.rest.RestClientVraNg;
+import com.vmware.pscoe.iac.artifact.aria.operations.configuration.ConfigurationVrops;
+import com.vmware.pscoe.iac.artifact.aria.operations.rest.RestClientVrops;
+import com.vmware.pscoe.iac.artifact.aria.operations.store.VropsPackageStore;
 import com.vmware.pscoe.iac.artifact.aria.automation.configuration.ConfigurationVraNg;
+import com.vmware.pscoe.iac.artifact.aria.automation.pack.VraNgPackageStore;
 import com.vmware.pscoe.iac.artifact.cli.CliManagerFactory;
 import com.vmware.pscoe.iac.artifact.cli.CliManagerVrops;
 import com.vmware.pscoe.iac.artifact.model.Version;

diff --git a/...automation/package/VraNgPackageStore.java → ...ia/automation/pack/VraNgPackageStore.java b/...automation/package/VraNgPackageStore.java → ...ia/automation/pack/VraNgPackageStore.java
@@ -16,7 +16,7 @@
  * LICENSE file.
  * #L%
  */
-package com.vmware.pscoe.iac.artifact;
+package com.vmware.pscoe.iac.artifact.aria.automation.pack;
 
 import java.io.File;
 import java.io.IOException;
@@ -25,12 +25,15 @@
 import java.util.Collections;
 import java.util.List;
 
+import com.vmware.pscoe.iac.artifact.GenericPackageStore;
+import com.vmware.pscoe.iac.artifact.PackageManager;
+import com.vmware.pscoe.iac.artifact.PackageStore;
 import com.vmware.pscoe.iac.artifact.aria.automation.configuration.ConfigurationVraNg;
 import com.vmware.pscoe.iac.artifact.model.Package;
 import com.vmware.pscoe.iac.artifact.model.PackageContent.Content;
-import com.vmware.pscoe.iac.artifact.aria.automation.models.VraNgPackageAdapter;
-import com.vmware.pscoe.iac.artifact.aria.automation.models.VraNgPackageContent;
-import com.vmware.pscoe.iac.artifact.aria.automation.models.VraNgPackageDescriptor;
+import com.vmware.pscoe.iac.artifact.aria.automation.store.models.VraNgPackageAdapter;
+import com.vmware.pscoe.iac.artifact.aria.automation.store.models.VraNgPackageContent;
+import com.vmware.pscoe.iac.artifact.aria.automation.store.models.VraNgPackageDescriptor;
 import com.vmware.pscoe.iac.artifact.aria.automation.rest.RestClientVraNg;
 import com.vmware.pscoe.iac.artifact.aria.automation.store.VraNgTypeStoreFactory;
 
@@ -58,7 +61,7 @@ public class VraNgPackageStore extends GenericPackageStore<VraNgPackageDescripto
 	 * @param vraRestClient the vRA rest client
 	 * @param vraConfig     the vRA config
 	 */
-	protected VraNgPackageStore(final RestClientVraNg vraRestClient, final ConfigurationVraNg vraConfig) {
+	public VraNgPackageStore(final RestClientVraNg vraRestClient, final ConfigurationVraNg vraConfig) {
 		this.restClient = vraRestClient;
 		this.config = vraConfig;
 	}

diff --git a/...src/main/java/com/vmware/pscoe/iac/artifact/aria/automation/store/AbstractVraNgStore.java b/...src/main/java/com/vmware/pscoe/iac/artifact/aria/automation/store/AbstractVraNgStore.java
@@ -18,7 +18,7 @@
 import com.vmware.pscoe.iac.artifact.aria.automation.configuration.ConfigurationVraNg;
 import com.vmware.pscoe.iac.artifact.model.Package;
 import com.vmware.pscoe.iac.artifact.aria.automation.models.VraNgIntegration;
-import com.vmware.pscoe.iac.artifact.aria.automation.models.VraNgPackageDescriptor;
+import com.vmware.pscoe.iac.artifact.aria.automation.store.models.VraNgPackageDescriptor;
 import com.vmware.pscoe.iac.artifact.aria.automation.rest.RestClientVraNg;
 import com.vmware.pscoe.iac.artifact.aria.automation.utils.VraNgIntegrationUtils;
 

diff --git a/...ain/java/com/vmware/pscoe/iac/artifact/aria/automation/store/VraNgContentSourceStore.java b/...ain/java/com/vmware/pscoe/iac/artifact/aria/automation/store/VraNgContentSourceStore.java
@@ -31,7 +31,7 @@
 import com.vmware.pscoe.iac.artifact.aria.automation.models.VraNgContentSourceBase;
 import com.vmware.pscoe.iac.artifact.aria.automation.models.VraNgContentSourceType;
 import com.vmware.pscoe.iac.artifact.aria.automation.models.VraNgIntegration;
-import com.vmware.pscoe.iac.artifact.aria.automation.models.VraNgPackageDescriptor;
+import com.vmware.pscoe.iac.artifact.aria.automation.store.models.VraNgPackageDescriptor;
 import com.vmware.pscoe.iac.artifact.aria.automation.models.VraNgWorkflow;
 import com.vmware.pscoe.iac.artifact.aria.automation.models.VraNgWorkflowContentSource;
 import com.vmware.pscoe.iac.artifact.aria.automation.rest.RestClientVraNg;

diff --git a/...in/java/com/vmware/pscoe/iac/artifact/aria/automation/store/VraNgCustomResourceStore.java b/...in/java/com/vmware/pscoe/iac/artifact/aria/automation/store/VraNgCustomResourceStore.java
@@ -24,7 +24,7 @@
 import com.vmware.pscoe.iac.artifact.aria.automation.configuration.ConfigurationVraNg;
 import com.vmware.pscoe.iac.artifact.model.Package;
 import com.vmware.pscoe.iac.artifact.aria.automation.models.VraNgCustomResource;
-import com.vmware.pscoe.iac.artifact.aria.automation.models.VraNgPackageDescriptor;
+import com.vmware.pscoe.iac.artifact.aria.automation.store.models.VraNgPackageDescriptor;
 import com.vmware.pscoe.iac.artifact.aria.automation.rest.RestClientVraNg;
 import com.vmware.pscoe.iac.artifact.store.filters.CustomFolderFileFilter;
 import com.vmware.pscoe.iac.artifact.aria.automation.utils.VraNgOrganizationUtil;

diff --git a/.../main/java/com/vmware/pscoe/iac/artifact/aria/automation/store/VraNgEntitlementStore.java b/.../main/java/com/vmware/pscoe/iac/artifact/aria/automation/store/VraNgEntitlementStore.java
@@ -37,7 +37,7 @@
 import com.vmware.pscoe.iac.artifact.aria.automation.models.VraNgCatalogItem;
 import com.vmware.pscoe.iac.artifact.aria.automation.models.VraNgContentSourceBase;
 import com.vmware.pscoe.iac.artifact.aria.automation.models.VraNgContentSourceType;
-import com.vmware.pscoe.iac.artifact.aria.automation.models.VraNgPackageDescriptor;
+import com.vmware.pscoe.iac.artifact.aria.automation.store.models.VraNgPackageDescriptor;
 import com.vmware.pscoe.iac.artifact.aria.automation.models.VraNgProject;
 import com.vmware.pscoe.iac.artifact.aria.automation.rest.RestClientVraNg;
 import com.vmware.pscoe.iac.artifact.store.filters.CustomFolderFileFilter;

diff --git a/...ain/java/com/vmware/pscoe/iac/artifact/aria/automation/store/VraNgPropertyGroupStore.java b/...ain/java/com/vmware/pscoe/iac/artifact/aria/automation/store/VraNgPropertyGroupStore.java
@@ -29,7 +29,7 @@
 import com.google.gson.stream.JsonReader;
 import com.vmware.pscoe.iac.artifact.aria.automation.configuration.ConfigurationVraNg;
 import com.vmware.pscoe.iac.artifact.model.Package;
-import com.vmware.pscoe.iac.artifact.aria.automation.models.VraNgPackageDescriptor;
+import com.vmware.pscoe.iac.artifact.aria.automation.store.models.VraNgPackageDescriptor;
 import com.vmware.pscoe.iac.artifact.aria.automation.models.VraNgPropertyGroup;
 import com.vmware.pscoe.iac.artifact.aria.automation.rest.RestClientVraNg;
 

diff --git a/...main/java/com/vmware/pscoe/iac/artifact/aria/automation/store/VraNgSubscriptionStore.java b/...main/java/com/vmware/pscoe/iac/artifact/aria/automation/store/VraNgSubscriptionStore.java
@@ -23,7 +23,7 @@
 import com.vmware.pscoe.iac.artifact.aria.automation.configuration.ConfigurationVraNg;
 import com.vmware.pscoe.iac.artifact.model.Package;
 import com.vmware.pscoe.iac.artifact.model.abx.AbxAction;
-import com.vmware.pscoe.iac.artifact.aria.automation.models.VraNgPackageDescriptor;
+import com.vmware.pscoe.iac.artifact.aria.automation.store.models.VraNgPackageDescriptor;
 import com.vmware.pscoe.iac.artifact.aria.automation.models.VraNgProject;
 import com.vmware.pscoe.iac.artifact.aria.automation.models.VraNgSubscription;
 import com.vmware.pscoe.iac.artifact.aria.automation.rest.RestClientVraNg;

diff --git a/.../main/java/com/vmware/pscoe/iac/artifact/aria/automation/store/VraNgTypeStoreFactory.java b/.../main/java/com/vmware/pscoe/iac/artifact/aria/automation/store/VraNgTypeStoreFactory.java
@@ -20,24 +20,24 @@
 
 import com.vmware.pscoe.iac.artifact.aria.automation.configuration.ConfigurationVraNg;
 import com.vmware.pscoe.iac.artifact.model.Package;
-import com.vmware.pscoe.iac.artifact.aria.automation.models.VraNgPackageContent;
-import com.vmware.pscoe.iac.artifact.aria.automation.models.VraNgPackageDescriptor;
+import com.vmware.pscoe.iac.artifact.aria.automation.store.models.VraNgPackageContent;
+import com.vmware.pscoe.iac.artifact.aria.automation.store.models.VraNgPackageDescriptor;
 import com.vmware.pscoe.iac.artifact.aria.automation.rest.RestClientVraNg;
 
-import static com.vmware.pscoe.iac.artifact.aria.automation.models.VraNgPackageContent.ContentType.APPROVAL_POLICY;
-import static com.vmware.pscoe.iac.artifact.aria.automation.models.VraNgPackageContent.ContentType.BLUEPRINT;
-import static com.vmware.pscoe.iac.artifact.aria.automation.models.VraNgPackageContent.ContentType.CATALOG_ENTITLEMENT;
-import static com.vmware.pscoe.iac.artifact.aria.automation.models.VraNgPackageContent.ContentType.CATALOG_ITEM;
-import static com.vmware.pscoe.iac.artifact.aria.automation.models.VraNgPackageContent.ContentType.CONTENT_SHARING_POLICY;
-import static com.vmware.pscoe.iac.artifact.aria.automation.models.VraNgPackageContent.ContentType.CONTENT_SOURCE;
-import static com.vmware.pscoe.iac.artifact.aria.automation.models.VraNgPackageContent.ContentType.CUSTOM_RESOURCE;
-import static com.vmware.pscoe.iac.artifact.aria.automation.models.VraNgPackageContent.ContentType.DAY2_ACTIONS_POLICY;
-import static com.vmware.pscoe.iac.artifact.aria.automation.models.VraNgPackageContent.ContentType.DEPLOYMENT_LIMIT_POLICY;
-import static com.vmware.pscoe.iac.artifact.aria.automation.models.VraNgPackageContent.ContentType.LEASE_POLICY;
-import static com.vmware.pscoe.iac.artifact.aria.automation.models.VraNgPackageContent.ContentType.PROPERTY_GROUP;
-import static com.vmware.pscoe.iac.artifact.aria.automation.models.VraNgPackageContent.ContentType.RESOURCE_ACTION;
-import static com.vmware.pscoe.iac.artifact.aria.automation.models.VraNgPackageContent.ContentType.RESOURCE_QUOTA_POLICY;
-import static com.vmware.pscoe.iac.artifact.aria.automation.models.VraNgPackageContent.ContentType.SUBSCRIPTION;
+import static com.vmware.pscoe.iac.artifact.aria.automation.store.models.VraNgPackageContent.ContentType.APPROVAL_POLICY;
+import static com.vmware.pscoe.iac.artifact.aria.automation.store.models.VraNgPackageContent.ContentType.BLUEPRINT;
+import static com.vmware.pscoe.iac.artifact.aria.automation.store.models.VraNgPackageContent.ContentType.CATALOG_ENTITLEMENT;
+import static com.vmware.pscoe.iac.artifact.aria.automation.store.models.VraNgPackageContent.ContentType.CATALOG_ITEM;
+import static com.vmware.pscoe.iac.artifact.aria.automation.store.models.VraNgPackageContent.ContentType.CONTENT_SHARING_POLICY;
+import static com.vmware.pscoe.iac.artifact.aria.automation.store.models.VraNgPackageContent.ContentType.CONTENT_SOURCE;
+import static com.vmware.pscoe.iac.artifact.aria.automation.store.models.VraNgPackageContent.ContentType.CUSTOM_RESOURCE;
+import static com.vmware.pscoe.iac.artifact.aria.automation.store.models.VraNgPackageContent.ContentType.DAY2_ACTIONS_POLICY;
+import static com.vmware.pscoe.iac.artifact.aria.automation.store.models.VraNgPackageContent.ContentType.DEPLOYMENT_LIMIT_POLICY;
+import static com.vmware.pscoe.iac.artifact.aria.automation.store.models.VraNgPackageContent.ContentType.LEASE_POLICY;
+import static com.vmware.pscoe.iac.artifact.aria.automation.store.models.VraNgPackageContent.ContentType.PROPERTY_GROUP;
+import static com.vmware.pscoe.iac.artifact.aria.automation.store.models.VraNgPackageContent.ContentType.RESOURCE_ACTION;
+import static com.vmware.pscoe.iac.artifact.aria.automation.store.models.VraNgPackageContent.ContentType.RESOURCE_QUOTA_POLICY;
+import static com.vmware.pscoe.iac.artifact.aria.automation.store.models.VraNgPackageContent.ContentType.SUBSCRIPTION;
 
 /**
  * Factory to select and setup the store (handler) and determine the order of

diff --git a/...utomation/models/VraNgPackageAdapter.java → ...ion/store/models/VraNgPackageAdapter.java b/...utomation/models/VraNgPackageAdapter.java → ...ion/store/models/VraNgPackageAdapter.java
@@ -12,7 +12,7 @@
  * This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file.
  * #L%
  */
-package com.vmware.pscoe.iac.artifact.aria.automation.models;
+package com.vmware.pscoe.iac.artifact.aria.automation.store.models;
 
 import java.io.IOException;
 import java.nio.file.Files;

diff --git a/...utomation/models/VraNgPackageContent.java → ...ion/store/models/VraNgPackageContent.java b/...utomation/models/VraNgPackageContent.java → ...ion/store/models/VraNgPackageContent.java
@@ -12,7 +12,7 @@
  * This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file.
  * #L%
  */
-package com.vmware.pscoe.iac.artifact.aria.automation.models;
+package com.vmware.pscoe.iac.artifact.aria.automation.store.models;
 
 import java.util.List;
 

diff --git a/...mation/models/VraNgPackageDescriptor.java → .../store/models/VraNgPackageDescriptor.java b/...mation/models/VraNgPackageDescriptor.java → .../store/models/VraNgPackageDescriptor.java
@@ -12,7 +12,7 @@
  * This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file.
  * #L%
  */
-package com.vmware.pscoe.iac.artifact.aria.automation.models;
+package com.vmware.pscoe.iac.artifact.aria.automation.store.models;
 
 import java.io.File;
 import java.util.ArrayList;

diff --git a/...mation/models/VraNgPackageMemberType.java → .../store/models/VraNgPackageMemberType.java b/...mation/models/VraNgPackageMemberType.java → .../store/models/VraNgPackageMemberType.java
@@ -12,7 +12,7 @@
  * This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file.
  * #L%
  */
-package com.vmware.pscoe.iac.artifact.aria.automation.models;
+package com.vmware.pscoe.iac.artifact.aria.automation.store.models;
 
 public enum VraNgPackageMemberType {
 	BLUEPRINT("blueprint"),

diff --git a/...t/aria/automation/models/VraNgPolicy.java → .../automation/store/models/VraNgPolicy.java b/...t/aria/automation/models/VraNgPolicy.java → .../automation/store/models/VraNgPolicy.java
@@ -12,7 +12,7 @@
  * This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file.
  * #L%
  */
-package com.vmware.pscoe.iac.artifact.aria.automation.models;
+package com.vmware.pscoe.iac.artifact.aria.automation.store.models;
 
 import java.util.List;
 import java.util.ArrayList;

diff --git a/...act/configuration/ConfigurationVrops.java → ...ons/configuration/ConfigurationVrops.java b/...act/configuration/ConfigurationVrops.java → ...ons/configuration/ConfigurationVrops.java
@@ -12,7 +12,7 @@
  * This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file.
  * #L%
  */
-package com.vmware.pscoe.iac.artifact.configuration;
+package com.vmware.pscoe.iac.artifact.aria.operations.configuration;
 
 import java.net.InetAddress;
 import java.net.URISyntaxException;
@@ -22,6 +22,8 @@
 import org.apache.hc.core5.net.URIBuilder;
 import org.springframework.util.StringUtils;
 
+import com.vmware.pscoe.iac.artifact.configuration.ConfigurationException;
+import com.vmware.pscoe.iac.artifact.configuration.ConfigurationWithRefreshToken;
 import com.vmware.pscoe.iac.artifact.model.PackageType;
 
 public class ConfigurationVrops extends ConfigurationWithRefreshToken {
@@ -42,7 +44,7 @@ public class ConfigurationVrops extends ConfigurationWithRefreshToken {
 	 */
 	public static final String PACKAGE_IMPORT_OVERWRITE_MODE = "packageImportOverwriteMode";
 
-	protected ConfigurationVrops(Properties props) {
+	public ConfigurationVrops(Properties props) {
 		super(PackageType.VROPS, props);
 	}
 

diff --git a/...fact/rest/model/vrops/AdapterKindDTO.java → ...ria/operations/models/AdapterKindDTO.java b/...fact/rest/model/vrops/AdapterKindDTO.java → ...ria/operations/models/AdapterKindDTO.java
@@ -12,7 +12,7 @@
  * This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file.
  * #L%
  */
-package com.vmware.pscoe.iac.artifact.rest.model.vrops;
+package com.vmware.pscoe.iac.artifact.aria.operations.models;
 
 import java.io.Serializable;
 import java.util.ArrayList;

diff --git a/.../rest/model/vrops/AlertDefinitionDTO.java → ...operations/models/AlertDefinitionDTO.java b/.../rest/model/vrops/AlertDefinitionDTO.java → ...operations/models/AlertDefinitionDTO.java
@@ -12,7 +12,7 @@
  * This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file.
  * #L%
  */
-package com.vmware.pscoe.iac.artifact.rest.model.vrops;
+package com.vmware.pscoe.iac.artifact.aria.operations.models;
 
 import java.io.Serializable;
 import java.util.ArrayList;

diff --git a/...tifact/rest/model/vrops/AuthGroupDTO.java → .../aria/operations/models/AuthGroupDTO.java b/...tifact/rest/model/vrops/AuthGroupDTO.java → .../aria/operations/models/AuthGroupDTO.java
@@ -12,7 +12,7 @@
  * This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file.
  * #L%
  */
-package com.vmware.pscoe.iac.artifact.rest.model.vrops;
+package com.vmware.pscoe.iac.artifact.aria.operations.models;
 
 import java.io.Serializable;
 import java.util.ArrayList;

diff --git a/...ifact/rest/model/vrops/AuthGroupsDTO.java → ...aria/operations/models/AuthGroupsDTO.java b/...ifact/rest/model/vrops/AuthGroupsDTO.java → ...aria/operations/models/AuthGroupsDTO.java
@@ -12,7 +12,7 @@
  * This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file.
  * #L%
  */
-package com.vmware.pscoe.iac.artifact.rest.model.vrops;
+package com.vmware.pscoe.iac.artifact.aria.operations.models;
 
 import java.io.Serializable;
 import java.util.ArrayList;

diff --git a/...rtifact/rest/model/vrops/AuthUserDTO.java → ...t/aria/operations/models/AuthUserDTO.java b/...rtifact/rest/model/vrops/AuthUserDTO.java → ...t/aria/operations/models/AuthUserDTO.java
@@ -12,7 +12,7 @@
  * This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file.
  * #L%
  */
-package com.vmware.pscoe.iac.artifact.rest.model.vrops;
+package com.vmware.pscoe.iac.artifact.aria.operations.models;
 
 import java.util.LinkedHashMap;
 import java.util.List;

diff --git a/...tifact/rest/model/vrops/AuthUsersDTO.java → .../aria/operations/models/AuthUsersDTO.java b/...tifact/rest/model/vrops/AuthUsersDTO.java → .../aria/operations/models/AuthUsersDTO.java
@@ -12,7 +12,7 @@
  * This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file.
  * #L%
  */
-package com.vmware.pscoe.iac.artifact.rest.model.vrops;
+package com.vmware.pscoe.iac.artifact.aria.operations.models;
 
 import java.util.LinkedHashMap;
 import java.util.List;

diff --git a/...fact/rest/model/vrops/CustomGroupDTO.java → ...ria/operations/models/CustomGroupDTO.java b/...fact/rest/model/vrops/CustomGroupDTO.java → ...ria/operations/models/CustomGroupDTO.java
@@ -12,7 +12,7 @@
  * This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file.
  * #L%
  */
-package com.vmware.pscoe.iac.artifact.rest.model.vrops;
+package com.vmware.pscoe.iac.artifact.aria.operations.models;
 
 import java.io.Serializable;
 import java.util.ArrayList;

diff --git a/.../rest/model/vrops/CustomGroupTypeDTO.java → ...operations/models/CustomGroupTypeDTO.java b/.../rest/model/vrops/CustomGroupTypeDTO.java → ...operations/models/CustomGroupTypeDTO.java
@@ -12,19 +12,8 @@
  * This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file.
  * #L%
  */
-package com.vmware.pscoe.iac.artifact.rest.model.vrops;
+package com.vmware.pscoe.iac.artifact.aria.operations.models;
 
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 

diff --git a/...vrops/PolicyCustomGroupAssignmentDTO.java → ...odels/PolicyCustomGroupAssignmentDTO.java b/...vrops/PolicyCustomGroupAssignmentDTO.java → ...odels/PolicyCustomGroupAssignmentDTO.java
@@ -12,7 +12,7 @@
  * This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file.
  * #L%
  */
-package com.vmware.pscoe.iac.artifact.rest.model.vrops;
+package com.vmware.pscoe.iac.artifact.aria.operations.models;
 
 import java.io.Serializable;
 import java.util.LinkedHashMap;

diff --git a/.../artifact/rest/model/vrops/PolicyDTO.java → ...act/aria/operations/models/PolicyDTO.java b/.../artifact/rest/model/vrops/PolicyDTO.java → ...act/aria/operations/models/PolicyDTO.java
@@ -12,7 +12,7 @@
  * This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file.
  * #L%
  */
-package com.vmware.pscoe.iac.artifact.rest.model.vrops;
+package com.vmware.pscoe.iac.artifact.aria.operations.models;
 
 import java.util.HashMap;
 import java.util.List;

diff --git a/...st/model/vrops/PolicyImportResultDTO.java → ...rations/models/PolicyImportResultDTO.java b/...st/model/vrops/PolicyImportResultDTO.java → ...rations/models/PolicyImportResultDTO.java
@@ -12,7 +12,7 @@
  * This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file.
  * #L%
  */
-package com.vmware.pscoe.iac.artifact.rest.model.vrops;
+package com.vmware.pscoe.iac.artifact.aria.operations.models;
 
 import java.io.Serializable;
 import java.util.ArrayList;

diff --git a/...t/rest/model/vrops/RecommendationDTO.java → .../operations/models/RecommendationDTO.java b/...t/rest/model/vrops/RecommendationDTO.java → .../operations/models/RecommendationDTO.java
@@ -12,7 +12,7 @@
  * This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file.
  * #L%
  */
-package com.vmware.pscoe.iac.artifact.rest.model.vrops;
+package com.vmware.pscoe.iac.artifact.aria.operations.models;
 
 import java.io.Serializable;
 import java.util.ArrayList;

diff --git a/...rest/model/vrops/ReportDefinitionDTO.java → ...perations/models/ReportDefinitionDTO.java b/...rest/model/vrops/ReportDefinitionDTO.java → ...perations/models/ReportDefinitionDTO.java
@@ -12,7 +12,7 @@
  * This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file.
  * #L%
  */
-package com.vmware.pscoe.iac.artifact.rest.model.vrops;
+package com.vmware.pscoe.iac.artifact.aria.operations.models;
 
 import java.io.Serializable;
 import java.util.ArrayList;