From cea1ece498ebfcc7616e543d3ded749cdd4139bd Mon Sep 17 00:00:00 2001
From: Ivan Mihov <imihov@vmware.com>
Date: Tue, 19 Sep 2023 10:27:25 +0300
Subject: [PATCH 1/3] fixed default content.yaml tempalte for vRA to be working
 for vRA push/pull

---
 .../archetype-resources/vra/content.yaml      | 21 ++++++++++++-------
 .../archetype-resources/content.yaml          | 21 ++++++++++++-------
 2 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/maven/archetypes/ts-vra-ng/src/main/resources/archetype-resources/vra/content.yaml b/maven/archetypes/ts-vra-ng/src/main/resources/archetype-resources/vra/content.yaml
index 6251482eb..e41e62645 100644
--- a/maven/archetypes/ts-vra-ng/src/main/resources/archetype-resources/vra/content.yaml
+++ b/maven/archetypes/ts-vra-ng/src/main/resources/archetype-resources/vra/content.yaml
@@ -27,7 +27,8 @@
 #     - policy name 2
 
 blueprint:
-subscription:
+  - Volume
+subscription: []
 flavor-mapping:
   - small
   - medium
@@ -37,11 +38,15 @@ region-mapping:
   cloud-account-tags:
     export-tag: "env:dev"
     import-tags: ["env:dev", "env:test"]
-catalog-item:
-custom-resource:
-resource-action:
-catalog-entitlement:
-content-source:
-property-group:
+catalog-item: []
+custom-resource: []
+resource-action: []
+catalog-entitlement: []
+
+property-group: []
 policy:
-  content-sharing:
+  content-sharing: []
+  lease: []
+  day2actions: []
+
+content-source: []
diff --git a/maven/archetypes/vra-ng/src/main/resources/archetype-resources/content.yaml b/maven/archetypes/vra-ng/src/main/resources/archetype-resources/content.yaml
index 6251482eb..e41e62645 100644
--- a/maven/archetypes/vra-ng/src/main/resources/archetype-resources/content.yaml
+++ b/maven/archetypes/vra-ng/src/main/resources/archetype-resources/content.yaml
@@ -27,7 +27,8 @@
 #     - policy name 2
 
 blueprint:
-subscription:
+  - Volume
+subscription: []
 flavor-mapping:
   - small
   - medium
@@ -37,11 +38,15 @@ region-mapping:
   cloud-account-tags:
     export-tag: "env:dev"
     import-tags: ["env:dev", "env:test"]
-catalog-item:
-custom-resource:
-resource-action:
-catalog-entitlement:
-content-source:
-property-group:
+catalog-item: []
+custom-resource: []
+resource-action: []
+catalog-entitlement: []
+
+property-group: []
 policy:
-  content-sharing:
+  content-sharing: []
+  lease: []
+  day2actions: []
+
+content-source: []

From fd58befe070a0c0be0a40ffce8f076d1cdae15da Mon Sep 17 00:00:00 2001
From: Ivan Mihov <imihov@vmware.com>
Date: Tue, 19 Sep 2023 11:11:38 +0300
Subject: [PATCH 2/3] removed unimplemented lease and day2actions content
 sharing policies

---
 .../src/main/resources/archetype-resources/vra/content.yaml     | 2 --
 .../vra-ng/src/main/resources/archetype-resources/content.yaml  | 2 --
 2 files changed, 4 deletions(-)

diff --git a/maven/archetypes/ts-vra-ng/src/main/resources/archetype-resources/vra/content.yaml b/maven/archetypes/ts-vra-ng/src/main/resources/archetype-resources/vra/content.yaml
index e41e62645..f4183ae7f 100644
--- a/maven/archetypes/ts-vra-ng/src/main/resources/archetype-resources/vra/content.yaml
+++ b/maven/archetypes/ts-vra-ng/src/main/resources/archetype-resources/vra/content.yaml
@@ -46,7 +46,5 @@ catalog-entitlement: []
 property-group: []
 policy:
   content-sharing: []
-  lease: []
-  day2actions: []
 
 content-source: []
diff --git a/maven/archetypes/vra-ng/src/main/resources/archetype-resources/content.yaml b/maven/archetypes/vra-ng/src/main/resources/archetype-resources/content.yaml
index e41e62645..f4183ae7f 100644
--- a/maven/archetypes/vra-ng/src/main/resources/archetype-resources/content.yaml
+++ b/maven/archetypes/vra-ng/src/main/resources/archetype-resources/content.yaml
@@ -46,7 +46,5 @@ catalog-entitlement: []
 property-group: []
 policy:
   content-sharing: []
-  lease: []
-  day2actions: []
 
 content-source: []

From c731ece58975c74cc7e67315a1f2126c8dc761ea Mon Sep 17 00:00:00 2001
From: Georgi Kostadinov <georgik@vmware.com>
Date: Tue, 14 Nov 2023 13:57:05 +0200
Subject: [PATCH 3/3] IAC-797 Improved content.yaml definition for 'ts-vra-ng'
 and 'vra-ng'

Signed-off-by: Georgi Kostadinov <georgik@vmware.com>
---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 460e3c8bb..dcaa21e34 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 ### Enhancements
 * [artifact-manager] IAC-786 / Set Aria Operations Default Policy vROPs 8.12.x.
 * [artifact-manager] IAC-790 / Update usage of deprecated policy APIs for vROPs 8.12.x.
+* [archetypes] IAC-797 / Improved content.yaml definition for "ts-vra-ng" and "vra-ng"
 
 ## v2.35.1 - 29 Sep 2023