Skip to content

Commit d596620

Browse files
WangLiNarutoWangLiNaruto
authored
add new property isReadOnly to ServiceConfigurationParameter (eclipse-xpanse#1795)
1 parent 4783f1d commit d596620

File tree

9 files changed

+55
-4
lines changed

9 files changed

+55
-4
lines changed

Diff for: ‎modules/models/src/main/java/org/eclipse/xpanse/modules/models/servicetemplate/ServiceConfigurationParameter.java

+4
Original file line numberDiff line numberDiff line change
@@ -73,4 +73,8 @@ public class ServiceConfigurationParameter implements Serializable {
7373
@Schema(description = "Service config parameter modificationImpact")
7474
private ModificationImpact modificationImpact;
7575

76+
@NotNull
77+
@Schema(description = "Whether the service configuration parameters are read-only")
78+
private Boolean isReadOnly;
79+
7680
}

Diff for: ‎modules/models/src/test/java/org/eclipse/xpanse/modules/models/servicetemplate/ServiceConfigurationParameterTest.java

+16-4
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ void setUp() {
5050
serviceConfigurationParameter.setSensitiveScope(sensitiveScope);
5151
serviceConfigurationParameter.setAutoFill(autoFill);
5252
serviceConfigurationParameter.setModificationImpact(modificationImpact);
53+
serviceConfigurationParameter.setIsReadOnly(true);
5354
}
5455

5556
@Test
@@ -65,6 +66,7 @@ void testGetterAndSetter() {
6566
assertEquals(validatorMap, serviceConfigurationParameter.getValueSchema());
6667
assertEquals(sensitiveScope, serviceConfigurationParameter.getSensitiveScope());
6768
assertEquals(modificationImpact, serviceConfigurationParameter.getModificationImpact());
69+
assertEquals(true, serviceConfigurationParameter.getIsReadOnly());
6870
}
6971

7072
@Test
@@ -141,18 +143,27 @@ void testEqualsAndHashCode() {
141143
assertNotEquals(configurationParameter1.hashCode(), configurationParameter2.hashCode());
142144

143145
configurationParameter1.setSensitiveScope(sensitiveScope);
144-
assertEquals(serviceConfigurationParameter, configurationParameter1);
146+
assertNotEquals(serviceConfigurationParameter, configurationParameter1);
145147
assertNotEquals(configurationParameter1, configurationParameter2);
146-
assertEquals(serviceConfigurationParameter.hashCode(), configurationParameter1.hashCode());
148+
assertNotEquals(serviceConfigurationParameter.hashCode(),
149+
configurationParameter1.hashCode());
147150
assertNotEquals(configurationParameter1.hashCode(), configurationParameter2.hashCode());
148151

149152
configurationParameter1.setAutoFill(autoFill);
150-
assertEquals(serviceConfigurationParameter, configurationParameter1);
153+
assertNotEquals(serviceConfigurationParameter, configurationParameter1);
151154
assertNotEquals(configurationParameter1, configurationParameter2);
152-
assertEquals(serviceConfigurationParameter.hashCode(), configurationParameter1.hashCode());
155+
assertNotEquals(serviceConfigurationParameter.hashCode(),
156+
configurationParameter1.hashCode());
153157
assertNotEquals(configurationParameter1.hashCode(), configurationParameter2.hashCode());
154158

155159
configurationParameter1.setModificationImpact(modificationImpact);
160+
assertNotEquals(serviceConfigurationParameter, configurationParameter1);
161+
assertNotEquals(configurationParameter1, configurationParameter2);
162+
assertNotEquals(serviceConfigurationParameter.hashCode(),
163+
configurationParameter1.hashCode());
164+
assertNotEquals(configurationParameter1.hashCode(), configurationParameter2.hashCode());
165+
166+
configurationParameter1.setIsReadOnly(true);
156167
assertEquals(serviceConfigurationParameter, configurationParameter1);
157168
assertNotEquals(configurationParameter1, configurationParameter2);
158169
assertEquals(serviceConfigurationParameter.hashCode(), configurationParameter1.hashCode());
@@ -174,6 +185,7 @@ void testToString() {
174185
", sensitiveScope=" + sensitiveScope + "" +
175186
", autoFill=" + autoFill + "" +
176187
", modificationImpact=" + modificationImpact + "" +
188+
", isReadOnly=" + true + "" +
177189
")";
178190
assertEquals(expectedString, serviceConfigurationParameter.toString());
179191
}

Diff for: ‎samples/HuaweiCloud-Kafka-autofill.yml

+5
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ configurationParameters:
127127
modificationImpact:
128128
isDataLost: true
129129
isServiceInterrupted: true
130+
isReadOnly: false
130131
- name: kafka_cfg_log_dirs
131132
kind: variable
132133
dataType: string
@@ -136,6 +137,7 @@ configurationParameters:
136137
modificationImpact:
137138
isDataLost: true
138139
isServiceInterrupted: true
140+
isReadOnly: false
139141
- name: kafka_cfg_num_io_threads
140142
kind: variable
141143
dataType: number
@@ -145,6 +147,7 @@ configurationParameters:
145147
modificationImpact:
146148
isDataLost: true
147149
isServiceInterrupted: true
150+
isReadOnly: false
148151
- name: kafka_log_flush_interval_messages
149152
kind: variable
150153
dataType: number
@@ -154,6 +157,7 @@ configurationParameters:
154157
modificationImpact:
155158
isDataLost: true
156159
isServiceInterrupted: true
160+
isReadOnly: false
157161
- name: kafka_offsets_topic_replication_factor
158162
kind: variable
159163
dataType: number
@@ -163,6 +167,7 @@ configurationParameters:
163167
modificationImpact:
164168
isDataLost: true
165169
isServiceInterrupted: true
170+
isReadOnly: false
166171
deployment:
167172
# kind, Supported values are terraform, opentofu.
168173
kind: terraform

Diff for: ‎samples/HuaweiCloud-Kafka-terraform_module.yml

+5
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ configurationParameters:
127127
modificationImpact:
128128
isDataLost: true
129129
isServiceInterrupted: true
130+
isReadOnly: false
130131
- name: kafka_cfg_log_dirs
131132
kind: variable
132133
dataType: string
@@ -136,6 +137,7 @@ configurationParameters:
136137
modificationImpact:
137138
isDataLost: true
138139
isServiceInterrupted: true
140+
isReadOnly: false
139141
- name: kafka_cfg_num_io_threads
140142
kind: variable
141143
dataType: number
@@ -145,6 +147,7 @@ configurationParameters:
145147
modificationImpact:
146148
isDataLost: true
147149
isServiceInterrupted: true
150+
isReadOnly: false
148151
- name: kafka_log_flush_interval_messages
149152
kind: variable
150153
dataType: number
@@ -154,6 +157,7 @@ configurationParameters:
154157
modificationImpact:
155158
isDataLost: true
156159
isServiceInterrupted: true
160+
isReadOnly: false
157161
- name: kafka_offsets_topic_replication_factor
158162
kind: variable
159163
dataType: number
@@ -163,6 +167,7 @@ configurationParameters:
163167
modificationImpact:
164168
isDataLost: true
165169
isServiceInterrupted: true
170+
isReadOnly: false
166171
deployment:
167172
# kind, Supported values are terraform, opentofu.
168173
kind: terraform

Diff for: ‎samples/HuaweiCloud-Kafka.yml

+5
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ configurationParameters:
130130
modificationImpact:
131131
isDataLost: true
132132
isServiceInterrupted: true
133+
isReadOnly: false
133134
- name: kafka_cfg_log_dirs
134135
kind: variable
135136
dataType: string
@@ -139,6 +140,7 @@ configurationParameters:
139140
modificationImpact:
140141
isDataLost: true
141142
isServiceInterrupted: true
143+
isReadOnly: false
142144
- name: kafka_cfg_num_io_threads
143145
kind: variable
144146
dataType: number
@@ -148,6 +150,7 @@ configurationParameters:
148150
modificationImpact:
149151
isDataLost: true
150152
isServiceInterrupted: true
153+
isReadOnly: false
151154
- name: kafka_log_flush_interval_messages
152155
kind: variable
153156
dataType: number
@@ -157,6 +160,7 @@ configurationParameters:
157160
modificationImpact:
158161
isDataLost: true
159162
isServiceInterrupted: true
163+
isReadOnly: false
160164
- name: kafka_offsets_topic_replication_factor
161165
kind: variable
162166
dataType: number
@@ -166,6 +170,7 @@ configurationParameters:
166170
modificationImpact:
167171
isDataLost: true
168172
isServiceInterrupted: true
173+
isReadOnly: false
169174
deployment:
170175
# kind, Supported values are terraform, opentofu.
171176
kind: terraform

Diff for: ‎samples/OpenstackTestLab-Kafka.yml

+5
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ configurationParameters:
7777
modificationImpact:
7878
isDataLost: true
7979
isServiceInterrupted: true
80+
isReadOnly: false
8081
- name: kafka_cfg_log_dirs
8182
kind: variable
8283
dataType: string
@@ -86,6 +87,7 @@ configurationParameters:
8687
modificationImpact:
8788
isDataLost: true
8889
isServiceInterrupted: true
90+
isReadOnly: false
8991
- name: kafka_cfg_num_io_threads
9092
kind: variable
9193
dataType: number
@@ -95,6 +97,7 @@ configurationParameters:
9597
modificationImpact:
9698
isDataLost: true
9799
isServiceInterrupted: true
100+
isReadOnly: false
98101
- name: kafka_log_flush_interval_messages
99102
kind: variable
100103
dataType: number
@@ -104,6 +107,7 @@ configurationParameters:
104107
modificationImpact:
105108
isDataLost: true
106109
isServiceInterrupted: true
110+
isReadOnly: false
107111
- name: kafka_offsets_topic_replication_factor
108112
kind: variable
109113
dataType: number
@@ -113,6 +117,7 @@ configurationParameters:
113117
modificationImpact:
114118
isDataLost: true
115119
isServiceInterrupted: true
120+
isReadOnly: false
116121
deployment:
117122
# kind, Supported values are terraform, opentofu.
118123
kind: terraform

Diff for: ‎samples/PlusServer-Kafka.yml

+5
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ configurationParameters:
7979
modificationImpact:
8080
isDataLost: true
8181
isServiceInterrupted: true
82+
isReadOnly: false
8283
- name: kafka_cfg_log_dirs
8384
kind: variable
8485
dataType: string
@@ -88,6 +89,7 @@ configurationParameters:
8889
modificationImpact:
8990
isDataLost: true
9091
isServiceInterrupted: true
92+
isReadOnly: false
9193
- name: kafka_cfg_num_io_threads
9294
kind: variable
9395
dataType: number
@@ -97,6 +99,7 @@ configurationParameters:
9799
modificationImpact:
98100
isDataLost: true
99101
isServiceInterrupted: true
102+
isReadOnly: false
100103
- name: kafka_log_flush_interval_messages
101104
kind: variable
102105
dataType: number
@@ -106,6 +109,7 @@ configurationParameters:
106109
modificationImpact:
107110
isDataLost: true
108111
isServiceInterrupted: true
112+
isReadOnly: false
109113
- name: kafka_offsets_topic_replication_factor
110114
kind: variable
111115
dataType: number
@@ -115,6 +119,7 @@ configurationParameters:
115119
modificationImpact:
116120
isDataLost: true
117121
isServiceInterrupted: true
122+
isReadOnly: false
118123
deployment:
119124
# kind, Supported values are terraform, opentofu.
120125
kind: terraform

Diff for: ‎samples/RegioCloud-Kafka.yml

+5
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ configurationParameters:
7979
modificationImpact:
8080
isDataLost: true
8181
isServiceInterrupted: true
82+
isReadOnly: false
8283
- name: kafka_cfg_log_dirs
8384
kind: variable
8485
dataType: string
@@ -88,6 +89,7 @@ configurationParameters:
8889
modificationImpact:
8990
isDataLost: true
9091
isServiceInterrupted: true
92+
isReadOnly: false
9193
- name: kafka_cfg_num_io_threads
9294
kind: variable
9395
dataType: number
@@ -97,6 +99,7 @@ configurationParameters:
9799
modificationImpact:
98100
isDataLost: true
99101
isServiceInterrupted: true
102+
isReadOnly: false
100103
- name: kafka_log_flush_interval_messages
101104
kind: variable
102105
dataType: number
@@ -106,6 +109,7 @@ configurationParameters:
106109
modificationImpact:
107110
isDataLost: true
108111
isServiceInterrupted: true
112+
isReadOnly: false
109113
- name: kafka_offsets_topic_replication_factor
110114
kind: variable
111115
dataType: number
@@ -115,6 +119,7 @@ configurationParameters:
115119
modificationImpact:
116120
isDataLost: true
117121
isServiceInterrupted: true
122+
isReadOnly: false
118123
deployment:
119124
# kind, Supported values are terraform, opentofu.
120125
kind: terraform

Diff for: ‎samples/flexibleEngine-Kafka.yml

+5
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ configurationParameters:
7676
modificationImpact:
7777
isDataLost: true
7878
isServiceInterrupted: true
79+
isReadOnly: false
7980
- name: kafka_cfg_log_dirs
8081
kind: variable
8182
dataType: string
@@ -85,6 +86,7 @@ configurationParameters:
8586
modificationImpact:
8687
isDataLost: true
8788
isServiceInterrupted: true
89+
isReadOnly: false
8890
- name: kafka_cfg_num_io_threads
8991
kind: variable
9092
dataType: number
@@ -94,6 +96,7 @@ configurationParameters:
9496
modificationImpact:
9597
isDataLost: true
9698
isServiceInterrupted: true
99+
isReadOnly: false
97100
- name: kafka_log_flush_interval_messages
98101
kind: variable
99102
dataType: number
@@ -103,6 +106,7 @@ configurationParameters:
103106
modificationImpact:
104107
isDataLost: true
105108
isServiceInterrupted: true
109+
isReadOnly: false
106110
- name: kafka_offsets_topic_replication_factor
107111
kind: variable
108112
dataType: number
@@ -112,6 +116,7 @@ configurationParameters:
112116
modificationImpact:
113117
isDataLost: true
114118
isServiceInterrupted: true
119+
isReadOnly: false
115120
deployment:
116121
# kind, Supported values are terraform, opentofu.
117122
kind: terraform

0 commit comments

Comments
 (0)