web/modules
by Michael Mraka
web/modules/dobby/Dobby/Reporting.pm | 42 +++++++++++++++--------------------
1 file changed, 19 insertions(+), 23 deletions(-)
New commits:
commit 943f56f1d333cc51159cc1803831da82c13a741d
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Dec 21 14:23:17 2010 +0100
664487 - fixed space report query
diff --git a/web/modules/dobby/Dobby/Reporting.pm b/web/modules/dobby/Dobby/Reporting.pm
index 4cc974a..331e951 100644
--- a/web/modules/dobby/Dobby/Reporting.pm
+++ b/web/modules/dobby/Dobby/Reporting.pm
@@ -25,33 +25,29 @@ sub tablespace_overview {
my $dbh = $dobby->sysdba_connect;
my $query = <<EOQ;
-SELECT DT.tablespace_name NAME, DT.extent_management, DT.contents,
- DFS.bytes FREE_BYTES,
- DUS.bytes USED_BYTES,
- nvl(DTS.bytes,0) TOTAL_BYTES
- FROM (SELECT tablespace_name,
- SUM(bytes) bytes
- FROM dba_free_space
- GROUP BY tablespace_name) DFS,
- (SELECT u.tablespace,
- sum(u.blocks* p.value) bytes
- FROM v\$tempseg_usage u,
- v\$parameter p
- WHERE p.name = 'db_block_size'
- GROUP BY u.tablespace) DUS,
- (SELECT tablespace_name,
- SUM(bytes) bytes
+SELECT DT.tablespace_name as NAME, DT.extent_management, DT.contents,
+ case DT.contents when 'TEMPORARY' then DF.total_bytes-NVL(DTF.used_bytes,0) else NVL(DFS.free_bytes,0) end as free_bytes,
+ case DT.contents when 'TEMPORARY' then NVL(DTF.used_bytes,0) else DF.total_bytes-NVL(DFS.free_bytes,0) end as used_bytes,
+ DF.total_bytes
+ FROM dba_tablespaces DT
+ JOIN (SELECT tablespace_name, sum(bytes) as total_bytes
FROM dba_data_files
GROUP BY tablespace_name
UNION
- SELECT tablespace_name,
- SUM(bytes) bytes
+ SELECT tablespace_name, SUM(bytes) as total_bytes
FROM dba_temp_files
- GROUP BY tablespace_name) DTS,
- DBA_TABLESPACES DT
- WHERE DFS.tablespace_name (+) = DTS.tablespace_name
- AND DTS.tablespace_name = DT.tablespace_name
- AND DUS.tablespace (+) = DTS.tablespace_name
+ GROUP BY tablespace_name) DF
+ on DT.tablespace_name = DF.tablespace_name
+ LEFT JOIN (SELECT tablespace_name, SUM(bytes) as free_bytes
+ FROM dba_free_space
+ GROUP BY tablespace_name) DFS
+ on DT.tablespace_name = DFS.tablespace_name
+ LEFT JOIN (SELECT u.tablespace, sum(u.blocks* p.value) as used_bytes
+ FROM v\$tempseg_usage u,
+ v\$parameter p
+ WHERE p.name = 'db_block_size'
+ GROUP BY u.tablespace) DTF
+ on DT.tablespace_name = DTF.tablespace
ORDER BY DT.tablespace_name
EOQ
13 years, 4 months
rel-eng/comps
by Tomas Lestach
rel-eng/comps/comps-spacewalk-server-fedora13.xml | 1 +
1 file changed, 1 insertion(+)
New commits:
commit 71984c6a0b6a523c7c7d37a4fb1f6338bb70625b
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Dec 21 14:03:15 2010 +0100
putting back temporary rhnlib for fedora13 comps
until the correct rhnlib lands into offical fedora13 repo
diff --git a/rel-eng/comps/comps-spacewalk-server-fedora13.xml b/rel-eng/comps/comps-spacewalk-server-fedora13.xml
index d9a8b9c..7c678a4 100644
--- a/rel-eng/comps/comps-spacewalk-server-fedora13.xml
+++ b/rel-eng/comps/comps-spacewalk-server-fedora13.xml
@@ -60,6 +60,7 @@
<packagereq type="default">quartz</packagereq>
<packagereq type="default">quartz-oracle</packagereq>
<packagereq type="default">redstone-xmlrpc</packagereq>
+ <packagereq type="default">rhnlib</packagereq>
<packagereq type="default">rhnpush</packagereq>
<packagereq type="default">SatConfig-bootstrap</packagereq>
<packagereq type="default">SatConfig-bootstrap-server</packagereq>
13 years, 4 months
rel-eng/comps
by Tomas Lestach
rel-eng/comps/comps-spacewalk-server-fedora13.xml | 1 -
rel-eng/comps/comps-spacewalk-server-fedora14.xml | 1 -
rel-eng/comps/comps-spacewalk-server-rhel5.xml | 1 -
rel-eng/comps/comps-spacewalk-server-rhel6.xml | 1 -
4 files changed, 4 deletions(-)
New commits:
commit a943177d3ac693dbeacdf3748316dc14ad209f8a
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Dec 21 10:01:46 2010 +0100
removing rhnlib from server comps
diff --git a/rel-eng/comps/comps-spacewalk-server-fedora13.xml b/rel-eng/comps/comps-spacewalk-server-fedora13.xml
index 7c678a4..d9a8b9c 100644
--- a/rel-eng/comps/comps-spacewalk-server-fedora13.xml
+++ b/rel-eng/comps/comps-spacewalk-server-fedora13.xml
@@ -60,7 +60,6 @@
<packagereq type="default">quartz</packagereq>
<packagereq type="default">quartz-oracle</packagereq>
<packagereq type="default">redstone-xmlrpc</packagereq>
- <packagereq type="default">rhnlib</packagereq>
<packagereq type="default">rhnpush</packagereq>
<packagereq type="default">SatConfig-bootstrap</packagereq>
<packagereq type="default">SatConfig-bootstrap-server</packagereq>
diff --git a/rel-eng/comps/comps-spacewalk-server-fedora14.xml b/rel-eng/comps/comps-spacewalk-server-fedora14.xml
index 1989d2a..13938d8 100644
--- a/rel-eng/comps/comps-spacewalk-server-fedora14.xml
+++ b/rel-eng/comps/comps-spacewalk-server-fedora14.xml
@@ -61,7 +61,6 @@
<packagereq type="default">quartz</packagereq>
<packagereq type="default">quartz-oracle</packagereq>
<packagereq type="default">redstone-xmlrpc</packagereq>
- <packagereq type="default">rhnlib</packagereq>
<packagereq type="default">rhnpush</packagereq>
<packagereq type="default">SatConfig-bootstrap</packagereq>
<packagereq type="default">SatConfig-bootstrap-server</packagereq>
diff --git a/rel-eng/comps/comps-spacewalk-server-rhel5.xml b/rel-eng/comps/comps-spacewalk-server-rhel5.xml
index cfdfbcc..bd29281 100644
--- a/rel-eng/comps/comps-spacewalk-server-rhel5.xml
+++ b/rel-eng/comps/comps-spacewalk-server-rhel5.xml
@@ -114,7 +114,6 @@
<packagereq type="default">quartz-oracle</packagereq>
<packagereq type="default">redstone-xmlrpc</packagereq>
<packagereq type="default">relaxngDatatype</packagereq>
- <packagereq type="default">rhnlib</packagereq>
<packagereq type="default">rhnpush</packagereq>
<packagereq type="default">SatConfig-bootstrap</packagereq>
<packagereq type="default">SatConfig-bootstrap-server</packagereq>
diff --git a/rel-eng/comps/comps-spacewalk-server-rhel6.xml b/rel-eng/comps/comps-spacewalk-server-rhel6.xml
index 5faa318..fa9ed4c 100644
--- a/rel-eng/comps/comps-spacewalk-server-rhel6.xml
+++ b/rel-eng/comps/comps-spacewalk-server-rhel6.xml
@@ -103,7 +103,6 @@
<packagereq type="default">quartz-oracle</packagereq>
<packagereq type="default">redstone-xmlrpc</packagereq>
<packagereq type="default">relaxngDatatype</packagereq>
- <packagereq type="default">rhnlib</packagereq>
<packagereq type="default">rhnpush</packagereq>
<packagereq type="default">SatConfig-bootstrap</packagereq>
<packagereq type="default">SatConfig-bootstrap-server</packagereq>
13 years, 4 months
Changes to 'refs/tags/spacewalk-backend-1.3.31-1'
by Jan Pazdziora
Tag 'spacewalk-backend-1.3.31-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2010-12-21 07:46 +0000
Tagging package [spacewalk-backend] version [1.3.31-1] in directory [backend/].
Changes since spacewalk-java-1.3.30-1:
Jan Pazdziora (2):
Need to remove gentree from Makefile as well.
Automatic commit of package [spacewalk-backend] release [1.3.31-1].
---
backend/satellite_tools/Makefile | 2 +-
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
---
13 years, 4 months
backend/spacewalk-backend.spec rel-eng/packages
by Jan Pazdziora
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 1f9a7a40e829dd2ab7eac0c20d4042fe2237294d
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 21 08:46:48 2010 +0100
Automatic commit of package [spacewalk-backend] release [1.3.31-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 6bb2c89..53aae72 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -11,7 +11,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2 and Python
-Version: 1.3.30
+Version: 1.3.31
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -684,6 +684,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Tue Dec 21 2010 Jan Pazdziora 1.3.31-1
+- Need to remove gentree from Makefile as well.
+
* Mon Dec 20 2010 Michael Mraka <michael.mraka(a)redhat.com> 1.3.30-1
- removed obsoleted ISO generator code
- 653163 - sort child channels
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index ae5ec1e..d08b24e 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.3.30-1 backend/
+1.3.31-1 backend/
13 years, 4 months
backend/satellite_tools
by Jan Pazdziora
backend/satellite_tools/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit c4d5f6aca7d48f8a940cb398ba2e677cfa062508
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 21 08:40:30 2010 +0100
Need to remove gentree from Makefile as well.
Amending e0ef70a77eef26feef86e1fe06d40406895e6909.
diff --git a/backend/satellite_tools/Makefile b/backend/satellite_tools/Makefile
index 7953e0a..8825ed7 100644
--- a/backend/satellite_tools/Makefile
+++ b/backend/satellite_tools/Makefile
@@ -13,7 +13,7 @@ SPACEWALK_FILES = __init__ connection constants diskImportLib messages \
syncLib SequenceServer xmlDiskSource \
xmlSource xmlWireSource rhn_satellite_activate rhn_ssl_dbstore \
satComputePkgHeaders updatePackages reposync \
- geniso gentree
+ geniso
SCRIPTS = satellite-sync spacewalk-debug rhn-entitlement-report \
rhn-schema-version rhn-satellite-activate rhn-charsets \
13 years, 4 months
Changes to 'refs/tags/spacewalk-java-1.3.30-1'
by Tomas Lestach
Tag 'spacewalk-java-1.3.30-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2010-12-20 19:00 +0000
Tagging package [spacewalk-java] version [1.3.30-1] in directory [java/].
Changes since spacewalk-java-1.3.29-1:
Tomas Lestach (3):
662981 - fix ISE, when adding virt entitlement and current org has no access to the VT channel
662981 - change warnings to errors, if required channels not found when adding virt entitlement
Automatic commit of package [spacewalk-java] release [1.3.30-1].
---
java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java | 10 +++++++++-
java/code/src/com/redhat/rhn/manager/system/SystemManager.java | 8 ++++----
java/spacewalk-java.spec | 8 +++++++-
rel-eng/packages/spacewalk-java | 2 +-
4 files changed, 21 insertions(+), 7 deletions(-)
---
13 years, 4 months
3 commits - java/code java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java | 10 +++++++++-
java/code/src/com/redhat/rhn/manager/system/SystemManager.java | 8 ++++----
java/spacewalk-java.spec | 8 +++++++-
rel-eng/packages/spacewalk-java | 2 +-
4 files changed, 21 insertions(+), 7 deletions(-)
New commits:
commit 1a3f7dc2e7e39c2820b4bd17cf65055f81bd8076
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Dec 20 20:00:50 2010 +0100
Automatic commit of package [spacewalk-java] release [1.3.30-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 3bfc66b..808b0e3 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -17,7 +17,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.3.29
+Version: 1.3.30
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -456,6 +456,12 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Mon Dec 20 2010 Tomas Lestach <tlestach(a)redhat.com> 1.3.30-1
+- 662981 - change warnings to errors, if required channels not found when
+ adding virt entitlement (tlestach(a)redhat.com)
+- 662981 - fix ISE, when adding virt entitlement and current org has no access
+ to the VT channel (tlestach(a)redhat.com)
+
* Mon Dec 20 2010 Tomas Lestach <tlestach(a)redhat.com> 1.3.29-1
- 640958 - do not zero (non)flex entitlements, when updating the others
(tlestach(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index f857e62..a2a5582 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.3.29-1 java/
+1.3.30-1 java/
commit f19676151d0e83a64016a68d3c8a903f74b4af29
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Dec 20 19:31:39 2010 +0100
662981 - change warnings to errors, if required channels not found when adding virt entitlement
diff --git a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
index cce17e3..bca2708 100644
--- a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
+++ b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
@@ -1607,10 +1607,10 @@ public class SystemManager extends BaseManager {
user, server, ChannelManager.RHN_VIRT_HOST_PACKAGE_NAME);
// If this is a Satellite and no RHN Tools channel is available
- // report the error, but continue:
+ // report the error
if (!ConfigDefaults.get().isSpacewalk() && toolsChannel == null) {
log.warn("no tools channel found");
- result.addWarning(new ValidatorWarning("system.entitle.notoolschannel"));
+ result.addError(new ValidatorError("system.entitle.notoolschannel"));
}
// If Spacewalk and no channel has the rhn-virtualization-host package,
// warn but allow the operation to proceed.
@@ -1630,7 +1630,7 @@ public class SystemManager extends BaseManager {
user, server, nameId, evrId, archId);
}
else {
- result.addWarning(new ValidatorWarning("system.entitle.novirtpackage",
+ result.addError(new ValidatorError("system.entitle.novirtpackage",
ChannelManager.RHN_VIRT_HOST_PACKAGE_NAME));
}
}
@@ -1669,7 +1669,7 @@ public class SystemManager extends BaseManager {
// If we couldn't find a virt channel, warn the user but continue:
if (virtChannel == null) {
log.warn("no virt channel");
- result.addWarning(new ValidatorWarning(
+ result.addError(new ValidatorError(
"system.entitle.novirtchannel"));
}
}
commit 6c5131ed37eb39085c5a11c688f9620c0789ea97
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Dec 20 19:31:07 2010 +0100
662981 - fix ISE, when adding virt entitlement and current org has no access to the VT channel
diff --git a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java
index d5aa671..6009aab 100644
--- a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java
+++ b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java
@@ -1528,7 +1528,15 @@ public class ChannelManager extends BaseManager {
return null;
}
- Channel channel = ChannelManager.lookupByIdAndUser(cid, user);
+ Channel channel = null;
+ try {
+ channel = ChannelManager.lookupByIdAndUser(cid, user);
+ }
+ catch (LookupException e) {
+ log.warn("User " + user.getLogin() + " does not have access to channel " +
+ cid + ".");
+ }
+
boolean canSubscribe = false;
// check to make sure we *can* sub to this channel
13 years, 4 months
Changes to 'refs/tags/spacewalk-java-1.3.29-1'
by Tomas Lestach
Tag 'spacewalk-java-1.3.29-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2010-12-20 16:43 +0000
Tagging package [spacewalk-java] version [1.3.29-1] in directory [java/].
Changes since rhn-virtualization-5.4.18-1:
Tomas Lestach (2):
640958 - do not zero (non)flex entitlements, when updating the others
Automatic commit of package [spacewalk-java] release [1.3.29-1].
---
java/code/src/com/redhat/rhn/frontend/xmlrpc/org/OrgHandler.java | 4 -
java/code/src/com/redhat/rhn/manager/org/UpdateOrgSoftwareEntitlementsCommand.java | 34 ++++++----
java/spacewalk-java.spec | 6 +
rel-eng/packages/spacewalk-java | 2
4 files changed, 30 insertions(+), 16 deletions(-)
---
13 years, 4 months
2 commits - java/code java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/xmlrpc/org/OrgHandler.java | 4 -
java/code/src/com/redhat/rhn/manager/org/UpdateOrgSoftwareEntitlementsCommand.java | 34 ++++++----
java/spacewalk-java.spec | 6 +
rel-eng/packages/spacewalk-java | 2
4 files changed, 30 insertions(+), 16 deletions(-)
New commits:
commit 6dd72a3a708cb0db2248dcdee01cdd41915142ca
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Dec 20 17:43:30 2010 +0100
Automatic commit of package [spacewalk-java] release [1.3.29-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index cf43c9c..3bfc66b 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -17,7 +17,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.3.28
+Version: 1.3.29
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -456,6 +456,10 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Mon Dec 20 2010 Tomas Lestach <tlestach(a)redhat.com> 1.3.29-1
+- 640958 - do not zero (non)flex entitlements, when updating the others
+ (tlestach(a)redhat.com)
+
* Thu Dec 16 2010 Aron Parsons <aparsons(a)redhat.com> 1.3.28-1
- fix testSystemSearch JUnit test (aparsons(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 61817c3..f857e62 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.3.28-1 java/
+1.3.29-1 java/
commit 2be74a7cde69e82702480e1ed18f34402d4250c8
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Dec 20 14:05:34 2010 +0100
640958 - do not zero (non)flex entitlements, when updating the others
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/org/OrgHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/org/OrgHandler.java
index 2f9c6c7..16f42fe 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/org/OrgHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/org/OrgHandler.java
@@ -513,7 +513,7 @@ public class OrgHandler extends BaseHandler {
UpdateOrgSoftwareEntitlementsCommand cmd =
new UpdateOrgSoftwareEntitlementsCommand(channelFamilyLabel, org,
- Long.valueOf(allocation), 0L);
+ Long.valueOf(allocation), null);
ValidatorError ve = cmd.store();
if (ve != null) {
throw new ValidationException(ve.getMessage());
@@ -555,7 +555,7 @@ public class OrgHandler extends BaseHandler {
UpdateOrgSoftwareEntitlementsCommand cmd =
new UpdateOrgSoftwareEntitlementsCommand(channelFamilyLabel, org,
- 0L, Long.valueOf(allocation));
+ null, Long.valueOf(allocation));
ValidatorError ve = cmd.store();
if (ve != null) {
throw new ValidationException(ve.getMessage());
diff --git a/java/code/src/com/redhat/rhn/manager/org/UpdateOrgSoftwareEntitlementsCommand.java b/java/code/src/com/redhat/rhn/manager/org/UpdateOrgSoftwareEntitlementsCommand.java
index 30d3b42..27f2a21 100644
--- a/java/code/src/com/redhat/rhn/manager/org/UpdateOrgSoftwareEntitlementsCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/org/UpdateOrgSoftwareEntitlementsCommand.java
@@ -59,14 +59,25 @@ public class UpdateOrgSoftwareEntitlementsCommand {
throw new IllegalArgumentException("Cant update the default org");
}
this.org = orgIn;
- this.newTotal = newTotalIn;
- this.newFlexTotal = newFlexTotalIn;
this.channelFamily = ChannelFamilyFactory.lookupByLabel(channelFamilyLabel,
OrgFactory.getSatelliteOrg());
if (this.channelFamily == null) {
throw new IllegalArgumentException("ChannelFamily not found: [" +
channelFamilyLabel + "]");
}
+ // if set to null, keep currently used value
+ if (newTotalIn == null) {
+ this.newTotal = this.channelFamily.getMaxMembers(org);
+ }
+ else {
+ this.newTotal = newTotalIn;
+ }
+ if (newFlexTotalIn == null) {
+ this.newFlexTotal = this.channelFamily.getMaxFlex(org);
+ }
+ else {
+ this.newFlexTotal = newFlexTotalIn;
+ }
}
/**
@@ -122,14 +133,13 @@ public class UpdateOrgSoftwareEntitlementsCommand {
private ValidatorError store(Long satMax, Long orgMax,
Long satCurrent, Long orgCurrent,
Long proposed, boolean isFlex) {
- // No sense making the call if its the same.
- if (orgMax == proposed) {
- return null;
- }
-
if (orgMax == null) {
orgMax = 0L;
}
+ // No sense making the call if its the same.
+ if (proposed.compareTo(orgMax) == 0) {
+ return null;
+ }
Long avail = 0L;
if (satMax != null) {
@@ -156,18 +166,18 @@ public class UpdateOrgSoftwareEntitlementsCommand {
Long toOrgId;
Long fromOrgId;
- long actualTotal;
+ long actualDiff;
// If we are decreasing the # of entitlements
// we give back to the default org.
if (orgMax.longValue() > proposed) {
fromOrgId = this.org.getId();
toOrgId = OrgFactory.getSatelliteOrg().getId();
- actualTotal = orgMax.longValue() - proposed;
+ actualDiff = orgMax.longValue() - proposed;
}
else {
toOrgId = this.org.getId();
fromOrgId = OrgFactory.getSatelliteOrg().getId();
- actualTotal = proposed - orgMax.longValue();
+ actualDiff = proposed - orgMax.longValue();
}
Map in = new HashMap();
@@ -177,11 +187,11 @@ public class UpdateOrgSoftwareEntitlementsCommand {
in.put("to_org_id", toOrgId);
if (isFlex) {
in.put("quantity", 0);
- in.put("flex_quantity", actualTotal);
+ in.put("flex_quantity", actualDiff);
}
else {
- in.put("quantity", actualTotal);
+ in.put("quantity", actualDiff);
in.put("flex_quantity", 0);
}
13 years, 4 months