fix LocalVariableName violation of checkstyle and enable it.
Change-Id: I6945ac54f3851772cc848093c56111c142d0723d
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
}
public static void runTests(String base) {
- NeutronBgpvpnTests bgpvpn_tester = new NeutronBgpvpnTests(base);
- bgpvpn_tester.bgpvpn_collection_get_test();
- String createJsonString = bgpvpn_tester.singleton_bgpvpn_create_test();
- bgpvpn_tester.singleton_bgpvpn_get_with_one_query_item_test(createJsonString);
- bgpvpn_tester.bulk_bgpvpn_create_test();
- bgpvpn_tester.bgpvpn_update_test();
- bgpvpn_tester.bgpvpn_element_get_test();
- bgpvpn_tester.bgpvpn_element_get_test_with_added_query();
- bgpvpn_tester.bgpvpn_delete_test();
- bgpvpn_tester.bgpvpn_element_negative_get_test();
+ NeutronBgpvpnTests bgpvpnTester = new NeutronBgpvpnTests(base);
+ bgpvpnTester.bgpvpn_collection_get_test();
+ String createJsonString = bgpvpnTester.singleton_bgpvpn_create_test();
+ bgpvpnTester.singleton_bgpvpn_get_with_one_query_item_test(createJsonString);
+ bgpvpnTester.bulk_bgpvpn_create_test();
+ bgpvpnTester.bgpvpn_update_test();
+ bgpvpnTester.bgpvpn_element_get_test();
+ bgpvpnTester.bgpvpn_element_get_test_with_added_query();
+ bgpvpnTester.bgpvpn_delete_test();
+ bgpvpnTester.bgpvpn_element_negative_get_test();
}
}
}
public static void runTests(String base) {
- NeutronFirewallPolicyTests fw_policy_tester = new NeutronFirewallPolicyTests(base);
- String createJsonString = fw_policy_tester.singleton_fw_policy_create_test();
- fw_policy_tester.singleton_fw_policy_get_with_one_query_item_test(createJsonString);
- fw_policy_tester.fw_policy_element_get_test();
- fw_policy_tester.fw_policy_element_get_with_query_test();
- fw_policy_tester.fw_policy_collection_get_test();
- fw_policy_tester.fw_policy_modify_test();
- fw_policy_tester.fw_policy_delete_test();
- fw_policy_tester.fw_policy_element_negative_get_test();
+ NeutronFirewallPolicyTests fwPolicyTester = new NeutronFirewallPolicyTests(base);
+ String createJsonString = fwPolicyTester.singleton_fw_policy_create_test();
+ fwPolicyTester.singleton_fw_policy_get_with_one_query_item_test(createJsonString);
+ fwPolicyTester.fw_policy_element_get_test();
+ fwPolicyTester.fw_policy_element_get_with_query_test();
+ fwPolicyTester.fw_policy_collection_get_test();
+ fwPolicyTester.fw_policy_modify_test();
+ fwPolicyTester.fw_policy_delete_test();
+ fwPolicyTester.fw_policy_element_negative_get_test();
}
}
}
public static void runTests(String base) {
- NeutronFirewallRuleTests fw_rule_tester = new NeutronFirewallRuleTests(base);
- String createJsonString = fw_rule_tester.singleton_fw_rule_create_test();
- fw_rule_tester.singleton_fw_rule_get_with_one_query_item_test(createJsonString);
- fw_rule_tester.fw_rule_element_get_test();
- fw_rule_tester.fw_rule_element_get_with_query_test();
- fw_rule_tester.fw_rule_collection_get_test();
- fw_rule_tester.fw_rule_modify_test();
- fw_rule_tester.fw_rule_delete_test();
- fw_rule_tester.fw_rule_element_negative_get_test();
- fw_rule_tester.test_bug6398_fw_rule_create_test();
+ NeutronFirewallRuleTests fwRuleTester = new NeutronFirewallRuleTests(base);
+ String createJsonString = fwRuleTester.singleton_fw_rule_create_test();
+ fwRuleTester.singleton_fw_rule_get_with_one_query_item_test(createJsonString);
+ fwRuleTester.fw_rule_element_get_test();
+ fwRuleTester.fw_rule_element_get_with_query_test();
+ fwRuleTester.fw_rule_collection_get_test();
+ fwRuleTester.fw_rule_modify_test();
+ fwRuleTester.fw_rule_delete_test();
+ fwRuleTester.fw_rule_element_negative_get_test();
+ fwRuleTester.test_bug6398_fw_rule_create_test();
}
}
}
public static void runTests(String base) {
- NeutronFirewallTests fw_tester = new NeutronFirewallTests(base);
- String createJsonString = fw_tester.singleton_fw_create_test();
- fw_tester.singleton_fw_get_with_one_query_item_test(createJsonString);
- fw_tester.fw_element_get_test();
- fw_tester.fw_element_get_with_query_test();
- fw_tester.fw_collection_get_test();
- fw_tester.fw_modify_test();
- fw_tester.fw_delete_test();
- fw_tester.fw_element_negative_get_test();
- fw_tester.fw_collection_bug4944_test();
+ NeutronFirewallTests fwTester = new NeutronFirewallTests(base);
+ String createJsonString = fwTester.singleton_fw_create_test();
+ fwTester.singleton_fw_get_with_one_query_item_test(createJsonString);
+ fwTester.fw_element_get_test();
+ fwTester.fw_element_get_with_query_test();
+ fwTester.fw_collection_get_test();
+ fwTester.fw_modify_test();
+ fwTester.fw_delete_test();
+ fwTester.fw_element_negative_get_test();
+ fwTester.fw_collection_bug4944_test();
}
}
}
public static void runTests(String base) {
- NeutronFloatingIPTests floatingIP_tester = new NeutronFloatingIPTests(base);
- String createJsonString = floatingIP_tester.singleton_floatingIP_create_test();
- floatingIP_tester.singleton_floatingIP_get_with_one_query_item_test(createJsonString);
- floatingIP_tester.update_floatingIP_test();
- floatingIP_tester.floatingIP_element_get_test();
- floatingIP_tester.floatingIP_element_get_with_query_test();
- floatingIP_tester.floatingIP_collection_get_test();
- floatingIP_tester.floatingIP_delete_test();
- floatingIP_tester.floatingIP_element_negative_get_test();
+ NeutronFloatingIPTests floatingIPTester = new NeutronFloatingIPTests(base);
+ String createJsonString = floatingIPTester.singleton_floatingIP_create_test();
+ floatingIPTester.singleton_floatingIP_get_with_one_query_item_test(createJsonString);
+ floatingIPTester.update_floatingIP_test();
+ floatingIPTester.floatingIP_element_get_test();
+ floatingIPTester.floatingIP_element_get_with_query_test();
+ floatingIPTester.floatingIP_collection_get_test();
+ floatingIPTester.floatingIP_delete_test();
+ floatingIPTester.floatingIP_element_negative_get_test();
}
}
}
public static void runTests(String base) {
- NeutronIKEPoliciesTests ike_policy_tester = new NeutronIKEPoliciesTests(base);
- String createJsonString = ike_policy_tester.singleton_ikePolicy_create_test();
- ike_policy_tester.singleton_ikePolicy_get_with_one_query_item_test(createJsonString);
- ike_policy_tester.ikePolicy_update_test();
- ike_policy_tester.ikePolicy_element_get_test();
- ike_policy_tester.ikePolicy_element_get_with_query_test();
- ike_policy_tester.ikePolicy_collection_get_test();
- ike_policy_tester.ikePolicy_delete_test();
- ike_policy_tester.ikePolicy_element_negative_get_test();
+ NeutronIKEPoliciesTests ikePolicyTester = new NeutronIKEPoliciesTests(base);
+ String createJsonString = ikePolicyTester.singleton_ikePolicy_create_test();
+ ikePolicyTester.singleton_ikePolicy_get_with_one_query_item_test(createJsonString);
+ ikePolicyTester.ikePolicy_update_test();
+ ikePolicyTester.ikePolicy_element_get_test();
+ ikePolicyTester.ikePolicy_element_get_with_query_test();
+ ikePolicyTester.ikePolicy_collection_get_test();
+ ikePolicyTester.ikePolicy_delete_test();
+ ikePolicyTester.ikePolicy_element_negative_get_test();
}
}
}
public static void runTests(String base) {
- NeutronIPSECPoliciesTests ipsec_policy_tester = new NeutronIPSECPoliciesTests(base);
- String createJsonString = ipsec_policy_tester.singleton_ipsecPolicy_create_test();
- ipsec_policy_tester.singleton_ipsecPolicy_get_with_one_query_item_test(createJsonString);
- ipsec_policy_tester.ipsecPolicy_update_test();
- ipsec_policy_tester.ipsecPolicy_element_get_test();
- ipsec_policy_tester.ipsecPolicy_element_get_with_query_test();
- ipsec_policy_tester.ipsecPolicy_collection_get_test();
- ipsec_policy_tester.ipsecPolicy_delete_test();
- ipsec_policy_tester.ipsecPolicy_element_negative_get_test();
+ NeutronIPSECPoliciesTests ipsecPolicyTester = new NeutronIPSECPoliciesTests(base);
+ String createJsonString = ipsecPolicyTester.singleton_ipsecPolicy_create_test();
+ ipsecPolicyTester.singleton_ipsecPolicy_get_with_one_query_item_test(createJsonString);
+ ipsecPolicyTester.ipsecPolicy_update_test();
+ ipsecPolicyTester.ipsecPolicy_element_get_test();
+ ipsecPolicyTester.ipsecPolicy_element_get_with_query_test();
+ ipsecPolicyTester.ipsecPolicy_collection_get_test();
+ ipsecPolicyTester.ipsecPolicy_delete_test();
+ ipsecPolicyTester.ipsecPolicy_element_negative_get_test();
}
}
}
public static void runTests(String base) {
- NeutronIPSECSiteConnectionTests ipsec_siteConnection_tester = new NeutronIPSECSiteConnectionTests(base);
- String createJsonString = ipsec_siteConnection_tester.singleton_ipsecSiteConnection_create_test();
- ipsec_siteConnection_tester.singleton_ipsecSiteConnection_get_with_one_query_item_test(createJsonString);
- ipsec_siteConnection_tester.ipsecSiteConnection_update_test();
- ipsec_siteConnection_tester.ipsecSiteConnection_element_get_test();
- ipsec_siteConnection_tester.ipsecSiteConnection_element_get_with_query_test();
- ipsec_siteConnection_tester.ipsecSiteConnection_collection_get_test();
- ipsec_siteConnection_tester.ipsecSiteConnection_delete_test();
- ipsec_siteConnection_tester.ipsecSiteConnection_element_negative_get_test();
+ NeutronIPSECSiteConnectionTests ipsecSiteConnectionTester = new NeutronIPSECSiteConnectionTests(base);
+ String createJsonString = ipsecSiteConnectionTester.singleton_ipsecSiteConnection_create_test();
+ ipsecSiteConnectionTester.singleton_ipsecSiteConnection_get_with_one_query_item_test(createJsonString);
+ ipsecSiteConnectionTester.ipsecSiteConnection_update_test();
+ ipsecSiteConnectionTester.ipsecSiteConnection_element_get_test();
+ ipsecSiteConnectionTester.ipsecSiteConnection_element_get_with_query_test();
+ ipsecSiteConnectionTester.ipsecSiteConnection_collection_get_test();
+ ipsecSiteConnectionTester.ipsecSiteConnection_delete_test();
+ ipsecSiteConnectionTester.ipsecSiteConnection_element_negative_get_test();
}
}
}
public static void runTests(String base) {
- NeutronL2GatewayConnectionTests l2gateway_connection_tester = new NeutronL2GatewayConnectionTests(base);
- String createJsonString = l2gateway_connection_tester.singleton_l2gateway_connection_create_test();
- l2gateway_connection_tester.singleton_l2gateway_connection_get_with_one_query_test(createJsonString);
- l2gateway_connection_tester.l2gateway_connection_element_get_test();
- l2gateway_connection_tester.l2gateway_connection_element_get_with_query_test();
- l2gateway_connection_tester.l2gateway_connection_collection_get_test();
- l2gateway_connection_tester.l2gateway_connection_delete_test();
- l2gateway_connection_tester.l2gateway_connection_element_negative_get_test();
- l2gateway_connection_tester.l2gateway_connection_create_without_port_test();
- l2gateway_connection_tester.l2gateway_connection_element_get_without_port_test();
- l2gateway_connection_tester.l2gateway_connection_delete_without_port_test();
+ NeutronL2GatewayConnectionTests l2gatewayConnectionTester = new NeutronL2GatewayConnectionTests(base);
+ String createJsonString = l2gatewayConnectionTester.singleton_l2gateway_connection_create_test();
+ l2gatewayConnectionTester.singleton_l2gateway_connection_get_with_one_query_test(createJsonString);
+ l2gatewayConnectionTester.l2gateway_connection_element_get_test();
+ l2gatewayConnectionTester.l2gateway_connection_element_get_with_query_test();
+ l2gatewayConnectionTester.l2gateway_connection_collection_get_test();
+ l2gatewayConnectionTester.l2gateway_connection_delete_test();
+ l2gatewayConnectionTester.l2gateway_connection_element_negative_get_test();
+ l2gatewayConnectionTester.l2gateway_connection_create_without_port_test();
+ l2gatewayConnectionTester.l2gateway_connection_element_get_without_port_test();
+ l2gatewayConnectionTester.l2gateway_connection_delete_without_port_test();
}
}
}
public static void runTests(String base) {
- NeutronL2GatewayTests l2gateway_tester = new NeutronL2GatewayTests(base);
- String createJsonString = l2gateway_tester.singleton_l2gateway_create_test();
- l2gateway_tester.singleton_l2gateway_get_with_one_query_item_test(createJsonString);
- l2gateway_tester.l2gateway_element_get_test();
- l2gateway_tester.l2gateway_element_get_with_query_test();
- l2gateway_tester.l2gateway_collection_get_test();
- l2gateway_tester.l2gateway_modify_test();
- l2gateway_tester.l2gateway_delete_test();
- l2gateway_tester.l2gateway_element_negative_get_test();
+ NeutronL2GatewayTests l2gatewayTester = new NeutronL2GatewayTests(base);
+ String createJsonString = l2gatewayTester.singleton_l2gateway_create_test();
+ l2gatewayTester.singleton_l2gateway_get_with_one_query_item_test(createJsonString);
+ l2gatewayTester.l2gateway_element_get_test();
+ l2gatewayTester.l2gateway_element_get_with_query_test();
+ l2gatewayTester.l2gateway_collection_get_test();
+ l2gatewayTester.l2gateway_modify_test();
+ l2gatewayTester.l2gateway_delete_test();
+ l2gatewayTester.l2gateway_element_negative_get_test();
}
}
}
public static void runTests(String base) {
- NeutronLBHealthMonitorTests healthMonitor_tester = new NeutronLBHealthMonitorTests(base);
- String createJsonString = healthMonitor_tester.singleton_lb_healthMonitor_create_test();
- healthMonitor_tester.singleton_lb_healthMonitor_with_one_query_item_test(createJsonString);
- healthMonitor_tester.healthMonitor_update_test();
- healthMonitor_tester.healthMonitor_element_get_test();
- healthMonitor_tester.healthMonitor_element_get_with_query_test();
- healthMonitor_tester.healthMonitor_collection_get_test();
- healthMonitor_tester.healthMonitor_delete_test();
- healthMonitor_tester.healthMonitor_element_negative_get_test();
+ NeutronLBHealthMonitorTests healthMonitorTester = new NeutronLBHealthMonitorTests(base);
+ String createJsonString = healthMonitorTester.singleton_lb_healthMonitor_create_test();
+ healthMonitorTester.singleton_lb_healthMonitor_with_one_query_item_test(createJsonString);
+ healthMonitorTester.healthMonitor_update_test();
+ healthMonitorTester.healthMonitor_element_get_test();
+ healthMonitorTester.healthMonitor_element_get_with_query_test();
+ healthMonitorTester.healthMonitor_collection_get_test();
+ healthMonitorTester.healthMonitor_delete_test();
+ healthMonitorTester.healthMonitor_element_negative_get_test();
}
}
}
public static void runTests(String base) {
- NeutronLBListenerTests listener_tester = new NeutronLBListenerTests(base);
- String createJsonString = listener_tester.singleton_lb_listener_create_test();
- listener_tester.singleton_lb_listener_get_with_one_query_item_test(createJsonString);
- listener_tester.listener_update_test();
- listener_tester.listener_element_get_test();
- listener_tester.listener_element_get_with_query_test();
- listener_tester.listener_collection_get_test();
- listener_tester.listener_delete_test();
- listener_tester.listener_element_negative_get_test();
- listener_tester.test_bug6398_lb_listener_create_test();
+ NeutronLBListenerTests listenerTester = new NeutronLBListenerTests(base);
+ String createJsonString = listenerTester.singleton_lb_listener_create_test();
+ listenerTester.singleton_lb_listener_get_with_one_query_item_test(createJsonString);
+ listenerTester.listener_update_test();
+ listenerTester.listener_element_get_test();
+ listenerTester.listener_element_get_with_query_test();
+ listenerTester.listener_collection_get_test();
+ listenerTester.listener_delete_test();
+ listenerTester.listener_element_negative_get_test();
+ listenerTester.test_bug6398_lb_listener_create_test();
}
}
}
public static void runTests(String base) {
- NeutronLBPoolMembersTests pool_member_tester = new NeutronLBPoolMembersTests(base);
- String createJsonString = pool_member_tester.singleton_lb_pool_member_create_test();
- pool_member_tester.singleton_lb_pool_member_get_with_one_query_item_test(createJsonString);
- pool_member_tester.pool_member_update_test();
- pool_member_tester.pool_member_element_get_test();
- pool_member_tester.pool_member_element_get_with_query_test();
- pool_member_tester.pool_member_collection_get_test();
- pool_member_tester.pool_member_delete_test();
- pool_member_tester.pool_member_element_negative_get_test();
+ NeutronLBPoolMembersTests poolMemberTester = new NeutronLBPoolMembersTests(base);
+ String createJsonString = poolMemberTester.singleton_lb_pool_member_create_test();
+ poolMemberTester.singleton_lb_pool_member_get_with_one_query_item_test(createJsonString);
+ poolMemberTester.pool_member_update_test();
+ poolMemberTester.pool_member_element_get_test();
+ poolMemberTester.pool_member_element_get_with_query_test();
+ poolMemberTester.pool_member_collection_get_test();
+ poolMemberTester.pool_member_delete_test();
+ poolMemberTester.pool_member_element_negative_get_test();
}
}
}
public static void runTests(String base) {
- NeutronLBPoolTests pool_tester = new NeutronLBPoolTests(base);
- String createJsonString = pool_tester.singleton_lb_pool_create_test();
- pool_tester.singleton_lb_pool_get_with_one_query_item_test(createJsonString);
- pool_tester.pool_update_test();
- pool_tester.pool_element_get_test();
- pool_tester.pool_element_get_with_query_test();
- pool_tester.pool_collection_get_test();
- pool_tester.pool_delete_test();
- pool_tester.pool_element_negative_get_test();
+ NeutronLBPoolTests poolTester = new NeutronLBPoolTests(base);
+ String createJsonString = poolTester.singleton_lb_pool_create_test();
+ poolTester.singleton_lb_pool_get_with_one_query_item_test(createJsonString);
+ poolTester.pool_update_test();
+ poolTester.pool_element_get_test();
+ poolTester.pool_element_get_with_query_test();
+ poolTester.pool_collection_get_test();
+ poolTester.pool_delete_test();
+ poolTester.pool_element_negative_get_test();
// needed for pool member testing
- pool_tester.singleton_lb_pool_create_test();
+ poolTester.singleton_lb_pool_create_test();
}
}
}
public static void runTests(String base) {
- NeutronLoadBalancerTests loadBalancer_tester = new NeutronLoadBalancerTests(base);
- String createJsonString = loadBalancer_tester.singleton_loadbalancer_create_test();
- loadBalancer_tester.singleton_loadbalancer_get_with_one_query_item_test(createJsonString);
- loadBalancer_tester.loadBalancer_update_test();
- loadBalancer_tester.loadBalancer_element_get_test();
- loadBalancer_tester.loadBalancer_element_get_with_query_test();
- loadBalancer_tester.loadBalancer_collection_get_test();
- loadBalancer_tester.loadBalancer_delete_test();
- loadBalancer_tester.loadBalancer_element_negative_get_test();
+ NeutronLoadBalancerTests loadBalancerTester = new NeutronLoadBalancerTests(base);
+ String createJsonString = loadBalancerTester.singleton_loadbalancer_create_test();
+ loadBalancerTester.singleton_loadbalancer_get_with_one_query_item_test(createJsonString);
+ loadBalancerTester.loadBalancer_update_test();
+ loadBalancerTester.loadBalancer_element_get_test();
+ loadBalancerTester.loadBalancer_element_get_with_query_test();
+ loadBalancerTester.loadBalancer_collection_get_test();
+ loadBalancerTester.loadBalancer_delete_test();
+ loadBalancerTester.loadBalancer_element_negative_get_test();
}
}
}
public static void runTests(String base) {
- NeutronMeteringLabelTests meteringLabel_tester = new NeutronMeteringLabelTests(base);
- meteringLabel_tester.singleton_meteringLabel_create_test();
- meteringLabel_tester.meteringLabel_element_get_test();
- meteringLabel_tester.meteringLabel_element_get_with_query_test();
- meteringLabel_tester.meteringLabel_collection_get_test();
- meteringLabel_tester.meteringLabel_delete_test();
- meteringLabel_tester.meteringLabel_element_negative_get_test();
+ NeutronMeteringLabelTests meteringLabelTester = new NeutronMeteringLabelTests(base);
+ meteringLabelTester.singleton_meteringLabel_create_test();
+ meteringLabelTester.meteringLabel_element_get_test();
+ meteringLabelTester.meteringLabel_element_get_with_query_test();
+ meteringLabelTester.meteringLabel_collection_get_test();
+ meteringLabelTester.meteringLabel_delete_test();
+ meteringLabelTester.meteringLabel_element_negative_get_test();
}
}
}
public static void runTests(String base) {
- NeutronMeteringRuleTests meteringRule_tester = new NeutronMeteringRuleTests(base);
- meteringRule_tester.singleton_meteringRule_create_test();
- meteringRule_tester.meteringRule_element_get_test();
- meteringRule_tester.meteringRule_element_get_with_query_test();
- meteringRule_tester.meteringRule_collection_get_test();
- meteringRule_tester.meteringRule_delete_test();
- meteringRule_tester.meteringRule_element_negative_get_test();
+ NeutronMeteringRuleTests meteringRuleTester = new NeutronMeteringRuleTests(base);
+ meteringRuleTester.singleton_meteringRule_create_test();
+ meteringRuleTester.meteringRule_element_get_test();
+ meteringRuleTester.meteringRule_element_get_with_query_test();
+ meteringRuleTester.meteringRule_collection_get_test();
+ meteringRuleTester.meteringRule_delete_test();
+ meteringRuleTester.meteringRule_element_negative_get_test();
}
}
}
public void network_collection_get_test_with_wait() throws IOException, InterruptedException {
- String url_s = base + "/networks";
- int i = 0;
- while (i < TIMEOUT) {
- URL url = new URL(url_s);
+ String urlS = base + "/networks";
+ for (int retry = 0; retry < TIMEOUT; retry++) {
+ URL url = new URL(urlS);
HttpURLConnection httpConn = ITNeutronE2E.httpURLConnectionFactoryGet(url);
if (httpConn.getResponseCode() != 200) {
- LOGGER.info("trial " + Integer.toString(i) + ": failed with: "
+ LOGGER.info("trial " + Integer.toString(retry) + ": failed with: "
+ Integer.toString(httpConn.getResponseCode()));
Thread.sleep(1000);
- i += 1;
} else {
Assert.assertEquals("Network Collection GET failed", 200, httpConn.getResponseCode());
return;
}
public void network_collection_get_test() {
- String url_s = base + "/networks";
- ITNeutronE2E.test_fetch(url_s, true, "Network collection Get Failed");
+ String urlS = base + "/networks";
+ ITNeutronE2E.test_fetch(urlS, true, "Network collection Get Failed");
}
public void network_element_get_test() {
}
public static void runTests(String base) throws IOException, InterruptedException {
- NeutronNetworkTests network_tester = new NeutronNetworkTests(base);
- network_tester.network_collection_get_test_with_wait();
- String createJsonString = network_tester.singleton_network_create_test();
- network_tester.singleton_network_get_with_one_query_item_test(createJsonString);
- network_tester.external_network_create_test(); //needed for router test
- network_tester.bulk_network_create_test();
- network_tester.network_update_test();
- network_tester.network_collection_get_test();
- network_tester.network_element_get_test();
- network_tester.network_element_get_test_with_query();
- network_tester.network_delete_test();
- network_tester.network_element_negative_get_test();
+ NeutronNetworkTests networkTester = new NeutronNetworkTests(base);
+ networkTester.network_collection_get_test_with_wait();
+ String createJsonString = networkTester.singleton_network_create_test();
+ networkTester.singleton_network_get_with_one_query_item_test(createJsonString);
+ networkTester.external_network_create_test(); //needed for router test
+ networkTester.bulk_network_create_test();
+ networkTester.network_update_test();
+ networkTester.network_collection_get_test();
+ networkTester.network_element_get_test();
+ networkTester.network_element_get_test_with_query();
+ networkTester.network_delete_test();
+ networkTester.network_element_negative_get_test();
}
}
}
public static void runTests(String base) {
- NeutronPortTests port_tester = new NeutronPortTests(base);
- String createJsonString = port_tester.singleton_port_create_test();
- port_tester.singleton_port_get_with_one_query_item_test(createJsonString);
- port_tester.router_interface_port_create_test(); //needed for router test
- port_tester.bulk_port_create_test();
- port_tester.port_update_test();
- port_tester.port_element_get_test();
- port_tester.port_element_get_with_query_content_validation_test();
- port_tester.port_element_get_with_query_test();
- port_tester.port_collection_get_test();
- port_tester.port_delete_test();
- port_tester.port_element_negative_get_test();
+ NeutronPortTests portTester = new NeutronPortTests(base);
+ String createJsonString = portTester.singleton_port_create_test();
+ portTester.singleton_port_get_with_one_query_item_test(createJsonString);
+ portTester.router_interface_port_create_test(); //needed for router test
+ portTester.bulk_port_create_test();
+ portTester.port_update_test();
+ portTester.port_element_get_test();
+ portTester.port_element_get_with_query_content_validation_test();
+ portTester.port_element_get_with_query_test();
+ portTester.port_collection_get_test();
+ portTester.port_delete_test();
+ portTester.port_element_negative_get_test();
}
}
}
public static void runTests(String base) {
- NeutronQosPolicyTests qos_policy_tester = new NeutronQosPolicyTests(base);
- String createJsonString = qos_policy_tester.singleton_qos_policy_create_test();
- qos_policy_tester.singleton_qos_policy_get_with_query_item_test(createJsonString);
- qos_policy_tester.qos_policy_element_get_test();
- qos_policy_tester.qos_policy_element_get_with_query_test();
- qos_policy_tester.qos_policy_collection_get_test();
- qos_policy_tester.qos_policy_modify_test();
- qos_policy_tester.qos_policy_delete_test();
- qos_policy_tester.qos_policy_element_negative_get_test();
+ NeutronQosPolicyTests qosPolicyTester = new NeutronQosPolicyTests(base);
+ String createJsonString = qosPolicyTester.singleton_qos_policy_create_test();
+ qosPolicyTester.singleton_qos_policy_get_with_query_item_test(createJsonString);
+ qosPolicyTester.qos_policy_element_get_test();
+ qosPolicyTester.qos_policy_element_get_with_query_test();
+ qosPolicyTester.qos_policy_collection_get_test();
+ qosPolicyTester.qos_policy_modify_test();
+ qosPolicyTester.qos_policy_delete_test();
+ qosPolicyTester.qos_policy_element_negative_get_test();
}
}
}
public static void runTests(String base) {
- NeutronRouterTests router_tester = new NeutronRouterTests(base);
- String createJsonString = router_tester.singleton_router_create_test();
- router_tester.singleton_router_get_with_one_query_item_test(createJsonString);
- router_tester.router_add_interface_test();
- router_tester.update_router_test();
- router_tester.create_router(); // needed for following tests
- router_tester.router_add_interface();
- router_tester.router_element_get_test();
- router_tester.router_element_get_with_query_test();
- router_tester.router_collection_get_test();
- router_tester.router_remove_interface_test();
- router_tester.router_delete_test();
- router_tester.router_element_negative_get_test();
+ NeutronRouterTests routerTester = new NeutronRouterTests(base);
+ String createJsonString = routerTester.singleton_router_create_test();
+ routerTester.singleton_router_get_with_one_query_item_test(createJsonString);
+ routerTester.router_add_interface_test();
+ routerTester.update_router_test();
+ routerTester.create_router(); // needed for following tests
+ routerTester.router_add_interface();
+ routerTester.router_element_get_test();
+ routerTester.router_element_get_with_query_test();
+ routerTester.router_collection_get_test();
+ routerTester.router_remove_interface_test();
+ routerTester.router_delete_test();
+ routerTester.router_element_negative_get_test();
}
}
}
public static void runTests(String base) {
- NeutronSFCFlowClassifierTests sfc_flowclassifier_tester = new NeutronSFCFlowClassifierTests(base);
- String createJsonString = sfc_flowclassifier_tester.singleton_sfc_flowclassifier_create_test();
- sfc_flowclassifier_tester.singleton_sfc_flowclassifier_get_with_query_item(createJsonString);
- sfc_flowclassifier_tester.sfc_flowclassifier_element_get_test();
- sfc_flowclassifier_tester.sfc_flowclassifier_get_test_with_query_test();
- sfc_flowclassifier_tester.sfc_flowclassifier_collection_get_test();
- sfc_flowclassifier_tester.sfc_flowclassifier_modify_test();
- sfc_flowclassifier_tester.sfc_flowclassifier_delete_test();
- sfc_flowclassifier_tester.sfc_flowclassifier_element_negative_get_test();
- sfc_flowclassifier_tester.test_bug_6865();
+ NeutronSFCFlowClassifierTests sfcFlowclassifierTester = new NeutronSFCFlowClassifierTests(base);
+ String createJsonString = sfcFlowclassifierTester.singleton_sfc_flowclassifier_create_test();
+ sfcFlowclassifierTester.singleton_sfc_flowclassifier_get_with_query_item(createJsonString);
+ sfcFlowclassifierTester.sfc_flowclassifier_element_get_test();
+ sfcFlowclassifierTester.sfc_flowclassifier_get_test_with_query_test();
+ sfcFlowclassifierTester.sfc_flowclassifier_collection_get_test();
+ sfcFlowclassifierTester.sfc_flowclassifier_modify_test();
+ sfcFlowclassifierTester.sfc_flowclassifier_delete_test();
+ sfcFlowclassifierTester.sfc_flowclassifier_element_negative_get_test();
+ sfcFlowclassifierTester.test_bug_6865();
}
}
}
public static void runTests(String base) {
- NeutronSFCPortChainTests sfc_portchain_tester = new NeutronSFCPortChainTests(base);
- String createJsonString = sfc_portchain_tester.singleton_sfc_portchain_create_test();
- sfc_portchain_tester.singleton_sfc_portchain_get_with_query_item(createJsonString);
- sfc_portchain_tester.sfc_portchain_element_get_test();
- sfc_portchain_tester.sfc_portchain_element_get_test_with_query_test();
- sfc_portchain_tester.sfc_portchain_collection_get_test();
- sfc_portchain_tester.sfc_portchain_modify_test();
- sfc_portchain_tester.sfc_portchain_delete_test();
- sfc_portchain_tester.sfc_portchain_element_negative_get_test();
+ NeutronSFCPortChainTests sfcPortchainTester = new NeutronSFCPortChainTests(base);
+ String createJsonString = sfcPortchainTester.singleton_sfc_portchain_create_test();
+ sfcPortchainTester.singleton_sfc_portchain_get_with_query_item(createJsonString);
+ sfcPortchainTester.sfc_portchain_element_get_test();
+ sfcPortchainTester.sfc_portchain_element_get_test_with_query_test();
+ sfcPortchainTester.sfc_portchain_collection_get_test();
+ sfcPortchainTester.sfc_portchain_modify_test();
+ sfcPortchainTester.sfc_portchain_delete_test();
+ sfcPortchainTester.sfc_portchain_element_negative_get_test();
}
}
}
public static void runTests(String base) {
- NeutronSFCPortPairGroupTests sfc_portpairgroup_tester = new NeutronSFCPortPairGroupTests(base);
- String createJsonString = sfc_portpairgroup_tester.singleton_sfc_portpairgroup_create_test();
- sfc_portpairgroup_tester.singleton_sfc_portpairgroup_get_with_query_item(createJsonString);
- sfc_portpairgroup_tester.sfc_portpairgroup_element_get_test();
- sfc_portpairgroup_tester.sfc_portpairgroup_collection_get_test();
- sfc_portpairgroup_tester.sfc_portpairgroup_element_get_with_query_test();
- sfc_portpairgroup_tester.sfc_portpairgroup_modify_test();
- sfc_portpairgroup_tester.sfc_portpairgroup_delete_test();
- sfc_portpairgroup_tester.sfc_portpairgroup_element_negative_get_test();
+ NeutronSFCPortPairGroupTests sfcPortpairgroupTester = new NeutronSFCPortPairGroupTests(base);
+ String createJsonString = sfcPortpairgroupTester.singleton_sfc_portpairgroup_create_test();
+ sfcPortpairgroupTester.singleton_sfc_portpairgroup_get_with_query_item(createJsonString);
+ sfcPortpairgroupTester.sfc_portpairgroup_element_get_test();
+ sfcPortpairgroupTester.sfc_portpairgroup_collection_get_test();
+ sfcPortpairgroupTester.sfc_portpairgroup_element_get_with_query_test();
+ sfcPortpairgroupTester.sfc_portpairgroup_modify_test();
+ sfcPortpairgroupTester.sfc_portpairgroup_delete_test();
+ sfcPortpairgroupTester.sfc_portpairgroup_element_negative_get_test();
}
}
}
public static void runTests(String base) {
- NeutronSFCPortPairTests sfc_portpair_tester = new NeutronSFCPortPairTests(base);
- String createJsonString = sfc_portpair_tester.singleton_sfc_portpair_create_test();
- sfc_portpair_tester.singleton_sfc_portpair_get_with_query_item_test(createJsonString);
- sfc_portpair_tester.sfc_portpair_element_get_test();
- sfc_portpair_tester.sfc_portpair_element_get_with_query_test();
- sfc_portpair_tester.sfc_portpair_collection_get_test();
- sfc_portpair_tester.sfc_portpair_modify_test();
- sfc_portpair_tester.sfc_portpair_delete_test();
- sfc_portpair_tester.sfc_portpair_element_negative_get_test();
+ NeutronSFCPortPairTests sfcPortpairTester = new NeutronSFCPortPairTests(base);
+ String createJsonString = sfcPortpairTester.singleton_sfc_portpair_create_test();
+ sfcPortpairTester.singleton_sfc_portpair_get_with_query_item_test(createJsonString);
+ sfcPortpairTester.sfc_portpair_element_get_test();
+ sfcPortpairTester.sfc_portpair_element_get_with_query_test();
+ sfcPortpairTester.sfc_portpair_collection_get_test();
+ sfcPortpairTester.sfc_portpair_modify_test();
+ sfcPortpairTester.sfc_portpair_delete_test();
+ sfcPortpairTester.sfc_portpair_element_negative_get_test();
}
}
}
public static void runTests(String base) {
- NeutronSecurityGroupTests securityGroup_tester = new NeutronSecurityGroupTests(base);
- String createJsonString = securityGroup_tester.singleton_sg_create_test();
- securityGroup_tester.singleton_sg_get_with_one_query_item_test(createJsonString);
- securityGroup_tester.sg_update_test();
- securityGroup_tester.sg_element_get_test();
- securityGroup_tester.sg_element_get_with_query_test();
- securityGroup_tester.securityGroup_collection_get_test();
- securityGroup_tester.sg_delete_test();
- securityGroup_tester.sg_element_negative_get_test();
+ NeutronSecurityGroupTests securityGroupTester = new NeutronSecurityGroupTests(base);
+ String createJsonString = securityGroupTester.singleton_sg_create_test();
+ securityGroupTester.singleton_sg_get_with_one_query_item_test(createJsonString);
+ securityGroupTester.sg_update_test();
+ securityGroupTester.sg_element_get_test();
+ securityGroupTester.sg_element_get_with_query_test();
+ securityGroupTester.securityGroup_collection_get_test();
+ securityGroupTester.sg_delete_test();
+ securityGroupTester.sg_element_negative_get_test();
}
}
}
public static void runTests(String base) {
- NeutronSecurityRuleTests securityRule_tester = new NeutronSecurityRuleTests(base);
- String createJsonString = securityRule_tester.singleton_sr_create_test();
- securityRule_tester.singleton_sr_get_with_one_query_item_test(createJsonString);
- securityRule_tester.multiple_sr_create_test();
- securityRule_tester.singleton_sr_modify_test();
- securityRule_tester.sr_element_get_test();
- securityRule_tester.sr_element_get_with_query_test();
- securityRule_tester.securityRule_collection_get_test();
- securityRule_tester.sr_delete_test();
- securityRule_tester.sr_element_negative_get_test();
- securityRule_tester.bug5478_rule_delete_negative_test();
- securityRule_tester.bug4043_ipv4_test();
- securityRule_tester.bug4043_ipv6_test();
- securityRule_tester.bug6398_sr_create_test();
+ NeutronSecurityRuleTests securityRuleTester = new NeutronSecurityRuleTests(base);
+ String createJsonString = securityRuleTester.singleton_sr_create_test();
+ securityRuleTester.singleton_sr_get_with_one_query_item_test(createJsonString);
+ securityRuleTester.multiple_sr_create_test();
+ securityRuleTester.singleton_sr_modify_test();
+ securityRuleTester.sr_element_get_test();
+ securityRuleTester.sr_element_get_with_query_test();
+ securityRuleTester.securityRule_collection_get_test();
+ securityRuleTester.sr_delete_test();
+ securityRuleTester.sr_element_negative_get_test();
+ securityRuleTester.bug5478_rule_delete_negative_test();
+ securityRuleTester.bug4043_ipv4_test();
+ securityRuleTester.bug4043_ipv6_test();
+ securityRuleTester.bug6398_sr_create_test();
}
}
}
public static void runTests(String base) {
- NeutronSubnetTests subnet_tester = new NeutronSubnetTests(base);
- String createJsonString = subnet_tester.singleton_subnet_create_test();
- subnet_tester.singleton_subnet_get_with_one_query_item_test(createJsonString);
- subnet_tester.external_subnet_create_test(); //needed for router test
- subnet_tester.bulk_subnet_create_test();
- subnet_tester.subnet_update_test();
- subnet_tester.subnet_element_get_test();
- subnet_tester.subnet_element_get_with_query_test();
- subnet_tester.subnet_collection_get_test();
- subnet_tester.subnet_delete_test();
- subnet_tester.subnet_element_negative_get_test();
+ NeutronSubnetTests subnetTester = new NeutronSubnetTests(base);
+ String createJsonString = subnetTester.singleton_subnet_create_test();
+ subnetTester.singleton_subnet_get_with_one_query_item_test(createJsonString);
+ subnetTester.external_subnet_create_test(); //needed for router test
+ subnetTester.bulk_subnet_create_test();
+ subnetTester.subnet_update_test();
+ subnetTester.subnet_element_get_test();
+ subnetTester.subnet_element_get_with_query_test();
+ subnetTester.subnet_collection_get_test();
+ subnetTester.subnet_delete_test();
+ subnetTester.subnet_element_negative_get_test();
}
}
}
public static void runTests(String base) {
- NeutronVPNServicesTests vpnService_tester = new NeutronVPNServicesTests(base);
- String createJsonString = vpnService_tester.singleton_vpnservice_create_test();
- vpnService_tester.singleton_vpnservice_get_with_one_query_item_test(createJsonString);
- vpnService_tester.vpnservice_update_test();
- vpnService_tester.vpnservice_element_get_test();
- vpnService_tester.vpnservice_element_get_with_query_test();
- vpnService_tester.vpnService_collection_get_test();
- vpnService_tester.vpnservice_delete_test();
- vpnService_tester.vpnservice_element_negative_get_test();
+ NeutronVPNServicesTests vpnServiceTester = new NeutronVPNServicesTests(base);
+ String createJsonString = vpnServiceTester.singleton_vpnservice_create_test();
+ vpnServiceTester.singleton_vpnservice_get_with_one_query_item_test(createJsonString);
+ vpnServiceTester.vpnservice_update_test();
+ vpnServiceTester.vpnservice_element_get_test();
+ vpnServiceTester.vpnservice_element_get_with_query_test();
+ vpnServiceTester.vpnService_collection_get_test();
+ vpnServiceTester.vpnservice_delete_test();
+ vpnServiceTester.vpnservice_element_negative_get_test();
}
}
public void check_bug3812() {
// create network
- String url_n = base + "/networks";
- String content_n = "{\"network\": {\"name\": \"test\", \"provider:physical_network\": \"\", "
+ String urlN = base + "/networks";
+ String contentN = "{\"network\": {\"name\": \"test\", \"provider:physical_network\": \"\", "
+ "\"router:external\": false, \"tenant_id\": \"04684ce029a6415ca8a9293a24f884b9\", "
+ "\"admin_state_up\": true, \"shared\": false, \"provider:network_type\": \"vxlan\", "
+ "\"id\": \"ec36ae5a-ff7f-4441-8229-179e5d5207a7\", \"provider:segmentation_id\": 2550}}";
- ITNeutronE2E.test_create(url_n, content_n, "Bug 3812 Network Post Failed");
+ ITNeutronE2E.test_create(urlN, contentN, "Bug 3812 Network Post Failed");
// create first subnet
- String url_s = base + "/subnets";
- String content_s1 = "{\"subnet\": {\"name\": \"s1\", \"enable_dhcp\": true, "
+ String urlS = base + "/subnets";
+ String contentS1 = "{\"subnet\": {\"name\": \"s1\", \"enable_dhcp\": true, "
+ "\"network_id\": \"ec36ae5a-ff7f-4441-8229-179e5d5207a7\","
+ " \"tenant_id\": \"04684ce029a6415ca8a9293a24f884b9\", \"dns_nameservers\": [], "
+ "\"gateway_ip\": \"10.0.0.1\", \"ipv6_ra_mode\": \"\", \"allocation_pools\": "
+ "[{\"start\": \"10.0.0.2\", \"end\": \"10.0.3.254\"}], \"host_routes\": [], \"shared\": false,"
+ " \"ip_version\": 4, \"ipv6_address_mode\": \"\", \"cidr\": \"10.0.0.0/22\", "
+ "\"id\": \"64605c41-688d-4548-97da-0f895943f840\", \"subnetpool_id\": \"\"}}";
- ITNeutronE2E.test_create(url_s, content_s1, "Bug 3812 Subnet 1 Post Failed");
+ ITNeutronE2E.test_create(urlS, contentS1, "Bug 3812 Subnet 1 Post Failed");
- String url_p = base + "/ports";
- String content_p1 = "{\"port\": {\"binding:host_id\": \"00000000-1111-2222-3333-444444444444\", "
+ String urlP = base + "/ports";
+ String contentP1 = "{\"port\": {\"binding:host_id\": \"00000000-1111-2222-3333-444444444444\", "
+ "\"allowed_address_pairs\": [], \"device_owner\": \"network:dhcp\", "
+ "\"binding:profile\": {}, \"fixed_ips\": [{\"subnet_id\": \"64605c41-688d-4548-97da-0f895943f840\","
+ " \"ip_address\": \"10.0.0.2\"}], \"id\": \"fcd1d7ab-8486-42a0-8f60-9d1a682aa00e\", "
+ " \"tenant_id\": \"04684ce029a6415ca8a9293a24f884b9\", \"binding:vif_details\": {}, "
+ "\"binding:vnic_type\": \"normal\", \"binding:vif_type\": \"unbound\","
+ " \"mac_address\": \"FA:16:3E:02:CB:DE\"}}";
- ITNeutronE2E.test_create(url_p, content_p1, "Bug 3812 DHCP Port 1 Post Failed");
+ ITNeutronE2E.test_create(urlP, contentP1, "Bug 3812 DHCP Port 1 Post Failed");
- String url_p1 = url_p + "/fcd1d7ab-8486-42a0-8f60-9d1a682aa00e";
- String content_p1m1 = "{\"port\": {\"binding:host_id\": \"00000000-1111-2222-3333-444444444444\", "
+ String urlP1 = urlP + "/fcd1d7ab-8486-42a0-8f60-9d1a682aa00e";
+ String contentP1M1 = "{\"port\": {\"binding:host_id\": \"00000000-1111-2222-3333-444444444444\", "
+ "\"allowed_address_pairs\": [], \"extra_dhcp_opts\": [], \"device_owner\": \"network:dhcp\","
+ " \"network_id\": \"ec36ae5a-ff7f-4441-8229-179e5d5207a7\", \"binding:profile\": {},"
+ " \"security_groups\": [], "
+ "\"device_id\": \"dhcp1c8f692f-b8db-5449-80ea-c9243b652e59-ec36ae5a-ff7f-4441-8229-179e5d5207a7\","
+ " \"name\": \"\", \"admin_state_up\": true, \"binding:vif_details\": "
+ "{\"port_filter\": \"true\"}, \"binding:vnic_type\": \"normal\", \"binding:vif_type\": \"ovs\"}}";
- ITNeutronE2E.test_modify(url_p1, content_p1m1, "Bug 3812 DHCP Port 1 Put 1 Failed");
+ ITNeutronE2E.test_modify(urlP1, contentP1M1, "Bug 3812 DHCP Port 1 Put 1 Failed");
// subnet 2 create
- String content_s2 = "{\"subnet\": {\"name\": \"s2\", \"enable_dhcp\": true, "
+ String contentS2 = "{\"subnet\": {\"name\": \"s2\", \"enable_dhcp\": true, "
+ "\"network_id\": \"ec36ae5a-ff7f-4441-8229-179e5d5207a7\", "
+ "\"tenant_id\": \"04684ce029a6415ca8a9293a24f884b9\", "
+ "\"dns_nameservers\": [], \"gateway_ip\": \"20.0.0.1\", "
+ "\"host_routes\": [], \"shared\": false, \"ip_version\": 4, "
+ "\"ipv6_address_mode\": \"\", \"cidr\": \"20.0.0.0/22\", "
+ "\"id\": \"dd9b62eb-d9a3-42b5-b2f1-bffa43475614\", \"subnetpool_id\": \"\"}}";
- ITNeutronE2E.test_create(url_s, content_s2, "Bug 3812 Subnet 2 Post Failed");
+ ITNeutronE2E.test_create(urlS, contentS2, "Bug 3812 Subnet 2 Post Failed");
- String content_p1m2 = "{\"port\": {\"binding:host_id\": \"00000000-1111-2222-3333-444444444444\", "
+ String contentP1M2 = "{\"port\": {\"binding:host_id\": \"00000000-1111-2222-3333-444444444444\", "
+ "\"allowed_address_pairs\": [], \"extra_dhcp_opts\": [], \"device_owner\": \"network:dhcp\", "
+ "\"network_id\": \"ec36ae5a-ff7f-4441-8229-179e5d5207a7\", \"binding:profile\": {}, "
+ "\"security_groups\": [], "
+ "\"device_id\": \"dhcp1c8f692f-b8db-5449-80ea-c9243b652e59-ec36ae5a-ff7f-4441-8229-179e5d5207a7\","
+ " \"name\": \"\", \"admin_state_up\": true, \"binding:vif_details\": "
+ "{\"port_filter\": \"true\"}, \"binding:vnic_type\": \"normal\", \"binding:vif_type\": \"ovs\"}}";
- ITNeutronE2E.test_modify(url_p1, content_p1m2, "Bug 3812 DHCP Port Put 2 Failed");
+ ITNeutronE2E.test_modify(urlP1, contentP1M2, "Bug 3812 DHCP Port Put 2 Failed");
// delete first subnet
- String content_p1m3 = "{\"port\": {\"binding:host_id\": \"00000000-1111-2222-3333-444444444444\","
+ String contentP1M3 = "{\"port\": {\"binding:host_id\": \"00000000-1111-2222-3333-444444444444\","
+ " \"allowed_address_pairs\": [], \"extra_dhcp_opts\": [], \"device_owner\": \"network:dhcp\", "
+ "\"binding:profile\": {}, \"network_id\": \"ec36ae5a-ff7f-4441-8229-179e5d5207a7\", "
+ "\"security_groups\": [], "
+ "\"device_id\": \"dhcp1c8f692f-b8db-5449-80ea-c9243b652e59-ec36ae5a-ff7f-4441-8229-179e5d5207a7\", "
+ "\"name\": \"\", \"admin_state_up\": true, \"binding:vif_details\": "
+ "{\"port_filter\": \"true\"}, \"binding:vnic_type\": \"normal\", \"binding:vif_type\": \"ovs\"}}";
- ITNeutronE2E.test_modify(url_p1, content_p1m3, "Bug 3812 DHCP Port Put 3 Failed");
+ ITNeutronE2E.test_modify(urlP1, contentP1M3, "Bug 3812 DHCP Port Put 3 Failed");
- String url_s1 = url_s + "/64605c41-688d-4548-97da-0f895943f840";
- ITNeutronE2E.test_delete(url_s1, "Bug 3812 Subnet 1 Delete Failed");
+ String urlS1 = urlS + "/64605c41-688d-4548-97da-0f895943f840";
+ ITNeutronE2E.test_delete(urlS1, "Bug 3812 Subnet 1 Delete Failed");
- String url_s2 = url_s + "/dd9b62eb-d9a3-42b5-b2f1-bffa43475614";
- ITNeutronE2E.test_delete(url_s2, "Bug 3812 Subnet 2 Delete Failed");
+ String urlS2 = urlS + "/dd9b62eb-d9a3-42b5-b2f1-bffa43475614";
+ ITNeutronE2E.test_delete(urlS2, "Bug 3812 Subnet 2 Delete Failed");
}
public static void runTests(String base) {
public void check_bug4027() {
// create network
- String url_n = base + "/ports";
- String content_n = "{ \"port\" : {" + "\"id\" : \"ea2ac142-8454-4990-8bfb-7a218479864b\","
+ String urlN = base + "/ports";
+ String contentN = "{ \"port\" : {" + "\"id\" : \"ea2ac142-8454-4990-8bfb-7a218479864b\","
+ "\"network_id\" : \"e44cdc39-2d43-4775-82e8-b18da318da61\"," + "\"name\" : \"\","
+ "\"admin_state_up\" : true," + "\"mac_address\" : \"FA:16:3E:A2:44:3F\"," + "\"fixed_ips\" : [ {"
+ "\"ip_address\" : \"10.1.0.2\"," + "\"subnet_id\" : \"6aba69a3-a541-4b93-b724-7bf822e4986b\" } ],"
+ "\"security_groups\" : [ ]," + "\"allowed_address_pairs\" : [ ],"
+ "\"binding:host_id\" : \"devstack-control\"," + "\"binding:vnic_type\" : \"normal\","
+ "\"binding:vif_type\" : \"unbound\"," + "\"binding:vif_details\" : { } } }";
- ITNeutronE2E.test_create(url_n, content_n, "Bug 4027 Port Post Failed");
- String url_2 = base + "/ports/ea2ac142-8454-4990-8bfb-7a218479864b";
- String content_2 = " { \"port\" : {" + "\"id\" : \"ea2ac142-8454-4990-8bfb-7a218479864b\"," + "\"name\" : \"\","
+ ITNeutronE2E.test_create(urlN, contentN, "Bug 4027 Port Post Failed");
+ String url2 = base + "/ports/ea2ac142-8454-4990-8bfb-7a218479864b";
+ String content2 = " { \"port\" : {" + "\"id\" : \"ea2ac142-8454-4990-8bfb-7a218479864b\"," + "\"name\" : \"\","
+ "\"admin_state_up\" : true,"
+ "\"device_id\" : \"dhcp58155ae3-f2e7-51ca-9978-71c513ab02ee-e44cdc39-2d43-4775-82e8-b18da318da61\","
+ "\"device_owner\" : \"network:dhcp\"," + "\"security_groups\" : [ ],"
+ "\"allowed_address_pairs\" : [ ]," + "\"binding:host_id\" : \"devstack-control\","
+ "\"binding:vnic_type\" : \"normal\"," + "\"binding:vif_type\" : \"ovs\","
+ "\"binding:vif_details\" : { \"port_filter\" : \"true\" }," + "\"extra_dhcp_opts\" : [ ] } } }";
- ITNeutronE2E.test_modify(url_2, content_2, "Bug 4027 Port Modify Failed");
+ ITNeutronE2E.test_modify(url2, content2, "Bug 4027 Port Modify Failed");
}
public static void runTests(String base) {
public void test_create_port_in_allowed_allocation_pools() {
// create network
- String url_n = base + "/networks";
- String content_n = " {\"network\": {\"status\": \"ACTIVE\", \"subnets\": [], \"name\":"
+ String urlN = base + "/networks";
+ String contentN = " {\"network\": {\"status\": \"ACTIVE\", \"subnets\": [], \"name\":"
+ " \"test-network--1850822235\", \"router:external\": false, "
+ "\"tenant_id\": \"4c1be4874f0048fc8205acffe2821cd3\", \"admin_state_up\": true,"
+ " \"mtu\": 0, \"shared\": false, \"port_security_enabled\": true, "
+ "\"id\": \"114ddf69-8ccd-46bb-92fb-bc3e921318d4\"}}";
- ITNeutronE2E.test_create(url_n, content_n, "test_create_port_in_allowed_allocation_pools Network Post Failed");
+ ITNeutronE2E.test_create(urlN, contentN, "test_create_port_in_allowed_allocation_pools Network Post Failed");
// create subnet
- String url_s = base + "/subnets";
- String content_s1 = "{\"subnet\": {\"name\": \"\", \"enable_dhcp\": true, "
+ String urlS = base + "/subnets";
+ String contentS1 = "{\"subnet\": {\"name\": \"\", \"enable_dhcp\": true, "
+ "\"network_id\": \"114ddf69-8ccd-46bb-92fb-bc3e921318d4\", "
+ "\"tenant_id\": \"4c1be4874f0048fc8205acffe2821cd3\", \"dns_nameservers\": [], "
+ "\"gateway_ip\": \"2003::1\", \"ipv6_ra_mode\": null, "
+ "\"allocation_pools\": [{\"start\": \"2003::4\", \"end\": \"2003::6\"}], \"host_routes\": [], "
+ "\"ip_version\": 6, \"ipv6_address_mode\": null, \"cidr\": \"2003::/64\", "
+ "\"id\": \"77c68c25-72a6-415b-a6f0-886fe26f1b02\", \"subnetpool_id\": null}}";
- ITNeutronE2E.test_create(url_s, content_s1, "test_create_port_in_allowed_allocation_pools Subnet Post Failed");
+ ITNeutronE2E.test_create(urlS, contentS1, "test_create_port_in_allowed_allocation_pools Subnet Post Failed");
- String url_p = base + "/ports";
- String content_p1 = "{ \"port\": {\"status\": \"ACTIVE\", \"binding:host_id\": \"odl-devstack\","
+ String urlP = base + "/ports";
+ String contentP1 = "{ \"port\": {\"status\": \"ACTIVE\", \"binding:host_id\": \"odl-devstack\","
+ " \"allowed_address_pairs\": [], \"extra_dhcp_opts\": [], \"device_owner\": \"network:dhcp\","
+ " \"port_security_enabled\": false, \"binding:profile\": {}, \"fixed_ips\": "
+ "[{\"subnet_id\": \"77c68c25-72a6-415b-a6f0-886fe26f1b02\", \"ip_address\": \"2003::5\"}], "
+ "\"tenant_id\": \"4c1be4874f0048fc8205acffe2821cd3\", \"binding:vif_details\": "
+ "{\"port_filter\": \"true\"}, \"binding:vnic_type\": \"normal\", \"binding:vif_type\": \"ovs\", "
+ "\"mac_address\": \"fa:16:3e:09:db:75\"}}";
- ITNeutronE2E.test_create(url_p, content_p1, "test_create_port_in_allowed_allocation_pools Port Post Failed");
+ ITNeutronE2E.test_create(urlP, contentP1, "test_create_port_in_allowed_allocation_pools Port Post Failed");
- String content_p2 = "{\"port\": {\"binding:host_id\": \"\", \"allowed_address_pairs\": [], "
+ String contentP2 = "{\"port\": {\"binding:host_id\": \"\", \"allowed_address_pairs\": [], "
+ "\"device_owner\": \"\", \"port_security_enabled\": true, \"binding:profile\": {}, "
+ "\"fixed_ips\": [{\"subnet_id\": \"77c68c25-72a6-415b-a6f0-886fe26f1b02\", "
+ "\"ip_address\": \"2003::4\"}], \"id\": \"856c48ea-fd3a-4ee2-b0c6-bf86f8813888\", "
+ "\"tenant_id\": \"4c1be4874f0048fc8205acffe2821cd3\", \"binding:vif_details\": {}, "
+ "\"binding:vnic_type\": \"normal\", \"binding:vif_type\": \"unbound\","
+ " \"mac_address\": \"FA:16:3E:66:B1:38\"}}";
- ITNeutronE2E.test_create(url_p, content_p2, "test_create_port_in_allowed_allocation_pools Port Post 2 Failed");
+ ITNeutronE2E.test_create(urlP, contentP2, "test_create_port_in_allowed_allocation_pools Port Post 2 Failed");
}
public static Object getInstances(Class<?> clazz, Object bundle) {
try {
- BundleContext bCtx = FrameworkUtil.getBundle(bundle.getClass()).getBundleContext();
+ BundleContext bundleCtx = FrameworkUtil.getBundle(bundle.getClass()).getBundleContext();
ServiceReference<?>[] services = null;
- services = bCtx.getServiceReferences(clazz.getName(), null);
+ services = bundleCtx.getServiceReferences(clazz.getName(), null);
if (services != null) {
- return bCtx.getService(services[0]);
+ return bundleCtx.getService(services[0]);
}
} catch (InvalidSyntaxException e) {
LOGGER.error("Error in getInstances", e);
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
ans.setDnsNameservers(nsList);
}
if (s.equals("allocation_pools")) {
- List<NeutronSubnetIPAllocationPool> aPools = new ArrayList<NeutronSubnetIPAllocationPool>();
- aPools.addAll(this.getAllocationPools());
- ans.setAllocationPools(aPools);
+ List<NeutronSubnetIPAllocationPool> pools = new ArrayList<NeutronSubnetIPAllocationPool>();
+ pools.addAll(this.getAllocationPools());
+ ans.setAllocationPools(pools);
}
if (s.equals("host_routes")) {
- List<NeutronRoute> hRoutes = new ArrayList<NeutronRoute>();
- hRoutes.addAll(this.getHostRoutes());
- ans.setHostRoutes(hRoutes);
+ List<NeutronRoute> hostRoutes = new ArrayList<NeutronRoute>();
+ hostRoutes.addAll(this.getHostRoutes());
+ ans.setHostRoutes(hostRoutes);
}
if (s.equals("enable_dhcp")) {
ans.setEnableDHCP(this.getEnableDHCP());
//TODO?: limit check on length
// convert to byte array
byte[] addrBytes = ((Inet6Address) InetAddress.getByName(parts[0])).getAddress();
- int i;
- for (i = length; i < IPV6_LENGTH; i++) {
- if (((((int) addrBytes[i / IPV6_LENGTH_BYTES]) & IPV6_LSB_MASK)
- & (1 << (IPV6_BYTE_OFFSET - (i % IPV6_LENGTH_BYTES)))) != 0) {
+ for (int index = length; index < IPV6_LENGTH; index++) {
+ if (((((int) addrBytes[index / IPV6_LENGTH_BYTES]) & IPV6_LSB_MASK)
+ & (1 << (IPV6_BYTE_OFFSET - (index % IPV6_LENGTH_BYTES)))) != 0) {
return (false);
}
}
* or assigning a gateway IP)
*/
public boolean gatewayIP_Pool_overlap() {
- Iterator<NeutronSubnetIPAllocationPool> i = allocationPools.iterator();
- while (i.hasNext()) {
- NeutronSubnetIPAllocationPool pool = i.next();
+ for (NeutronSubnetIPAllocationPool pool : allocationPools) {
if (ipVersion == IPV4_VERSION && pool.contains(gatewayIP)) {
return true;
}
}
int length = Integer.parseInt(parts[1]);
- BigInteger lowAddress_bi = NeutronSubnetIPAllocationPool.convertV6(parts[0]);
- String lowAddress = NeutronSubnetIPAllocationPool.bigIntegerToIP(lowAddress_bi.add(BigInteger.ONE));
+ BigInteger lowAddressBi = NeutronSubnetIPAllocationPool.convertV6(parts[0]);
+ String lowAddress = NeutronSubnetIPAllocationPool.bigIntegerToIP(lowAddressBi.add(BigInteger.ONE));
BigInteger mask = BigInteger.ONE.shiftLeft(length).subtract(BigInteger.ONE);
String highAddress = NeutronSubnetIPAllocationPool
- .bigIntegerToIP(lowAddress_bi.add(mask).subtract(BigInteger.ONE));
+ .bigIntegerToIP(lowAddressBi.add(mask).subtract(BigInteger.ONE));
if (gatewayIP == null || ("").equals(gatewayIP)) {
gatewayIP = lowAddress;
}
int length = Integer.parseInt(parts[1]);
byte[] cidrBytes = ((Inet6Address) InetAddress.getByName(parts[0])).getAddress();
byte[] ipBytes = ((Inet6Address) InetAddress.getByName(ipAddress)).getAddress();
- int i;
- for (i = 0; i < length; i++) {
- if (((((int) cidrBytes[i / IPV6_LENGTH_BYTES]) & IPV6_LSB_MASK) & (1 << (IPV6_BYTE_OFFSET
- - (i % IPV6_LENGTH_BYTES)))) != ((((int) ipBytes[i / IPV6_LENGTH_BYTES]) & IPV6_LSB_MASK)
- & (1 << (IPV6_BYTE_OFFSET - (i % IPV6_LENGTH_BYTES))))) {
+ for (int index = 0; index < length; index++) {
+ if (((((int) cidrBytes[index / IPV6_LENGTH_BYTES]) & IPV6_LSB_MASK) & (1 << (IPV6_BYTE_OFFSET
+ - (index % IPV6_LENGTH_BYTES)))) != (
+ (((int) ipBytes[index / IPV6_LENGTH_BYTES]) & IPV6_LSB_MASK)
+ & (1 << (IPV6_BYTE_OFFSET - (index % IPV6_LENGTH_BYTES))))) {
return (false);
}
}
*/
public String getLowAddr() {
String ans = null;
- Iterator<NeutronSubnetIPAllocationPool> i = allocationPools.iterator();
- while (i.hasNext()) {
- NeutronSubnetIPAllocationPool pool = i.next();
+ for (NeutronSubnetIPAllocationPool pool : allocationPools) {
if (ans == null) {
ans = pool.getPoolStart();
} else {
return "";
}
StringBuilder sb = new StringBuilder();
- int i;
- for (i = 0; i < strings.length - 1; i++) {
- sb.append(strings[i]);
+ int index;
+ for (index = 0; index < strings.length - 1; index++) {
+ sb.append(strings[index]);
sb.append(separator);
}
- return sb.toString() + strings[i];
+ return sb.toString() + strings[index];
}
/*
*/
public List<NeutronSubnetIPAllocationPool> splitPool(String ipAddress) {
List<NeutronSubnetIPAllocationPool> ans = new ArrayList<>();
- long gIP = NeutronSubnetIPAllocationPool.convert(ipAddress);
- long sIP = NeutronSubnetIPAllocationPool.convert(poolStart);
- long eIP = NeutronSubnetIPAllocationPool.convert(poolEnd);
- long i;
- NeutronSubnetIPAllocationPool p = new NeutronSubnetIPAllocationPool();
+ long givenIp = NeutronSubnetIPAllocationPool.convert(ipAddress);
+ long startIp = NeutronSubnetIPAllocationPool.convert(poolStart);
+ long endIp = NeutronSubnetIPAllocationPool.convert(poolEnd);
+ long ipaddr;
+ NeutronSubnetIPAllocationPool pool = new NeutronSubnetIPAllocationPool();
boolean poolStarted = false;
- for (i = sIP; i <= eIP; i++) {
- if (i == sIP) {
- if (i != gIP) {
- p.setPoolStart(poolStart);
+ for (ipaddr = startIp; ipaddr <= endIp; ipaddr++) {
+ if (ipaddr == startIp) {
+ if (ipaddr != givenIp) {
+ pool.setPoolStart(poolStart);
poolStarted = true;
} else {
//FIX for bug 533
- p.setPoolStart(NeutronSubnetIPAllocationPool.longToIP(i + 1));
+ pool.setPoolStart(NeutronSubnetIPAllocationPool.longToIP(ipaddr + 1));
}
}
- if (i == eIP) {
- if (i != gIP) {
- p.setPoolEnd(poolEnd);
+ if (ipaddr == endIp) {
+ if (ipaddr != givenIp) {
+ pool.setPoolEnd(poolEnd);
} else {
- p.setPoolEnd(NeutronSubnetIPAllocationPool.longToIP(i - 1));
+ pool.setPoolEnd(NeutronSubnetIPAllocationPool.longToIP(ipaddr - 1));
}
- ans.add(p);
+ ans.add(pool);
}
- if (i != sIP && i != eIP) {
- if (i != gIP) {
+ if (ipaddr != startIp && ipaddr != endIp) {
+ if (ipaddr != givenIp) {
if (!poolStarted) {
- p.setPoolStart(NeutronSubnetIPAllocationPool.longToIP(i));
+ pool.setPoolStart(NeutronSubnetIPAllocationPool.longToIP(ipaddr));
poolStarted = true;
}
} else {
- p.setPoolEnd(NeutronSubnetIPAllocationPool.longToIP(i - 1));
+ pool.setPoolEnd(NeutronSubnetIPAllocationPool.longToIP(ipaddr - 1));
poolStarted = false;
- ans.add(p);
- p = new NeutronSubnetIPAllocationPool();
+ ans.add(pool);
+ pool = new NeutronSubnetIPAllocationPool();
// Fix for 2120
- p.setPoolStart(NeutronSubnetIPAllocationPool.longToIP(i + 1));
+ pool.setPoolStart(NeutronSubnetIPAllocationPool.longToIP(ipaddr + 1));
poolStarted = true;
}
}
*/
public List<NeutronSubnetIPAllocationPool> splitPoolV6(String ipAddress) {
List<NeutronSubnetIPAllocationPool> ans = new ArrayList<>();
- BigInteger gIP = NeutronSubnetIPAllocationPool.convertV6(ipAddress);
- BigInteger sIP = NeutronSubnetIPAllocationPool.convertV6(poolStart);
- BigInteger eIP = NeutronSubnetIPAllocationPool.convertV6(poolEnd);
- if (gIP.compareTo(sIP) == 0 && gIP.compareTo(eIP) < 0) {
- NeutronSubnetIPAllocationPool p = new NeutronSubnetIPAllocationPool();
- p.setPoolStart(NeutronSubnetIPAllocationPool.bigIntegerToIP(sIP.add(BigInteger.ONE)));
- p.setPoolEnd(poolEnd);
- ans.add(p);
+ BigInteger givenIp = NeutronSubnetIPAllocationPool.convertV6(ipAddress);
+ BigInteger startIp = NeutronSubnetIPAllocationPool.convertV6(poolStart);
+ BigInteger endIp = NeutronSubnetIPAllocationPool.convertV6(poolEnd);
+ if (givenIp.compareTo(startIp) == 0 && givenIp.compareTo(endIp) < 0) {
+ NeutronSubnetIPAllocationPool pool = new NeutronSubnetIPAllocationPool();
+ pool.setPoolStart(NeutronSubnetIPAllocationPool.bigIntegerToIP(startIp.add(BigInteger.ONE)));
+ pool.setPoolEnd(poolEnd);
+ ans.add(pool);
return ans;
}
- if (gIP.compareTo(eIP) == 0 && gIP.compareTo(sIP) > 0) {
- NeutronSubnetIPAllocationPool p = new NeutronSubnetIPAllocationPool();
- p.setPoolStart(poolStart);
- p.setPoolEnd(NeutronSubnetIPAllocationPool.bigIntegerToIP(eIP.subtract(BigInteger.ONE)));
- ans.add(p);
+ if (givenIp.compareTo(endIp) == 0 && givenIp.compareTo(startIp) > 0) {
+ NeutronSubnetIPAllocationPool pool = new NeutronSubnetIPAllocationPool();
+ pool.setPoolStart(poolStart);
+ pool.setPoolEnd(NeutronSubnetIPAllocationPool.bigIntegerToIP(endIp.subtract(BigInteger.ONE)));
+ ans.add(pool);
return ans;
}
- if (gIP.compareTo(eIP) < 0 && gIP.compareTo(sIP) > 0) {
- NeutronSubnetIPAllocationPool p = new NeutronSubnetIPAllocationPool();
- p.setPoolStart(poolStart);
- p.setPoolEnd(NeutronSubnetIPAllocationPool.bigIntegerToIP(gIP.subtract(BigInteger.ONE)));
- ans.add(p);
+ if (givenIp.compareTo(endIp) < 0 && givenIp.compareTo(startIp) > 0) {
+ NeutronSubnetIPAllocationPool pool = new NeutronSubnetIPAllocationPool();
+ pool.setPoolStart(poolStart);
+ pool.setPoolEnd(NeutronSubnetIPAllocationPool.bigIntegerToIP(givenIp.subtract(BigInteger.ONE)));
+ ans.add(pool);
NeutronSubnetIPAllocationPool p2 = new NeutronSubnetIPAllocationPool();
- p2.setPoolStart(NeutronSubnetIPAllocationPool.bigIntegerToIP(gIP.add(BigInteger.ONE)));
+ p2.setPoolStart(NeutronSubnetIPAllocationPool.bigIntegerToIP(givenIp.add(BigInteger.ONE)));
p2.setPoolEnd(poolEnd);
ans.add(p2);
return ans;
@SuppressWarnings({ "rawtypes", "unchecked" })
public static Object jaxbUnmarshall(Object schemaObject, String json) throws JAXBException {
- Class c = schemaObject.getClass();
+ Class cls = schemaObject.getClass();
Class[] types = new Class[1];
- types[0] = c;
+ types[0] = cls;
Map<String, String> namespacePrefixMapper = new HashMap<String, String>(3);
namespacePrefixMapper.put("router", "router");
namespacePrefixMapper.put("provider", "provider");
StringReader reader = new StringReader(json);
StreamSource stream = new StreamSource(reader);
- return unmarshaller.unmarshal(stream, c).getValue();
+ return unmarshaller.unmarshal(stream, cls).getValue();
}
}
Assert.assertEquals("NeutronLoadBalancerHealthMonitor JAXB Test 10: Testing tenant_id failed",
"00045a7b-796b-4f26-9cf9-9e82d248fda7", testObject.getTenantID());
- Neutron_ID neutron_id = new Neutron_ID();
- neutron_id.setID("2f245a7b-0000-4f26-9cf9-9e82d248fda7");
+ Neutron_ID neutronId = new Neutron_ID();
+ neutronId.setID("2f245a7b-0000-4f26-9cf9-9e82d248fda7");
List<Neutron_ID> loadBalancerHealthMonitorPool = new ArrayList<Neutron_ID>();
- loadBalancerHealthMonitorPool.add(neutron_id);
+ loadBalancerHealthMonitorPool.add(neutronId);
testObject.setLoadBalancerHealthMonitorPools(loadBalancerHealthMonitorPool);
Assert.assertEquals("NeutronLoadBalancerHealthMonitor JAXB Test 11: Testing Pools failed",
"2f245a7b-0000-4f26-9cf9-9e82d248fda7",
NeutronRouter testObject = (NeutronRouter) JaxbTestHelper.jaxbUnmarshall(dummyObject,
NeutronRouter_sourceJson);
- NeutronRouter_NetworkReference external_gateway_info = testObject.getExternalGatewayInfo();
+ NeutronRouter_NetworkReference externalGatewayInfo = testObject.getExternalGatewayInfo();
List<NeutronRoute> routes = testObject.getRoutes();
Assert.assertEquals("NeutronRouter JAXB Test 1: Testing router_uuid failed",
Assert.assertEquals("NeutronFloatingIP JAXB Test 5: Testing tenant_id failed",
"aa902936679e4ea29bfe1158e3450a13", testObject.getTenantID());
- Assert.assertEquals("NeutronRouter JAXB Test 6: Testing external_gateway_info failed",
- "e9330b1f-a2ef-4160-a991-169e56ab17f6", external_gateway_info.getNetworkID());
+ Assert.assertEquals("NeutronRouter JAXB Test 6: Testing externalGatewayInfo failed",
+ "e9330b1f-a2ef-4160-a991-169e56ab17f6", externalGatewayInfo.getNetworkID());
Assert.assertEquals("NeutronRouter JAXB Test 7: Testing distributed failed", false,
testObject.getDistributed());
NeutronSubnetIPAllocationPool allocationPool = new NeutronSubnetIPAllocationPool();
allocationPool.setPoolStart("10.18.0.2");
allocationPool.setPoolEnd("10.18.0.6");
- List<NeutronSubnetIPAllocationPool> aPools = new ArrayList<NeutronSubnetIPAllocationPool>();
- aPools.add(allocationPool);
- objectUT.setAllocationPools(aPools);
+ List<NeutronSubnetIPAllocationPool> pools = new ArrayList<NeutronSubnetIPAllocationPool>();
+ pools.add(allocationPool);
+ objectUT.setAllocationPools(pools);
objectUT.setGatewayIP("10.18.0.1");
Assert.assertFalse("gatewayIP_Pool_overlap Test 1: test with address below allocation pool failed",
allocationPool = new NeutronSubnetIPAllocationPool();
allocationPool.setPoolStart("2015::2");
allocationPool.setPoolEnd("2015::6");
- aPools = new ArrayList<NeutronSubnetIPAllocationPool>();
- aPools.add(allocationPool);
- objectUT.setAllocationPools(aPools);
+ pools = new ArrayList<NeutronSubnetIPAllocationPool>();
+ pools.add(allocationPool);
+ objectUT.setAllocationPools(pools);
objectUT.setGatewayIP("2015::1");
Assert.assertFalse("gatewayIP_Pool_overlap v6 Test 1: test with address below allocation pool failed",
NeutronSubnetIPAllocationPool allocationPool = new NeutronSubnetIPAllocationPool();
allocationPool.setPoolStart("10.18.0.2");
allocationPool.setPoolEnd("10.18.0.6");
- List<NeutronSubnetIPAllocationPool> aPools = new ArrayList<NeutronSubnetIPAllocationPool>();
- aPools.add(allocationPool);
+ List<NeutronSubnetIPAllocationPool> pools = new ArrayList<NeutronSubnetIPAllocationPool>();
+ pools.add(allocationPool);
allocationPool = new NeutronSubnetIPAllocationPool();
allocationPool.setPoolStart("10.18.0.10");
allocationPool.setPoolEnd("10.18.0.15");
- objectUT.setAllocationPools(aPools);
+ objectUT.setAllocationPools(pools);
Assert.assertEquals("getLowAddr Test 1: test of returned address", "10.18.0.2", objectUT.getLowAddr());
allocationPool = new NeutronSubnetIPAllocationPool();
allocationPool.setPoolStart("2015::2");
allocationPool.setPoolEnd("2015::6");
- aPools = new ArrayList<NeutronSubnetIPAllocationPool>();
- aPools.add(allocationPool);
+ pools = new ArrayList<NeutronSubnetIPAllocationPool>();
+ pools.add(allocationPool);
allocationPool = new NeutronSubnetIPAllocationPool();
allocationPool.setPoolStart("2015::10");
allocationPool.setPoolEnd("2015::15");
- objectUT.setAllocationPools(aPools);
+ objectUT.setAllocationPools(pools);
Assert.assertEquals("getLowAddr v6 Test 1: test of returned address", "2015::2", objectUT.getLowAddr());
}
public interface INeutronRequest<T extends INeutronObject<T>> {
default T getSingleton() {
// return this.sinleton;
- Class aClass = getClass();
+ Class cls = getClass();
try {
- Field field = aClass.getDeclaredField("singleton");
+ Field field = cls.getDeclaredField("singleton");
return (T) field.get(this);
} catch (IllegalAccessException | NoSuchFieldException e) {
throw new IllegalArgumentException(e);
default boolean isSingleton() {
// return this.sinleton != null;
- Class aClass = getClass();
+ Class cls = getClass();
try {
- Field field = aClass.getDeclaredField("singleton");
+ Field field = cls.getDeclaredField("singleton");
return field.get(this) != null;
} catch (IllegalAccessException | NoSuchFieldException e) {
throw new IllegalArgumentException(e);
default List<T> getBulk() {
// return this.bulkRequest;
- Class aClass = getClass();
+ Class cls = getClass();
try {
- Field field = aClass.getDeclaredField("bulkRequest");
+ Field field = cls.getDeclaredField("bulkRequest");
return (List<T>) field.get(this);
} catch (IllegalAccessException | NoSuchFieldException e) {
throw new IllegalArgumentException(e);
import java.net.HttpURLConnection;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import javax.ws.rs.Consumes;
import javax.ws.rs.DELETE;
INeutronBgpvpnCRUD bgpvpnInterface = getNeutronCRUD();
List<NeutronBgpvpn> allBgpvpns = bgpvpnInterface.getAll();
List<NeutronBgpvpn> ans = new ArrayList<>();
- Iterator<NeutronBgpvpn> i = allBgpvpns.iterator();
- while (i.hasNext()) {
- NeutronBgpvpn oSN = i.next();
+ for (NeutronBgpvpn bgpvpn : allBgpvpns) {
//match filters: TODO provider extension
- Boolean bAdminStateUp = null;
- Boolean bAutoAggregate = null;
+ Boolean adminStateUp = null;
+ Boolean autoAggregate = null;
if (queryAdminStateUp != null) {
- bAdminStateUp = Boolean.valueOf(queryAdminStateUp);
+ adminStateUp = Boolean.valueOf(queryAdminStateUp);
}
if (queryAutoAggregate != null) {
- bAutoAggregate = Boolean.valueOf(queryAutoAggregate);
+ autoAggregate = Boolean.valueOf(queryAutoAggregate);
}
- if ((queryID == null || queryID.equals(oSN.getID()))
- && (queryName == null || queryName.equals(oSN.getName()))
- && (bAdminStateUp == null || bAdminStateUp.booleanValue() == oSN.isAdminStateUp())
- && (queryStatus == null || queryStatus.equals(oSN.getStatus()))
- && (bAutoAggregate == null || bAutoAggregate.booleanValue() == oSN.isAutoAggregate())
- && (queryTenantID == null || queryTenantID.equals(oSN.getTenantID()))) {
+ if ((queryID == null || queryID.equals(bgpvpn.getID()))
+ && (queryName == null || queryName.equals(bgpvpn.getName()))
+ && (adminStateUp == null || adminStateUp.booleanValue() == bgpvpn.isAdminStateUp())
+ && (queryStatus == null || queryStatus.equals(bgpvpn.getStatus()))
+ && (autoAggregate == null || autoAggregate.booleanValue() == bgpvpn.isAutoAggregate())
+ && (queryTenantID == null || queryTenantID.equals(bgpvpn.getTenantID()))) {
if (fields.size() > 0) {
- ans.add(oSN.extractFields(fields));
+ ans.add(bgpvpn.extractFields(fields));
} else {
- ans.add(oSN);
+ ans.add(bgpvpn);
}
}
}
import java.net.HttpURLConnection;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import javax.ws.rs.Consumes;
import javax.ws.rs.DELETE;
INeutronFloatingIPCRUD floatingIPInterface = getNeutronCRUD();
List<NeutronFloatingIP> allFloatingIPs = floatingIPInterface.getAll();
List<NeutronFloatingIP> ans = new ArrayList<>();
- Iterator<NeutronFloatingIP> i = allFloatingIPs.iterator();
- while (i.hasNext()) {
- NeutronFloatingIP oSS = i.next();
+ for (NeutronFloatingIP floatingIp : allFloatingIPs) {
//match filters: TODO provider extension and router extension
- if ((queryID == null || queryID.equals(oSS.getID()))
- && (queryFloatingNetworkId == null || queryFloatingNetworkId.equals(oSS.getFloatingNetworkUUID()))
- && (queryPortId == null || queryPortId.equals(oSS.getPortUUID()))
- && (queryFixedIPAddress == null || queryFixedIPAddress.equals(oSS.getFixedIPAddress()))
- && (queryFloatingIPAddress == null || queryFloatingIPAddress.equals(oSS.getFloatingIPAddress()))
- && (queryStatus == null || queryStatus.equals(oSS.getStatus()))
- && (queryRouterID == null || queryRouterID.equals(oSS.getRouterUUID()))
- && (queryTenantID == null || queryTenantID.equals(oSS.getTenantID()))) {
+ if ((queryID == null || queryID.equals(floatingIp.getID()))
+ && (queryFloatingNetworkId == null
+ || queryFloatingNetworkId.equals(floatingIp.getFloatingNetworkUUID()))
+ && (queryPortId == null || queryPortId.equals(floatingIp.getPortUUID()))
+ && (queryFixedIPAddress == null || queryFixedIPAddress.equals(floatingIp.getFixedIPAddress()))
+ && (queryFloatingIPAddress == null
+ || queryFloatingIPAddress.equals(floatingIp.getFloatingIPAddress()))
+ && (queryStatus == null || queryStatus.equals(floatingIp.getStatus()))
+ && (queryRouterID == null || queryRouterID.equals(floatingIp.getRouterUUID()))
+ && (queryTenantID == null || queryTenantID.equals(floatingIp.getTenantID()))) {
if (fields.size() > 0) {
- ans.add(oSS.extractFields(fields));
+ ans.add(floatingIp.extractFields(fields));
} else {
- ans.add(oSS);
+ ans.add(floatingIp);
}
}
}
import java.net.HttpURLConnection;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import javax.ws.rs.Consumes;
import javax.ws.rs.DELETE;
INeutronL2gatewayConnectionCRUD l2gatewayConnectionInterface = getNeutronCRUD();
List<NeutronL2gatewayConnection> allL2gatewayConnections = l2gatewayConnectionInterface.getAll();
List<NeutronL2gatewayConnection> ans = new ArrayList<>();
- Iterator<NeutronL2gatewayConnection> i = allL2gatewayConnections.iterator();
- while (i.hasNext()) {
- NeutronL2gatewayConnection oSS = i.next();
- if ((queryTenantID == null || queryTenantID.equals(oSS.getTenantID()))
- && (queryConnectionID == null || queryConnectionID.equals(oSS.getID()))
- && (queryL2gatewayID == null || queryL2gatewayID.equals(oSS.getL2gatewayID()))
- && (queryNetworkID == null || queryNetworkID.equals(oSS.getNetworkID()))
- && (querySegmentID == null || (Integer.valueOf(querySegmentID).equals(oSS.getSegmentID())))
- && (queryPortID == null || queryPortID.equals(oSS.getPortID()))) {
+ for (NeutronL2gatewayConnection connection : allL2gatewayConnections) {
+ if ((queryTenantID == null || queryTenantID.equals(connection.getTenantID()))
+ && (queryConnectionID == null || queryConnectionID.equals(connection.getID()))
+ && (queryL2gatewayID == null || queryL2gatewayID.equals(connection.getL2gatewayID()))
+ && (queryNetworkID == null || queryNetworkID.equals(connection.getNetworkID()))
+ && (querySegmentID == null || (Integer.valueOf(querySegmentID).equals(connection.getSegmentID())))
+ && (queryPortID == null || queryPortID.equals(connection.getPortID()))) {
if (fields.size() > 0) {
- ans.add(oSS.extractFields(fields));
+ ans.add(connection.extractFields(fields));
} else {
- ans.add(oSS);
+ ans.add(connection);
}
}
}
import java.net.HttpURLConnection;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import javax.ws.rs.Consumes;
import javax.ws.rs.DELETE;
INeutronL2gatewayCRUD l2gatewayInterface = getNeutronCRUD();
List<NeutronL2gateway> allL2gateways = l2gatewayInterface.getAll();
List<NeutronL2gateway> ans = new ArrayList<>();
- Iterator<NeutronL2gateway> i = allL2gateways.iterator();
- while (i.hasNext()) {
- NeutronL2gateway l2gateway = i.next();
+ for (NeutronL2gateway l2gateway : allL2gateways) {
if ((queryID == null || queryID.equals(l2gateway.getID()))
&& (queryName == null || queryName.equals(l2gateway.getName()))
&& (queryTenantID == null || queryTenantID.equals(l2gateway.getTenantID()))) {
import java.net.HttpURLConnection;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import javax.ws.rs.Consumes;
import javax.ws.rs.DELETE;
List<NeutronLoadBalancerHealthMonitor> allLoadBalancerHealthMonitors = loadBalancerHealthMonitorInterface
.getAll();
List<NeutronLoadBalancerHealthMonitor> ans = new ArrayList<>();
- Iterator<NeutronLoadBalancerHealthMonitor> i = allLoadBalancerHealthMonitors.iterator();
- while (i.hasNext()) {
- NeutronLoadBalancerHealthMonitor nsg = i.next();
+ for (NeutronLoadBalancerHealthMonitor nsg : allLoadBalancerHealthMonitors) {
if ((queryLoadBalancerHealthMonitorID == null || queryLoadBalancerHealthMonitorID.equals(nsg.getID()))
&& (queryLoadBalancerHealthMonitorTenantID == null
|| queryLoadBalancerHealthMonitorTenantID.equals(nsg.getTenantID()))
import java.net.HttpURLConnection;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import javax.ws.rs.Consumes;
import javax.ws.rs.DELETE;
INeutronLoadBalancerListenerCRUD loadBalancerListenerInterface = getNeutronCRUD();
List<NeutronLoadBalancerListener> allLoadBalancerListeners = loadBalancerListenerInterface.getAll();
List<NeutronLoadBalancerListener> ans = new ArrayList<>();
- Iterator<NeutronLoadBalancerListener> i = allLoadBalancerListeners.iterator();
- while (i.hasNext()) {
- NeutronLoadBalancerListener nsg = i.next();
+ for (NeutronLoadBalancerListener nsg : allLoadBalancerListeners) {
if ((queryLoadBalancerListenerID == null || queryLoadBalancerListenerID.equals(nsg.getID()))
&& (queryLoadBalancerListenerDefaultPoolID == null || queryLoadBalancerListenerDefaultPoolID
.equals(nsg.getNeutronLoadBalancerListenerDefaultPoolID()))
import java.net.HttpURLConnection;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import javax.ws.rs.Consumes;
import javax.ws.rs.DELETE;
INeutronLoadBalancerCRUD loadBalancerInterface = getNeutronCRUD();
List<NeutronLoadBalancer> allLoadBalancers = loadBalancerInterface.getAll();
List<NeutronLoadBalancer> ans = new ArrayList<>();
- Iterator<NeutronLoadBalancer> i = allLoadBalancers.iterator();
- while (i.hasNext()) {
- NeutronLoadBalancer nsg = i.next();
+ for (NeutronLoadBalancer nsg : allLoadBalancers) {
if ((queryLoadBalancerID == null || queryLoadBalancerID.equals(nsg.getID()))
&& (queryLoadBalancerTenantID == null || queryLoadBalancerTenantID.equals(nsg.getTenantID()))
&& (queryLoadBalancerName == null || queryLoadBalancerName.equals(nsg.getName()))
import java.net.HttpURLConnection;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import javax.ws.rs.Consumes;
import javax.ws.rs.DELETE;
INeutronLoadBalancerPoolCRUD loadBalancerPoolInterface = getNeutronCRUD();
List<NeutronLoadBalancerPool> allLoadBalancerPools = loadBalancerPoolInterface.getAll();
List<NeutronLoadBalancerPool> ans = new ArrayList<>();
- Iterator<NeutronLoadBalancerPool> i = allLoadBalancerPools.iterator();
- while (i.hasNext()) {
- NeutronLoadBalancerPool nsg = i.next();
+ for (NeutronLoadBalancerPool nsg : allLoadBalancerPools) {
if ((queryLoadBalancerPoolID == null || queryLoadBalancerPoolID.equals(nsg.getID()))
&& (queryLoadBalancerPoolTenantID == null
|| queryLoadBalancerPoolTenantID.equals(nsg.getTenantID()))
List<NeutronLoadBalancerPoolMember> members = loadBalancerPoolInterface.get(loadBalancerPoolUUID)
.getLoadBalancerPoolMembers();
List<NeutronLoadBalancerPoolMember> ans = new ArrayList<>();
- Iterator<NeutronLoadBalancerPoolMember> i = members.iterator();
- while (i.hasNext()) {
- NeutronLoadBalancerPoolMember nsg = i.next();
+ for (NeutronLoadBalancerPoolMember nsg : members) {
if ((queryLoadBalancerPoolMemberID == null || queryLoadBalancerPoolMemberID.equals(nsg.getID()))
&& loadBalancerPoolUUID.equals(nsg.getPoolID())
&& (queryLoadBalancerPoolMemberTenantID == null
import java.net.HttpURLConnection;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import javax.ws.rs.Consumes;
import javax.ws.rs.DELETE;
INeutronMeteringLabelRuleCRUD ruleInterface = getNeutronCRUD();
List<NeutronMeteringLabelRule> allNeutronMeteringLabelRule = ruleInterface.getAll();
List<NeutronMeteringLabelRule> ans = new ArrayList<>();
- Iterator<NeutronMeteringLabelRule> i = allNeutronMeteringLabelRule.iterator();
- while (i.hasNext()) {
- NeutronMeteringLabelRule oSS = i.next();
- if ((queryID == null || queryID.equals(oSS.getID()))
- && (queryDirection == null || queryDirection.equals(oSS.getMeteringLabelRuleDirection()))
+ for (NeutronMeteringLabelRule rule : allNeutronMeteringLabelRule) {
+ if ((queryID == null || queryID.equals(rule.getID()))
+ && (queryDirection == null || queryDirection.equals(rule.getMeteringLabelRuleDirection()))
&& (queryRemoteIPPrefix == null
- || queryRemoteIPPrefix.equals(oSS.getMeteringLabelRuleRemoteIPPrefix()))
- && (queryLabelID == null || queryLabelID.equals(oSS.getMeteringLabelRuleLabelID()))) {
+ || queryRemoteIPPrefix.equals(rule.getMeteringLabelRuleRemoteIPPrefix()))
+ && (queryLabelID == null || queryLabelID.equals(rule.getMeteringLabelRuleLabelID()))) {
if (fields.size() > 0) {
- ans.add(oSS.extractFields(fields));
+ ans.add(rule.extractFields(fields));
} else {
- ans.add(oSS);
+ ans.add(rule);
}
}
}
import java.net.HttpURLConnection;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import javax.ws.rs.Consumes;
import javax.ws.rs.DELETE;
INeutronMeteringLabelCRUD labelInterface = getNeutronCRUD();
List<NeutronMeteringLabel> allNeutronMeteringLabel = labelInterface.getAll();
List<NeutronMeteringLabel> ans = new ArrayList<>();
- Iterator<NeutronMeteringLabel> i = allNeutronMeteringLabel.iterator();
- while (i.hasNext()) {
- NeutronMeteringLabel oSS = i.next();
- if ((queryID == null || queryID.equals(oSS.getID()))
- && (queryName == null || queryName.equals(oSS.getName()))
- && (queryTenantID == null || queryTenantID.equals(oSS.getTenantID()))) {
+ for (NeutronMeteringLabel label : allNeutronMeteringLabel) {
+ if ((queryID == null || queryID.equals(label.getID()))
+ && (queryName == null || queryName.equals(label.getName()))
+ && (queryTenantID == null || queryTenantID.equals(label.getTenantID()))) {
if (fields.size() > 0) {
- ans.add(oSS.extractFields(fields));
+ ans.add(label.extractFields(fields));
} else {
- ans.add(oSS);
+ ans.add(label);
}
}
}
import java.net.HttpURLConnection;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import javax.ws.rs.Consumes;
import javax.ws.rs.DELETE;
INeutronNetworkCRUD networkInterface = getNeutronCRUD();
List<NeutronNetwork> allNetworks = networkInterface.getAll();
List<NeutronNetwork> ans = new ArrayList<>();
- Iterator<NeutronNetwork> i = allNetworks.iterator();
- while (i.hasNext()) {
+ for (NeutronNetwork network : allNetworks) {
//match filters: TODO provider extension
- Boolean bAdminStateUp = null;
- Boolean bShared = null;
- Boolean bRouterExternal = null;
+ Boolean adminStateUp = null;
+ Boolean shared = null;
+ Boolean routerExternal = null;
if (queryAdminStateUp != null) {
- bAdminStateUp = Boolean.valueOf(queryAdminStateUp);
+ adminStateUp = Boolean.valueOf(queryAdminStateUp);
}
if (queryShared != null) {
- bShared = Boolean.valueOf(queryShared);
+ shared = Boolean.valueOf(queryShared);
}
if (queryRouterExternal != null) {
- bRouterExternal = Boolean.valueOf(queryRouterExternal);
+ routerExternal = Boolean.valueOf(queryRouterExternal);
}
- NeutronNetwork oSN = i.next();
- if ((queryID == null || queryID.equals(oSN.getID()))
- && (queryName == null || queryName.equals(oSN.getName()))
- && (bAdminStateUp == null || bAdminStateUp.booleanValue() == oSN.isAdminStateUp())
- && (queryStatus == null || queryStatus.equals(oSN.getStatus()))
- && (bShared == null || bShared.booleanValue() == oSN.isShared())
- && (bRouterExternal == null || bRouterExternal.booleanValue() == oSN.isRouterExternal())
- && (queryTenantID == null || queryTenantID.equals(oSN.getTenantID()))
- && (queryQosPolicyId == null || queryQosPolicyId.equals(oSN.getQosPolicyId()))) {
+ if ((queryID == null || queryID.equals(network.getID()))
+ && (queryName == null || queryName.equals(network.getName()))
+ && (adminStateUp == null || adminStateUp.booleanValue() == network.isAdminStateUp())
+ && (queryStatus == null || queryStatus.equals(network.getStatus()))
+ && (shared == null || shared.booleanValue() == network.isShared())
+ && (routerExternal == null || routerExternal.booleanValue() == network.isRouterExternal())
+ && (queryTenantID == null || queryTenantID.equals(network.getTenantID()))
+ && (queryQosPolicyId == null || queryQosPolicyId.equals(network.getQosPolicyId()))) {
if (fields.size() > 0) {
- ans.add(oSN.extractFields(fields));
+ ans.add(network.extractFields(fields));
} else {
- ans.add(oSN);
+ ans.add(network);
}
}
}
import java.net.HttpURLConnection;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import javax.ws.rs.Consumes;
import javax.ws.rs.DELETE;
INeutronPortCRUD portInterface = getNeutronCRUD();
List<NeutronPort> allPorts = portInterface.getAll();
List<NeutronPort> ans = new ArrayList<>();
- Iterator<NeutronPort> i = allPorts.iterator();
- while (i.hasNext()) {
- NeutronPort oSS = i.next();
- if ((queryID == null || queryID.equals(oSS.getID()))
- && (queryNetworkID == null || queryNetworkID.equals(oSS.getNetworkUUID()))
- && (queryName == null || queryName.equals(oSS.getName()))
- && (queryAdminStateUp == null || queryAdminStateUp.equals(oSS.getAdminStateUp()))
- && (queryStatus == null || queryStatus.equals(oSS.getStatus()))
- && (queryMACAddress == null || queryMACAddress.equals(oSS.getMacAddress()))
- && (queryDeviceID == null || queryDeviceID.equals(oSS.getDeviceID()))
- && (queryDeviceOwner == null || queryDeviceOwner.equals(oSS.getDeviceOwner()))
- && (queryTenantID == null || queryTenantID.equals(oSS.getTenantID()))
+ for (NeutronPort port: allPorts) {
+ if ((queryID == null || queryID.equals(port.getID()))
+ && (queryNetworkID == null || queryNetworkID.equals(port.getNetworkUUID()))
+ && (queryName == null || queryName.equals(port.getName()))
+ && (queryAdminStateUp == null || queryAdminStateUp.equals(port.getAdminStateUp()))
+ && (queryStatus == null || queryStatus.equals(port.getStatus()))
+ && (queryMACAddress == null || queryMACAddress.equals(port.getMacAddress()))
+ && (queryDeviceID == null || queryDeviceID.equals(port.getDeviceID()))
+ && (queryDeviceOwner == null || queryDeviceOwner.equals(port.getDeviceOwner()))
+ && (queryTenantID == null || queryTenantID.equals(port.getTenantID()))
&& (queryPortSecurityEnabled == null
- || queryPortSecurityEnabled.equals(oSS.getPortSecurityEnabled()))
- && (queryQosPolicyId == null || queryQosPolicyId.equals(oSS.getQosPolicyId()))) {
+ || queryPortSecurityEnabled.equals(port.getPortSecurityEnabled()))
+ && (queryQosPolicyId == null || queryQosPolicyId.equals(port.getQosPolicyId()))) {
if (fields.size() > 0) {
- ans.add(oSS.extractFields(fields));
+ ans.add(port.extractFields(fields));
} else {
- ans.add(oSS);
+ ans.add(port);
}
}
}
import java.net.HttpURLConnection;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import javax.ws.rs.Consumes;
import javax.ws.rs.DELETE;
}
List<NeutronRouter> allRouters = routerInterface.getAll();
List<NeutronRouter> ans = new ArrayList<>();
- Iterator<NeutronRouter> i = allRouters.iterator();
- while (i.hasNext()) {
- NeutronRouter oSS = i.next();
- if ((queryID == null || queryID.equals(oSS.getID()))
- && (queryName == null || queryName.equals(oSS.getName()))
- && (queryAdminStateUp == null || queryAdminStateUp.equals(oSS.getAdminStateUp()))
- && (queryStatus == null || queryStatus.equals(oSS.getStatus()))
- && (queryTenantID == null || queryTenantID.equals(oSS.getTenantID()))) {
+ for (NeutronRouter router : allRouters) {
+ if ((queryID == null || queryID.equals(router.getID()))
+ && (queryName == null || queryName.equals(router.getName()))
+ && (queryAdminStateUp == null || queryAdminStateUp.equals(router.getAdminStateUp()))
+ && (queryStatus == null || queryStatus.equals(router.getStatus()))
+ && (queryTenantID == null || queryTenantID.equals(router.getTenantID()))) {
if (fields.size() > 0) {
- ans.add(oSS.extractFields(fields));
+ ans.add(router.extractFields(fields));
} else {
- ans.add(oSS);
+ ans.add(router);
}
}
}
import java.net.HttpURLConnection;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import javax.ws.rs.Consumes;
import javax.ws.rs.DELETE;
INeutronSFCFlowClassifierCRUD sfcFlowClassifierInterface = getNeutronCRUD();
List<NeutronSFCFlowClassifier> allSFCFlowClassifier = sfcFlowClassifierInterface.getAll();
List<NeutronSFCFlowClassifier> ans = new ArrayList<>();
- Iterator<NeutronSFCFlowClassifier> i = allSFCFlowClassifier.iterator();
- while (i.hasNext()) {
- NeutronSFCFlowClassifier oSFC = i.next();
- if ((queryID == null || queryID.equals(oSFC.getID()))
- && (queryName == null || queryName.equals(oSFC.getName()))
- && (queryEthertype == null || queryEthertype.equals(oSFC.getEthertype()))
- && (queryProtocol == null || queryProtocol.equals(oSFC.getProtocol()))
- && (querySourcePortRangeMin == null || querySourcePortRangeMin.equals(oSFC.getSourcePortRangeMin()))
- && (querySourcePortRangeMax == null || querySourcePortRangeMax.equals(oSFC.getSourcePortRangeMax()))
+ for (NeutronSFCFlowClassifier classifier : allSFCFlowClassifier) {
+ if ((queryID == null || queryID.equals(classifier.getID()))
+ && (queryName == null || queryName.equals(classifier.getName()))
+ && (queryEthertype == null || queryEthertype.equals(classifier.getEthertype()))
+ && (queryProtocol == null || queryProtocol.equals(classifier.getProtocol()))
+ && (querySourcePortRangeMin == null
+ || querySourcePortRangeMin.equals(classifier.getSourcePortRangeMin()))
+ && (querySourcePortRangeMax == null
+ || querySourcePortRangeMax.equals(classifier.getSourcePortRangeMax()))
&& (queryDestinationPortRangeMin == null
- || queryDestinationPortRangeMin.equals(oSFC.getDestinationPortRangeMin()))
+ || queryDestinationPortRangeMin.equals(classifier.getDestinationPortRangeMin()))
&& (queryDestinationPortRangeMax == null
- || queryDestinationPortRangeMax.equals(oSFC.getDestinationPortRangeMax()))
- && (querySourceIpPrefix == null || querySourceIpPrefix.equals(oSFC.getSourceIpPrefix()))
+ || queryDestinationPortRangeMax.equals(classifier.getDestinationPortRangeMax()))
+ && (querySourceIpPrefix == null || querySourceIpPrefix.equals(classifier.getSourceIpPrefix()))
&& (queryDestinationIpPrefix == null
- || queryDestinationIpPrefix.equals(oSFC.getDestinationIpPrefix()))
+ || queryDestinationIpPrefix.equals(classifier.getDestinationIpPrefix()))
&& (queryLogicalSourcePort == null
- || queryLogicalSourcePort.equals(oSFC.getLogicalSourcePortUUID()))
+ || queryLogicalSourcePort.equals(classifier.getLogicalSourcePortUUID()))
&& (queryLogicalDestinationPort == null
- || queryLogicalDestinationPort.equals(oSFC.getLogicalDestinationPortUUID()))
- && (queryTenantID == null || queryTenantID.equals(oSFC.getTenantID()))) {
+ || queryLogicalDestinationPort.equals(classifier.getLogicalDestinationPortUUID()))
+ && (queryTenantID == null || queryTenantID.equals(classifier.getTenantID()))) {
if (fields.size() > 0) {
- ans.add(oSFC.extractFields(fields));
+ ans.add(classifier.extractFields(fields));
} else {
- ans.add(oSFC);
+ ans.add(classifier);
}
}
}
import java.net.HttpURLConnection;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import javax.ws.rs.Consumes;
import javax.ws.rs.DELETE;
INeutronSFCPortChainCRUD sfcPortChainInterface = getNeutronCRUD();
List<NeutronSFCPortChain> allSFCPortChain = sfcPortChainInterface.getAll();
List<NeutronSFCPortChain> ans = new ArrayList<>();
- Iterator<NeutronSFCPortChain> i = allSFCPortChain.iterator();
- while (i.hasNext()) {
- NeutronSFCPortChain oSFCPC = i.next();
- if ((queryID == null || queryID.equals(oSFCPC.getID()))
- && (queryName == null || queryName.equals(oSFCPC.getName()))
- && (queryTenantID == null || queryTenantID.equals(oSFCPC.getTenantID()))) {
+ for (NeutronSFCPortChain sfcPortChain : allSFCPortChain) {
+ if ((queryID == null || queryID.equals(sfcPortChain.getID()))
+ && (queryName == null || queryName.equals(sfcPortChain.getName()))
+ && (queryTenantID == null || queryTenantID.equals(sfcPortChain.getTenantID()))) {
if (fields.size() > 0) {
- ans.add(oSFCPC.extractFields(fields));
+ ans.add(sfcPortChain.extractFields(fields));
} else {
- ans.add(oSFCPC);
+ ans.add(sfcPortChain);
}
}
}
import java.net.HttpURLConnection;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import javax.ws.rs.Consumes;
import javax.ws.rs.DELETE;
INeutronSFCPortPairGroupCRUD sfcPortPairGroupInterface = getNeutronCRUD();
List<NeutronSFCPortPairGroup> allSFCPortPairGroup = sfcPortPairGroupInterface.getAll();
List<NeutronSFCPortPairGroup> ans = new ArrayList<>();
- Iterator<NeutronSFCPortPairGroup> i = allSFCPortPairGroup.iterator();
- while (i.hasNext()) {
- NeutronSFCPortPairGroup oSFCPPG = i.next();
- if ((queryID == null || queryID.equals(oSFCPPG.getID()))
- && (queryName == null || queryName.equals(oSFCPPG.getName()))
- && (queryTenantID == null || queryTenantID.equals(oSFCPPG.getTenantID()))) {
+ for (NeutronSFCPortPairGroup sfcPortPairGroup : allSFCPortPairGroup) {
+ if ((queryID == null || queryID.equals(sfcPortPairGroup.getID()))
+ && (queryName == null || queryName.equals(sfcPortPairGroup.getName()))
+ && (queryTenantID == null || queryTenantID.equals(sfcPortPairGroup.getTenantID()))) {
if (fields.size() > 0) {
- ans.add(oSFCPPG.extractFields(fields));
+ ans.add(sfcPortPairGroup.extractFields(fields));
} else {
- ans.add(oSFCPPG);
+ ans.add(sfcPortPairGroup);
}
}
}
import java.net.HttpURLConnection;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import javax.ws.rs.Consumes;
import javax.ws.rs.DELETE;
INeutronSFCPortPairCRUD sfcPortPairInterface = getNeutronCRUD();
List<NeutronSFCPortPair> allSFCPortPair = sfcPortPairInterface.getAll();
List<NeutronSFCPortPair> ans = new ArrayList<>();
- Iterator<NeutronSFCPortPair> i = allSFCPortPair.iterator();
- while (i.hasNext()) {
- NeutronSFCPortPair oSFCPP = i.next();
- if ((queryID == null || queryID.equals(oSFCPP.getID()))
- && (queryName == null || queryName.equals(oSFCPP.getName()))
- && (queryIngressPort == null || queryIngressPort.equals(oSFCPP.getIngressPortUUID()))
- && (queryEgressPort == null || queryEgressPort.equals(oSFCPP.getEgressPortUUID()))
- && (queryTenantID == null || queryTenantID.equals(oSFCPP.getTenantID()))) {
+ for (NeutronSFCPortPair sfcPortPair : allSFCPortPair) {
+ if ((queryID == null || queryID.equals(sfcPortPair.getID()))
+ && (queryName == null || queryName.equals(sfcPortPair.getName()))
+ && (queryIngressPort == null || queryIngressPort.equals(sfcPortPair.getIngressPortUUID()))
+ && (queryEgressPort == null || queryEgressPort.equals(sfcPortPair.getEgressPortUUID()))
+ && (queryTenantID == null || queryTenantID.equals(sfcPortPair.getTenantID()))) {
if (fields.size() > 0) {
- ans.add(oSFCPP.extractFields(fields));
+ ans.add(sfcPortPair.extractFields(fields));
} else {
- ans.add(oSFCPP);
+ ans.add(sfcPortPair);
}
}
}
import java.net.HttpURLConnection;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import javax.ws.rs.Consumes;
import javax.ws.rs.DELETE;
INeutronSecurityGroupCRUD securityGroupInterface = getNeutronCRUD();
List<NeutronSecurityGroup> allSecurityGroups = securityGroupInterface.getAll();
List<NeutronSecurityGroup> ans = new ArrayList<>();
- Iterator<NeutronSecurityGroup> i = allSecurityGroups.iterator();
- while (i.hasNext()) {
- NeutronSecurityGroup nsg = i.next();
+ for (NeutronSecurityGroup nsg : allSecurityGroups) {
if ((querySecurityGroupUUID == null || querySecurityGroupUUID.equals(nsg.getID()))
&& (querySecurityGroupName == null || querySecurityGroupName.equals(nsg.getName()))
&& (querySecurityTenantID == null || querySecurityTenantID.equals(nsg.getTenantID()))) {
import java.net.HttpURLConnection;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import javax.ws.rs.Consumes;
import javax.ws.rs.DELETE;
INeutronSecurityRuleCRUD securityRuleInterface = getNeutronCRUD();
List<NeutronSecurityRule> allSecurityRules = securityRuleInterface.getAll();
List<NeutronSecurityRule> ans = new ArrayList<>();
- Iterator<NeutronSecurityRule> i = allSecurityRules.iterator();
- while (i.hasNext()) {
- NeutronSecurityRule nsr = i.next();
+ for (NeutronSecurityRule nsr : allSecurityRules) {
if ((querySecurityRuleUUID == null || querySecurityRuleUUID.equals(nsr.getID()))
&& (querySecurityRuleDirection == null
|| querySecurityRuleDirection.equals(nsr.getSecurityRuleDirection()))
import java.net.HttpURLConnection;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import javax.ws.rs.Consumes;
import javax.ws.rs.DELETE;
// sorting not supported
) {
INeutronSubnetCRUD subnetInterface = getNeutronCRUD();
- List<NeutronSubnet> allNetworks = subnetInterface.getAll();
+ List<NeutronSubnet> allSubnets = subnetInterface.getAll();
List<NeutronSubnet> ans = new ArrayList<>();
- Iterator<NeutronSubnet> i = allNetworks.iterator();
- while (i.hasNext()) {
- NeutronSubnet oSS = i.next();
- if ((queryID == null || queryID.equals(oSS.getID()))
- && (queryNetworkID == null || queryNetworkID.equals(oSS.getNetworkUUID()))
- && (queryName == null || queryName.equals(oSS.getName()))
- && (queryIPVersion == null || queryIPVersion.equals(oSS.getIpVersion()))
- && (queryCIDR == null || queryCIDR.equals(oSS.getCidr()))
- && (queryGatewayIP == null || queryGatewayIP.equals(oSS.getGatewayIP()))
- && (queryEnableDHCP == null || queryEnableDHCP.equals(oSS.getEnableDHCP()))
- && (queryTenantID == null || queryTenantID.equals(oSS.getTenantID()))
- && (queryIpV6AddressMode == null || queryIpV6AddressMode.equals(oSS.getIpV6AddressMode()))
- && (queryIpV6RaMode == null || queryIpV6RaMode.equals(oSS.getIpV6RaMode()))) {
+ for (NeutronSubnet subnet : allSubnets) {
+ if ((queryID == null || queryID.equals(subnet.getID()))
+ && (queryNetworkID == null || queryNetworkID.equals(subnet.getNetworkUUID()))
+ && (queryName == null || queryName.equals(subnet.getName()))
+ && (queryIPVersion == null || queryIPVersion.equals(subnet.getIpVersion()))
+ && (queryCIDR == null || queryCIDR.equals(subnet.getCidr()))
+ && (queryGatewayIP == null || queryGatewayIP.equals(subnet.getGatewayIP()))
+ && (queryEnableDHCP == null || queryEnableDHCP.equals(subnet.getEnableDHCP()))
+ && (queryTenantID == null || queryTenantID.equals(subnet.getTenantID()))
+ && (queryIpV6AddressMode == null || queryIpV6AddressMode.equals(subnet.getIpV6AddressMode()))
+ && (queryIpV6RaMode == null || queryIpV6RaMode.equals(subnet.getIpV6RaMode()))) {
if (fields.size() > 0) {
- ans.add(oSS.extractFields(fields));
+ ans.add(subnet.extractFields(fields));
} else {
- ans.add(oSS);
+ ans.add(subnet);
}
}
}
import java.net.HttpURLConnection;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import javax.ws.rs.Consumes;
import javax.ws.rs.DELETE;
INeutronVPNIKEPolicyCRUD labelInterface = getNeutronCRUD();
List<NeutronVPNIKEPolicy> allNeutronVPNIKEPolicy = labelInterface.getAll();
List<NeutronVPNIKEPolicy> ans = new ArrayList<>();
- Iterator<NeutronVPNIKEPolicy> i = allNeutronVPNIKEPolicy.iterator();
- while (i.hasNext()) {
- NeutronVPNIKEPolicy oSS = i.next();
- if ((queryID == null || queryID.equals(oSS.getID()))
- && (queryName == null || queryName.equals(oSS.getName()))
- && (queryAuthAlgorithm == null || queryAuthAlgorithm.equals(oSS.getAuthAlgorithm()))
+ for (NeutronVPNIKEPolicy policy : allNeutronVPNIKEPolicy) {
+ if ((queryID == null || queryID.equals(policy.getID()))
+ && (queryName == null || queryName.equals(policy.getName()))
+ && (queryAuthAlgorithm == null || queryAuthAlgorithm.equals(policy.getAuthAlgorithm()))
&& (queryEncryptionAlgorithm == null
- || queryEncryptionAlgorithm.equals(oSS.getEncryptionAlgorithm()))
+ || queryEncryptionAlgorithm.equals(policy.getEncryptionAlgorithm()))
&& (queryPhase1NegotiationMode == null
- || queryPhase1NegotiationMode.equals(oSS.getPhase1NegotiationMode()))
- && (queryPFS == null || queryPFS.equals(oSS.getPerfectForwardSecrecy()))
- && (queryIKEVersion == null || queryIKEVersion.equals(oSS.getIkeVersion()))
- && (queryTenantID == null || queryTenantID.equals(oSS.getTenantID()))) {
+ || queryPhase1NegotiationMode.equals(policy.getPhase1NegotiationMode()))
+ && (queryPFS == null || queryPFS.equals(policy.getPerfectForwardSecrecy()))
+ && (queryIKEVersion == null || queryIKEVersion.equals(policy.getIkeVersion()))
+ && (queryTenantID == null || queryTenantID.equals(policy.getTenantID()))) {
if (fields.size() > 0) {
- ans.add(oSS.extractFields(fields));
+ ans.add(policy.extractFields(fields));
} else {
- ans.add(oSS);
+ ans.add(policy);
}
}
}
import java.net.HttpURLConnection;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import javax.ws.rs.Consumes;
import javax.ws.rs.DELETE;
INeutronVPNIPSECPolicyCRUD policyInterface = getNeutronCRUD();
List<NeutronVPNIPSECPolicy> allNeutronVPNIPSECPolicies = policyInterface.getAll();
List<NeutronVPNIPSECPolicy> ans = new ArrayList<>();
- Iterator<NeutronVPNIPSECPolicy> i = allNeutronVPNIPSECPolicies.iterator();
- while (i.hasNext()) {
- NeutronVPNIPSECPolicy oSS = i.next();
- if ((queryID == null || queryID.equals(oSS.getID()))
- && (queryName == null || queryName.equals(oSS.getName()))
- && (queryAuthAlgorithm == null || queryAuthAlgorithm.equals(oSS.getAuthAlgorithm()))
+ for (NeutronVPNIPSECPolicy policy : allNeutronVPNIPSECPolicies) {
+ if ((queryID == null || queryID.equals(policy.getID()))
+ && (queryName == null || queryName.equals(policy.getName()))
+ && (queryAuthAlgorithm == null || queryAuthAlgorithm.equals(policy.getAuthAlgorithm()))
&& (queryEncryptionAlgorithm == null
- || queryEncryptionAlgorithm.equals(oSS.getEncryptionAlgorithm()))
- && (queryPFS == null || queryPFS.equals(oSS.getPerfectForwardSecrecy()))
- && (queryTransformProtocol == null || queryTransformProtocol.equals(oSS.getTransformProtocol()))
- && (queryEncapsulationMode == null || queryEncapsulationMode.equals(oSS.getEncapsulationMode()))
- && (queryTenantID == null || queryTenantID.equals(oSS.getTenantID()))) {
+ || queryEncryptionAlgorithm.equals(policy.getEncryptionAlgorithm()))
+ && (queryPFS == null || queryPFS.equals(policy.getPerfectForwardSecrecy()))
+ && (queryTransformProtocol == null || queryTransformProtocol.equals(policy.getTransformProtocol()))
+ && (queryEncapsulationMode == null || queryEncapsulationMode.equals(policy.getEncapsulationMode()))
+ && (queryTenantID == null || queryTenantID.equals(policy.getTenantID()))) {
if (fields.size() > 0) {
- ans.add(oSS.extractFields(fields));
+ ans.add(policy.extractFields(fields));
} else {
- ans.add(oSS);
+ ans.add(policy);
}
}
}
import java.net.HttpURLConnection;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import javax.ws.rs.Consumes;
import javax.ws.rs.DELETE;
INeutronVPNIPSECSiteConnectionsCRUD labelInterface = getNeutronCRUD();
List<NeutronVPNIPSECSiteConnection> allNeutronVPNIPSECSiteConnection = labelInterface.getAll();
List<NeutronVPNIPSECSiteConnection> ans = new ArrayList<>();
- Iterator<NeutronVPNIPSECSiteConnection> i = allNeutronVPNIPSECSiteConnection.iterator();
- while (i.hasNext()) {
- NeutronVPNIPSECSiteConnection oSS = i.next();
- if ((queryID == null || queryID.equals(oSS.getID()))
- && (queryTenantID == null || queryTenantID.equals(oSS.getTenantID()))
- && (queryName == null || queryName.equals(oSS.getName()))
- && (queryPeerAddress == null || queryPeerAddress.equals(oSS.getPeerAddress()))
- && (queryPeerID == null || queryPeerID.equals(oSS.getPeerID()))
- && (queryRouteMode == null || queryRouteMode.equals(oSS.getRouteMode()))
- && (queryMtu == null || queryMtu.equals(oSS.getMtu()))
- && (queryAuthMode == null || queryAuthMode.equals(oSS.getAuthMode()))
- && (queryPsk == null || queryPsk.equals(oSS.getPreSharedKey()))
- && (queryInitiator == null || queryInitiator.equals(oSS.getInitiator()))
- && (queryAdminStateUp == null || queryAdminStateUp.equals(oSS.getAdminStateUp()))
- && (queryStatus == null || queryStatus.equals(oSS.getStatus()))
- && (queryIkePolicyID == null || queryIkePolicyID.equals(oSS.getIkePolicyID()))
- && (queryIpSecPolicyID == null || queryIpSecPolicyID.equals(oSS.getIpsecPolicyID()))
- && (queryVpnServiceID == null || queryVpnServiceID.equals(oSS.getVpnServiceID()))) {
+ for (NeutronVPNIPSECSiteConnection siteConnection : allNeutronVPNIPSECSiteConnection) {
+ if ((queryID == null || queryID.equals(siteConnection.getID()))
+ && (queryTenantID == null || queryTenantID.equals(siteConnection.getTenantID()))
+ && (queryName == null || queryName.equals(siteConnection.getName()))
+ && (queryPeerAddress == null || queryPeerAddress.equals(siteConnection.getPeerAddress()))
+ && (queryPeerID == null || queryPeerID.equals(siteConnection.getPeerID()))
+ && (queryRouteMode == null || queryRouteMode.equals(siteConnection.getRouteMode()))
+ && (queryMtu == null || queryMtu.equals(siteConnection.getMtu()))
+ && (queryAuthMode == null || queryAuthMode.equals(siteConnection.getAuthMode()))
+ && (queryPsk == null || queryPsk.equals(siteConnection.getPreSharedKey()))
+ && (queryInitiator == null || queryInitiator.equals(siteConnection.getInitiator()))
+ && (queryAdminStateUp == null || queryAdminStateUp.equals(siteConnection.getAdminStateUp()))
+ && (queryStatus == null || queryStatus.equals(siteConnection.getStatus()))
+ && (queryIkePolicyID == null || queryIkePolicyID.equals(siteConnection.getIkePolicyID()))
+ && (queryIpSecPolicyID == null || queryIpSecPolicyID.equals(siteConnection.getIpsecPolicyID()))
+ && (queryVpnServiceID == null || queryVpnServiceID.equals(siteConnection.getVpnServiceID()))) {
if (fields.size() > 0) {
- ans.add(oSS.extractFields(fields));
+ ans.add(siteConnection.extractFields(fields));
} else {
- ans.add(oSS);
+ ans.add(siteConnection);
}
}
}
import java.net.HttpURLConnection;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import javax.ws.rs.Consumes;
import javax.ws.rs.DELETE;
@QueryParam("page_reverse") String pageReverse
// sorting not supported
) {
- INeutronVPNServiceCRUD VPNServiceInterface = getNeutronCRUD();
- List<NeutronVPNService> allVPNService = VPNServiceInterface.getAll();
+ INeutronVPNServiceCRUD vpnServiceInterface = getNeutronCRUD();
+ List<NeutronVPNService> allVPNService = vpnServiceInterface.getAll();
List<NeutronVPNService> ans = new ArrayList<>();
- Iterator<NeutronVPNService> i = allVPNService.iterator();
- while (i.hasNext()) {
- NeutronVPNService oSS = i.next();
- if ((queryID == null || queryID.equals(oSS.getID()))
- && (queryName == null || queryName.equals(oSS.getName()))
- && (queryAdminStateUp == null || queryAdminStateUp.equals(oSS.getAdminStateUp()))
- && (queryStatus == null || queryStatus.equals(oSS.getStatus()))
- && (querySubnetID == null || querySubnetID.equals(oSS.getSubnetUUID()))
- && (queryRouterID == null || queryRouterID.equals(oSS.getRouterUUID()))
- && (queryTenantID == null || queryTenantID.equals(oSS.getTenantID()))) {
+ for (NeutronVPNService vpnService : allVPNService) {
+ if ((queryID == null || queryID.equals(vpnService.getID()))
+ && (queryName == null || queryName.equals(vpnService.getName()))
+ && (queryAdminStateUp == null || queryAdminStateUp.equals(vpnService.getAdminStateUp()))
+ && (queryStatus == null || queryStatus.equals(vpnService.getStatus()))
+ && (querySubnetID == null || querySubnetID.equals(vpnService.getSubnetUUID()))
+ && (queryRouterID == null || queryRouterID.equals(vpnService.getRouterUUID()))
+ && (queryTenantID == null || queryTenantID.equals(vpnService.getTenantID()))) {
if (fields.size() > 0) {
- ans.add(oSS.extractFields(fields));
+ ans.add(vpnService.extractFields(fields));
} else {
- ans.add(oSS);
+ ans.add(vpnService);
}
}
}
String endMarker;
Boolean firstPage = false;
Boolean lastPage = false;
- List<T> lCollection = collection;
- Collections.sort(lCollection, NEUTRON_OBJECT_COMPARATOR);
+ Collections.sort(collection, NEUTRON_OBJECT_COMPARATOR);
if (marker != null) {
- int offset = Collections.binarySearch(lCollection, new MarkerObject(marker), NEUTRON_OBJECT_COMPARATOR);
+ int offset = Collections.binarySearch(collection, new MarkerObject(marker), NEUTRON_OBJECT_COMPARATOR);
if (offset < 0) {
throw new ResourceNotFoundException("UUID for marker: " + marker + " could not be found");
}
firstPage = true;
}
- if (startPos + limit >= lCollection.size()) {
- lCollection = lCollection.subList(startPos, lCollection.size());
- startMarker = lCollection.get(0).getID();
- endMarker = lCollection.get(lCollection.size() - 1).getID();
+ if (startPos + limit >= collection.size()) {
+ collection = collection.subList(startPos, collection.size());
+ startMarker = collection.get(0).getID();
+ endMarker = collection.get(collection.size() - 1).getID();
lastPage = true;
} else if (startPos < 0) {
if (startPos + limit > 0) {
- lCollection = lCollection.subList(0, startPos + limit);
- startMarker = lCollection.get(0).getID();
- endMarker = lCollection.get(lCollection.size() - 1).getID();
+ collection = collection.subList(0, startPos + limit);
+ startMarker = collection.get(0).getID();
+ endMarker = collection.get(collection.size() - 1).getID();
firstPage = true;
} else {
throw new BadRequestException(
"Requested page is out of bounds. Please check the supplied limit and marker");
}
} else {
- lCollection = lCollection.subList(startPos, startPos + limit);
- startMarker = lCollection.get(0).getID();
- endMarker = lCollection.get(limit - 1).getID();
+ collection = collection.subList(startPos, startPos + limit);
+ startMarker = collection.get(0).getID();
+ endMarker = collection.get(limit - 1).getID();
}
if (!lastPage) {
links.add(previous);
}
- return new PaginationResults<T>(lCollection, links);
+ return new PaginationResults<T>(collection, links);
}
}
<suppress checks="AbbreviationAsWordInName"
files="."
/>
- <suppress checks="LocalVariableName"
- files="."
- />
<suppress checks="ConstantName"
files="."
/>
ParameterizedType parameterizedType = (ParameterizedType) getClass().getGenericSuperclass();
mdListClass = (Class<T>) parameterizedType.getActualTypeArguments()[0];
mdContainerClass = (Class<U>) parameterizedType.getActualTypeArguments()[1];
- Class<S> iNeutronClass = (Class<S>) parameterizedType.getActualTypeArguments()[3];
+ Class<S> neutronObjectClass = (Class<S>) parameterizedType.getActualTypeArguments()[3];
try {
setUuid = builderClass.getDeclaredMethod("setUuid", Uuid.class);
setTenantId = builderClass.getDeclaredMethod("setTenantId", Uuid.class);
- if (INeutronBaseAttributes.class.isAssignableFrom(iNeutronClass)) {
+ if (INeutronBaseAttributes.class.isAssignableFrom(neutronObjectClass)) {
setName = builderClass.getDeclaredMethod("setName", String.class);
} else {
setName = null;
}
- if (INeutronAdminAttributes.class.isAssignableFrom(iNeutronClass)) {
+ if (INeutronAdminAttributes.class.isAssignableFrom(neutronObjectClass)) {
setAdminStateUp = builderClass.getDeclaredMethod("setAdminStateUp", Boolean.class);
setStatus = builderClass.getDeclaredMethod("setStatus", String.class);
} else {
}
if (healthMonitor.getLoadBalancerHealthMonitorPools() != null) {
final List<Uuid> listUuid = new ArrayList<Uuid>();
- for (final Neutron_ID neutron_id : healthMonitor.getLoadBalancerHealthMonitorPools()) {
- listUuid.add(toUuid(neutron_id.getID()));
+ for (final Neutron_ID neutronId : healthMonitor.getLoadBalancerHealthMonitorPools()) {
+ listUuid.add(toUuid(neutronId.getID()));
}
healthmonitorBuilder.setPools(listUuid);
}
}
if (listener.getNeutronLoadBalancerListenerLoadBalancerIDs() != null) {
final List<Uuid> listLoadBalancers = new ArrayList<Uuid>();
- for (final Neutron_ID neutron_id : listener.getNeutronLoadBalancerListenerLoadBalancerIDs()) {
- listLoadBalancers.add(toUuid(neutron_id.getID()));
+ for (final Neutron_ID neutronId : listener.getNeutronLoadBalancerListenerLoadBalancerIDs()) {
+ listLoadBalancers.add(toUuid(neutronId.getID()));
}
listenerBuilder.setLoadbalancers(listLoadBalancers);
}
}
if (pool.getLoadBalancerPoolListeners() != null) {
final List<Uuid> listListener = new ArrayList<Uuid>();
- for (final Neutron_ID neutron_id : pool.getLoadBalancerPoolListeners()) {
- listListener.add(toUuid(neutron_id.getID()));
+ for (final Neutron_ID neutronId : pool.getLoadBalancerPoolListeners()) {
+ listListener.add(toUuid(neutronId.getID()));
}
poolBuilder.setListeners(listListener);
}
}
if (neutronPort.getFixedIPs() != null) {
final List<FixedIps> listNeutronIPs = new ArrayList<FixedIps>();
- for (final Neutron_IPs neutron_IPs : neutronPort.getFixedIPs()) {
+ for (final Neutron_IPs neutronIPs : neutronPort.getFixedIPs()) {
final FixedIpsBuilder fixedIpsBuilder = new FixedIpsBuilder();
- fixedIpsBuilder.setIpAddress(new IpAddress(neutron_IPs.getIpAddress().toCharArray()));
- fixedIpsBuilder.setSubnetId(toUuid(neutron_IPs.getSubnetUUID()));
+ fixedIpsBuilder.setIpAddress(new IpAddress(neutronIPs.getIpAddress().toCharArray()));
+ fixedIpsBuilder.setSubnetId(toUuid(neutronIPs.getSubnetUUID()));
listNeutronIPs.add(fixedIpsBuilder.build());
}
portBuilder.setFixedIps(listNeutronIPs);
builder.setExternalNetworkId(toUuid(externalGatewayInfos.getNetworkID()));
if (externalGatewayInfos.getExternalFixedIPs() != null) {
final List<ExternalFixedIps> externalFixedIps = new ArrayList<ExternalFixedIps>();
- for (final Neutron_IPs eIP : externalGatewayInfos.getExternalFixedIPs()) {
+ for (final Neutron_IPs externalIp : externalGatewayInfos.getExternalFixedIPs()) {
final ExternalFixedIpsBuilder eFixedIpBuilder = new ExternalFixedIpsBuilder();
- eFixedIpBuilder.setIpAddress(new IpAddress(eIP.getIpAddress().toCharArray()));
- eFixedIpBuilder.setSubnetId(toUuid(eIP.getSubnetUUID()));
+ eFixedIpBuilder.setIpAddress(new IpAddress(externalIp.getIpAddress().toCharArray()));
+ eFixedIpBuilder.setSubnetId(toUuid(externalIp.getSubnetUUID()));
externalFixedIps.add(eFixedIpBuilder.build());
}
builder.setExternalFixedIps(externalFixedIps);
T extends AutoCloseable /* & S */> void registerCRUDInterface(java.lang.Class<S> clazz, T crudInterface) {
neutronInterfaces.add(crudInterface);
@SuppressWarnings("unchecked")
- S sCrudInterface = (S) crudInterface;
- final ServiceRegistration<S> crudInterfaceRegistration = context.registerService(clazz, sCrudInterface, null);
+ S castCrudInterface = (S) crudInterface;
+ final ServiceRegistration<S> crudInterfaceRegistration =
+ context.registerService(clazz, castCrudInterface, null);
registrations.add(crudInterfaceRegistration);
}
Code Review / neutron.git / commitdiff