Cannot create HostAggregate

core-test/src/main/java/org/openstack4j/api/compute/HostAggregateTests.java

@@ -0,0 +1,52 @@
+package org.openstack4j.api.compute;
+
+import static org.testng.Assert.assertEquals;
+
+import java.util.List;
+
+import org.openstack4j.api.AbstractTest;
+import org.openstack4j.model.compute.HostAggregate;
+import org.testng.annotations.Test;
+
+/**
+ * Host Aggregate Tests
+ * @author chenyan
+ *
+ */
+@Test(suiteName = "HostAggregate")
+public class HostAggregateTests extends AbstractTest {
+
+	private static final String JSON_HOST_AGGREGATES = "/compute/aggregates.json";
+	private static final String JSON_HOST_AGGREGATE_CREATE = "/compute/aggregate_create.json";
+
+	@Test
+	public void serviceListingTest() throws Exception {
+        respondWith(JSON_HOST_AGGREGATES);
+
+        List<? extends HostAggregate> hostAggregateList = osv3().compute().hostAggregates().list();
+        assertEquals(hostAggregateList.size(),2);
+
+        HostAggregate aggregate = hostAggregateList.get(0);
+        assertEquals(aggregate.getAvailabilityZone(),"uec_zone_1");
+        assertEquals(aggregate.getId(),"8");
+        assertEquals(aggregate.getName(),"aggregate_zl_test");
+    }
+
+	@Test
+	public void createTest() throws Exception {
+		respondWith(JSON_HOST_AGGREGATE_CREATE);
+
+		String name = "testAggregate01";
+		String availabilityZone = "nova";
+		HostAggregate hostAggregate = osv3().compute().hostAggregates().create(name, availabilityZone);
+		assertEquals(null != hostAggregate, true);
+		assertEquals(hostAggregate.getName(),name);
+		assertEquals(hostAggregate.getAvailabilityZone(),availabilityZone);
+	}
+
+	@Override
+	protected Service service() {
+		return Service.COMPUTE;
+	}
+
+}

core-test/src/main/java/org/openstack4j/api/network/SecurityGroupRuleTest.java

@@ -0,0 +1,41 @@
+package org.openstack4j.api.network;
+
+import static org.testng.Assert.assertEquals;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.openstack4j.api.AbstractTest;
+import org.openstack4j.model.network.SecurityGroupRule;
+import org.testng.annotations.Test;
+
+/**
+ * Security Group Rule Test
+ * @author chenyan
+ *
+ */
+public class SecurityGroupRuleTest extends AbstractTest {
+
+	private static final String JSON_SECURITY_GROUP_RULES = "/network/security_group_rulesv2.json";
+
+	@Test
+	public void serviceListingTest() throws Exception {
+        respondWith(JSON_SECURITY_GROUP_RULES);
+
+        Map<String, Object> params = new HashMap<String, Object>();
+        String security_group_id = "85cc3048-abc3-43cc-89b3-377341426ac5";
+        params.put("security_group_id", security_group_id);
+        List<? extends SecurityGroupRule> ruleList = osv3().networking().securityrule().list(params);
+        assertEquals(ruleList.size(),4);
+
+        SecurityGroupRule rule = ruleList.get(0);
+        assertEquals(rule.getSecurityGroupId(),security_group_id);
+    }
+
+	@Override
+	protected Service service() {
+		return Service.NETWORK;
+	}
+
+}

core-test/src/main/java/org/openstack4j/api/network/SecurityGroupTest.java

@@ -0,0 +1,43 @@
+package org.openstack4j.api.network;
+
+import static org.testng.Assert.assertEquals;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.openstack4j.api.AbstractTest;
+import org.openstack4j.model.network.SecurityGroup;
+import org.testng.annotations.Test;
+
+/**
+ * Security Group Test
+ * @author chenyan
+ *
+ */
+public class SecurityGroupTest extends AbstractTest {
+
+	private static final String JSON_SECURITY_GROUPS = "/network/security_groupsv2.json";
+
+	@Test
+	public void serviceListingTest() throws Exception {
+        respondWith(JSON_SECURITY_GROUPS);
+
+        Map<String, Object> params = new HashMap<String, Object>();
+        String projectId = "e4f50856753b4dc6afee5fa6b9b6c550";
+        params.put("tenant_id", projectId);
+        String tenantId = "e4f50856753b4dc6afee5fa6b9b6c550";
+        params.put("project_id", tenantId);
+        List<? extends SecurityGroup> securityGroupList = osv3().networking().securitygroup().list(params);
+        assertEquals(securityGroupList.size(),1);
+
+        SecurityGroup securityGroup = securityGroupList.get(0);
+        assertEquals(securityGroup.getTenantId(),tenantId);
+    }
+
+	@Override
+	protected Service service() {
+		return Service.NETWORK;
+	}
+
+}

core-test/src/main/resources/compute/aggregate_create.json

@@ -0,0 +1,7 @@
+{
+    "aggregate":
+    {
+        "name": "testAggregate01",
+        "availability_zone": "nova"
+    }
+}

core-test/src/main/resources/compute/aggregates.json

@@ -0,0 +1,35 @@
+{
+    "aggregates": [
+        {
+            "availability_zone": "uec_zone_1",
+            "create": 1485163578000,
+            "created_at": 1485163578000,
+            "deleted": false,
+            "hosts": [
+                "node-70.domain.tld",
+                "node-68.domain.tld",
+                "node-69.domain.tld"
+            ],
+            "id": "8",
+            "metadata": {
+                "availability_zone": "uec_zone_1"
+            },
+            "name": "aggregate_zl_test"
+        },
+        {
+            "availability_zone": "uec_zone_1",
+            "create": 1486968614000,
+            "created_at": 1486968614000,
+            "deleted": false,
+            "hosts": [
+                "node-70.domain.tld",
+                "node-69.domain.tld"
+            ],
+            "id": "9",
+            "metadata": {
+                "availability_zone": "uec_zone_1"
+            },
+            "name": "cyTest01"
+        }
+    ]
+}

core-test/src/main/resources/network/security_group_rulesv2.json

@@ -0,0 +1,60 @@
+{
+    "security_group_rules": [
+        {
+            "direction": "egress",
+            "ethertype": "IPv6",
+            "id": "3c0e45ff-adaf-4124-b083-bf390e5482ff",
+            "port_range_max": null,
+            "port_range_min": null,
+            "protocol": null,
+            "remote_group_id": null,
+            "remote_ip_prefix": null,
+            "security_group_id": "85cc3048-abc3-43cc-89b3-377341426ac5",
+            "project_id": "e4f50856753b4dc6afee5fa6b9b6c550",
+            "tenant_id": "e4f50856753b4dc6afee5fa6b9b6c550",
+            "description": ""
+        },
+        {
+            "direction": "egress",
+            "ethertype": "IPv4",
+            "id": "93aa42e5-80db-4581-9391-3a608bd0e448",
+            "port_range_max": null,
+            "port_range_min": null,
+            "protocol": null,
+            "remote_group_id": null,
+            "remote_ip_prefix": null,
+            "security_group_id": "85cc3048-abc3-43cc-89b3-377341426ac5",
+            "project_id": "e4f50856753b4dc6afee5fa6b9b6c550",
+            "tenant_id": "e4f50856753b4dc6afee5fa6b9b6c550",
+            "description": ""
+        },
+        {
+            "direction": "ingress",
+            "ethertype": "IPv6",
+            "id": "c0b09f00-1d49-4e64-a0a7-8a186d928138",
+            "port_range_max": null,
+            "port_range_min": null,
+            "protocol": null,
+            "remote_group_id": "85cc3048-abc3-43cc-89b3-377341426ac5",
+            "remote_ip_prefix": null,
+            "security_group_id": "85cc3048-abc3-43cc-89b3-377341426ac5",
+            "project_id": "e4f50856753b4dc6afee5fa6b9b6c550",
+            "tenant_id": "e4f50856753b4dc6afee5fa6b9b6c550",
+            "description": ""
+        },
+        {
+            "direction": "ingress",
+            "ethertype": "IPv4",
+            "id": "f7d45c89-008e-4bab-88ad-d6811724c51c",
+            "port_range_max": null,
+            "port_range_min": null,
+            "protocol": null,
+            "remote_group_id": "85cc3048-abc3-43cc-89b3-377341426ac5",
+            "remote_ip_prefix": null,
+            "security_group_id": "85cc3048-abc3-43cc-89b3-377341426ac5",
+            "project_id": "e4f50856753b4dc6afee5fa6b9b6c550",
+            "tenant_id": "e4f50856753b4dc6afee5fa6b9b6c550",
+            "description": ""
+        }
+    ]
+}

core-test/src/main/resources/network/security_groupsv2.json

@@ -0,0 +1,69 @@
+{
+    "security_groups": [
+        {
+            "description": "default",
+            "id": "85cc3048-abc3-43cc-89b3-377341426ac5",
+            "name": "default",
+            "security_group_rules": [
+                {
+                    "direction": "egress",
+                    "ethertype": "IPv6",
+                    "id": "3c0e45ff-adaf-4124-b083-bf390e5482ff",
+                    "port_range_max": null,
+                    "port_range_min": null,
+                    "protocol": null,
+                    "remote_group_id": null,
+                    "remote_ip_prefix": null,
+                    "security_group_id": "85cc3048-abc3-43cc-89b3-377341426ac5",
+                    "project_id": "e4f50856753b4dc6afee5fa6b9b6c550",
+                    "tenant_id": "e4f50856753b4dc6afee5fa6b9b6c550",
+                    "description": ""
+                },
+                {
+                    "direction": "egress",
+                    "ethertype": "IPv4",
+                    "id": "93aa42e5-80db-4581-9391-3a608bd0e448",
+                    "port_range_max": null,
+                    "port_range_min": null,
+                    "protocol": null,
+                    "remote_group_id": null,
+                    "remote_ip_prefix": null,
+                    "security_group_id": "85cc3048-abc3-43cc-89b3-377341426ac5",
+                    "project_id": "e4f50856753b4dc6afee5fa6b9b6c550",
+                    "tenant_id": "e4f50856753b4dc6afee5fa6b9b6c550",
+                    "description": ""
+                },
+                {
+                    "direction": "ingress",
+                    "ethertype": "IPv6",
+                    "id": "c0b09f00-1d49-4e64-a0a7-8a186d928138",
+                    "port_range_max": null,
+                    "port_range_min": null,
+                    "protocol": null,
+                    "remote_group_id": "85cc3048-abc3-43cc-89b3-377341426ac5",
+                    "remote_ip_prefix": null,
+                    "security_group_id": "85cc3048-abc3-43cc-89b3-377341426ac5",
+                    "project_id": "e4f50856753b4dc6afee5fa6b9b6c550",
+                    "tenant_id": "e4f50856753b4dc6afee5fa6b9b6c550",
+                    "description": ""
+                },
+                {
+                    "direction": "ingress",
+                    "ethertype": "IPv4",
+                    "id": "f7d45c89-008e-4bab-88ad-d6811724c51c",
+                    "port_range_max": null,
+                    "port_range_min": null,
+                    "protocol": null,
+                    "remote_group_id": "85cc3048-abc3-43cc-89b3-377341426ac5",
+                    "remote_ip_prefix": null,
+                    "security_group_id": "85cc3048-abc3-43cc-89b3-377341426ac5",
+                    "project_id": "e4f50856753b4dc6afee5fa6b9b6c550",
+                    "tenant_id": "e4f50856753b4dc6afee5fa6b9b6c550",
+                    "description": ""
+                }
+            ],
+            "project_id": "e4f50856753b4dc6afee5fa6b9b6c550",
+            "tenant_id": "e4f50856753b4dc6afee5fa6b9b6c550"
+        }
+    ]
+}

core/src/main/java/org/openstack4j/api/compute/HostService.java

@@ -1,6 +1,7 @@
 package org.openstack4j.api.compute;
 
 import java.util.List;
+import java.util.Map;
 
 import org.openstack4j.common.RestService;
 import org.openstack4j.model.compute.HostResource;
@@ -20,5 +21,22 @@ public interface HostService extends RestService {
 	 * @return the Resource of the Host specified
 	 */
 	public List<? extends HostResource> hostDescribe(String hostName);
+
+	/**
+     * List all host that the current tenant has access to
+     * 
+     * @return list of all hosts
+     * @author Wang Ting/王婷
+     */
+    List<? extends HostResource> list();
+
+    /**
+     * Returns list of hosts filtered by parameters.
+     * 
+     * @param filteringParams map (name, value) of filtering parameters
+     * @return 
+     * @author Wang Ting/王婷
+     */
+    List<? extends HostResource> list(Map<String, String> filteringParams);
 
 }

core/src/main/java/org/openstack4j/api/compute/ext/HypervisorService.java

@@ -31,5 +31,12 @@ public interface HypervisorService extends RestService {
 		 * @return the hypervisor statistics
 		 */
 		HypervisorStatistics statistics();
-
+
+		/**
+	     * Get the specified Hypervisor by ID
+	     * Author:Wang Ting 
+	     * @param hypervisorId the hypervisor identifier
+	     * @return the Hypervisor or null if not found
+	     */
+		Hypervisor get(String hypervisorId);
 }

core/src/main/java/org/openstack4j/api/compute/ext/InterfaceService.java

@@ -21,6 +21,15 @@ public interface InterfaceService extends RestService {
      * @return the attached interface
      */
     InterfaceAttachment create(String serverId, String portId);
+
+    /**
+     * Creates a port interface and uses it to attach a port to a server.
+     * @param serverId：instance id
+     * @param portId： The ID of the port for which you want to create an interface. The net_id and port_id parameters are mutually exclusive. If you do not specify the port_id parameter, the OpenStack Networking API v2.0 allocates a port and creates an interface for it on the network.
+     * @param netId：The ID of the network for which you want to create a port interface. The net_id and port_id parameters are mutually exclusive. If you do not specify the net_id parameter, the OpenStack Networking API v2.0 uses the network information cache that is associated with the instance.
+     * @return
+     */
+    InterfaceAttachment create(String serverId, String portId, String netId);
 
     /**
      * List the port interfaces for the specified {@code serverId}