From c309f24909510ebd11737efc3eadb055c91e304e Mon Sep 17 00:00:00 2001 From: niamhcore Date: Tue, 7 Sep 2021 10:27:18 +0100 Subject: P2 - Get module names and revisions rest layer Issue-ID: CPS-485 Signed-off-by: niamhcore Change-Id: I1bcf45902207d0dba6b5dfe8277cb06571694db3 --- .../java/org/onap/cps/spi/impl/CpsModulePersistenceServiceImpl.java | 4 ++-- .../cps/spi/impl/CpsModulePersistenceServiceIntegrationSpec.groovy | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'cps-ri/src') diff --git a/cps-ri/src/main/java/org/onap/cps/spi/impl/CpsModulePersistenceServiceImpl.java b/cps-ri/src/main/java/org/onap/cps/spi/impl/CpsModulePersistenceServiceImpl.java index d7b882f6ee..e0f54265ab 100755 --- a/cps-ri/src/main/java/org/onap/cps/spi/impl/CpsModulePersistenceServiceImpl.java +++ b/cps-ri/src/main/java/org/onap/cps/spi/impl/CpsModulePersistenceServiceImpl.java @@ -116,7 +116,7 @@ public class CpsModulePersistenceServiceImpl implements CpsModulePersistenceServ } @Override - public Collection getAllYangResourceModuleReferences(final String dataspaceName) { + public Collection getYangResourceModuleReferences(final String dataspaceName) { final Set yangResourceModuleReferenceList = yangResourceRepository.findAllModuleReferences(dataspaceName); return yangResourceModuleReferenceList.stream().map(CpsModulePersistenceServiceImpl::toModuleReference) @@ -124,7 +124,7 @@ public class CpsModulePersistenceServiceImpl implements CpsModulePersistenceServ } @Override - public Collection getAllYangResourceModuleReferences(final String dataspaceName, + public Collection getYangResourceModuleReferences(final String dataspaceName, final String anchorName) { final Set yangResourceModuleReferenceList = yangResourceRepository diff --git a/cps-ri/src/test/groovy/org/onap/cps/spi/impl/CpsModulePersistenceServiceIntegrationSpec.groovy b/cps-ri/src/test/groovy/org/onap/cps/spi/impl/CpsModulePersistenceServiceIntegrationSpec.groovy index a139830a2b..7e42200799 100644 --- a/cps-ri/src/test/groovy/org/onap/cps/spi/impl/CpsModulePersistenceServiceIntegrationSpec.groovy +++ b/cps-ri/src/test/groovy/org/onap/cps/spi/impl/CpsModulePersistenceServiceIntegrationSpec.groovy @@ -140,7 +140,7 @@ class CpsModulePersistenceServiceIntegrationSpec extends CpsPersistenceSpecBase given: 'a dataspace name' def dataspaceName = 'DATASPACE-002' when: 'all yang resources module references are retrieved for the given dataspace name' - def result = objectUnderTest.getAllYangResourceModuleReferences(dataspaceName) + def result = objectUnderTest.getYangResourceModuleReferences(dataspaceName) then: 'the correct resources are returned' result.sort() == [new ModuleReference(moduleName: 'MODULE-NAME-005', revision: 'REVISION-002'), new ModuleReference(moduleName: 'MODULE-NAME-006', revision: 'REVISION-006')] @@ -152,7 +152,7 @@ class CpsModulePersistenceServiceIntegrationSpec extends CpsPersistenceSpecBase def dataspaceName = 'DATASPACE-001' def anchorName = 'ANCHOR1' when: 'all yang resources module references are retrieved for the given anchor' - def result = objectUnderTest.getAllYangResourceModuleReferences(dataspaceName, anchorName) + def result = objectUnderTest.getYangResourceModuleReferences(dataspaceName, anchorName) then: 'the correct module names and revisions are returned' result.sort() == [new ModuleReference(moduleName: null, revision: null), new ModuleReference(moduleName: 'MODULE-NAME-002', revision: 'REVISION-002'), new ModuleReference(moduleName: 'MODULE-NAME-003', revision: 'REVISION-002'), -- cgit 1.2.3-korg d36785226b7c6ca4c9df759f2'>kubernetes/robot/instantiate-k8s.sh
blob: 94883567d6161c3eed66bafd68bb8f17b5527aae (plain) 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151