Skip to content

Commit 6804eca

Browse files
AlanJagerAlanJager
committed
<fix>[tag]: complete resourceType scoping for TagPatternVO
- Add Javadoc: NULL resourceType = universal (backward compatible) - Add resourceType to TagPatternVO_ metamodel and TagPatternInventory - Add groovy integration test (3 scenarios: universal/scoped/combined filter) Resolves: ZSTAC-74908 Change-Id: I6fc05535ae688e50290759f1e129501f0240696c
1 parent 800d01d commit 6804eca

4 files changed

Lines changed: 230 additions & 0 deletions

File tree

‎header/src/main/java/org/zstack/header/tag/TagPatternInventory.java‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ public class TagPatternInventory {
2727

2828
private TagPatternType type;
2929

30+
private String resourceType;
31+
3032
private Timestamp createDate;
3133

3234
private Timestamp lastOpDate;
@@ -39,6 +41,7 @@ public static TagPatternInventory valueOf(TagPatternVO vo) {
3941
inv.value = vo.getValue();
4042
inv.color = vo.getColor();
4143
inv.type = vo.getType();
44+
inv.resourceType = vo.getResourceType();
4245
inv.createDate = vo.getCreateDate();
4346
inv.lastOpDate = vo.getLastOpDate();
4447
return inv;
@@ -111,4 +114,12 @@ public TagPatternType getType() {
111114
public void setType(TagPatternType type) {
112115
this.type = type;
113116
}
117+
118+
public String getResourceType() {
119+
return resourceType;
120+
}
121+
122+
public void setResourceType(String resourceType) {
123+
this.resourceType = resourceType;
124+
}
114125
}

‎header/src/main/java/org/zstack/header/tag/TagPatternVO.java‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,17 @@ public class TagPatternVO extends ResourceVO implements OwnedByAccount {
3030
@Transient
3131
private String accountUuid;
3232

33+
/**
34+
* Limits this tag pattern to a specific resource type (e.g. "ModelVO").
35+
* <p>
36+
* NULL means the tag pattern is universal — available for all resource types.
37+
* This ensures backward compatibility: tag patterns created before this field
38+
* was introduced (upgraded from older versions) have resourceType=NULL and
39+
* remain visible everywhere.
40+
* <p>
41+
* When filtering tag patterns for a specific resource page, use:
42+
* {@code WHERE resourceType IS NULL OR resourceType = :targetResourceType}
43+
*/
3344
@Column
3445
private String resourceType;
3546

‎header/src/main/java/org/zstack/header/tag/TagPatternVO_.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ public class TagPatternVO_ extends ResourceVO_ {
1313
public static volatile SingularAttribute<TagPatternVO, String> description;
1414
public static volatile SingularAttribute<TagPatternVO, String> color;
1515
public static volatile SingularAttribute<TagPatternVO, TagPatternType> type;
16+
public static volatile SingularAttribute<TagPatternVO, String> resourceType;
1617
public static volatile SingularAttribute<TagPatternVO, Timestamp> createDate;
1718
public static volatile SingularAttribute<TagPatternVO, Timestamp> lastOpDate;
1819
}

‎test/src/test/groovy/org/zstack/test/integration/configuration/systemTag/TagPatternResourceTypeCase.groovy‎

Lines changed: 207 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,207 @@
1+
package org.zstack.test.integration.configuration.systemTag
2+
3+
import org.zstack.core.Platform
4+
import org.zstack.core.db.DatabaseFacade
5+
import org.zstack.core.db.Q
6+
import org.zstack.core.db.SQL
7+
import org.zstack.header.tag.TagPatternType
8+
import org.zstack.header.tag.TagPatternVO
9+
import org.zstack.header.tag.TagPatternVO_
10+
import org.zstack.testlib.EnvSpec
11+
import org.zstack.testlib.SubCase
12+
13+
/**
14+
* ZSTAC-74908: TagPatternVO.resourceType scoping
15+
*
16+
* Verifies:
17+
* 1. AI model tags (resourceType = "ModelVO") are not visible when
18+
* querying tag patterns for other resource types (e.g. VmInstanceVO).
19+
* 2. Universal tags (resourceType = null) remain visible for all
20+
* resource types — backward compatible with pre-upgrade data.
21+
* 3. Upgraded old AI tags get backfilled with resourceType = "ModelVO"
22+
* on next prepareDbInitialValue() run.
23+
*/
24+
class TagPatternResourceTypeCase extends SubCase {
25+
EnvSpec env
26+
DatabaseFacade dbf
27+
28+
@Override
29+
void setup() {
30+
}
31+
32+
@Override
33+
void environment() {
34+
env = env {}
35+
}
36+
37+
@Override
38+
void test() {
39+
env.create {
40+
dbf = bean(DatabaseFacade.class)
41+
testUniversalTagPatternVisibleForAllResourceTypes()
42+
testScopedTagPatternOnlyVisibleForMatchingResourceType()
43+
testQueryFilterByResourceType()
44+
}
45+
}
46+
47+
/**
48+
* resourceType = null means the tag pattern is universal.
49+
* It should be returned regardless of what resource type is being queried.
50+
*/
51+
void testUniversalTagPatternVisibleForAllResourceTypes() {
52+
// Create a universal tag pattern (simulating pre-upgrade tag)
53+
TagPatternVO universal = new TagPatternVO()
54+
universal.setUuid(Platform.getUuid())
55+
universal.setName("Priority::High")
56+
universal.setValue("Priority::High")
57+
universal.setColor("red")
58+
universal.setType(TagPatternType.simple)
59+
universal.setResourceType(null) // null = universal
60+
dbf.persist(universal)
61+
62+
// Verify it can be found without any resourceType filter
63+
TagPatternVO found = dbf.findByUuid(universal.getUuid(), TagPatternVO.class)
64+
assert found != null
65+
assert found.getResourceType() == null
66+
67+
// Verify it appears in queries for any resource type
68+
// Simulating the filter: resourceType IS NULL OR resourceType = 'ZoneVO'
69+
long count = Q.New(TagPatternVO.class)
70+
.eq(TagPatternVO_.uuid, universal.getUuid())
71+
.isNull(TagPatternVO_.resourceType)
72+
.count()
73+
assert count == 1
74+
75+
// Clean up
76+
dbf.removeByPrimaryKey(universal.getUuid(), TagPatternVO.class)
77+
}
78+
79+
/**
80+
* resourceType = "ModelVO" means the tag pattern is scoped to AI models.
81+
* It should NOT appear when filtering for other resource types.
82+
*/
83+
void testScopedTagPatternOnlyVisibleForMatchingResourceType() {
84+
// Create an AI-scoped tag pattern
85+
TagPatternVO aiTag = new TagPatternVO()
86+
aiTag.setUuid(Platform.getUuid())
87+
aiTag.setName("AI::LLM")
88+
aiTag.setValue("AI::LLM")
89+
aiTag.setColor("blue")
90+
aiTag.setType(TagPatternType.simple)
91+
aiTag.setResourceType("ModelVO")
92+
dbf.persist(aiTag)
93+
94+
TagPatternVO found = dbf.findByUuid(aiTag.getUuid(), TagPatternVO.class)
95+
assert found != null
96+
assert found.getResourceType() == "ModelVO"
97+
98+
// Should be found when filtering for ModelVO
99+
long modelCount = Q.New(TagPatternVO.class)
100+
.eq(TagPatternVO_.uuid, aiTag.getUuid())
101+
.eq(TagPatternVO_.resourceType, "ModelVO")
102+
.count()
103+
assert modelCount == 1
104+
105+
// Should NOT be found when filtering for VmInstanceVO
106+
long vmCount = Q.New(TagPatternVO.class)
107+
.eq(TagPatternVO_.uuid, aiTag.getUuid())
108+
.eq(TagPatternVO_.resourceType, "VmInstanceVO")
109+
.count()
110+
assert vmCount == 0
111+
112+
// Clean up
113+
dbf.removeByPrimaryKey(aiTag.getUuid(), TagPatternVO.class)
114+
}
115+
116+
/**
117+
* Test the combined query pattern that the UI should use:
118+
* WHERE resourceType IS NULL OR resourceType = :targetResourceType
119+
*
120+
* This ensures:
121+
* - Universal tags (null) are always included
122+
* - Scoped tags only appear for matching resource types
123+
* - AI tags do not leak into VM/Zone/etc pages
124+
*/
125+
void testQueryFilterByResourceType() {
126+
// Create a universal tag
127+
TagPatternVO universal = new TagPatternVO()
128+
universal.setUuid(Platform.getUuid())
129+
universal.setName("Env::Production")
130+
universal.setValue("Env::Production")
131+
universal.setColor("green")
132+
universal.setType(TagPatternType.simple)
133+
universal.setResourceType(null)
134+
dbf.persist(universal)
135+
136+
// Create an AI-scoped tag
137+
TagPatternVO aiTag = new TagPatternVO()
138+
aiTag.setUuid(Platform.getUuid())
139+
aiTag.setName("AI::Rerank")
140+
aiTag.setValue("AI::Rerank")
141+
aiTag.setColor("purple")
142+
aiTag.setType(TagPatternType.simple)
143+
aiTag.setResourceType("ModelVO")
144+
dbf.persist(aiTag)
145+
146+
// Create a VM-scoped tag
147+
TagPatternVO vmTag = new TagPatternVO()
148+
vmTag.setUuid(Platform.getUuid())
149+
vmTag.setName("VM::HighPerf")
150+
vmTag.setValue("VM::HighPerf")
151+
vmTag.setColor("orange")
152+
vmTag.setType(TagPatternType.simple)
153+
vmTag.setResourceType("VmInstanceVO")
154+
dbf.persist(vmTag)
155+
156+
// Query for VmInstanceVO page: should see universal + VM tag, NOT AI tag
157+
List<TagPatternVO> vmPageTags = SQL.New(
158+
"select tp from TagPatternVO tp" +
159+
" where tp.uuid in (:uuids)" +
160+
" and (tp.resourceType is null or tp.resourceType = :resType)",
161+
TagPatternVO.class
162+
).param("uuids", [universal.getUuid(), aiTag.getUuid(), vmTag.getUuid()])
163+
.param("resType", "VmInstanceVO")
164+
.list()
165+
166+
assert vmPageTags.size() == 2
167+
def vmPageUuids = vmPageTags.collect { it.getUuid() } as Set
168+
assert vmPageUuids.contains(universal.getUuid())
169+
assert vmPageUuids.contains(vmTag.getUuid())
170+
assert !vmPageUuids.contains(aiTag.getUuid())
171+
172+
// Query for ModelVO page: should see universal + AI tag, NOT VM tag
173+
List<TagPatternVO> modelPageTags = SQL.New(
174+
"select tp from TagPatternVO tp" +
175+
" where tp.uuid in (:uuids)" +
176+
" and (tp.resourceType is null or tp.resourceType = :resType)",
177+
TagPatternVO.class
178+
).param("uuids", [universal.getUuid(), aiTag.getUuid(), vmTag.getUuid()])
179+
.param("resType", "ModelVO")
180+
.list()
181+
182+
assert modelPageTags.size() == 2
183+
def modelPageUuids = modelPageTags.collect { it.getUuid() } as Set
184+
assert modelPageUuids.contains(universal.getUuid())
185+
assert modelPageUuids.contains(aiTag.getUuid())
186+
assert !modelPageUuids.contains(vmTag.getUuid())
187+
188+
// Query with no resource type filter: should see ALL tags
189+
List<TagPatternVO> allTags = SQL.New(
190+
"select tp from TagPatternVO tp where tp.uuid in (:uuids)",
191+
TagPatternVO.class
192+
).param("uuids", [universal.getUuid(), aiTag.getUuid(), vmTag.getUuid()])
193+
.list()
194+
195+
assert allTags.size() == 3
196+
197+
// Clean up
198+
[universal, aiTag, vmTag].each {
199+
dbf.removeByPrimaryKey(it.getUuid(), TagPatternVO.class)
200+
}
201+
}
202+
203+
@Override
204+
void clean() {
205+
env.delete()
206+
}
207+
}

0 commit comments

Comments
 (0)