January 2012 - spacewalk-commits - Fedora Mailing-Lists

2 commits - rel-eng/packages web/modules web/spacewalk-web.spec

by Michael Mraka

rel-eng/packages/spacewalk-web | 2 +- web/modules/rhn/RHN/DB/ChannelEditor.pm | 4 ++-- web/spacewalk-web.spec | 5 ++++- 3 files changed, 7 insertions(+), 4 deletions(-) New commits: commit 5f264bf006bcb221e718dd259a892015fd536221 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Mon Jan 2 16:56:49 2012 +0100 Automatic commit of package [spacewalk-web] release [1.7.3-1]. diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web index b735add..ab7cf6d 100644 --- a/rel-eng/packages/spacewalk-web +++ b/rel-eng/packages/spacewalk-web @@ -1 +1 @@ -1.7.2-1 web/ +1.7.3-1 web/ diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec index 9d043df..ce51c5a 100644 --- a/web/spacewalk-web.spec +++ b/web/spacewalk-web.spec @@ -2,7 +2,7 @@ Name: spacewalk-web Summary: Spacewalk Web site - Perl modules Group: Applications/Internet License: GPLv2 -Version: 1.7.2 +Version: 1.7.3 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk/ Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -254,6 +254,9 @@ rm -rf $RPM_BUILD_ROOT # $Id$ %changelog +* Mon Jan 02 2012 Michael Mraka <michael.mraka(a)redhat.com> 1.7.3-1 +- fixed merging channels + * Mon Jan 02 2012 Tomas Lestach <tlestach(a)redhat.com> 1.7.2-1 - 771214 - add missing widget require (tlestach(a)redhat.com) commit fa20dc38a2b94b53378ef5d26cab9eb182f2f0ac Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Mon Jan 2 16:48:18 2012 +0100 fixed merging channels fixing RHN::Exception: DBD::Pg::st execute failed: ERROR: missing FROM-clause entry for table "rhn_repo_regen_queue_id_seq" at character 141 RHN::Exception: DBD::Pg::st execute failed: ERROR: column "sysdate" does not exist at character 252 diff --git a/web/modules/rhn/RHN/DB/ChannelEditor.pm b/web/modules/rhn/RHN/DB/ChannelEditor.pm index a643dee..1d2d7e9 100644 --- a/web/modules/rhn/RHN/DB/ChannelEditor.pm +++ b/web/modules/rhn/RHN/DB/ChannelEditor.pm @@ -213,8 +213,8 @@ EOQ INSERT INTO rhnRepoRegenQueue (id, channel_label, client, reason, force, bypass_filters, next_action, created, modified) -VALUES (rhn_repo_regen_queue_id_seq.nextval, - :label, 'perl-web::add_channel_packages', NULL, 'N', 'N', sysdate, sysdate, sysdate) +VALUES (sequence_nextval('rhn_repo_regen_queue_id_seq'), + :label, 'perl-web::add_channel_packages', NULL, 'N', 'N', current_timestamp, current_timestamp, current_timestamp) EOQ my $channel = RHN::Channel->lookup(-id => $cid);

12 years, 4 months

1
0
0 / 0

schema/spacewalk

by Jan Pazdziora

schema/spacewalk/spacewalk-sql | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 873e6ec5099c35421667b455b1064640f5a2ea35 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Mon Jan 2 16:47:53 2012 +0100 Prevent output from being printed out for the second time to STDERR upon error, for direct mode. diff --git a/schema/spacewalk/spacewalk-sql b/schema/spacewalk/spacewalk-sql index 6fb315d..6f37bdb 100755 --- a/schema/spacewalk/spacewalk-sql +++ b/schema/spacewalk/spacewalk-sql @@ -107,8 +107,9 @@ my @out; while (<$rfh>) { if ($select_direct) { print; + } else { + push @out, $_; } - push @out, $_; } close $rfh; waitpid $pid, 0;

12 years, 4 months

1
0
0 / 0

Changes to 'refs/tags/spacewalk-schema-1.7.1-1'

by Jan Pazdziora

Tag 'spacewalk-schema-1.7.1-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-01-02 15:43 +0000 Tagging package [spacewalk-schema] version [1.7.1-1] in directory [schema/spacewalk/]. Changes since spacewalk-web-1.7.2-1: Jan Pazdziora (2): The rhn_entitlements.set_group_count is always called with type S in our code, removing the user group calls. Automatic commit of package [spacewalk-schema] release [1.7.1-1]. Miroslav Suchý (4): 705363 - add spacewalk-web to list of packages to automaticaly import to Fedora warn about spacewalk-backend-sql-oracle during import into Fedora use fedpkg tag instead of git tag $BASENAME do not tag spacewalk-backend package --- rel-eng/packages/spacewalk-schema | 2 rel-eng/push-packages-to-fedora.sh | 13 schema/spacewalk/oracle/packages/rhn_entitlements.pkb | 167 schema/spacewalk/oracle/packages/rhn_entitlements.pks | 10 schema/spacewalk/postgres/packages/rhn_entitlements.pkb | 103 schema/spacewalk/postgres/packages/rhn_entitlements.pks | 17 schema/spacewalk/spacewalk-schema.spec | 6 schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/001-rhn_entitlements.pks.sql.oracle | 160 schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/001-rhn_entitlements.pks.sql.postgresql | 15 schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/002-rhn_entitlements.pkb.sql.oracle | 1799 ++++++++++ schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/002-rhn_entitlements.pkb.sql.postgresql | 292 + 11 files changed, 2360 insertions(+), 224 deletions(-) ---

12 years, 4 months

1
0
0 / 0

rel-eng/packages schema/spacewalk

by Jan Pazdziora

rel-eng/packages/spacewalk-schema | 2 +- schema/spacewalk/spacewalk-schema.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) New commits: commit 42d996296b1ab03c4aab8a16a0c724d8c52f3295 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Mon Jan 2 16:43:53 2012 +0100 Automatic commit of package [spacewalk-schema] release [1.7.1-1]. diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema index 2ffb846..63376ed 100644 --- a/rel-eng/packages/spacewalk-schema +++ b/rel-eng/packages/spacewalk-schema @@ -1 +1 @@ -1.6.42-1 schema/spacewalk/ +1.7.1-1 schema/spacewalk/ diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec index 972cdc3..bec571a 100644 --- a/schema/spacewalk/spacewalk-schema.spec +++ b/schema/spacewalk/spacewalk-schema.spec @@ -2,7 +2,7 @@ Name: spacewalk-schema Group: Applications/Internet Summary: Oracle SQL schema for Spacewalk server -Version: 1.7.0 +Version: 1.7.1 Release: 1%{?dist} Source0: %{name}-%{version}.tar.gz @@ -66,6 +66,10 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/spacewalk-sql* %changelog +* Mon Jan 02 2012 Jan Pazdziora 1.7.1-1 +- The rhn_entitlements.set_group_count is always called with type S in our + code, removing the user group calls. + * Thu Dec 22 2011 Jan Pazdziora 1.6.42-1 - Fix typo in source file name, add oracle equivalent source sha1.

12 years, 4 months

1
0
0 / 0

schema/spacewalk

by Jan Pazdziora

schema/spacewalk/oracle/packages/rhn_entitlements.pkb | 167 schema/spacewalk/oracle/packages/rhn_entitlements.pks | 10 schema/spacewalk/postgres/packages/rhn_entitlements.pkb | 103 schema/spacewalk/postgres/packages/rhn_entitlements.pks | 17 schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/001-rhn_entitlements.pks.sql.oracle | 160 schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/001-rhn_entitlements.pks.sql.postgresql | 15 schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/002-rhn_entitlements.pkb.sql.oracle | 1799 ++++++++++ schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/002-rhn_entitlements.pkb.sql.postgresql | 292 + 8 files changed, 2345 insertions(+), 218 deletions(-) New commits: commit 006fbe78ce378cbaada60b88630f81b91007a18d Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Mon Jan 2 13:15:46 2012 +0100 The rhn_entitlements.set_group_count is always called with type S in our code, removing the user group calls. diff --git a/schema/spacewalk/oracle/packages/rhn_entitlements.pkb b/schema/spacewalk/oracle/packages/rhn_entitlements.pkb index a187b7f..c64a310 100644 --- a/schema/spacewalk/oracle/packages/rhn_entitlements.pkb +++ b/schema/spacewalk/oracle/packages/rhn_entitlements.pkb @@ -987,39 +987,13 @@ is -- PROCEDURE: prune_group -- Unsubscribes servers consuming physical slots that over the org's -- limit. - -- Called by: set_group_count, repoll_virt_guest_entitlements + -- Called by: set_server_group_count, repoll_virt_guest_entitlements -- ******************************************************************* procedure prune_group ( group_id_in in number, - type_in in char, quantity_in in number, update_family_countsYN in number := 1 ) is - cursor usergroups is - select user_id, user_group_id, ugt.label - from rhnUserGroupType ugt, - rhnUserGroup ug, - rhnUserGroupMembers ugm - where 1=1 - and ugm.user_group_id = group_id_in - and ugm.user_id in ( - select user_id - from ( - select rownum row_number, - user_id, - time - from ( - select user_id, - modified time - from rhnUserGroupMembers - where user_group_id = group_id_in - order by time asc - ) - ) - where row_number > quantity_in - ) - and ugm.user_group_id = ug.id - and ug.group_type = ugt.id; cursor servergroups is select server_id, server_group_id, sgt.id as group_type_id, sgt.label from rhnServerGroupType sgt, @@ -1049,21 +1023,12 @@ is and sg.group_type = sgt.id; type_is_base char; begin - if type_in = 'U' then - update rhnUserGroup - set max_members = quantity_in - where id = group_id_in; - - for ug in usergroups loop - rhn_user.remove_from_usergroup(ug.user_id, ug.user_group_id); - end loop; - elsif type_in = 'S' then - update rhnServerGroup - set max_members = quantity_in - where id = group_id_in; + update rhnServerGroup + set max_members = quantity_in + where id = group_id_in; - for sg in servergroups loop - remove_server_entitlement(sg.server_id, sg.label); + for sg in servergroups loop + remove_server_entitlement(sg.server_id, sg.label); select is_base into type_is_base @@ -1077,10 +1042,49 @@ is update_family_countsYN => update_family_countsYN); end if; - end loop; - end if; + end loop; end prune_group; + procedure set_server_group_count ( + customer_id_in in number, + group_type_in in number, + quantity_in in number, + update_family_countsYN in number := 1 + ) is + group_id number; + quantity number; + begin + quantity := quantity_in; + if quantity is not null and quantity < 0 then + quantity := 0; + end if; + + select rsg.id + into group_id + from rhnServerGroup rsg + where 1=1 + and rsg.org_id = customer_id_in + and rsg.group_type = group_type_in; + + rhn_entitlements.prune_group( + group_id, + quantity, + update_family_countsYN + ); + exception + when no_data_found then + insert into rhnServerGroup ( + id, name, description, max_members, current_members, + group_type, org_id, created, modified + ) ( + select rhn_server_group_id_seq.nextval, name, name, + quantity, 0, id, customer_id_in, + sysdate, sysdate + from rhnServerGroupType + where id = group_type_in + ); + end set_server_group_count; + -- ******************************************************************* -- PROCEDURE: assign_system_entitlement -- @@ -1088,7 +1092,7 @@ is -- Can raise not_enough_entitlements_in_base_org if from_org_id_in -- does not have enough entitlements to cover the move. -- Takes care of unentitling systems if necessary by calling - -- set_group_count + -- set_server_group_count -- ******************************************************************* procedure assign_system_entitlement( group_label_in in varchar2, @@ -1154,13 +1158,11 @@ is end if; - rhn_entitlements.set_group_count(from_org_id_in, - 'S', + set_server_group_count(from_org_id_in, group_type, new_ent_count); - rhn_entitlements.set_group_count(to_org_id_in, - 'S', + set_server_group_count(to_org_id_in, group_type, new_quantity); @@ -1322,7 +1324,7 @@ is -- -- Sets the values in rhnServerGroup for a given rhnServerGroupType. -- - -- Calls: set_group_count to update, prune, or create the group. + -- Calls: set_server_group_count to update, prune, or create the group. -- Called by: the code that activates a satellite cert. -- -- Raises not_enough_entitlements_in_base_org if all entitlements @@ -1375,8 +1377,7 @@ is else -- don't update family counts after every server -- will do bulk update afterwards - rhn_entitlements.set_group_count(org_id_in, - 'S', + set_server_group_count(org_id_in, group_type, quantity_in, update_family_countsYN => 0); @@ -1546,70 +1547,6 @@ is end activate_channel_entitlement; - procedure set_group_count ( - customer_id_in in number, - type_in in char, - group_type_in in number, - quantity_in in number, - update_family_countsYN in number := 1 - ) is - group_id number; - quantity number; - begin - quantity := quantity_in; - if quantity is not null and quantity < 0 then - quantity := 0; - end if; - - if type_in = 'U' then - select rug.id - into group_id - from rhnUserGroup rug - where 1=1 - and rug.org_id = customer_id_in - and rug.group_type = group_type_in; - elsif type_in = 'S' then - select rsg.id - into group_id - from rhnServerGroup rsg - where 1=1 - and rsg.org_id = customer_id_in - and rsg.group_type = group_type_in; - end if; - - rhn_entitlements.prune_group( - group_id, - type_in, - quantity, - update_family_countsYN - ); - exception - when no_data_found then - if type_in = 'U' then - insert into rhnUserGroup ( - id, name, description, max_members, current_members, - group_type, org_id, created, modified - ) ( - select rhn_user_group_id_seq.nextval, name, name, - quantity, 0, id, customer_id_in, - sysdate, sysdate - from rhnUserGroupType - where id = group_type_in - ); - elsif type_in = 'S' then - insert into rhnServerGroup ( - id, name, description, max_members, current_members, - group_type, org_id, created, modified - ) ( - select rhn_server_group_id_seq.nextval, name, name, - quantity, 0, id, customer_id_in, - sysdate, sysdate - from rhnServerGroupType - where id = group_type_in - ); - end if; - end set_group_count; - -- ******************************************************************* -- PROCEDURE: prune_family -- Unsubscribes servers consuming physical slots from the channel family diff --git a/schema/spacewalk/oracle/packages/rhn_entitlements.pks b/schema/spacewalk/oracle/packages/rhn_entitlements.pks index 786a320..9ed6705 100644 --- a/schema/spacewalk/oracle/packages/rhn_entitlements.pks +++ b/schema/spacewalk/oracle/packages/rhn_entitlements.pks @@ -1,5 +1,5 @@ -- --- Copyright (c) 2008--2010 Red Hat, Inc. +-- Copyright (c) 2008--2011 Red Hat, Inc. -- -- This software is licensed to you under the GNU General Public License, -- version 2 (GPLv2). There is NO WARRANTY for this software, express or @@ -135,14 +135,6 @@ is flex_in in number ); - procedure set_group_count ( - customer_id_in in number, -- customer_id - type_in in char, -- 'U' or 'S' - group_type_in in number, -- rhn[User|Server]GroupType.id - quantity_in in number, -- quantity - update_family_countsYN in number := 1 -- call update_family_counts inside - ); - procedure set_family_count ( customer_id_in in number, -- customer_id channel_family_id_in in number, -- 246 diff --git a/schema/spacewalk/postgres/packages/rhn_entitlements.pkb b/schema/spacewalk/postgres/packages/rhn_entitlements.pkb index 10477a5..f004c46 100644 --- a/schema/spacewalk/postgres/packages/rhn_entitlements.pkb +++ b/schema/spacewalk/postgres/packages/rhn_entitlements.pkb @@ -1,4 +1,4 @@ --- oracle equivalent source sha1 8fcbc1336a4b7f715fb1304875a38ebd0ae53565 +-- oracle equivalent source sha1 c887b0b88c4d0f81b815333b074d93d32106350d -- -- Copyright (c) 2008--2011 Red Hat, Inc. -- @@ -997,45 +997,18 @@ language plpgsql; -- PROCEDURE: prune_group -- Unsubscribes servers consuming physical slots that over the org's -- limit. - -- Called by: set_group_count, repoll_virt_guest_entitlements + -- Called by: set_server_group_count, repoll_virt_guest_entitlements -- ******************************************************************* create or replace function prune_group ( group_id_in in numeric, - type_in in char, quantity_in in numeric, update_family_countsYN in numeric default 1 ) returns void as $$ declare - ugrecord record; sgrecord record; type_is_base char; begin - if type_in = 'U' then - update rhnUserGroup - set max_members = quantity_in - where id = group_id_in; - - for ugrecord in ( - select user_id, user_group_id, ugt.label - from rhnUserGroupType ugt, - rhnUserGroup ug, - rhnUserGroupMembers ugm - where 1=1 - and ugm.user_group_id = group_id_in - and ugm.user_id in ( - select user_id - from rhnUserGroupMembers - where user_group_id = group_id_in - order by modified asc - offset quantity_in - ) - and ugm.user_group_id = ug.id - and ug.group_type = ugt.id - ) loop - perform rhn_user.remove_from_usergroup(ugrecord.user_id, ugrecord.user_group_id); - end loop; - elsif type_in = 'S' then update rhnServerGroup set max_members = quantity_in where id = group_id_in; @@ -1073,7 +1046,6 @@ as $$ end if; end loop; - end if; end$$ language plpgsql; @@ -1084,7 +1056,7 @@ language plpgsql; -- Can raise not_enough_entitlements_in_base_org if from_org_id_in -- does not have enough entitlements to cover the move. -- Takes care of unentitling systems if necessary by calling - -- set_group_count + -- set_server_group_count -- ******************************************************************* create or replace function assign_system_entitlement( group_label_in in varchar, @@ -1148,13 +1120,11 @@ as $$ end if; - perform rhn_entitlements.set_group_count(from_org_id_in, - 'S', + perform rhn_entitlements.set_server_group_count(from_org_id_in, group_type, new_ent_count); - perform rhn_entitlements.set_group_count(to_org_id_in, - 'S', + perform rhn_entitlements.set_server_group_count(to_org_id_in, group_type, new_quantity); @@ -1316,7 +1286,7 @@ language plpgsql; -- -- Sets the values in rhnServerGroup for a given rhnServerGroupType. -- - -- Calls: set_group_count to update, prune, or create the group. + -- Calls: set_server_group_count to update, prune, or create the group. -- Called by: the code that activates a satellite cert. -- -- Raises not_enough_entitlements_in_base_org if all entitlements @@ -1369,8 +1339,7 @@ as $$ else -- don't update family counts after every server -- will do bulk update afterwards - perform rhn_entitlements.set_group_count(org_id_in, - 'S', + perform rhn_entitlements.set_server_group_count(org_id_in, group_type, quantity_in, 0); @@ -1531,9 +1500,8 @@ as $$ end$$ language plpgsql; - create or replace function set_group_count ( + create or replace function set_server_group_count ( customer_id_in in numeric, -- customer_id - type_in in char, -- 'U' or 'S' group_type_in in numeric, -- rhn[User|Server]GroupType.id quantity_in in numeric, -- quantity update_family_countsYN in numeric default 1 @@ -1549,21 +1517,12 @@ as $$ quantity := 0; end if; - if type_in = 'U' then - select rug.id - into group_id - from rhnUserGroup rug - where 1=1 - and rug.org_id = customer_id_in - and rug.group_type = group_type_in; - elsif type_in = 'S' then - select rsg.id - into group_id - from rhnServerGroup rsg - where 1=1 - and rsg.org_id = customer_id_in - and rsg.group_type = group_type_in; - end if; + select rsg.id + into group_id + from rhnServerGroup rsg + where 1=1 + and rsg.org_id = customer_id_in + and rsg.group_type = group_type_in; -- preserve the not found status across the rhn_entitlements.prune_group invocation wasfound := true; @@ -1573,35 +1532,21 @@ as $$ perform rhn_entitlements.prune_group( group_id, - type_in, quantity, update_family_countsYN ); if not wasfound then - if type_in = 'U' then - insert into rhnUserGroup ( - id, name, description, max_members, current_members, - group_type, org_id, created, modified - ) ( - select nextval('rhn_user_group_id_seq'), name, name, - quantity, 0, id, customer_id_in, - current_timestamp, current_timestamp - from rhnUserGroupType - where id = group_type_in - ); - elsif type_in = 'S' then - insert into rhnServerGroup ( - id, name, description, max_members, current_members, - group_type, org_id, created, modified - ) ( - select nextval('rhn_server_group_id_seq'), name, name, - quantity, 0, id, customer_id_in, - current_timestamp, current_timestamp - from rhnServerGroupType - where id = group_type_in - ); - end if; + insert into rhnServerGroup ( + id, name, description, max_members, current_members, + group_type, org_id, created, modified + ) ( + select nextval('rhn_server_group_id_seq'), name, name, + quantity, 0, id, customer_id_in, + current_timestamp, current_timestamp + from rhnServerGroupType + where id = group_type_in + ); end if; end$$ diff --git a/schema/spacewalk/postgres/packages/rhn_entitlements.pks b/schema/spacewalk/postgres/packages/rhn_entitlements.pks index 8b30904..1daa02e 100644 --- a/schema/spacewalk/postgres/packages/rhn_entitlements.pks +++ b/schema/spacewalk/postgres/packages/rhn_entitlements.pks @@ -1,6 +1,6 @@ --- oracle equivalent source sha1 b190abdd45d28c181dee9ef0a5f38c6e43bcf9ef +-- oracle equivalent source sha1 001ac49ee3db5da4e52b15d0297137448f05899c -- --- Copyright (c) 2008--2010 Red Hat, Inc. +-- Copyright (c) 2008--2011 Red Hat, Inc. -- -- This software is licensed to you under the GNU General Public License, -- version 2 (GPLv2). There is NO WARRANTY for this software, express or @@ -241,19 +241,6 @@ BEGIN END; $$ language plpgsql; - create or replace function set_group_count ( - customer_id_in in numeric, -- customer_id - type_in in char, -- 'U' or 'S' - group_type_in in numeric, -- rhn[User|Server]GroupType.id - quantity_in in numeric, -- quantity - update_family_countsYN in numeric default 1 -- call update_family_counts inside - ) returns void -as $$ -BEGIN - RAISE EXCEPTION 'Stub called, must be replaced by .pkb'; -END; -$$ language plpgsql; - create or replace function set_family_count ( customer_id_in in numeric, -- customer_id channel_family_id_in in numeric, -- 246 diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/001-rhn_entitlements.pks.sql.oracle b/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/001-rhn_entitlements.pks.sql.oracle new file mode 100644 index 0000000..9ed6705 --- /dev/null +++ b/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/001-rhn_entitlements.pks.sql.oracle @@ -0,0 +1,160 @@ +-- +-- Copyright (c) 2008--2011 Red Hat, Inc. +-- +-- This software is licensed to you under the GNU General Public License, +-- version 2 (GPLv2). There is NO WARRANTY for this software, express or +-- implied, including the implied warranties of MERCHANTABILITY or FITNESS +-- FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 +-- along with this software; if not, see +-- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. +-- +-- Red Hat trademarks are not licensed under GPLv2. No permission is +-- granted to use or replicate Red Hat trademarks that are incorporated +-- in this software or its documentation. +-- +-- +-- +-- + +create or replace +package rhn_entitlements +is + body_version varchar2(100) := ''; + + type ents_array is varray(10) of rhnServerGroupType.label%TYPE; + + procedure remove_org_entitlements ( + org_id_in number + ); + + function entitlement_grants_service ( + entitlement_in in varchar2, + service_level_in in varchar2 + ) return number; + + function lookup_entitlement_group ( + org_id_in in number, + type_label_in in varchar2 := 'sw_mgr_entitled' + ) return number; + + function create_entitlement_group ( + org_id_in in number, + type_label_in in varchar2 := 'sw_mgr_entitled' + ) return number; + + function can_entitle_server ( + server_id_in in number, + type_label_in in varchar2 + ) + return number; + + function can_switch_base ( + server_id_in in integer, + type_label_in in varchar2 + ) + return number; + + procedure entitle_server ( + server_id_in in number, + type_label_in in varchar2 := 'sw_mgr_entitled' + ); + + procedure remove_server_entitlement ( + server_id_in in number, + type_label_in in varchar2 := 'sw_mgr_entitled', + repoll_virt_guests in number := 1 + ); + + procedure unentitle_server ( + server_id_in in number + ); + + procedure repoll_virt_guest_entitlements( + server_id_in in number + ); + + function get_server_entitlement ( + server_id_in in number + ) return ents_array; + + procedure modify_org_service ( + org_id_in in number, + service_label_in in varchar2, + enable_in in char + ); + + procedure set_customer_enterprise ( + customer_id_in in number + ); + + procedure set_customer_provisioning ( + customer_id_in in number + ); + + procedure set_customer_nonlinux ( + customer_id_in in number + ); + + procedure unset_customer_enterprise ( + customer_id_in in number + ); + + procedure unset_customer_provisioning ( + customer_id_in in number + ); + + procedure unset_customer_nonlinux ( + customer_id_in in number + ); + + procedure assign_system_entitlement( + group_label_in in varchar2, + from_org_id_in in number, + to_org_id_in in number, + quantity_in in number + ); + + procedure assign_channel_entitlement( + channel_family_label_in in varchar2, + from_org_id_in in number, + to_org_id_in in number, + quantity_in in number, + flex_in in number + ); + + procedure activate_system_entitlement( + org_id_in in number, + group_label_in in varchar2, + quantity_in in number + ); + + procedure activate_channel_entitlement( + org_id_in in number, + channel_family_label_in in varchar2, + quantity_in in number, + flex_in in number + ); + + procedure set_family_count ( + customer_id_in in number, -- customer_id + channel_family_id_in in number, -- 246 + quantity_in in number, -- 3 + flex_in in number + ); + + -- this makes NO checks that the quantity is within max, + -- so we should NEVER run this unless we KNOW that we won't be + -- violating the max + procedure entitle_last_modified_servers ( + customer_id_in in number, -- customer_id + type_label_in in varchar2, -- 'enterprise_entitled' + quantity_in in number -- 3 + ); + + procedure subscribe_newest_servers ( + customer_id_in in number + ); +end rhn_entitlements; +/ +show errors + diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/001-rhn_entitlements.pks.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/001-rhn_entitlements.pks.sql.postgresql new file mode 100644 index 0000000..de5563d --- /dev/null +++ b/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/001-rhn_entitlements.pks.sql.postgresql @@ -0,0 +1,15 @@ +-- oracle equivalent source sha1 001ac49ee3db5da4e52b15d0297137448f05899c + +-- setup search_path so that these functions are created in appropriate schema. +update pg_settings set setting = 'rhn_entitlements,' || setting where name = 'search_path'; + + drop function set_group_count ( + customer_id_in in numeric, -- customer_id + type_in in char, -- 'U' or 'S' + group_type_in in numeric, -- rhn[User|Server]GroupType.id + quantity_in in numeric, -- quantity + update_family_countsYN in numeric default 1 -- call update_family_counts inside + ); + +-- restore the original setting +update pg_settings set setting = overlay( setting placing '' from 1 for (length('rhn_entitlements')+1) ) where name = 'search_path'; diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/002-rhn_entitlements.pkb.sql.oracle b/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/002-rhn_entitlements.pkb.sql.oracle new file mode 100644 index 0000000..c64a310 --- /dev/null +++ b/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/002-rhn_entitlements.pkb.sql.oracle @@ -0,0 +1,1799 @@ +-- +-- Copyright (c) 2008--2011 Red Hat, Inc. +-- +-- This software is licensed to you under the GNU General Public License, +-- version 2 (GPLv2). There is NO WARRANTY for this software, express or +-- implied, including the implied warranties of MERCHANTABILITY or FITNESS +-- FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 +-- along with this software; if not, see +-- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. +-- +-- Red Hat trademarks are not licensed under GPLv2. No permission is +-- granted to use or replicate Red Hat trademarks that are incorporated +-- in this software or its documentation. +-- +-- +-- +-- + +create or replace +package body rhn_entitlements +is + body_version varchar2(100) := ''; + + function find_compatible_sg ( + server_id_in in number, + type_label_in in varchar2 + ) return number is + + cursor servergroups is + select sg.id id + from rhnServerGroupType sgt, + rhnServerGroup sg, + rhnServer s, + rhnServerServerGroupArchCompat ssgac + where s.id = server_id_in + and s.org_id = sg.org_id + and sgt.label = type_label_in + and sg.group_type = sgt.id + and ssgac.server_group_type = sgt.id + and ssgac.server_arch_id = s.server_arch_id + and not exists ( + select 1 + from rhnServerGroupMembers sgm + where sgm.server_group_id = sg.id + and sgm.server_id = s.id); + + + begin + for servergroup in servergroups loop + return servergroup.id; + end loop; + + --no servergroup found + return null; + end find_compatible_sg; + + + -- ******************************************************************* + -- PROCEDURE: remove_org_entitlements + -- + -- Removes both system entitlements and channel subscriptions + -- that are currently assigned to an org and re-assigns to the + -- master org (org_id = 1). + -- + -- When we call this we expect everything to already be unentitled + -- which shoul be handled by delete_org. + -- + -- Called by: delete_org + -- ******************************************************************* + procedure remove_org_entitlements( + org_id_in in number + ) + is + + cursor system_ents is + select sg.id, sg.max_members, sg.group_type + from rhnServerGroup sg + where group_type is not null + and org_id = org_id_in; + + cursor channel_subs is + select pcf.channel_family_id, pcf.max_members + from rhnChannelFamily cf, + rhnPrivateChannelFamily pcf + where pcf.org_id = org_id_in + and pcf.channel_family_id = cf.id + and cf.org_id is null; + + begin + + for system_ent in system_ents loop + update rhnServerGroup + set max_members = max_members + system_ent.max_members + where org_id = 1 + and group_type = system_ent.group_type; + end loop; + + update rhnServerGroup + set max_members = 0 + where org_id = org_id_in; + + for channel_sub in channel_subs loop + update rhnPrivateChannelFamily + set max_members = max_members + channel_sub.max_members + where org_id = 1 + and channel_family_id = channel_sub.channel_family_id; + end loop; + + update rhnPrivateChannelFamily + set max_members = 0 + where org_id = org_id_in; + + end remove_org_entitlements; + + function entitlement_grants_service ( + entitlement_in in varchar2, + service_level_in in varchar2 + ) return number is + begin + if service_level_in = 'provisioning' then + if entitlement_in = 'provisioning_entitled' then + return 1; + else + return 0; + end if; + elsif service_level_in = 'management' then + if entitlement_in = 'enterprise_entitled' then + return 1; + else + return 0; + end if; + elsif service_level_in = 'monitoring' then + if entitlement_in = 'monitoring_entitled' then + return 1; + end if; + elsif service_level_in = 'updates' then + return 1; + else + return 0; + end if; + end entitlement_grants_service; + + function lookup_entitlement_group ( + org_id_in in number, + type_label_in in varchar2 := 'sw_mgr_entitled' + ) return number is + cursor server_groups is + select sg.id server_group_id + from rhnServerGroup sg, + rhnServerGroupType sgt + where sgt.label = type_label_in + and sgt.id = sg.group_type + and sg.org_id = org_id_in; + begin + for sg in server_groups loop + return sg.server_group_id; + end loop; + return rhn_entitlements.create_entitlement_group( + org_id_in, + type_label_in + ); + end lookup_entitlement_group; + + function create_entitlement_group ( + org_id_in in number, + type_label_in in varchar2 := 'sw_mgr_entitled' + ) return number is + sg_id_val number; + begin + select rhn_server_group_id_seq.nextval + into sg_id_val + from dual; + + insert into rhnServerGroup ( + id, name, description, max_members, current_members, + group_type, org_id + ) ( + select sg_id_val, sgt.label, sgt.label, + 0, 0, sgt.id, org_id_in + from rhnServerGroupType sgt + where sgt.label = type_label_in + ); + + return sg_id_val; + end create_entitlement_group; + + function can_entitle_server ( + server_id_in in number, + type_label_in in varchar2 ) + return number is + cursor addon_servergroups (base_label_in in varchar2, + addon_label_in in varchar2) is + select + addon_id + from + rhnSGTypeBaseAddonCompat + where base_id = lookup_sg_type (base_label_in) + and addon_id = lookup_sg_type (addon_label_in); + + previous_ent rhn_entitlements.ents_array; + is_base_in char := 'N'; + is_base_current char := 'N'; + i number := 0; + sgid number := 0; + + begin + + previous_ent := rhn_entitlements.ents_array(); + previous_ent := rhn_entitlements.get_server_entitlement(server_id_in); + + select distinct is_base + into is_base_in + from rhnServerGroupType + where label = type_label_in; + + if previous_ent.count = 0 then + sgid := find_compatible_sg (server_id_in, type_label_in); + if (is_base_in = 'Y' and sgid is not null) then + -- rhn_server.insert_into_servergroup (server_id_in, sgid); + return 1; + else + -- rhn_exception.raise_exception ('invalid_base_entitlement'); + return 0; + end if; + + -- there are previous ents, first make sure we're not trying to entitle a base ent + elsif is_base_in = 'Y' then + -- rhn_exception.raise_exception ('invalid_addon_entitlement'); + return 0; + + -- it must be an addon, so proceed with the entitlement + else + + -- find the servers base ent + is_base_current := 'N'; + i := 0; + while is_base_current = 'N' and i <= previous_ent.count + loop + i := i + 1; + select is_base + into is_base_current + from rhnServerGroupType + where label = previous_ent(i); + end loop; + + -- never found a base ent, that would be strange + if is_base_current = 'N' then + -- rhn_exception.raise_exception ('invalid_base_entitlement'); + return 0; + end if; + + -- this for loop verifies the validity of the addon path + for addon_servergroup in addon_servergroups (previous_ent(i), type_label_in) loop + -- find an appropriate sgid for the addon and entitle the server + sgid := find_compatible_sg (server_id_in, type_label_in); + if sgid is not null then + -- rhn_server.insert_into_servergroup (server_id_in, sgid); + return 1; + else + -- rhn_exception.raise_exception ('invalid_addon_entitlement'); + return 0; + end if; + end loop; + + end if; + + return 0; + + end can_entitle_server; + + function can_switch_base ( + server_id_in in integer, + type_label_in in varchar2 + ) return number is + + type_label_in_is_base char(1); + sgid number; + + begin + + begin + select is_base into type_label_in_is_base + from rhnServerGroupType + where label = type_label_in; + exception + when no_data_found then + rhn_exception.raise_exception ( 'invalid_entitlement' ); + end; + + if type_label_in_is_base = 'N' then + rhn_exception.raise_exception ( 'invalid_entitlement' ); + else + sgid := find_compatible_sg ( server_id_in, type_label_in ); + if sgid is not null then + return 1; + else + return 0; + end if; + end if; + + end can_switch_base; + + + procedure entitle_server ( + server_id_in in number, + type_label_in in varchar2 := 'sw_mgr_entitled' + ) is + sgid number := 0; + is_virt number := 0; + + begin + + begin + select 1 into is_virt + from rhnServerEntitlementView + where server_id = server_id_in + and label in ('virtualization_host', 'virtualization_host_platform'); + exception + when no_data_found then + is_virt := 0; + end; + + if is_virt = 0 and (type_label_in = 'virtualization_host' or + type_label_in = 'virtualization_host_platform') then + + is_virt := 1; + end if; + + + + if rhn_entitlements.can_entitle_server(server_id_in, + type_label_in) = 1 then + sgid := find_compatible_sg (server_id_in, type_label_in); + if sgid is not null then + insert into rhnServerHistory ( id, server_id, summary, details ) + values ( rhn_event_id_seq.nextval, server_id_in, + 'added system entitlement ', + case type_label_in + when 'enterprise_entitled' then 'Management' + when 'sw_mgr_entitled' then 'Update' + when 'provisioning_entitled' then 'Provisioning' + when 'monitoring_entitled' then 'Monitoring' + when 'virtualization_host' then 'Virtualization' + when 'virtualization_host_platform' then + 'Virtualization Platform' end ); + + rhn_server.insert_into_servergroup (server_id_in, sgid); + + if is_virt = 1 then + rhn_entitlements.repoll_virt_guest_entitlements(server_id_in); + end if; + + else + rhn_exception.raise_exception ('no_available_server_group'); + end if; + else + rhn_exception.raise_exception ('invalid_entitlement'); + end if; + end entitle_server; + + procedure remove_server_entitlement ( + server_id_in in number, + type_label_in in varchar2 := 'sw_mgr_entitled', + repoll_virt_guests in number := 1 + ) is + group_id number; + type_is_base char; + is_virt number := 0; + begin + begin + + + -- would be nice if there were a virt attribute of entitlement types, not have to specify 2 different ones... + begin + select 1 into is_virt + from rhnServerEntitlementView + where server_id = server_id_in + and label in ('virtualization_host', 'virtualization_host_platform'); + exception + when no_data_found then + is_virt := 0; + end; + + select sg.id, sgt.is_base + into group_id, type_is_base + from rhnServerGroupType sgt, + rhnServerGroup sg, + rhnServerGroupMembers sgm, + rhnServer s + where s.id = server_id_in + and s.id = sgm.server_id + and sgm.server_group_id = sg.id + and sg.org_id = s.org_id + and sgt.label = type_label_in + and sgt.id = sg.group_type; + + if ( type_is_base = 'Y' ) then + -- unentitle_server should handle everything, don't really need to do anything else special here + unentitle_server ( server_id_in ); + else + + insert into rhnServerHistory ( id, server_id, summary, details ) + values ( rhn_event_id_seq.nextval, server_id_in, + 'removed system entitlement ', + case type_label_in + when 'enterprise_entitled' then 'Management' + when 'sw_mgr_entitled' then 'Update' + when 'provisioning_entitled' then 'Provisioning' + when 'monitoring_entitled' then 'Monitoring' + when 'virtualization_host' then 'Virtualization' + when 'virtualization_host_platform' then + 'Virtualization Platforrm' end ); + + rhn_server.delete_from_servergroup(server_id_in, group_id); + + -- special case: clean up related monitornig data + if type_label_in = 'monitoring_entitled' then + DELETE + FROM state_change + WHERE o_id IN (SELECT probe_id + FROM rhn_check_probe + WHERE host_id = server_id_in); + DELETE /*+index(time_series time_series_probe_id_idx)*/ + FROM time_series + WHERE SUBSTR(o_id, INSTR(o_id, '-') + 1, + (INSTR(o_id, '-', INSTR(o_id, '-') + 1) - INSTR(o_id, '-')) - 1) + IN (SELECT to_char(probe_id) + FROM rhn_check_probe + WHERE host_id = server_id_in); + DELETE + FROM rhn_probe + WHERE recid IN (SELECT probe_id + FROM rhn_check_probe + WHERE host_id = server_id_in); + end if; + + if is_virt = 1 and repoll_virt_guests = 1 then + rhn_entitlements.repoll_virt_guest_entitlements(server_id_in); + end if; + end if; + + exception + when no_data_found then + rhn_exception.raise_exception('invalid_server_group_member'); + end; + + end remove_server_entitlement; + + + procedure unentitle_server (server_id_in in number) is + + cursor servergroups is + select distinct sgt.label, sg.id server_group_id + from rhnServerGroupType sgt, + rhnServerGroup sg, + rhnServer s, + rhnServerGroupMembers sgm + where s.id = server_id_in + and s.org_id = sg.org_id + and sg.group_type = sgt.id + and sgm.server_group_id = sg.id + and sgm.server_id = s.id; + + is_virt number := 0; + + begin + + begin + select 1 into is_virt + from rhnServerEntitlementView + where server_id = server_id_in + and label in ('virtualization_host', 'virtualization_host_platform'); + exception + when no_data_found then + is_virt := 0; + end; + + for servergroup in servergroups loop + + insert into rhnServerHistory ( id, server_id, summary, details ) + values ( rhn_event_id_seq.nextval, server_id_in, + 'removed system entitlement ', + case servergroup.label + when 'enterprise_entitled' then 'Management' + when 'sw_mgr_entitled' then 'Update' + when 'provisioning_entitled' then 'Provisioning' + when 'monitoring_entitled' then 'Monitoring' + when 'virtualization_host' then 'Virtualization' + when 'virtualization_host_platform' then + 'Virtualization Platform' end ); + + rhn_server.delete_from_servergroup(server_id_in, + servergroup.server_group_id ); + end loop; + + if is_virt = 1 then + rhn_entitlements.repoll_virt_guest_entitlements(server_id_in); + end if; + + end unentitle_server; + + + -- ******************************************************************* + -- PROCEDURE: repoll_virt_guest_entitlements + -- + -- Whenever we add/remove a virtualization_host* entitlement from + -- a host, we can call this procedure to update what type of slots + -- the guests are consuming. + -- + -- If you're removing the entitlement, it's + -- possible the guests will become unentitled if you don't have enough + -- physical slots to cover them. + -- + -- If you're adding the entitlement, you end up freeing up physical + -- slots for other systems. + -- + -- ******************************************************************* + procedure repoll_virt_guest_entitlements(server_id_in in number) + is + + -- All channel families associated with the guests of server_id_in + cursor families is + select distinct cfs.channel_family_id + from + rhnChannelFamilyServers cfs, + rhnVirtualInstance vi + where + vi.host_system_id = server_id_in + and vi.virtual_system_id = cfs.server_id; + + -- All of server group types associated with the guests of + -- server_id_in + cursor group_types is + select distinct sg.group_type, sgt.label + from + rhnServerGroupType sgt, + rhnServerGroup sg, + rhnServerGroupMembers sgm, + rhnVirtualInstance vi + where + vi.host_system_id = server_id_in + and vi.virtual_system_id = sgm.server_id + and sgm.server_group_id = sg.id + and sg.group_type = sgt.id; + + -- Virtual servers from a certain family belonging to a speicifc + -- host that are consuming physical channel slots over the limit. + cursor virt_servers_cfam(family_id_in in number, quantity_in in number) is + select virtual_system_id + from ( + select rownum, vi.virtual_system_id + from + rhnChannelFamilyMembers cfm, + rhnServerChannel sc, + rhnVirtualInstance vi + where + vi.host_system_id = server_id_in + and vi.virtual_system_id = sc.server_id + and sc.channel_id = cfm.channel_id + and cfm.channel_family_id = family_id_in + order by sc.modified desc + ) + where rownum <= quantity_in; + + -- Virtual servers from a certain family belonging to a speicifc + -- host that are consuming physical system slots over the limit. + cursor virt_servers_sgt(group_type_in in number, quantity_in in number) is + select virtual_system_id + from ( + select rownum, vi.virtual_system_id + from + rhnServerGroup sg, + rhnServerGroupMembers sgm, + rhnVirtualInstance vi + where + vi.host_system_id = server_id_in + and vi.virtual_system_id = sgm.server_id + and sgm.server_group_id = sg.id + and sg.group_type = group_type_in + order by sgm.modified desc + ) + where rownum <= quantity_in; + -- Get the orgs of Virtual guests + -- Since they may belong to different orgs + cursor virt_guest_orgs is + select distinct (s.org_id) + from rhnServer s + inner join rhnVirtualInstance vi on vi.virtual_system_id = s.id + where + vi.host_system_id = server_id_in + and s.org_id <> (select s1.org_id from rhnServer s1 where s1.id = vi.host_system_id) ; + + + org_id_val number; + max_members_val number; + max_flex_val number; + current_members_calc number; + sg_id number; + is_virt number := 0; + begin + begin + select 1 into is_virt + from rhnServerEntitlementView + where server_id = server_id_in + and label in ('virtualization_host', 'virtualization_host_platform'); + exception + when no_data_found then + is_virt := 0; + end; + + select org_id + into org_id_val + from rhnServer + where id = server_id_in; + + -- deal w/ channel entitlements first ... + for family in families loop + if is_virt = 0 then + -- if the host_server does not have virt + --- find all possible flex slots + -- and set each of the flex eligible guests to Y + UPDATE rhnServerChannel sc set sc.is_fve = 'Y' + where sc.server_id in ( + select virtual_system_id from ( + select rownum, vi.virtual_system_id, sfc.max_members - sfc.current_members as free_slots + from rhnServerFveCapable sfc + inner join rhnVirtualInstance vi on vi.virtual_system_id = sfc.server_id + where vi.host_system_id = server_id_in + and sfc.channel_family_id = family.channel_family_id + order by vi.modified desc + ) + where rownum <= free_slots + ); + else + -- if the host_server has virt + -- set all its flex guests to N + UPDATE rhnServerChannel sc set sc.is_fve = 'N' + where + sc.channel_id in (select cfm.channel_id from rhnChannelFamilyMembers cfm + where cfm.CHANNEL_FAMILY_ID = family.channel_family_id) + and sc.is_fve = 'Y' + and sc.server_id in + (select vi.virtual_system_id from rhnVirtualInstance vi + where vi.host_system_id = server_id_in); + end if; + + -- get the current (physical) members of the family + current_members_calc := + rhn_channel.channel_family_current_members(family.channel_family_id, + org_id_val); -- fixed transposed args + + -- get the max members of the family + select max_members + into max_members_val + from rhnPrivateChannelFamily + where channel_family_id = family.channel_family_id + and org_id = org_id_val; + + select fve_max_members + into max_flex_val + from rhnPrivateChannelFamily + where channel_family_id = family.channel_family_id + and org_id = org_id_val; + + if current_members_calc > max_members_val then + -- A virtualization_host* ent must have been removed, so we'll + -- unsubscribe guests from the host first. + + -- hm, i don't think max_members - current_members_calc yielding a negative number + -- will work w/ rownum, swaping 'em in the body of this if... + for virt_server in virt_servers_cfam(family.channel_family_id, + current_members_calc - max_members_val) loop + + rhn_channel.unsubscribe_server_from_family( + virt_server.virtual_system_id, + family.channel_family_id); + end loop; + + -- if we're still over the limit, which would be odd, + -- just prune the group to max_members + -- + -- er... wouldn't we actually have to refresh the values of + -- current_members_calc and max_members_val to actually ever + -- *skip this?? + if current_members_calc > max_members_val then + -- argh, transposed again?! + set_family_count(org_id_val, + family.channel_family_id, + max_members_val, max_flex_val); + --TODO calculate this correctly + end if; + + end if; + + -- update current_members for the family. This will set the value + -- to reflect adding/removing the entitlement. + -- + -- what's the difference of doing this vs the unavoidable set_family_count above? + rhn_channel.update_family_counts(family.channel_family_id, + org_id_val); + + -- It is possible that the guests belong to a different org than the host + -- so we are going to update the family counts in the guests orgs also + for org in virt_guest_orgs loop + rhn_channel.update_family_counts(family.channel_family_id, + org.org_id); + end loop; + end loop; + + for a_group_type in group_types loop + -- get the current *physical* members of the system entitlement type for the org... + -- + -- unlike channel families, it appears the standard rhnServerGroup.max_members represents + -- *physical* slots, vs physical+virt ... boy that's confusing... + + select max_members, id + into max_members_val, sg_id + from rhnServerGroup + where group_type = a_group_type.group_type + and org_id = org_id_val; + + + select count(sep.server_id) into current_members_calc + from rhnServerEntitlementPhysical sep + where sep.server_group_id = sg_id + and sep.server_group_type_id = a_group_type.group_type; + + if current_members_calc > max_members_val then + -- A virtualization_host* ent must have been removed, and we're over the limit, so unsubscribe guests + for virt_server in virt_servers_sgt(a_group_type.group_type, + current_members_calc - max_members_val) loop + rhn_entitlements.remove_server_entitlement(virt_server.virtual_system_id, a_group_type.label); + + -- decrement current_members_calc, we'll use it to reset current_members for the group at the end... + current_members_calc := current_members_calc - 1; + end loop; + + end if; + + update rhnServerGroup set current_members = current_members_calc + where org_id = org_id_val + and group_type = a_group_type.group_type; + + -- I think that's all the house-keeping we have to do... + end loop; + + end repoll_virt_guest_entitlements; + + + function get_server_entitlement ( + server_id_in in number + ) return ents_array is + + cursor server_groups is + select sgt.label + from rhnServerGroupType sgt, + rhnServerGroup sg, + rhnServerGroupMembers sgm + where 1=1 + and sgm.server_id = server_id_in + and sg.id = sgm.server_group_id + and sgt.id = sg.group_type + and sgt.label in ( + 'sw_mgr_entitled','enterprise_entitled', + 'provisioning_entitled', 'nonlinux_entitled', + 'monitoring_entitled', 'virtualization_host', + 'virtualization_host_platform' + ); + + ent_array ents_array; + + begin + + ent_array := ents_array(); + + for sg in server_groups loop + ent_array.extend; + ent_array(ent_array.count) := sg.label; + end loop; + + return ent_array; + + end get_server_entitlement; + + + -- this desperately needs to be table driven. + procedure modify_org_service ( + org_id_in in number, + service_label_in in varchar2, + enable_in in char + ) is + type roles_v is varray(10) of rhnUserGroupType.label%TYPE; + roles_to_process roles_v; + cursor roles(role_label_in in varchar2) is + select label, id + from rhnUserGroupType + where label = role_label_in; + cursor org_roles(role_label_in in varchar2) is + select 1 + from rhnUserGroup ug, + rhnUserGroupType ugt + where ugt.label = role_label_in + and ug.org_id = org_id_in + and ugt.id = ug.group_type; + + type ents_v is varray(10) of rhnOrgEntitlementType.label%TYPE; + ents_to_process ents_v; + cursor ents(ent_label_in in varchar2) is + select label, id + from rhnOrgEntitlementType + where label = ent_label_in; + cursor org_ents(ent_label_in in varchar2) is + select 1 + from rhnOrgEntitlements oe, + rhnOrgEntitlementType oet + where oet.label = ent_label_in + and oe.org_id = org_id_in + and oet.id = oe.entitlement_id; + create_row char(1); + begin + ents_to_process := ents_v(); + roles_to_process := roles_v(); + -- a bit kludgy, but only for 3.4 really. Certainly no + -- worse than the old code... + if service_label_in = 'enterprise' or + service_label_in = 'management' then + ents_to_process.extend; + ents_to_process(ents_to_process.count) := 'sw_mgr_enterprise'; + + roles_to_process.extend; + roles_to_process(roles_to_process.count) := 'org_admin'; + + roles_to_process.extend; + roles_to_process(roles_to_process.count) := 'system_group_admin'; + + roles_to_process.extend; + roles_to_process(roles_to_process.count) := 'activation_key_admin'; + + roles_to_process.extend; + roles_to_process(roles_to_process.count) := 'org_applicant'; + elsif service_label_in = 'provisioning' then + ents_to_process.extend; + ents_to_process(ents_to_process.count) := 'rhn_provisioning'; + + roles_to_process.extend; + roles_to_process(roles_to_process.count) := 'system_group_admin'; + + roles_to_process.extend; + roles_to_process(roles_to_process.count) := 'activation_key_admin'; + + roles_to_process.extend; + roles_to_process(roles_to_process.count) := 'config_admin'; + -- another nasty special case... + if enable_in = 'Y' then + ents_to_process.extend; + ents_to_process(ents_to_process.count) := 'sw_mgr_enterprise'; + end if; + elsif service_label_in = 'monitoring' then + ents_to_process.extend; + ents_to_process(ents_to_process.count) := 'rhn_monitor'; + + roles_to_process.extend; + roles_to_process(roles_to_process.count) := 'monitoring_admin'; + elsif service_label_in = 'virtualization' then + ents_to_process.extend; + ents_to_process(ents_to_process.count) := 'rhn_virtualization'; + + roles_to_process.extend; + roles_to_process(roles_to_process.count) := 'config_admin'; + elsif service_label_in = 'virtualization_platform' then + ents_to_process.extend; + ents_to_process(ents_to_process.count) := 'rhn_virtualization_platform'; + roles_to_process.extend; + roles_to_process(roles_to_process.count) := 'config_admin'; + elsif service_label_in = 'nonlinux' then + ents_to_process.extend; + ents_to_process(ents_to_process.count) := 'rhn_nonlinux'; + roles_to_process.extend; + roles_to_process(roles_to_process.count) := 'config_admin'; + end if; + + if enable_in = 'Y' then + for i in 1..ents_to_process.count loop + for ent in ents(ents_to_process(i)) loop + create_row := 'Y'; + for oe in org_ents(ent.label) loop + create_row := 'N'; + end loop; + if create_row = 'Y' then + insert into rhnOrgEntitlements(org_id, entitlement_id) + values (org_id_in, ent.id); + end if; + end loop; + end loop; + for i in 1..roles_to_process.count loop + for role in roles(roles_to_process(i)) loop + create_row := 'Y'; + for o_r in org_roles(role.label) loop + create_row := 'N'; + end loop; + if create_row = 'Y' then + insert into rhnUserGroup( + id, name, description, current_members, + group_type, org_id + ) ( + select rhn_user_group_id_seq.nextval, + ugt.name || 's', + ugt.name || 's for Org ' || + o.name || ' ('|| o.id ||')', + 0, ugt.id, o.id + from rhnUserGroupType ugt, + web_customer o + where o.id = org_id_in + and ugt.id = role.id + ); + end if; + end loop; + end loop; + else + for i in 1..ents_to_process.count loop + for ent in ents(ents_to_process(i)) loop + delete from rhnOrgEntitlements + where org_id = org_id_in + and entitlement_id = ent.id; + end loop; + end loop; + end if; + end modify_org_service; + + procedure set_customer_enterprise ( + customer_id_in in number + ) is + begin + modify_org_service(customer_id_in, 'enterprise', 'Y'); + end set_customer_enterprise; + + procedure set_customer_provisioning ( + customer_id_in in number + ) is + begin + modify_org_service(customer_id_in, 'provisioning', 'Y'); + end set_customer_provisioning; + + procedure set_customer_monitoring ( + customer_id_in in number + ) is + begin + modify_org_service(customer_id_in, 'monitoring', 'Y'); + end set_customer_monitoring; + + procedure set_customer_nonlinux ( + customer_id_in in number + ) is + begin + modify_org_service(customer_id_in, 'nonlinux', 'Y'); + end set_customer_nonlinux; + + procedure unset_customer_enterprise ( + customer_id_in in number + ) is + begin + modify_org_service(customer_id_in, 'enterprise', 'N'); + end unset_customer_enterprise; + + procedure unset_customer_provisioning ( + customer_id_in in number + ) is + begin + modify_org_service(customer_id_in, 'provisioning', 'N'); + end unset_customer_provisioning; + + procedure unset_customer_monitoring ( + customer_id_in in number + ) is + begin + modify_org_service(customer_id_in, 'monitoring', 'N'); + end unset_customer_monitoring; + + procedure unset_customer_nonlinux ( + customer_id_in in number + ) is + begin + modify_org_service(customer_id_in, 'nonlinux', 'N'); + end unset_customer_nonlinux; + + -- ******************************************************************* + -- PROCEDURE: prune_group + -- Unsubscribes servers consuming physical slots that over the org's + -- limit. + -- Called by: set_server_group_count, repoll_virt_guest_entitlements + -- ******************************************************************* + procedure prune_group ( + group_id_in in number, + quantity_in in number, + update_family_countsYN in number := 1 + ) is + cursor servergroups is + select server_id, server_group_id, sgt.id as group_type_id, sgt.label + from rhnServerGroupType sgt, + rhnServerGroup sg, + rhnServerGroupMembers sgm + where 1=1 + and sgm.server_group_id = group_id_in + and sgm.server_id in ( + select server_id + from ( + select rownum row_number, + server_id, + time + from ( + select sep.server_id, + sep.modified time + from + rhnServerEntitlementPhysical sep + where + sep.server_group_id = group_id_in + order by time asc + ) + ) + where row_number > quantity_in + ) + and sgm.server_group_id = sg.id + and sg.group_type = sgt.id; + type_is_base char; + begin + update rhnServerGroup + set max_members = quantity_in + where id = group_id_in; + + for sg in servergroups loop + remove_server_entitlement(sg.server_id, sg.label); + + select is_base + into type_is_base + from rhnServerGroupType sgt + where sgt.id = sg.group_type_id; + + -- if we're removing a base ent, then be sure to + -- remove the server's channel subscriptions. + if ( type_is_base = 'Y' ) then + rhn_channel.clear_subscriptions(sg.server_id, + update_family_countsYN => update_family_countsYN); + end if; + + end loop; + end prune_group; + + procedure set_server_group_count ( + customer_id_in in number, + group_type_in in number, + quantity_in in number, + update_family_countsYN in number := 1 + ) is + group_id number; + quantity number; + begin + quantity := quantity_in; + if quantity is not null and quantity < 0 then + quantity := 0; + end if; + + select rsg.id + into group_id + from rhnServerGroup rsg + where 1=1 + and rsg.org_id = customer_id_in + and rsg.group_type = group_type_in; + + rhn_entitlements.prune_group( + group_id, + quantity, + update_family_countsYN + ); + exception + when no_data_found then + insert into rhnServerGroup ( + id, name, description, max_members, current_members, + group_type, org_id, created, modified + ) ( + select rhn_server_group_id_seq.nextval, name, name, + quantity, 0, id, customer_id_in, + sysdate, sysdate + from rhnServerGroupType + where id = group_type_in + ); + end set_server_group_count; + + -- ******************************************************************* + -- PROCEDURE: assign_system_entitlement + -- + -- Moves system entitlements from from_org_id_in to to_org_id_in. + -- Can raise not_enough_entitlements_in_base_org if from_org_id_in + -- does not have enough entitlements to cover the move. + -- Takes care of unentitling systems if necessary by calling + -- set_server_group_count + -- ******************************************************************* + procedure assign_system_entitlement( + group_label_in in varchar2, + from_org_id_in in number, + to_org_id_in in number, + quantity_in in number + ) + is + prev_ent_count number; + to_org_prev_ent_count number; + new_ent_count number; + new_quantity number; + group_type number; + begin + + begin + select max_members + into prev_ent_count + from rhnServerGroupType sgt, + rhnServerGroup sg + where sg.org_id = from_org_id_in + and sg.group_type = sgt.id + and sgt.label = group_label_in; + exception + when NO_DATA_FOUND then + rhn_exception.raise_exception( + 'not_enough_entitlements_in_base_org'); + end; + + begin + select max_members + into to_org_prev_ent_count + from rhnServerGroupType sgt, + rhnServerGroup sg + where sg.org_id = to_org_id_in + and sg.group_type = sgt.id + and sgt.label = group_label_in; + exception + when NO_DATA_FOUND then + to_org_prev_ent_count := 0; + end; + + begin + select id + into group_type + from rhnServerGroupType + where label = group_label_in; + exception + when NO_DATA_FOUND then + rhn_exception.raise_exception( + 'invalid_server_group'); + end; + + new_ent_count := prev_ent_count - quantity_in; + + if prev_ent_count > new_ent_count then + new_quantity := to_org_prev_ent_count + quantity_in; + end if; + + if new_ent_count < 0 then + rhn_exception.raise_exception( + 'not_enough_entitlements_in_base_org'); + end if; + + + set_server_group_count(from_org_id_in, + group_type, + new_ent_count); + + set_server_group_count(to_org_id_in, + group_type, + new_quantity); + + -- Create or delete the entries in rhnOrgEntitlementType + if group_label_in = 'enterprise_entitled' then + if new_quantity > 0 then + set_customer_enterprise(to_org_id_in); + else + unset_customer_enterprise(to_org_id_in); + end if; + end if; + + if group_label_in = 'provisioning_entitled' then + if new_quantity > 0 then + set_customer_provisioning(to_org_id_in); + else + unset_customer_provisioning(to_org_id_in); + end if; + end if; + + if group_label_in = 'monitoring_entitled' then + if new_quantity > 0 then + set_customer_monitoring(to_org_id_in); + else + unset_customer_monitoring(to_org_id_in); + end if; + end if; + + end assign_system_entitlement; + + -- ******************************************************************* + -- PROCEDURE: assign_channel_entitlement + -- + -- Moves channel entitlements from from_org_id_in to to_org_id_in. + -- Can raise not_enough_entitlements_in_base_org if from_org_id_in + -- does not have enough entitlements to cover the move. + -- Takes care of unentitling systems if necessary by calling + -- set_family_count + -- ******************************************************************* + procedure assign_channel_entitlement( + channel_family_label_in in varchar2, + from_org_id_in in number, + to_org_id_in in number, + quantity_in in number, + flex_in in number + ) + is + from_org_prev_ent_count number; + from_org_prev_ent_count_flex number; + new_ent_count number; + new_ent_count_flex number; + to_org_prev_ent_count number; + to_org_prev_ent_count_flex number; + new_quantity number; + new_flex number; + cfam_id number; + begin + + begin + select max_members + into from_org_prev_ent_count + from rhnChannelFamily cf, + rhnPrivateChannelFamily pcf + where pcf.org_id = from_org_id_in + and pcf.channel_family_id = cf.id + and cf.label = channel_family_label_in; + exception + when NO_DATA_FOUND then + rhn_exception.raise_exception( + 'not_enough_entitlements_in_base_org'); + end; + + begin + select max_members + into to_org_prev_ent_count + from rhnChannelFamily cf, + rhnPrivateChannelFamily pcf + where pcf.org_id = to_org_id_in + and pcf.channel_family_id = cf.id + and cf.label = channel_family_label_in; + exception + when NO_DATA_FOUND then + to_org_prev_ent_count := 0; + end; + + begin + select fve_max_members + into from_org_prev_ent_count_flex + from rhnChannelFamily cf, + rhnPrivateChannelFamily pcf + where pcf.org_id = from_org_id_in + and pcf.channel_family_id = cf.id + and cf.label = channel_family_label_in; + exception + when NO_DATA_FOUND then + rhn_exception.raise_exception( + 'not_enough_flex_entitlements_in_base_org'); + end; + + begin + select fve_max_members + into to_org_prev_ent_count_flex + from rhnChannelFamily cf, + rhnPrivateChannelFamily pcf + where pcf.org_id = to_org_id_in + and pcf.channel_family_id = cf.id + and cf.label = channel_family_label_in; + exception + when NO_DATA_FOUND then + to_org_prev_ent_count_flex := 0; + end; + + begin + select id + into cfam_id + from rhnChannelFamily + where label = channel_family_label_in; + exception + when NO_DATA_FOUND then + rhn_exception.raise_exception( + 'invalid_channel_family'); + end; + + new_ent_count := from_org_prev_ent_count - quantity_in; + new_ent_count_flex := from_org_prev_ent_count_flex - flex_in; + + if from_org_prev_ent_count >= new_ent_count then + new_quantity := to_org_prev_ent_count + quantity_in; + end if; + + if from_org_prev_ent_count_flex >= new_ent_count_flex then + new_flex := to_org_prev_ent_count_flex + flex_in; + end if; + + + if new_ent_count < 0 then + rhn_exception.raise_exception( + 'not_enough_entitlements_in_base_org'); + end if; + + if new_ent_count_flex < 0 then + rhn_exception.raise_exception( + 'not_enough_flex_entitlements_in_base_org'); + end if; + + + + rhn_entitlements.set_family_count(from_org_id_in, cfam_id, + new_ent_count, new_ent_count_flex); + + rhn_entitlements.set_family_count(to_org_id_in, + cfam_id, + new_quantity, new_flex); + + end assign_channel_entitlement; + + -- ******************************************************************* + -- PROCEDURE: activate_system_entitlement + -- + -- Sets the values in rhnServerGroup for a given rhnServerGroupType. + -- + -- Calls: set_server_group_count to update, prune, or create the group. + -- Called by: the code that activates a satellite cert. + -- + -- Raises not_enough_entitlements_in_base_org if all entitlements + -- in the org are used so the free entitlements would not cover + -- the difference when descreasing the number of entitlements. + -- ******************************************************************* + procedure activate_system_entitlement( + org_id_in in number, + group_label_in in varchar2, + quantity_in in number + ) + is + prev_ent_count number; + prev_ent_count_sum number; + group_type number; + begin + + -- Fetch the current entitlement count for the org + -- into prev_ent_count + begin + select current_members + into prev_ent_count + from rhnServerGroupType sgt, + rhnServerGroup sg + where sg.group_type = sgt.id + and sgt.label = group_label_in + and sg.org_id = org_id_in; + exception + when NO_DATA_FOUND then + prev_ent_count := 0; + end; + + begin + select id + into group_type + from rhnServerGroupType + where label = group_label_in; + exception + when NO_DATA_FOUND then + rhn_exception.raise_exception( + 'invalid_server_group'); + end; + + -- If we're setting the total entitlemnt count to a lower value, + -- and that value is less than the allocated count in this org, + -- we need to raise an exception. + if quantity_in < prev_ent_count then + rhn_exception.raise_exception( + 'not_enough_entitlements_in_base_org'); + else + -- don't update family counts after every server + -- will do bulk update afterwards + set_server_group_count(org_id_in, + group_type, + quantity_in, + update_family_countsYN => 0); + -- bulk update family counts + rhn_channel.update_group_family_counts(group_label_in, org_id_in); + end if; + + + end activate_system_entitlement; + + -- ******************************************************************* + -- PROCEDURE: activate_channel_entitlement + -- + -- Calls: set_family_count to update, prune, or create the family + -- permission bucket. + -- Called by: the code that activates a satellite cert. + -- + -- Raises not_enough_entitlements_in_base_org if there are not enough + -- entitlements in the org to cover the difference when you are + -- descreasing the number of entitlements. + -- + -- The backend code in Python is expected to do whatever arithmetics + -- is needed. + -- ******************************************************************* + procedure activate_channel_entitlement( + org_id_in in number, + channel_family_label_in in varchar2, + quantity_in in number, + flex_in in number + + ) + is + prev_ent_count number; + prev_flex_count number; + prev_ent_count_sum number; + cfam_id number; + reduce_quantity number; + total_flex_capable number; + cursor to_convert_reg (channel_family_id_val in number, org_id_in in number, quantity in number) + is + select SC.server_id + from rhnServerChannel SC inner join + rhnServer S on S.id = SC.server_id + where + is_fve = 'Y' + and S.org_id = org_id_in + and SC.channel_id in + (select cfm.channel_id from rhnChannelFamilyMembers cfm + where cfm.CHANNEL_FAMILY_ID = channel_family_id_val) + and rownum <= quantity; + cursor to_convert_flex (channel_family_id_val in number, org_id_in in number, quantity in number) + is + select server_id + from rhnServerFveCapable + where SERVER_ORG_ID = org_id_in and + channel_family_id = cfam_id and + rownum <= quantity; + + begin + + -- Fetch the current entitlement count for the org + -- into prev_ent_count + begin + select current_members + into prev_ent_count + from rhnChannelFamily cf, + rhnPrivateChannelFamily pcf + where pcf.org_id = org_id_in + and pcf.channel_family_id = cf.id + and cf.label = channel_family_label_in; + exception + when NO_DATA_FOUND then + prev_ent_count := 0; + end; + + begin + select pcf.fve_current_members + into prev_flex_count + from rhnChannelFamily cf, + rhnPrivateChannelFamily pcf + where pcf.org_id = org_id_in + and pcf.channel_family_id = cf.id + and cf.label = channel_family_label_in; + exception + when NO_DATA_FOUND then + prev_flex_count := 0; + end; + + + begin + select id + into cfam_id + from rhnChannelFamily + where label = channel_family_label_in; + exception + when NO_DATA_FOUND then + rhn_exception.raise_exception( + 'invalid_channel_family'); + end; + + -- if there are too few flex entitlements + if flex_in < prev_flex_count then + -- and if the extra we need is less than or equal to our extra regular entitlements + if prev_flex_count - flex_in <= quantity_in - prev_ent_count then + reduce_quantity := prev_flex_count - flex_in; + -- We need to convert some systems from flex guest to regular + for system in to_convert_reg(cfam_id, org_id_in, reduce_quantity) loop + --rhn_channel.convert_to_regular(system.server_id, cfam_id); + UPDATE rhnServerChannel sc set sc.is_fve = 'N' + where sc.server_id = system.server_id + and sc.channel_id in (select cfm.channel_id + from rhnChannelFamilyMembers cfm + where cfm.channel_family_id = cfam_id); + end loop; + + --reset previous counts + prev_ent_count := prev_ent_count + reduce_quantity; + prev_flex_count := prev_flex_count - reduce_quantity; + else + rhn_exception.raise_exception( + 'not_enough_flex_entitlements_in_base_org'); + end if; + end if; + + -- if there are too few regular entitlements, and extra flex entitlements + if quantity_in < prev_ent_count and prev_flex_count < flex_in then + -- how many flex-capable systems (that aren't using flex) do we have + select count(*) + into total_flex_capable + from rhnServerFveCapable + where SERVER_ORG_ID = org_id_in and + channel_family_id = cfam_id; + -- if we have enough flex capable machines that is at least + -- as many as what we are over on + if total_flex_capable >= prev_ent_count - quantity_in then + reduce_quantity := prev_ent_count - quantity_in; + for system in to_convert_flex(cfam_id, org_id_in, reduce_quantity) loop +-- rhn_channel.convert_to_fve(system.server_id, cfam_id); + UPDATE rhnServerChannel sc set sc.is_fve = 'Y' + where sc.server_id = system.server_id + and sc.channel_id in (select cfm.channel_id + from rhnChannelFamilyMembers cfm + where cfm.channel_family_id = cfam_id); + end loop; + prev_ent_count := prev_ent_count - reduce_quantity; + prev_flex_count := prev_flex_count + reduce_quantity; + end if; + end if; + + + + + -- If we're setting the total entitlemnt count to a lower value, + -- and that value is less than the count in that one org, + -- we need to raise an exception. + if quantity_in < prev_ent_count then + rhn_exception.raise_exception( + 'not_enough_entitlements_in_base_org'); + else + -- even if we've manually converted systems to/from flex above + -- set_family_count should call update_family_counts, to reset + -- current used slots + rhn_entitlements.set_family_count(org_id_in, cfam_id, + quantity_in, flex_in); + end if; + + end activate_channel_entitlement; + + + -- ******************************************************************* + -- PROCEDURE: prune_family + -- Unsubscribes servers consuming physical slots from the channel family + -- that are over the org's limit. + -- Called by: set_family_count + -- ******************************************************************* + procedure prune_family ( + customer_id_in in number, + channel_family_id_in in number, + quantity_in in number, + flex_in in number + ) is + is_fve_in char; + tmp_quantity number; + + cursor serverchannels is + select sc.server_id, + sc.channel_id + from rhnServerChannel sc, + rhnChannelFamilyMembers cfm + where 1=1 + and cfm.channel_family_id = channel_family_id_in + and cfm.channel_id = sc.channel_id + and server_id in ( + select server_id + from ( + select server_id, time, rownum row_number + from ( + select rs.id server_id, rcfm.modified time + from rhnServerChannel rsc, + rhnChannelFamilyMembers rcfm, + rhnServer rs + where 1=1 + and rs.org_id = customer_id_in + and rs.id = rsc.server_id + and rsc.channel_id = rcfm.channel_id + and rcfm.channel_family_id = channel_family_id_in + and rsc.is_fve = is_fve_in + -- we only want to grab servers consuming + -- physical slots. + and exists ( + select 1 + from rhnChannelFamilyServerPhysical cfsp + where cfsp.server_id = rs.id + and cfsp.channel_family_id = + channel_family_id_in + ) + order by time asc + ) + ) + where row_number > tmp_quantity + ); + begin + -- if we get a null customer_id, this is completely bogus. + if customer_id_in is null then + return; + end if; + + tmp_quantity := quantity_in; + is_fve_in := 'N'; + + for sc in serverchannels loop + rhn_channel.unsubscribe_server(sc.server_id, sc.channel_id, 1, 1, + update_family_countsYN => 0); + + tmp_quantity := flex_in; + is_fve_in := 'Y'; + for sc in serverchannels loop + rhn_channel.unsubscribe_server(sc.server_id, sc.channel_id, 1, 1, + update_family_countsYN => 0); + end loop; + + + + end loop; + rhn_channel.update_family_counts(channel_family_id_in, customer_id_in); + end prune_family; + + procedure set_family_count ( + customer_id_in in number, + channel_family_id_in in number, + quantity_in in number, + flex_in in number + ) is + cursor privperms is + select 1 + from rhnPrivateChannelFamily + where org_id = customer_id_in + and channel_family_id = channel_family_id_in; + cursor pubperms is + select o.id org_id + from web_customer o, + rhnPublicChannelFamily pcf + where pcf.channel_family_id = channel_family_id_in; + quantity number; + done number := 0; + flex number; + begin + quantity := quantity_in; + if quantity is not null and quantity < 0 then + quantity := 0; + end if; + flex := flex_in; + if flex is not null and flex < 0 then + flex := 0; + end if; + + + if customer_id_in is not null then + for perm in privperms loop + rhn_entitlements.prune_family(customer_id_in, channel_family_id_in, + quantity, flex); + + if quantity is null and flex is null then + delete from rhnPrivateChannelFamily + where org_id = customer_id_in + and channel_family_id = channel_family_id_in; + else + update rhnPrivateChannelFamily + set max_members = quantity + where org_id = customer_id_in + and channel_family_id = channel_family_id_in; + + update rhnPrivateChannelFamily + set fve_max_members = flex + where org_id = customer_id_in + and channel_family_id = channel_family_id_in; + end if; + return; + end loop; + + insert into rhnPrivateChannelFamily ( + channel_family_id, org_id, max_members, current_members, fve_max_members, fve_current_members + ) values ( + channel_family_id_in, customer_id_in, quantity, 0, flex, 0 ); + return; + end if; + + for perm in pubperms loop + if quantity = 0 then + rhn_entitlements.prune_family( + perm.org_id, + channel_family_id_in, + quantity, + flex + ); + if done = 0 then + delete from rhnPublicChannelFamily + where channel_family_id = channel_family_id_in; + end if; + end if; + done := 1; + end loop; + -- if done's not 1, then we don't have any entitlements + if done != 1 then + insert into rhnPublicChannelFamily ( + channel_family_id + ) values ( + channel_family_id_in + ); + end if; + end set_family_count; + + -- this expects quantity_in to be the number of available slots, not the + -- max_members of the server group. If you give it too many, it'll fail + -- and raise servergroup_max_members. + -- We should NEVER run this unless we're SURE that we won't + -- be violating the max. + procedure entitle_last_modified_servers ( + customer_id_in in number, + type_label_in in varchar2, + quantity_in in number + ) is + -- find the servers that aren't currently in slots + cursor servers(cid_in in number, quant_in in number) is + select server_id + from ( + select rownum row_number, + server_id + from ( + select rs.id server_iD + from rhnServer rs + where 1=1 + and rs.org_id = cid_in + and not exists ( + select 1 + from rhnServerGroup sg, + rhnServerGroupMembers rsgm + where rsgm.server_id = rs.id + and rsgm.server_group_id = sg.id + and sg.group_type is not null + ) + and not exists ( + select 1 + from rhnVirtualInstance vi + where vi.virtual_system_id = + rs.id + ) order by modified desc + ) + ) + where row_number <= quant_in; + begin + for server in servers(customer_id_in, quantity_in) loop + rhn_entitlements.entitle_server(server.server_id, type_label_in); + end loop; + end entitle_last_modified_servers; + + procedure subscribe_newest_servers ( + customer_id_in in number + ) is + -- find servers without base channels + cursor servers(cid_in in number) is + select s.id + from rhnServer s + where 1=1 + and s.org_id = cid_in + and not exists ( + select 1 + from rhnChannel c, + rhnServerChannel sc + where sc.server_id = s.id + and sc.channel_id = c.id + and c.parent_channel is null + ) + and not exists ( + select 1 + from rhnVirtualInstance vi + where vi.virtual_system_id = s.id + ) + order by s.modified desc; + channel_id number; + begin + for server in servers(customer_id_in) loop + channel_id := rhn_channel.guess_server_base(server.id); + if channel_id is not null then + begin + rhn_channel.subscribe_server(server.id, channel_id); + commit; + -- exception is really channel_family_no_subscriptions + exception + when others then + null; + end; + end if; + end loop; + end subscribe_newest_servers; +end rhn_entitlements; +/ +show errors + diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/002-rhn_entitlements.pkb.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/002-rhn_entitlements.pkb.sql.postgresql new file mode 100644 index 0000000..8db972c --- /dev/null +++ b/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/002-rhn_entitlements.pkb.sql.postgresql @@ -0,0 +1,292 @@ +-- oracle equivalent source sha1 c887b0b88c4d0f81b815333b074d93d32106350d + +-- setup search_path so that these functions are created in appropriate schema. +update pg_settings set setting = 'rhn_entitlements,' || setting where name = 'search_path'; + + -- ******************************************************************* + -- PROCEDURE: prune_group + -- Unsubscribes servers consuming physical slots that over the org's + -- limit. + -- Called by: set_server_group_count, repoll_virt_guest_entitlements + -- ******************************************************************* + create or replace function prune_group ( + group_id_in in numeric, + quantity_in in numeric, + update_family_countsYN in numeric default 1 + ) returns void +as $$ + declare + sgrecord record; + type_is_base char; + begin + update rhnServerGroup + set max_members = quantity_in + where id = group_id_in; + + for sgrecord in ( + select server_id, server_group_id, sgt.id as group_type_id, sgt.label + from rhnServerGroupType sgt, + rhnServerGroup sg, + rhnServerGroupMembers sgm + where 1=1 + and sgm.server_group_id = group_id_in + and sgm.server_id in ( + select sep.server_id + from + rhnServerEntitlementPhysical sep + where + sep.server_group_id = group_id_in + order by sep.modified asc + offset quantity_in + ) + and sgm.server_group_id = sg.id + and sg.group_type = sgt.id + ) loop + perform rhn_entitlements.remove_server_entitlement(sgrecord.server_id, sgrecord.label); + + select is_base + into type_is_base + from rhnServerGroupType sgt + where sgt.id = sgrecord.group_type_id; + + -- if we're removing a base ent, then be sure to + -- remove the server's channel subscriptions. + if ( type_is_base = 'Y' ) then + perform rhn_channel.clear_subscriptions(sgrecord.server_id, 0, update_family_countsYN); + end if; + + end loop; + end$$ +language plpgsql; + + -- ******************************************************************* + -- PROCEDURE: assign_system_entitlement + -- + -- Moves system entitlements from from_org_id_in to to_org_id_in. + -- Can raise not_enough_entitlements_in_base_org if from_org_id_in + -- does not have enough entitlements to cover the move. + -- Takes care of unentitling systems if necessary by calling + -- set_server_group_count + -- ******************************************************************* + create or replace function assign_system_entitlement( + group_label_in in varchar, + from_org_id_in in numeric, + to_org_id_in in numeric, + quantity_in in numeric + ) returns void +as $$ + declare + prev_ent_count numeric; + to_org_prev_ent_count numeric; + new_ent_count numeric; + new_quantity numeric; + group_type numeric; + begin + + select max_members + into prev_ent_count + from rhnServerGroupType sgt, + rhnServerGroup sg + where sg.org_id = from_org_id_in + and sg.group_type = sgt.id + and sgt.label = group_label_in; + + if not found then + perform rhn_exception.raise_exception( + 'not_enough_entitlements_in_base_org'); + end if; + + select max_members + into to_org_prev_ent_count + from rhnServerGroupType sgt, + rhnServerGroup sg + where sg.org_id = to_org_id_in + and sg.group_type = sgt.id + and sgt.label = group_label_in; + + if not found then + to_org_prev_ent_count := 0; + end if; + + select id + into group_type + from rhnServerGroupType + where label = group_label_in; + + if not found then + perform rhn_exception.raise_exception( + 'invalid_server_group'); + end if; + + new_ent_count := prev_ent_count - quantity_in; + + if prev_ent_count > new_ent_count then + new_quantity := to_org_prev_ent_count + quantity_in; + end if; + + if new_ent_count < 0 then + perform rhn_exception.raise_exception( + 'not_enough_entitlements_in_base_org'); + end if; + + + perform rhn_entitlements.set_server_group_count(from_org_id_in, + group_type, + new_ent_count); + + perform rhn_entitlements.set_server_group_count(to_org_id_in, + group_type, + new_quantity); + + -- Create or delete the entries in rhnOrgEntitlementType + if group_label_in = 'enterprise_entitled' then + if new_quantity > 0 then + perform rhn_entitlements.set_customer_enterprise(to_org_id_in); + else + perform rhn_entitlements.unset_customer_enterprise(to_org_id_in); + end if; + end if; + + if group_label_in = 'provisioning_entitled' then + if new_quantity > 0 then + perform rhn_entitlements.set_customer_provisioning(to_org_id_in); + else + perform rhn_entitlements.unset_customer_provisioning(to_org_id_in); + end if; + end if; + + if group_label_in = 'monitoring_entitled' then + if new_quantity > 0 then + perform rhn_entitlements.set_customer_monitoring(to_org_id_in); + else + perform rhn_entitlements.unset_customer_monitoring(to_org_id_in); + end if; + end if; + + end$$ +language plpgsql; + + -- ******************************************************************* + -- PROCEDURE: activate_system_entitlement + -- + -- Sets the values in rhnServerGroup for a given rhnServerGroupType. + -- + -- Calls: set_server_group_count to update, prune, or create the group. + -- Called by: the code that activates a satellite cert. + -- + -- Raises not_enough_entitlements_in_base_org if all entitlements + -- in the org are used so the free entitlements would not cover + -- the difference when descreasing the number of entitlements. + -- ******************************************************************* + create or replace function activate_system_entitlement( + org_id_in in numeric, + group_label_in in varchar, + quantity_in in numeric + ) returns void +as $$ + declare + prev_ent_count numeric; + prev_ent_count_sum numeric; + group_type numeric; + begin + + -- Fetch the current entitlement count for the org + -- into prev_ent_count + + select current_members + into prev_ent_count + from rhnServerGroupType sgt, + rhnServerGroup sg + where sg.group_type = sgt.id + and sgt.label = group_label_in + and sg.org_id = org_id_in; + + if not found then + prev_ent_count := 0; + end if; + + select id + into group_type + from rhnServerGroupType + where label = group_label_in; + + if not found then + perform rhn_exception.raise_exception( + 'invalid_server_group'); + end if; + + -- If we're setting the total entitlemnt count to a lower value, + -- and that value is less than the allocated count in this org, + -- we need to raise an exception. + if quantity_in < prev_ent_count then + perform rhn_exception.raise_exception( + 'not_enough_entitlements_in_base_org'); + else + -- don't update family counts after every server + -- will do bulk update afterwards + perform rhn_entitlements.set_server_group_count(org_id_in, + group_type, + quantity_in, + 0); + -- bulk update family counts + perform rhn_channel.update_group_family_counts(group_label_in, org_id_in); + end if; + + end$$ +language plpgsql; + + + create or replace function set_server_group_count ( + customer_id_in in numeric, -- customer_id + group_type_in in numeric, -- rhn[User|Server]GroupType.id + quantity_in in numeric, -- quantity + update_family_countsYN in numeric default 1 + ) returns void +as $$ + declare + group_id numeric; + quantity numeric; + wasfound boolean; + begin + quantity := quantity_in; + if quantity is not null and quantity < 0 then + quantity := 0; + end if; + + select rsg.id + into group_id + from rhnServerGroup rsg + where 1=1 + and rsg.org_id = customer_id_in + and rsg.group_type = group_type_in; + + -- preserve the not found status across the rhn_entitlements.prune_group invocation + wasfound := true; + if not found then + wasfound := false; + end if; + + perform rhn_entitlements.prune_group( + group_id, + quantity, + update_family_countsYN + ); + + if not wasfound then + insert into rhnServerGroup ( + id, name, description, max_members, current_members, + group_type, org_id, created, modified + ) ( + select nextval('rhn_server_group_id_seq'), name, name, + quantity, 0, id, customer_id_in, + current_timestamp, current_timestamp + from rhnServerGroupType + where id = group_type_in + ); + end if; + + end$$ +language plpgsql; + +-- restore the original setting +update pg_settings set setting = overlay( setting placing '' from 1 for (length('rhn_entitlements')+1) ) where name = 'search_path';

12 years, 4 months

1
0
0 / 0

4 commits - rel-eng/push-packages-to-fedora.sh

by Miroslav Suchý

rel-eng/push-packages-to-fedora.sh | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) New commits: commit 5bd9f5eb5035bc209f78a77b19d94e53af5f4c6d Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Mon Jan 2 16:20:23 2012 +0100 do not tag spacewalk-backend package diff --git a/rel-eng/push-packages-to-fedora.sh b/rel-eng/push-packages-to-fedora.sh index c63abf7..3222c28 100755 --- a/rel-eng/push-packages-to-fedora.sh +++ b/rel-eng/push-packages-to-fedora.sh @@ -46,15 +46,15 @@ for package in $PACKAGE_LIST; do echo "Importing version: $NVR_GIT" fedpkg import $SRC_RPM || exit $? fedpkg commit -m "Rebase to $BASENAME in rawhide." - fedpkg tag -c echo "Review your changes and hit ENTER to continue or Ctrl+C to stop" read git push || ( echo 'Error: could not push changes' && exit 1 ) - git push --tags if [ $package == "spacewalk-backend" ]; then echo "WARNING: please manualy comment out subpackage spacewalk-backend-sql-oracle in fedora dist-git and build the package. Hit ENTER to continue" read else + fedpkg tag -c + git push --tags fedpkg build --nowait fi else commit de9cdd9013c057fcdeb4f5d42bb59f353b5fffbf Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Mon Jan 2 16:19:21 2012 +0100 use fedpkg tag instead of git tag $BASENAME diff --git a/rel-eng/push-packages-to-fedora.sh b/rel-eng/push-packages-to-fedora.sh index 862f717..c63abf7 100755 --- a/rel-eng/push-packages-to-fedora.sh +++ b/rel-eng/push-packages-to-fedora.sh @@ -46,7 +46,7 @@ for package in $PACKAGE_LIST; do echo "Importing version: $NVR_GIT" fedpkg import $SRC_RPM || exit $? fedpkg commit -m "Rebase to $BASENAME in rawhide." - git tag $BASENAME + fedpkg tag -c echo "Review your changes and hit ENTER to continue or Ctrl+C to stop" read git push || ( echo 'Error: could not push changes' && exit 1 ) commit 832d3ce533ee6fc131ea62605cbc6a6aa96f22d5 Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Mon Jan 2 15:33:45 2012 +0100 warn about spacewalk-backend-sql-oracle during import into Fedora diff --git a/rel-eng/push-packages-to-fedora.sh b/rel-eng/push-packages-to-fedora.sh index d2ddd9c..862f717 100755 --- a/rel-eng/push-packages-to-fedora.sh +++ b/rel-eng/push-packages-to-fedora.sh @@ -51,7 +51,12 @@ for package in $PACKAGE_LIST; do read git push || ( echo 'Error: could not push changes' && exit 1 ) git push --tags - fedpkg build --nowait + if [ $package == "spacewalk-backend" ]; then + echo "WARNING: please manualy comment out subpackage spacewalk-backend-sql-oracle in fedora dist-git and build the package. Hit ENTER to continue" + read + else + fedpkg build --nowait + fi else echo "$NVR_DISTGIT already imported - skipping." fi commit 1734d670d7667cc9984cabccd7bbc70a7b3c4873 Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Mon Jan 2 15:29:35 2012 +0100 705363 - add spacewalk-web to list of packages to automaticaly import to Fedora diff --git a/rel-eng/push-packages-to-fedora.sh b/rel-eng/push-packages-to-fedora.sh index 2f83f04..d2ddd9c 100755 --- a/rel-eng/push-packages-to-fedora.sh +++ b/rel-eng/push-packages-to-fedora.sh @@ -7,7 +7,7 @@ TOP_DIR_FEDORA=$1 # top dir of spacewalk git checkout TOP_DIR_GIT=$2 -PACKAGE_LIST="rhnlib rhn-client-tools rhnsd yum-rhn-plugin rhncfg spacewalk-koan rhnpush nocpulse-common perl-Satcon perl-NOCpulse-CLAC perl-NOCpulse-Debug perl-NOCpulse-Gritch perl-NOCpulse-Object perl-NOCpulse-SetID perl-NOCpulse-Utils spacewalk-proxy-html spacewalk-proxy-docs spacecmd spacewalk-backend spacewalk-certs-tools rhn-custom-info spacewalk-config rhnmd spacewalk-branding python-gzipstream" +PACKAGE_LIST="rhnlib rhn-client-tools rhnsd yum-rhn-plugin rhncfg spacewalk-koan rhnpush nocpulse-common perl-Satcon perl-NOCpulse-CLAC perl-NOCpulse-Debug perl-NOCpulse-Gritch perl-NOCpulse-Object perl-NOCpulse-SetID perl-NOCpulse-Utils spacewalk-proxy-html spacewalk-proxy-docs spacecmd spacewalk-backend spacewalk-certs-tools rhn-custom-info spacewalk-config rhnmd spacewalk-branding python-gzipstream spacewalk-web" if [ -z "$TOP_DIR_FEDORA" -o ! -d "$TOP_DIR_FEDORA" ]; then

12 years, 4 months

1
0
0 / 0

Changes to 'refs/tags/spacewalk-web-1.7.2-1'

by Tomas Lestach

Tag 'spacewalk-web-1.7.2-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2012-01-02 15:07 +0000 Tagging package [spacewalk-web] version [1.7.2-1] in directory [web/]. Changes since rhn-client-tools-1.7.1-1: Tomas Lestach (2): 771214 - add missing widget require Automatic commit of package [spacewalk-web] release [1.7.2-1]. --- rel-eng/packages/spacewalk-web | 2 +- web/modules/sniglets/Sniglets/ChannelEditor.pm | 1 + web/spacewalk-web.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) ---

12 years, 4 months

1
0
0 / 0

2 commits - rel-eng/packages web/modules web/spacewalk-web.spec

by Tomas Lestach

rel-eng/packages/spacewalk-web | 2 +- web/modules/sniglets/Sniglets/ChannelEditor.pm | 1 + web/spacewalk-web.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) New commits: commit ead6ef18fcf37fefd8296057da60e262142a56c0 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Mon Jan 2 16:07:22 2012 +0100 Automatic commit of package [spacewalk-web] release [1.7.2-1]. diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web index 5732789..b735add 100644 --- a/rel-eng/packages/spacewalk-web +++ b/rel-eng/packages/spacewalk-web @@ -1 +1 @@ -1.7.1-1 web/ +1.7.2-1 web/ diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec index f1e9377..9d043df 100644 --- a/web/spacewalk-web.spec +++ b/web/spacewalk-web.spec @@ -2,7 +2,7 @@ Name: spacewalk-web Summary: Spacewalk Web site - Perl modules Group: Applications/Internet License: GPLv2 -Version: 1.7.1 +Version: 1.7.2 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk/ Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -254,6 +254,9 @@ rm -rf $RPM_BUILD_ROOT # $Id$ %changelog +* Mon Jan 02 2012 Tomas Lestach <tlestach(a)redhat.com> 1.7.2-1 +- 771214 - add missing widget require (tlestach(a)redhat.com) + * Thu Dec 22 2011 Milan Zazrivec <mzazrivec(a)redhat.com> 1.7.1-1 - web.version: 1.7 nightly commit a2e98e41acd13c116685996378de3714108bb7cc Author: Tomas Lestach <tlestach(a)redhat.com> Date: Mon Jan 2 16:06:32 2012 +0100 771214 - add missing widget require diff --git a/web/modules/sniglets/Sniglets/ChannelEditor.pm b/web/modules/sniglets/Sniglets/ChannelEditor.pm index 2ad0040..a3ce02c 100644 --- a/web/modules/sniglets/Sniglets/ChannelEditor.pm +++ b/web/modules/sniglets/Sniglets/ChannelEditor.pm @@ -25,6 +25,7 @@ use Sniglets::Channel; use RHN::DataSource::Package; use RHN::DataSource::Channel; +use RHN::Form::Widget::RadiobuttonGroup; sub register_tags { my $class = shift;

12 years, 4 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

spacewalk-commits January 2012