You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2015/06/08 10:01:36 UTC
[1/5] git commit: updated refs/heads/master to b272d77
Repository: cloudstack
Updated Branches:
refs/heads/master 9bac84a3f -> b272d7717
Fix findbugs high priority warning VmwareStorageManagerImpl.java:1023, RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE, Priority: High Redundant nullcheck of datastoreVolumePath, which is known to be non-null in com.cloud.hypervisor.vmware.manager.VmwareStorageManagerImpl.getVolumePathInDatastore(DatastoreMO, String)
Assertion is not used in runtime, correct way is throw and handle exception without killing app
Signed-off-by: Daan Hoogland <da...@gmail.com>
This closes #362
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e8c7069f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e8c7069f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e8c7069f
Branch: refs/heads/master
Commit: e8c7069f734b7886cbe0e8dfec4452a4fdfe20b3
Parents: 9bac84a
Author: Rafael da Fonseca <rs...@gmail.com>
Authored: Sun Jun 7 11:38:04 2015 +0200
Committer: Daan Hoogland <da...@gmail.com>
Committed: Mon Jun 8 09:40:50 2015 +0200
----------------------------------------------------------------------
.../cloud/hypervisor/vmware/manager/VmwareStorageManagerImpl.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e8c7069f/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareStorageManagerImpl.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareStorageManagerImpl.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareStorageManagerImpl.java
index 3aec7a4..34ede03 100644
--- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareStorageManagerImpl.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareStorageManagerImpl.java
@@ -1019,7 +1019,6 @@ public class VmwareStorageManagerImpl implements VmwareStorageManager {
private String getVolumePathInDatastore(DatastoreMO dsMo, String volumeFileName) throws Exception {
String datastoreVolumePath = dsMo.searchFileInSubFolders(volumeFileName, true);
- assert (datastoreVolumePath != null) : "Virtual disk file missing from datastore.";
if (datastoreVolumePath == null) {
throw new CloudRuntimeException("Unable to find file " + volumeFileName + " in datastore " + dsMo.getName());
}
[2/5] git commit: updated refs/heads/master to b272d77
Posted by da...@apache.org.
Fix 3 more findbugs performance alerts, creating Long and Integer unnecessarily F5BigIpResource.java:297, DM_BOXED_PRIMITIVE_FOR_PARSING, Priority: High F5BigIpResource.java:703, DM_BOXED_PRIMITIVE_FOR_PARSING, Priority: High F5BigIpResource.java:889, DM_BOXED_PRIMITIVE_FOR_PARSING, Priority: High Boxing/unboxing to parse a primitive com.cloud.network.resource.F5BigIpResource
Signed-off-by: Daan Hoogland <da...@gmail.com>
This closes #366
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/039d632a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/039d632a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/039d632a
Branch: refs/heads/master
Commit: 039d632ad3143dce5b39b0202092f0c6a6d09c44
Parents: e8c7069
Author: Rafael da Fonseca <rs...@gmail.com>
Authored: Sun Jun 7 21:33:49 2015 +0200
Committer: Daan Hoogland <da...@gmail.com>
Committed: Mon Jun 8 09:40:59 2015 +0200
----------------------------------------------------------------------
.../f5/src/com/cloud/network/resource/F5BigIpResource.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/039d632a/plugins/network-elements/f5/src/com/cloud/network/resource/F5BigIpResource.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/f5/src/com/cloud/network/resource/F5BigIpResource.java b/plugins/network-elements/f5/src/com/cloud/network/resource/F5BigIpResource.java
index 0f70a9b..c4e0fdf 100644
--- a/plugins/network-elements/f5/src/com/cloud/network/resource/F5BigIpResource.java
+++ b/plugins/network-elements/f5/src/com/cloud/network/resource/F5BigIpResource.java
@@ -294,7 +294,7 @@ public class F5BigIpResource implements ServerResource {
for (IpAddressTO ip : ips) {
// is it saver to use Long.valueOf(BroadcastDomain.getValue(ip.getBroadcastUri())) ???
// i.o.w. can this contain vlan:// then change !!!
- long guestVlanTag = Long.valueOf(ip.getBroadcastUri());
+ long guestVlanTag = Long.parseLong(ip.getBroadcastUri());
// It's a hack, using isOneToOneNat field for indicate if it's inline or not
boolean inline = ip.isOneToOneNat();
String vlanSelfIp = inline ? tagAddressWithRouteDomain(ip.getVlanGateway(), guestVlanTag) : ip.getVlanGateway();
@@ -700,7 +700,7 @@ public class F5BigIpResource implements ServerResource {
List<String> poolMembers = getMembers(virtualServerName);
for (String poolMember : poolMembers) {
String[] destIpAndPort = getIpAndPort(poolMember);
- deletePoolMember(virtualServerName, destIpAndPort[0], Integer.valueOf(destIpAndPort[1]));
+ deletePoolMember(virtualServerName, destIpAndPort[0], Integer.parseInt(destIpAndPort[1]));
}
// Delete the virtual server
@@ -886,7 +886,7 @@ public class F5BigIpResource implements ServerResource {
for (String member : allPoolMembers) {
if (!activePoolMembers.contains(member)) {
String[] ipAndPort = member.split("-");
- deletePoolMember(virtualServerName, ipAndPort[0], Integer.valueOf(ipAndPort[1]));
+ deletePoolMember(virtualServerName, ipAndPort[0], Integer.parseInt(ipAndPort[1]));
}
}
}
[4/5] git commit: updated refs/heads/master to b272d77
Posted by da...@apache.org.
Fix malformed closing tag on comments in cisco .xml files
Signed-off-by: Daan Hoogland <da...@gmail.com>
This closes #369
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c5437d21
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c5437d21
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c5437d21
Branch: refs/heads/master
Commit: c5437d216fe6aaf85e35bfc7d85bf3b2f37fa70a
Parents: b9b13d7
Author: Rafael da Fonseca <rs...@gmail.com>
Authored: Sun Jun 7 21:52:34 2015 +0200
Committer: Daan Hoogland <da...@gmail.com>
Committed: Mon Jun 8 09:41:13 2015 +0200
----------------------------------------------------------------------
.../scripts/network/cisco/create-acl-policy-ref.xml | 8 ++++----
.../scripts/network/cisco/create-acl-policy-set.xml | 8 ++++----
.../cisco-vnmc/scripts/network/cisco/create-acl-policy.xml | 8 ++++----
.../scripts/network/cisco/create-acl-rule-for-dnat.xml | 8 ++++----
.../scripts/network/cisco/create-acl-rule-for-pf.xml | 8 ++++----
.../cisco-vnmc/scripts/network/cisco/create-dhcp-policy.xml | 2 +-
.../cisco-vnmc/scripts/network/cisco/create-dnat-rule.xml | 8 ++++----
.../scripts/network/cisco/create-edge-firewall.xml | 2 +-
.../scripts/network/cisco/create-edge-security-profile.xml | 2 +-
.../scripts/network/cisco/create-egress-acl-rule.xml | 8 ++++----
.../cisco/create-generic-egress-acl-no-protocol-rule.xml | 8 ++++----
.../scripts/network/cisco/create-generic-egress-acl-rule.xml | 8 ++++----
.../network/cisco/create-generic-ingress-acl-rule.xml | 8 ++++----
.../scripts/network/cisco/create-ingress-acl-rule.xml | 8 ++++----
.../cisco-vnmc/scripts/network/cisco/create-ip-pool.xml | 8 ++++----
.../scripts/network/cisco/create-nat-policy-ref.xml | 8 ++++----
.../scripts/network/cisco/create-nat-policy-set.xml | 2 +-
.../cisco-vnmc/scripts/network/cisco/create-pf-rule.xml | 8 ++++----
.../cisco-vnmc/scripts/network/cisco/create-port-pool.xml | 8 ++++----
.../scripts/network/cisco/create-source-nat-pool.xml | 2 +-
.../scripts/network/cisco/create-source-nat-rule.xml | 2 +-
.../cisco-vnmc/scripts/network/cisco/list-acl-policies.xml | 8 ++++----
.../cisco-vnmc/scripts/network/cisco/list-children.xml | 8 ++++----
.../cisco-vnmc/scripts/network/cisco/list-nat-policies.xml | 8 ++++----
.../scripts/network/cisco/list-policyrefs-in-policyset.xml | 8 ++++----
25 files changed, 82 insertions(+), 82 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c5437d21/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-acl-policy-ref.xml
----------------------------------------------------------------------
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-acl-policy-ref.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-acl-policy-ref.xml
index c534c32..4fe3db7 100755
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-acl-policy-ref.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-acl-policy-ref.xml
@@ -32,7 +32,7 @@ under the License.
</inConfigs>
</configConfMos>
-<!--
- aclpolicyrefdn="org-root/org-vlan-123/org-VDC-vlan-123/pset-Ingress-ACL-Policy-Set-vlan-123/polref-aaa"
- aclpolicyname="aaa"
---!>
+<!--
+ aclpolicyrefdn="org-root/org-vlan-123/org-VDC-vlan-123/pset-Ingress-ACL-Policy-Set-vlan-123/polref-aaa"
+ aclpolicyname="aaa"
+-->
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c5437d21/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-acl-policy-set.xml
----------------------------------------------------------------------
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-acl-policy-set.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-acl-policy-set.xml
index b475d2c..a04be15 100755
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-acl-policy-set.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-acl-policy-set.xml
@@ -30,7 +30,7 @@ under the License.
</inConfigs>
</configConfMos>
-<!--
- aclpolicysetdn="org-root/org-vlan-123/org-VDC-vlan-123/pset-foo"
- aclpolicysetname="foo"
---!>
+<!--
+ aclpolicysetdn="org-root/org-vlan-123/org-VDC-vlan-123/pset-foo"
+ aclpolicysetname="foo"
+-->
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c5437d21/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-acl-policy.xml
----------------------------------------------------------------------
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-acl-policy.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-acl-policy.xml
index e71cd42..c6f7d37 100755
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-acl-policy.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-acl-policy.xml
@@ -29,7 +29,7 @@ under the License.
</inConfig>
</configConfMo>
-<!--
- aclpolicydn="org-root/org-vlan-123/org-VDC-vlan-123/pol-test_policy"
- aclpolicyname="test_policy"
---!>
\ No newline at end of file
+<!--
+ aclpolicydn="org-root/org-vlan-123/org-VDC-vlan-123/pol-test_policy"
+ aclpolicyname="test_policy"
+-->
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c5437d21/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-acl-rule-for-dnat.xml
----------------------------------------------------------------------
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-acl-rule-for-dnat.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-acl-rule-for-dnat.xml
index 5b6aaa3..e1ec9ad 100755
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-acl-rule-for-dnat.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-acl-rule-for-dnat.xml
@@ -76,7 +76,7 @@ under the License.
<!--
aclruledn="org-root/org-vlan-123/org-VDC-vlan-123/pol-test_policy/rule-dummy"
aclrulename="dummy"
- descr=value
- actiontype="drop" or "permit"
- ip="public ip at destination"
---!>
+ descr=value
+ actiontype="drop" or "permit"
+ ip="public ip at destination"
+-->
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c5437d21/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-acl-rule-for-pf.xml
----------------------------------------------------------------------
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-acl-rule-for-pf.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-acl-rule-for-pf.xml
index 1a1d9cb..e0fa2e4 100755
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-acl-rule-for-pf.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-acl-rule-for-pf.xml
@@ -150,7 +150,7 @@ under the License.
descr=value
actiontype="drop" or "permit"
protocolvalue="TCP" or "UDP"
- ip="public ip at destination"
- startport="start port at destination"
- endport="end port at destination"
---!>
+ ip="public ip at destination"
+ startport="start port at destination"
+ endport="end port at destination"
+-->
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c5437d21/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-dhcp-policy.xml
----------------------------------------------------------------------
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-dhcp-policy.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-dhcp-policy.xml
index 5bb4abc..cab9f98 100644
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-dhcp-policy.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-dhcp-policy.xml
@@ -69,4 +69,4 @@ under the License.
"org-root/org-TenantC/org-VDC-TenantC/dhcp-server-TenantC-Dhcp-Policy/ip-range-iprange"
"org-root/org-TestTenant3/org-Tenant3-VDC/dhcp-server-Tenant3-DHCP-Policy/dns-svc-Tenant3-DNS"
"org-root/org-TestTenant3/org-Tenant3-VDC/dhcp-server-Tenant3-DHCP-Policy/dns-svc-Tenant3-DNS/dns-8.8.8.8"
---!>
+-->
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c5437d21/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-dnat-rule.xml
----------------------------------------------------------------------
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-dnat-rule.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-dnat-rule.xml
index bd8dbff..308664d 100755
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-dnat-rule.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-dnat-rule.xml
@@ -85,7 +85,7 @@ under the License.
<!--
natruledn="org-root/org-vlan-123/org-VDC-vlan-123/natpol-aaa/rule-bbb"
natrulename="bbb"
- descr=value
- ippoolname="ccc"
- ip="10.147.30.230"
---!>
+ descr=value
+ ippoolname="ccc"
+ ip="10.147.30.230"
+-->
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c5437d21/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-edge-firewall.xml
----------------------------------------------------------------------
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-edge-firewall.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-edge-firewall.xml
index e5447e3..d2ab997 100644
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-edge-firewall.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-edge-firewall.xml
@@ -86,4 +86,4 @@ under the License.
ipAddressPrimary="%publicip%"
ipSubnet="%outsidesubnet%"
name="%outsideintfname%
---!>
+-->
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c5437d21/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-edge-security-profile.xml
----------------------------------------------------------------------
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-edge-security-profile.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-edge-security-profile.xml
index e2f5eaf..29f7111 100644
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-edge-security-profile.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-edge-security-profile.xml
@@ -38,4 +38,4 @@ under the License.
egressAclPsetRef="default-egress"
ingressAclPsetRef="default-ingress"
name="Tenant3-ESSP"
---!>
+-->
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c5437d21/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-egress-acl-rule.xml
----------------------------------------------------------------------
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-egress-acl-rule.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-egress-acl-rule.xml
index f283ffe..d6e4676 100755
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-egress-acl-rule.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-egress-acl-rule.xml
@@ -162,7 +162,7 @@ under the License.
actiontype="drop" or "permit"
protocolvalue = "TCP" or "UDP"
sourcestartip="source start ip"
- sourceendip="source end ip"
- deststartport="start port at destination"
- destendport="end port at destination"
---!>
+ sourceendip="source end ip"
+ deststartport="start port at destination"
+ destendport="end port at destination"
+-->
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c5437d21/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-generic-egress-acl-no-protocol-rule.xml
----------------------------------------------------------------------
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-generic-egress-acl-no-protocol-rule.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-generic-egress-acl-no-protocol-rule.xml
index e6f4cfb..fac59f3 100755
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-generic-egress-acl-no-protocol-rule.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-generic-egress-acl-no-protocol-rule.xml
@@ -88,7 +88,7 @@ under the License.
aclruledn="org-root/org-vlan-123/org-VDC-vlan-123/pol-test_policy/rule-dummy"
aclrulename="dummy"
descr=value
- actiontype="drop" or "permit"
- sourcestartip="source start ip"
- sourceendip="source end ip"
---!>
+ actiontype="drop" or "permit"
+ sourcestartip="source start ip"
+ sourceendip="source end ip"
+-->
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c5437d21/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-generic-egress-acl-rule.xml
----------------------------------------------------------------------
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-generic-egress-acl-rule.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-generic-egress-acl-rule.xml
index 55edd1f..7a5b9d8 100755
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-generic-egress-acl-rule.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-generic-egress-acl-rule.xml
@@ -115,7 +115,7 @@ under the License.
aclrulename="dummy"
descr=value
actiontype="drop" or "permit"
- protocolvalue = "TCP" or "UDP" or "ICMP"
- sourcestartip="source start ip"
- sourceendip="source end ip"
---!>
+ protocolvalue = "TCP" or "UDP" or "ICMP"
+ sourcestartip="source start ip"
+ sourceendip="source end ip"
+-->
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c5437d21/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-generic-ingress-acl-rule.xml
----------------------------------------------------------------------
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-generic-ingress-acl-rule.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-generic-ingress-acl-rule.xml
index 7c11641..bd368f5 100755
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-generic-ingress-acl-rule.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-generic-ingress-acl-rule.xml
@@ -115,7 +115,7 @@ under the License.
aclrulename="dummy"
descr=value
actiontype="drop" or "permit"
- protocolvalue = "TCP" or "UDP" or "ICMP"
- sourcestartip = "source start IP"
- sourceendip = "source end IP"
---!>
+ protocolvalue = "TCP" or "UDP" or "ICMP"
+ sourcestartip = "source start IP"
+ sourceendip = "source end IP"
+-->
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c5437d21/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-ingress-acl-rule.xml
----------------------------------------------------------------------
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-ingress-acl-rule.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-ingress-acl-rule.xml
index f283ffe..d6e4676 100755
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-ingress-acl-rule.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-ingress-acl-rule.xml
@@ -162,7 +162,7 @@ under the License.
actiontype="drop" or "permit"
protocolvalue = "TCP" or "UDP"
sourcestartip="source start ip"
- sourceendip="source end ip"
- deststartport="start port at destination"
- destendport="end port at destination"
---!>
+ sourceendip="source end ip"
+ deststartport="start port at destination"
+ destendport="end port at destination"
+-->
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c5437d21/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-ip-pool.xml
----------------------------------------------------------------------
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-ip-pool.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-ip-pool.xml
index 4cf0451..876fa21 100755
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-ip-pool.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-ip-pool.xml
@@ -52,7 +52,7 @@ under the License.
</configConfMos>
<!--
- ippooldn="org-root/org-vlan-123/org-VDC-vlan-123/objgrp-ccc"
- ippoolname="ccc"
- ipvalue="10.1.1.20"
---!>
\ No newline at end of file
+ ippooldn="org-root/org-vlan-123/org-VDC-vlan-123/objgrp-ccc"
+ ippoolname="ccc"
+ ipvalue="10.1.1.20"
+-->
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c5437d21/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-nat-policy-ref.xml
----------------------------------------------------------------------
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-nat-policy-ref.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-nat-policy-ref.xml
index 450d40c..0e7d6e0 100755
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-nat-policy-ref.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-nat-policy-ref.xml
@@ -32,7 +32,7 @@ under the License.
</inConfigs>
</configConfMos>
-<!--
- natpolicyrefdn="org-root/org-TenantD/org-VDC-TenantD/natpset-TenantD-NAT-Policy-Set/polref-Source-NAT-Policy-TenantD"
- natpolicyname="Source-NAT-Policy-TenantD"
---!>
+<!--
+ natpolicyrefdn="org-root/org-TenantD/org-VDC-TenantD/natpset-TenantD-NAT-Policy-Set/polref-Source-NAT-Policy-TenantD"
+ natpolicyname="Source-NAT-Policy-TenantD"
+-->
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c5437d21/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-nat-policy-set.xml
----------------------------------------------------------------------
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-nat-policy-set.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-nat-policy-set.xml
index 090caf1..2e2c63e 100644
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-nat-policy-set.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-nat-policy-set.xml
@@ -34,4 +34,4 @@ under the License.
<!--
natpolicysetdn="org-root/org-TenantD/org-VDC-TenantD/natpset-TenantD-NAT-Policy-Set"
natpolicysetname="Source-NAT-Policy-Set-TenantD"
---!>
+-->
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c5437d21/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-pf-rule.xml
----------------------------------------------------------------------
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-pf-rule.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-pf-rule.xml
index a8a631f..4cfecd4 100755
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-pf-rule.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-pf-rule.xml
@@ -160,7 +160,7 @@ under the License.
ippoolname="ccc"
portpoolname="ddd"
ip="10.147.30.230"
- startport="22"
- endport="22"
- protocolvalue="TCP"
---!>
+ startport="22"
+ endport="22"
+ protocolvalue="TCP"
+-->
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c5437d21/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-port-pool.xml
----------------------------------------------------------------------
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-port-pool.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-port-pool.xml
index e1b7be0..d218eec 100755
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-port-pool.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-port-pool.xml
@@ -66,7 +66,7 @@ under the License.
<!--
portpooldn="org-root/org-vlan-123/org-VDC-vlan-123/objgrp-ddd"
- portpoolname="ddd"
- startport="22"
- endport="22"
---!>
+ portpoolname="ddd"
+ startport="22"
+ endport="22"
+-->
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c5437d21/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-source-nat-pool.xml
----------------------------------------------------------------------
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-source-nat-pool.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-source-nat-pool.xml
index 2ad1e87..957bc9f 100644
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-source-nat-pool.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-source-nat-pool.xml
@@ -55,4 +55,4 @@ under the License.
publicipdn="org-root/org-TestTenant3/org-Tenant3-VDC/objgrp-Source-NAT-Pool-For-Tenant3/objgrp-expr-2/nw-ip-2"
snatpooldn= "org-root/org-TestTenant3/org-Tenant3-VDC/objgrp-Source-NAT-Pool-For-Tenant3"
value="10.223.136.10"
---!>
+-->
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c5437d21/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-source-nat-rule.xml
----------------------------------------------------------------------
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-source-nat-rule.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-source-nat-rule.xml
index a3ee987..9980df1 100644
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-source-nat-rule.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-source-nat-rule.xml
@@ -100,4 +100,4 @@ under the License.
ippoolname=value
srcstartip=value
srcendip=value
---!>
+-->
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c5437d21/plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-acl-policies.xml
----------------------------------------------------------------------
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-acl-policies.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-acl-policies.xml
index aec800e..aee2f89 100755
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-acl-policies.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-acl-policies.xml
@@ -25,7 +25,7 @@ under the License.
<inFilter>
</inFilter>
</orgResolveInScope>
-
-<!--
- vdcdn="org-root/org-vlan-123/org-VDC-vlan-123"
---!>
+
+<!--
+ vdcdn="org-root/org-vlan-123/org-VDC-vlan-123"
+-->
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c5437d21/plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-children.xml
----------------------------------------------------------------------
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-children.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-children.xml
index f272999..a24b1cf 100755
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-children.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-children.xml
@@ -21,7 +21,7 @@ under the License.
inDn="%dn%"
inHierarchical="true">
<inFilter>
- </inFilter>
-</configResolveChildren>
-
-<!--dn="org-root/org-vlan-517/org-VDC-vlan-517/natpol-DNAT-vlan-517-10-147-30-235"--!>
+ </inFilter>
+</configResolveChildren>
+
+<!--dn="org-root/org-vlan-517/org-VDC-vlan-517/natpol-DNAT-vlan-517-10-147-30-235"-->
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c5437d21/plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-nat-policies.xml
----------------------------------------------------------------------
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-nat-policies.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-nat-policies.xml
index 720ced0..bd978cb 100755
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-nat-policies.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-nat-policies.xml
@@ -25,7 +25,7 @@ under the License.
<inFilter>
</inFilter>
</orgResolveInScope>
-
-<!--
- vdcdn="org-root/org-vlan-123/org-VDC-vlan-123"
---!>
+
+<!--
+ vdcdn="org-root/org-vlan-123/org-VDC-vlan-123"
+-->
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c5437d21/plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-policyrefs-in-policyset.xml
----------------------------------------------------------------------
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-policyrefs-in-policyset.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-policyrefs-in-policyset.xml
index c53af90..cda51c5 100755
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-policyrefs-in-policyset.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-policyrefs-in-policyset.xml
@@ -25,7 +25,7 @@ under the License.
<inFilter>
</inFilter>
</orgResolveInScope>
-
-<!--
- vdcdn="org-root/org-vlan-123/org-VDC-vlan-123"
---!>
+
+<!--
+ vdcdn="org-root/org-vlan-123/org-VDC-vlan-123"
+-->
[5/5] git commit: updated refs/heads/master to b272d77
Posted by da...@apache.org.
Revert "Fix 2 findbugs high priority warnings"
This reverts commit 1ca74dac269faa890c830ccde67c5007ef2e3c45.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b272d771
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b272d771
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b272d771
Branch: refs/heads/master
Commit: b272d7717e67d5a31077bbef13c8a33ea073b9db
Parents: c5437d2
Author: Daan Hoogland <da...@gmail.com>
Authored: Mon Jun 8 10:01:19 2015 +0200
Committer: Daan Hoogland <da...@gmail.com>
Committed: Mon Jun 8 10:01:19 2015 +0200
----------------------------------------------------------------------
.../src/com/cloud/hypervisor/vmware/resource/VmwareResource.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b272d771/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
index f7c6db3..d98c308 100644
--- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
@@ -312,7 +312,7 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
protected DiskControllerType _rootDiskController = DiskControllerType.ide;
protected ManagedObjectReference _morHyperHost;
- protected static final ThreadLocal<VmwareContext> s_serviceContext = new ThreadLocal<VmwareContext>();
+ protected static ThreadLocal<VmwareContext> s_serviceContext = new ThreadLocal<VmwareContext>();
protected String _hostName;
protected List<PropertyMapDynamicBean> _cmdMBeans = new ArrayList<PropertyMapDynamicBean>();
@@ -328,7 +328,7 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
protected static HashMap<VirtualMachinePowerState, PowerState> s_powerStatesTable;
static {
- final s_powerStatesTable = new HashMap<VirtualMachinePowerState, PowerState>();
+ s_powerStatesTable = new HashMap<VirtualMachinePowerState, PowerState>();
s_powerStatesTable.put(VirtualMachinePowerState.POWERED_ON, PowerState.PowerOn);
s_powerStatesTable.put(VirtualMachinePowerState.POWERED_OFF, PowerState.PowerOff);
s_powerStatesTable.put(VirtualMachinePowerState.SUSPENDED, PowerState.PowerOn);
[3/5] git commit: updated refs/heads/master to b272d77
Posted by da...@apache.org.
Fix another case of unnecessary boxing JuniperSrxResource.java:1280, DM_BOXED_PRIMITIVE_FOR_PARSING, Priority: High Boxing/unboxing to parse a primitive com.cloud.network.resource.JuniperSrxResource.removeDestinationNatRules(Long, Map, List)
Signed-off-by: Daan Hoogland <da...@gmail.com>
This closes #367
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b9b13d76
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b9b13d76
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b9b13d76
Branch: refs/heads/master
Commit: b9b13d764dea1446df9e91c296c3bf767dd1ffc9
Parents: 039d632
Author: Rafael da Fonseca <rs...@gmail.com>
Authored: Sun Jun 7 21:38:01 2015 +0200
Committer: Daan Hoogland <da...@gmail.com>
Committed: Mon Jun 8 09:41:07 2015 +0200
----------------------------------------------------------------------
.../src/com/cloud/network/resource/JuniperSrxResource.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b9b13d76/plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java b/plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java
index 2133937..d89f1e9 100644
--- a/plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java
+++ b/plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java
@@ -1277,8 +1277,8 @@ public class JuniperSrxResource implements ServerResource {
for (String[] destNatRule : destNatRules) {
String publicIp = destNatRule[0];
String privateIp = destNatRule[1];
- int srcPort = Integer.valueOf(destNatRule[2]);
- int destPort = Integer.valueOf(destNatRule[3]);
+ int srcPort = Integer.parseInt(destNatRule[2]);
+ int destPort = Integer.parseInt(destNatRule[3]);
Long publicVlanTag = null;
if (publicVlanTags.containsKey(publicIp)) {