<?xml version="1.0" encoding="UTF-8"?>\r
-<!-- Copyright 2017-2020 ZTE Corporation. Licensed under the Apache License, Version\r
+<!-- Copyright 2017-2022 ZTE Corporation. Licensed under the Apache License, Version\r
2.0 (the "License"); you may not use this file except in compliance with\r
the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0\r
Unless required by applicable law or agreed to in writing, software distributed\r
<parent>\r
<groupId>org.onap.holmes.common</groupId>\r
<artifactId>holmes-common-parent</artifactId>\r
- <version>1.4.0-SNAPSHOT</version>\r
+ <version>1.4.1-SNAPSHOT</version>\r
</parent>\r
\r
<name>holmes-common-service</name>\r
/**
- * Copyright 2017-2020 ZTE Corporation.
+ * Copyright 2017-2022 ZTE Corporation.
* <p>
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
package org.onap.holmes.common.utils;
+import lombok.Setter;
import org.apache.commons.lang3.StringUtils;
import org.jvnet.hk2.annotations.Service;
import org.onap.holmes.common.config.MicroServiceConfig;
private JerseyClient client = JerseyClient.newInstance();
+ @Setter
+ private int totalRetryTimes = 20;
+
+ @Setter
+ private int interval = 20;
+
public MsbRegister() {
}
MicroServiceFullInfo microServiceFullInfo = null;
int retry = 0;
- int interval = 5;
- while (null == microServiceFullInfo && retry < 20) {
+ while (null == microServiceFullInfo && retry < totalRetryTimes) {
try {
- log.info("Holmes Service Registration. Retry: " + retry++);
-
+ log.info("Holmes Service Registration. Times: " + ++retry);
+ int time = interval * retry;
microServiceFullInfo = client
.header("Accept", MediaType.APPLICATION_JSON)
.queryParam("createOrUpdate", true)
MicroServiceFullInfo.class);
if (null == microServiceFullInfo) {
- log.warn(String.format("Failed to register the service to MSB. Sleep %ds and try again.", interval));
- threadSleep(TimeUnit.SECONDS.toSeconds(interval));
- interval += 5;
+ log.warn(String.format("Failed to register the service to MSB. Sleep %ds and try again.", time));
+ threadSleep(TimeUnit.SECONDS.toSeconds(time));
} else {
log.info("Registration succeeded!");
break;
/**
- * Copyright 2017-2020 ZTE Corporation.
+ * Copyright 2017-2022 ZTE Corporation.
* <p>
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
}
@Test
- public void test_register2Msb_fail_once() {
- expect(mockedJerseyClient.header("Accept", MediaType.APPLICATION_JSON)).andReturn(mockedJerseyClient).times(2);
- expect(mockedJerseyClient.queryParam("createOrUpdate", true)).andReturn(mockedJerseyClient).times(2);
+ public void test_register2Msb_fail_n_times() {
+ int requestTimes = 3;
+ expect(mockedJerseyClient.header("Accept", MediaType.APPLICATION_JSON)).andReturn(mockedJerseyClient).times(requestTimes);
+ expect(mockedJerseyClient.queryParam("createOrUpdate", true)).andReturn(mockedJerseyClient).times(requestTimes);
expect(mockedJerseyClient.post(anyObject(String.class),
anyObject(Entity.class),
anyObject(Class.class)))
- .andReturn(null);
+ .andReturn(null).times(requestTimes - 1);
expect(mockedJerseyClient.post(anyObject(String.class),
anyObject(Entity.class),
PowerMock.replayAll();
MsbRegister msbRegister = new MsbRegister();
+ msbRegister.setInterval(1);
try {
msbRegister.register2Msb(msi);
} catch (CorrelationException e) {
<?xml version="1.0" encoding="UTF-8"?>\r
-<!-- Copyright 2017-2020 ZTE Corporation. Licensed under the Apache License, Version\r
+<!-- Copyright 2017-2022 ZTE Corporation. Licensed under the Apache License, Version\r
2.0 (the "License"); you may not use this file except in compliance with\r
the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0\r
Unless required by applicable law or agreed to in writing, software distributed\r
<artifactId>holmes-common-parent</artifactId>\r
<packaging>pom</packaging>\r
\r
- <version>1.4.0-SNAPSHOT</version>\r
+ <version>1.4.1-SNAPSHOT</version>\r
<name>holmes-common</name>\r
<modules>\r
<module>holmes-actions</module>\r
\r
major=1\r
minor=4\r
-patch=0\r
+patch=1\r
\r
base_version=${major}.${minor}.${patch}\r
\r