summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryoubowu <wu.youbo@zte.com.cn>2017-03-08 17:22:05 +0800
committer6092002067 <wu.youbo@zte.com.cn>2017-03-09 08:53:00 +0800
commit1675d39c5a6a660b9dc4fc4c815bc344fc7d1d83 (patch)
treeae376d06fd0d000cb5b0d4ea7791f4bbcd7c1d52
parentbbd681988347c0a055def849abbb2e8dccb72d45 (diff)
Add msb register code
Issue-ID:HOLMES-51 Change-Id: I9c54afdc6c97bedd3d4d88d33a4ca9b4d40b18b4 Signed-off-by: youbowu <wu.youbo@zte.com.cn>
-rw-r--r--holmes-actions/pom.xml4
-rw-r--r--holmes-actions/src/main/java/org/openo/holmes/common/api/entity/ServiceNode.java31
-rw-r--r--holmes-actions/src/main/java/org/openo/holmes/common/api/entity/ServiceRegisterEntity.java46
-rw-r--r--holmes-actions/src/main/java/org/openo/holmes/common/constant/AlarmConst.java2
-rw-r--r--holmes-actions/src/test/java/org/openo/holmes/common/api/entity/ServiceNodeTest.java48
-rw-r--r--holmes-actions/src/test/java/org/openo/holmes/common/api/entity/ServiceRegisterEntityTest.java62
-rw-r--r--pom.xml5
7 files changed, 198 insertions, 0 deletions
diff --git a/holmes-actions/pom.xml b/holmes-actions/pom.xml
index 4fb2e3b..955958c 100644
--- a/holmes-actions/pom.xml
+++ b/holmes-actions/pom.xml
@@ -113,6 +113,10 @@
<artifactId>powermock-classloading-xstream</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ </dependency>
</dependencies>
<build>
<resources>
diff --git a/holmes-actions/src/main/java/org/openo/holmes/common/api/entity/ServiceNode.java b/holmes-actions/src/main/java/org/openo/holmes/common/api/entity/ServiceNode.java
new file mode 100644
index 0000000..429bf3b
--- /dev/null
+++ b/holmes-actions/src/main/java/org/openo/holmes/common/api/entity/ServiceNode.java
@@ -0,0 +1,31 @@
+/**
+ * Copyright 2017 ZTE Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+package org.openo.holmes.common.api.entity;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class ServiceNode {
+
+ private String ip;
+ private String port;
+ private int ttl;
+
+} \ No newline at end of file
diff --git a/holmes-actions/src/main/java/org/openo/holmes/common/api/entity/ServiceRegisterEntity.java b/holmes-actions/src/main/java/org/openo/holmes/common/api/entity/ServiceRegisterEntity.java
new file mode 100644
index 0000000..e7b032c
--- /dev/null
+++ b/holmes-actions/src/main/java/org/openo/holmes/common/api/entity/ServiceRegisterEntity.java
@@ -0,0 +1,46 @@
+/**
+ * Copyright 2017 ZTE Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.openo.holmes.common.api.entity;
+
+import java.util.ArrayList;
+import java.util.List;
+import lombok.Getter;
+import lombok.Setter;
+
+@Setter
+@Getter
+public class ServiceRegisterEntity {
+
+ private String serviceName;
+ private String version;
+ private String url;
+ private String protocol;
+ private String visualRange = "1";
+ private List<ServiceNode> nodes = new ArrayList<>();
+
+ public void setSingleNode(String ip, String port, int ttl) {
+ ServiceNode node = new ServiceNode();
+ if (ip != null && ip.length() > 0) {
+ node.setIp(ip);
+ } else {
+ node.setIp(null);
+ }
+ node.setPort(port);
+ node.setTtl(ttl);
+ nodes.add(node);
+ }
+} \ No newline at end of file
diff --git a/holmes-actions/src/main/java/org/openo/holmes/common/constant/AlarmConst.java b/holmes-actions/src/main/java/org/openo/holmes/common/constant/AlarmConst.java
index c2248f1..2ddf78f 100644
--- a/holmes-actions/src/main/java/org/openo/holmes/common/constant/AlarmConst.java
+++ b/holmes-actions/src/main/java/org/openo/holmes/common/constant/AlarmConst.java
@@ -32,4 +32,6 @@ public interface AlarmConst {
String ZH_CN = "zh_CN";
String ADMIN = "admin";
+
+ int RESPONSE_STATUS_OK = 200;
}
diff --git a/holmes-actions/src/test/java/org/openo/holmes/common/api/entity/ServiceNodeTest.java b/holmes-actions/src/test/java/org/openo/holmes/common/api/entity/ServiceNodeTest.java
new file mode 100644
index 0000000..383cb91
--- /dev/null
+++ b/holmes-actions/src/test/java/org/openo/holmes/common/api/entity/ServiceNodeTest.java
@@ -0,0 +1,48 @@
+/**
+ * Copyright 2017 ZTE Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.openo.holmes.common.api.entity;
+
+import static org.hamcrest.core.IsEqual.equalTo;
+import static org.junit.Assert.assertThat;
+
+import org.junit.Test;
+
+public class ServiceNodeTest {
+
+ private ServiceNode serviceNode = new ServiceNode();
+
+ @Test
+ public void getterAndSetter4ip() {
+ String ip = "test";
+ serviceNode.setIp(ip);
+ assertThat(serviceNode.getIp(), equalTo(ip));
+ }
+
+ @Test
+ public void getterAndSetter4port() {
+ String port = "test";
+ serviceNode.setPort(port);
+ assertThat(serviceNode.getPort(), equalTo(port));
+ }
+
+ @Test
+ public void getterAndSetter4ttl() {
+ int ttl = 1;
+ serviceNode.setTtl(ttl);
+ assertThat(serviceNode.getTtl(), equalTo(ttl));
+ }
+} \ No newline at end of file
diff --git a/holmes-actions/src/test/java/org/openo/holmes/common/api/entity/ServiceRegisterEntityTest.java b/holmes-actions/src/test/java/org/openo/holmes/common/api/entity/ServiceRegisterEntityTest.java
new file mode 100644
index 0000000..442549d
--- /dev/null
+++ b/holmes-actions/src/test/java/org/openo/holmes/common/api/entity/ServiceRegisterEntityTest.java
@@ -0,0 +1,62 @@
+/**
+ * Copyright 2017 ZTE Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.openo.holmes.common.api.entity;
+
+import static org.hamcrest.core.IsEqual.equalTo;
+import static org.junit.Assert.assertThat;
+
+import org.junit.Test;
+
+public class ServiceRegisterEntityTest {
+
+ private ServiceRegisterEntity serviceRegisterEntity = new ServiceRegisterEntity();
+
+ @Test
+ public void getterAndSetter4protocol() {
+ String protocol = "test";
+ serviceRegisterEntity.setProtocol(protocol);
+ assertThat(serviceRegisterEntity.getProtocol(), equalTo(protocol));
+ }
+
+ @Test
+ public void getterAndSetter4serviceName() {
+ String serviceName = "test";
+ serviceRegisterEntity.setServiceName(serviceName);
+ assertThat(serviceRegisterEntity.getServiceName(), equalTo(serviceName));
+ }
+
+ @Test
+ public void getterAndSetter4url() {
+ String url = "test";
+ serviceRegisterEntity.setUrl(url);
+ assertThat(serviceRegisterEntity.getUrl(), equalTo(url));
+ }
+
+ @Test
+ public void getterAndSetter4version() {
+ String version = "test";
+ serviceRegisterEntity.setVersion(version);
+ assertThat(serviceRegisterEntity.getVersion(), equalTo(version));
+ }
+
+ @Test
+ public void getterAndSetter4visualRange() {
+ String visualRange = "test";
+ serviceRegisterEntity.setVisualRange(visualRange);
+ assertThat(serviceRegisterEntity.getVisualRange(), equalTo(visualRange));
+ }
+} \ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 28dbb33..a5c3293 100644
--- a/pom.xml
+++ b/pom.xml
@@ -167,6 +167,11 @@
<artifactId>activemq-pool</artifactId>
<version>5.8.0</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>4.3.6</version>
+ </dependency>
</dependencies>
</dependencyManagement>