FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

CLOUDSTACK-8923: Do not send zoneId with createStorageNetworkIpRange command. by borisroman · Pull Request #911 · apache/cloudstack · GitHub

  1. apache
  2. cloudstack

Repository navigation

CLOUDSTACK-8923: Do not send zoneId with createStorageNetworkIpRange command. #911

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
borisroman wants to merge 2 commits into from
Conversation 3 Commits 2 Checks 0 Files changed
Closed

CLOUDSTACK-8923: Do not send zoneId with createStorageNetworkIpRange command. #911

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f4eb41
CLOUDSTACK-8923: Do not send zoneId with createStorageNetworkIpRange …
Oct 5, 2015
875cf77
CLOUDSTACK-8923: Close PreparedStatement when done.
Oct 5, 2015
File filter

Filter by extension

Filter by extension .java  (1) .js  (2) All 2 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
4 changes: 3 additions & 1 deletion server/src/com/cloud/network/StorageNetworkManagerImpl.java
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -112,11 +112,13 @@ private void createStorageIpEntires(TransactionLegacy txn, long rangeId, String
stmt_insert.setLong(3, zoneId);
stmt_insert.setNull(4, java.sql.Types.DATE);
stmt_insert.executeUpdate();
stmt_insert.close();
}

try (PreparedStatement stmt_update = txn.prepareStatement(updateSql);) {
stmt_update.setLong(1, zoneId);
stmt_update.executeUpdate();
stmt_update.close();
}
}
}
Expand Down Expand Up @@ -223,7 +225,7 @@ public StorageNetworkIpRange createIpRange(final CreateStorageNetworkIpRangeCmd
checkOverlapPrivateIpRange(podId, startIp, endIp);
checkOverlapStorageIpRange(podId, startIp, endIp);

StorageNetworkIpRangeVO range = null;
//StorageNetworkIpRangeVO range = null;

DaanHoogland Oct 5, 2015

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

please don't comment out code, remove it

borisroman Oct 5, 2015

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

I know :) Still busy testing, please read the last comment of my PR message. I PR'd the first commit, then pushed the second one for testing.

final String endIpFinal = endIp;
return Transaction.execute(new TransactionCallbackWithException<StorageNetworkIpRangeVO, SQLException>() {
Expand Down
1 change: 0 additions & 1 deletion ui/scripts/system.js
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -1007,7 +1007,6 @@
label: 'label.add',
action: function (args) {
var array1 =[];
array1.push("&zoneId=" + args.context.zones[0].id);
array1.push("&podid=" + args.data.podid);

array1.push("&gateway=" + args.data.gateway);
Expand Down
1 change: 0 additions & 1 deletion ui/scripts/zoneWizard.js
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -3938,7 +3938,6 @@
$.ajax({
url: createURL('createStorageNetworkIpRange'),
data: $.extend(true, {}, item, {
zoneid: args.data.returnedZone.id,
podid: args.data.returnedPod.id
}),
success: function(json) {
Expand Down
Back | FazBrowse Home | New Git URL