Add msb register code

Issue-ID:HOLMES-51

Change-Id: I9c54afdc6c97bedd3d4d88d33a4ca9b4d40b18b4
Signed-off-by: youbowu  <wu.youbo@zte.com.cn>

diff --git a/holmes-actions/pom.xml b/holmes-actions/pom.xml
index 4fb2e3b..955958c 100644 (file)
--- a/holmes-actions/pom.xml
+++ b/holmes-actions/pom.xml
@@ -113,6 +113,10 @@
             <artifactId>powermock-classloading-xstream</artifactId>\r
             <scope>test</scope>\r
         </dependency>\r
+        <dependency>\r
+            <groupId>org.apache.httpcomponents</groupId>\r
+            <artifactId>httpclient</artifactId>\r
+        </dependency>\r
     </dependencies>\r
     <build>\r
         <resources>\r

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 (file)
index 0000000..429bf3b
--- /dev/null
+++ b/holmes-actions/src/main/java/org/openo/holmes/common/api/entity/ServiceNode.java
@@ -0,0 +1,31 @@
+/**\r
+ * Copyright 2017 ZTE Corporation.\r
+ *\r
+ * Licensed under the Apache License, Version 2.0 (the "License");\r
+ * you may not use this file except in compliance with the License.\r
+ * You may obtain a copy of the License at\r
+ *\r
+ *     http://www.apache.org/licenses/LICENSE-2.0\r
+ *\r
+ * Unless required by applicable law or agreed to in writing, software\r
+ * distributed under the License is distributed on an "AS IS" BASIS,\r
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+ * See the License for the specific language governing permissions and\r
+ * limitations under the License.\r
+ */\r
+\r
+\r
+package org.openo.holmes.common.api.entity;\r
+\r
+import lombok.Getter;\r
+import lombok.Setter;\r
+\r
+@Getter\r
+@Setter\r
+public class ServiceNode {\r
+\r
+    private String ip;\r
+    private String port;\r
+    private int ttl;\r
+\r
+}
\ 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 (file)
index 0000000..e7b032c
--- /dev/null
+++ b/holmes-actions/src/main/java/org/openo/holmes/common/api/entity/ServiceRegisterEntity.java
@@ -0,0 +1,46 @@
+/**\r
+ * Copyright 2017 ZTE Corporation.\r
+ *\r
+ * Licensed under the Apache License, Version 2.0 (the "License");\r
+ * you may not use this file except in compliance with the License.\r
+ * You may obtain a copy of the License at\r
+ *\r
+ *     http://www.apache.org/licenses/LICENSE-2.0\r
+ *\r
+ * Unless required by applicable law or agreed to in writing, software\r
+ * distributed under the License is distributed on an "AS IS" BASIS,\r
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+ * See the License for the specific language governing permissions and\r
+ * limitations under the License.\r
+ */\r
+\r
+package org.openo.holmes.common.api.entity;\r
+\r
+import java.util.ArrayList;\r
+import java.util.List;\r
+import lombok.Getter;\r
+import lombok.Setter;\r
+\r
+@Setter\r
+@Getter\r
+public class ServiceRegisterEntity {\r
+\r
+    private String serviceName;\r
+    private String version;\r
+    private String url;\r
+    private String protocol;\r
+    private String visualRange = "1";\r
+    private List<ServiceNode> nodes = new ArrayList<>();\r
+\r
+    public void setSingleNode(String ip, String port, int ttl) {\r
+        ServiceNode node = new ServiceNode();\r
+        if (ip != null && ip.length() > 0) {\r
+            node.setIp(ip);\r
+        } else {\r
+            node.setIp(null);\r
+        }\r
+        node.setPort(port);\r
+        node.setTtl(ttl);\r
+        nodes.add(node);\r
+    }\r
+}
\ 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 (file)
--- 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";\r
 \r
     String ADMIN = "admin";\r
+\r
+    int RESPONSE_STATUS_OK = 200;\r
 }\r

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 (file)
index 0000000..383cb91
--- /dev/null
+++ b/holmes-actions/src/test/java/org/openo/holmes/common/api/entity/ServiceNodeTest.java
@@ -0,0 +1,48 @@
+/**\r
+ * Copyright 2017 ZTE Corporation.\r
+ *\r
+ * Licensed under the Apache License, Version 2.0 (the "License");\r
+ * you may not use this file except in compliance with the License.\r
+ * You may obtain a copy of the License at\r
+ *\r
+ *     http://www.apache.org/licenses/LICENSE-2.0\r
+ *\r
+ * Unless required by applicable law or agreed to in writing, software\r
+ * distributed under the License is distributed on an "AS IS" BASIS,\r
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+ * See the License for the specific language governing permissions and\r
+ * limitations under the License.\r
+ */\r
+\r
+package org.openo.holmes.common.api.entity;\r
+\r
+import static org.hamcrest.core.IsEqual.equalTo;\r
+import static org.junit.Assert.assertThat;\r
+\r
+import org.junit.Test;\r
+\r
+public class ServiceNodeTest {\r
+\r
+    private ServiceNode serviceNode = new ServiceNode();\r
+\r
+    @Test\r
+    public void getterAndSetter4ip() {\r
+        String ip = "test";\r
+        serviceNode.setIp(ip);\r
+        assertThat(serviceNode.getIp(), equalTo(ip));\r
+    }\r
+\r
+    @Test\r
+    public void getterAndSetter4port() {\r
+        String port = "test";\r
+        serviceNode.setPort(port);\r
+        assertThat(serviceNode.getPort(), equalTo(port));\r
+    }\r
+\r
+    @Test\r
+    public void getterAndSetter4ttl() {\r
+        int ttl = 1;\r
+        serviceNode.setTtl(ttl);\r
+        assertThat(serviceNode.getTtl(), equalTo(ttl));\r
+    }\r
+}
\ 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 (file)
index 0000000..442549d
--- /dev/null
+++ b/holmes-actions/src/test/java/org/openo/holmes/common/api/entity/ServiceRegisterEntityTest.java
@@ -0,0 +1,62 @@
+/**\r
+ * Copyright 2017 ZTE Corporation.\r
+ *\r
+ * Licensed under the Apache License, Version 2.0 (the "License");\r
+ * you may not use this file except in compliance with the License.\r
+ * You may obtain a copy of the License at\r
+ *\r
+ *     http://www.apache.org/licenses/LICENSE-2.0\r
+ *\r
+ * Unless required by applicable law or agreed to in writing, software\r
+ * distributed under the License is distributed on an "AS IS" BASIS,\r
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+ * See the License for the specific language governing permissions and\r
+ * limitations under the License.\r
+ */\r
+\r
+package org.openo.holmes.common.api.entity;\r
+\r
+import static org.hamcrest.core.IsEqual.equalTo;\r
+import static org.junit.Assert.assertThat;\r
+\r
+import org.junit.Test;\r
+\r
+public class ServiceRegisterEntityTest {\r
+\r
+    private ServiceRegisterEntity serviceRegisterEntity = new ServiceRegisterEntity();\r
+\r
+    @Test\r
+    public void getterAndSetter4protocol() {\r
+        String protocol = "test";\r
+        serviceRegisterEntity.setProtocol(protocol);\r
+        assertThat(serviceRegisterEntity.getProtocol(), equalTo(protocol));\r
+    }\r
+\r
+    @Test\r
+    public void getterAndSetter4serviceName() {\r
+        String serviceName = "test";\r
+        serviceRegisterEntity.setServiceName(serviceName);\r
+        assertThat(serviceRegisterEntity.getServiceName(), equalTo(serviceName));\r
+    }\r
+\r
+    @Test\r
+    public void getterAndSetter4url() {\r
+        String url = "test";\r
+        serviceRegisterEntity.setUrl(url);\r
+        assertThat(serviceRegisterEntity.getUrl(), equalTo(url));\r
+    }\r
+\r
+    @Test\r
+    public void getterAndSetter4version() {\r
+        String version = "test";\r
+        serviceRegisterEntity.setVersion(version);\r
+        assertThat(serviceRegisterEntity.getVersion(), equalTo(version));\r
+    }\r
+\r
+    @Test\r
+    public void getterAndSetter4visualRange() {\r
+        String visualRange = "test";\r
+        serviceRegisterEntity.setVisualRange(visualRange);\r
+        assertThat(serviceRegisterEntity.getVisualRange(), equalTo(visualRange));\r
+    }\r
+}
\ No newline at end of file

diff --git a/pom.xml b/pom.xml
index 28dbb33..a5c3293 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -167,6 +167,11 @@
                 <artifactId>activemq-pool</artifactId>\r
                 <version>5.8.0</version>\r
             </dependency>\r
+            <dependency>\r
+                <groupId>org.apache.httpcomponents</groupId>\r
+                <artifactId>httpclient</artifactId>\r
+                <version>4.3.6</version>\r
+            </dependency>\r
         </dependencies>\r
     </dependencyManagement>\r
 \r