Changes to 'refs/tags/spacewalk-java-2.1.44-1'
by Tomas Lestach
Tag 'spacewalk-java-2.1.44-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2013-09-18 15:00 +0000
Tagging package [spacewalk-java] version [2.1.44-1] in directory [java/].
Changes since spacewalk-schema-2.1.20-1:
Michael Mraka (1):
updated UI strings pulled from zanata
Tomas Kasparek (1):
1009019 - mentioning entitlement labels in apidoc
Tomas Lestach (2):
1007998 - fix activation key selection
Automatic commit of package [spacewalk-java] release [2.1.44-1].
---
java/code/src/com/redhat/rhn/common/db/datasource/xml/General_queries.xml | 4
java/code/src/com/redhat/rhn/frontend/action/token/ActivationKeysListAction.java | 2
java/code/src/com/redhat/rhn/frontend/dto/ActivationKeyDto.java | 12 +-
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ru.xml | 60 +++++-----
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml | 2
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml | 16 +-
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml | 2
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml | 40 +++---
java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_ru.xml | 2
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java | 6 -
java/spacewalk-java.spec | 9 +
rel-eng/packages/spacewalk-java | 2
12 files changed, 83 insertions(+), 74 deletions(-)
---
10 years, 7 months
java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/spacewalk-java.spec | 9 ++++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 9 insertions(+), 2 deletions(-)
New commits:
commit f729c6e61babbb16149a387ab70923312ebedeb6
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Sep 18 17:00:10 2013 +0200
Automatic commit of package [spacewalk-java] release [2.1.44-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index ff95db9..85524b7 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -28,7 +28,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 2.1.43
+Version: 2.1.44
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -785,6 +785,13 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Wed Sep 18 2013 Tomas Lestach <tlestach(a)redhat.com> 2.1.44-1
+- updated UI strings pulled from zanata
+- 1007998 - fix activation key selection
+- 1009019 - mentioning entitlement labels in apidoc
+- 820225 - remove and recount entitlements before we remove guest associations
+- 910739 - fix systemgroup.scheduleApplyErrataToActive API doc
+
* Tue Sep 17 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.43-1
- Grammar error occurred
- 1008687 - Fixing unlocalized strings in Manage Software Channels tab
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 6d82783..aff1ab0 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-2.1.43-1 java/
+2.1.44-1 java/
10 years, 7 months
java/code
by Michael Mraka
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ru.xml | 60 +++++-----
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml | 2
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml | 16 +-
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml | 2
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml | 40 +++---
java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_ru.xml | 2
6 files changed, 61 insertions(+), 61 deletions(-)
New commits:
commit d3c1ebddc7765e672625130b69f53136da31e924
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Sep 3 03:59:09 2013 -0400
updated UI strings pulled from zanata
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ru.xml b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ru.xml
index 7a3364e..662bf1d 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ru.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ru.xml
@@ -416,7 +416,7 @@
<context-group name="ctx">
<context context-type="sourcefile">/rhn/monitoring/config/GeneralConfig.do</context>
</context-group>
- <target>Полностью квалифицированное имя узла @@PRODUCT_NAME@@</target>
+ <target>Доменное имя @@PRODUCT_NAME@@</target>
</trans-unit>
<trans-unit id="RHN_SAT_WEB_PORT">
<source>@@PRODUCT_NAME@@ webserver port (80 for http, 443 for https)</source>
@@ -445,14 +445,14 @@
<context-group name="ctx">
<context context-type="sourcefile">/rhn/systems/details/probes/ProbeEdit.do</context>
</context-group>
- <target>Критично: если процентная часть доступного места превышает</target>
+ <target>Критично: занято больше чем</target>
</trans-unit>
<trans-unit id="Available Space Percent Used Warn if Above">
<source>Available Space Percent Used Warn if Above</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/systems/details/probes/ProbeEdit.do</context>
</context-group>
- <target>Предупреждение: если процентная часть доступного места превышает</target>
+ <target>Предупреждение: занято больше чем</target>
</trans-unit>
<trans-unit id="BEA Domain Admin Server">
<source>BEA Domain Admin Server</source>
@@ -900,7 +900,7 @@
<context-group name="ctx">
<context context-type="sourcefile">/rhn/systems/details/probes/ProbeEdit.do</context>
</context-group>
- <target>Критично: запросы повторного выделения места для журнала</target>
+ <target>Критично: запросы места для журнала повтора</target>
</trans-unit>
<trans-unit id="Critical Request Rate">
<source>Critical Request Rate</source>
@@ -1236,7 +1236,7 @@
<context-group name="ctx">
<context context-type="sourcefile">/rhn/systems/details/probes/ProbeEdit.do</context>
</context-group>
- <target>Файл журнала</target>
+ <target>Журнал</target>
</trans-unit>
<trans-unit id="MySQL Port">
<source>MySQL Port</source>
@@ -1376,7 +1376,7 @@
<context-group name="ctx">
<context context-type="sourcefile">/rhn/systems/details/probes/ProbeEdit.do</context>
</context-group>
- <target>Имя очереди</target>
+ <target>Очередь</target>
</trans-unit>
<trans-unit id="RHNMD Port">
<source>RHNMD Port</source>
@@ -1516,7 +1516,7 @@
<context-group name="ctx">
<context context-type="sourcefile">/rhn/systems/details/probes/ProbeEdit.do</context>
</context-group>
- <target>Имя области таблицы</target>
+ <target>Пространство таблиц</target>
</trans-unit>
<trans-unit id="Time Blocking (seconds)">
<source>Time Blocking (seconds)</source>
@@ -1964,7 +1964,7 @@
<context-group name="ctx">
<context context-type="sourcefile">/rhn/systems/details/probes/ProbeEdit.do</context>
</context-group>
- <target>Предупреждение: запросы повторного выделения места для журнала</target>
+ <target>Предупреждение: запросы места для журнала повтора</target>
</trans-unit>
<trans-unit id="Warning Request Rate">
<source>Warning Request Rate</source>
@@ -2154,7 +2154,7 @@
<context-group name="ctx">
<context context-type="sourcefile">/rhn/systems/details/probes/ProbeDetails.do</context>
</context-group>
- <target>Заблокированные процессы</target>
+ <target>Заблокированные</target>
</trans-unit>
<trans-unit id="metrics.Blocking sessions">
<source>Blocking sessions</source>
@@ -2280,7 +2280,7 @@
<context-group name="ctx">
<context context-type="sourcefile">/rhn/systems/details/probes/ProbeDetails.do</context>
</context-group>
- <target>Скорость получения блока DB</target>
+ <target>Скорость получения блоков</target>
</trans-unit>
<trans-unit id="metrics.Data dict hit ratio">
<source>Data dict hit ratio</source>
@@ -2462,7 +2462,7 @@
<context-group name="ctx">
<context context-type="sourcefile">/rhn/systems/details/probes/ProbeDetails.do</context>
</context-group>
- <target>Открыть объекты</target>
+ <target>Открытые объекты</target>
</trans-unit>
<trans-unit id="metrics.Opened objects">
<source>Opened objects</source>
@@ -2588,7 +2588,7 @@
<context-group name="ctx">
<context context-type="sourcefile">/rhn/systems/details/probes/ProbeDetails.do</context>
</context-group>
- <target>Скорость запросов повторного выделения места для журнала</target>
+ <target>Скорость запросов места для журнала повтора</target>
</trans-unit>
<trans-unit id="metrics.Reload rate">
<source>Reload rate</source>
@@ -2851,7 +2851,7 @@
</trans-unit>
<trans-unit id="Blocked Processes">
<source>Blocked Processes</source>
- <target>Заблокированные процессы</target>
+ <target>Заблокированные</target>
</trans-unit>
<trans-unit id="Buffer Cache Hit Ratio">
<source>Buffer Cache Hit Ratio</source>
@@ -2903,7 +2903,7 @@
</trans-unit>
<trans-unit id="DB Block Get Rate">
<source>DB Block Get Rate</source>
- <target>Скорость получения блоков DB</target>
+ <target>Скорость получения блоков</target>
</trans-unit>
<trans-unit id="Data Dictionary Hit Ratio">
<source>Data Dictionary Hit Ratio</source>
@@ -2995,7 +2995,7 @@
</trans-unit>
<trans-unit id="Open Objects">
<source>Open Objects</source>
- <target>Открыть объекты</target>
+ <target>Открытые объекты</target>
</trans-unit>
<trans-unit id="Opened Objects">
<source>Opened Objects</source>
@@ -3047,11 +3047,11 @@
</trans-unit>
<trans-unit id="Redo Buffer Allocation Retry Rate">
<source>Redo Buffer Allocation Retry Rate</source>
- <target>Скорость повторных попыток выделения буфера возврата</target>
+ <target>Скорость повторных попыток выделения буфера</target>
</trans-unit>
<trans-unit id="Redo Log Space Request Rate">
<source>Redo Log Space Request Rate</source>
- <target>Скорость запросов возврата места журнала</target>
+ <target>Скорость запросов места для журнала повтора</target>
</trans-unit>
<trans-unit id="Regular Expression Match Rate">
<source>Regular Expression Match Rate</source>
@@ -3302,7 +3302,7 @@
rhn_command_requirements.name -> rhn_command_requirements.description</note>
<trans-unit id="npunix">
<source>RHNMD must be running on the monitored host to perform this check.</source>
- <target>Для осуществления этой проверки необходимо, чтобы выполнялся RHNMD на контролируемом узле.</target>
+ <target>Для осуществления этой проверки необходимо, чтобы в проверяемой системе работал RHNMD.</target>
</trans-unit>
<trans-unit id="oracle">
<source>Oracle checks require the configuration of the database and public associations made by running $ORACLE_HOME/rdbms/admin/catalog.sql. In addition, in any instance of Oracle, the Oracle user configured in the check must have minimum privileges of CONNECT and SELECT_CATALOG_ROLE.</source>
@@ -3353,7 +3353,7 @@
</trans-unit>
<trans-unit id="Log Agent">
<source>Log Agent</source>
- <target>Агент журналирования</target>
+ <target>Журналы</target>
</trans-unit>
<trans-unit id="MySQL">
<source>MySQL</source>
@@ -3420,11 +3420,11 @@
</trans-unit>
<trans-unit id="Database Accessibility">
<source>Database Accessibility</source>
- <target>Доступность базы данных</target>
+ <target>Доступ к базе данных</target>
</trans-unit>
<trans-unit id="Disk I/O Throughput">
<source>Disk I/O Throughput</source>
- <target>Пропускная способность ввода/ вывода диска</target>
+ <target>Пропускная способность диска</target>
</trans-unit>
<trans-unit id="Disk Sort Ratio">
<source>Disk Sort Ratio</source>
@@ -3440,7 +3440,7 @@
</trans-unit>
<trans-unit id="Execute Queue">
<source>Execute Queue</source>
- <target>Выполнить очередь</target>
+ <target>Состояние очереди</target>
</trans-unit>
<trans-unit id="Execution Time">
<source>Execution Time</source>
@@ -3484,7 +3484,7 @@
</trans-unit>
<trans-unit id="JDBC Connection Pool">
<source>JDBC Connection Pool</source>
- <target>Пул соединения JDBC</target>
+ <target>Пул JDBC</target>
</trans-unit>
<trans-unit id="Latency">
<source>Latency</source>
@@ -3504,11 +3504,11 @@
</trans-unit>
<trans-unit id="Log Pattern Match">
<source>Log Pattern Match</source>
- <target>Соответствие шаблона журналирования</target>
+ <target>Совпадение с шаблоном</target>
</trans-unit>
<trans-unit id="Log Size Growth">
<source>Log Size Growth</source>
- <target>Рост размера журнала</target>
+ <target>Изменение размера</target>
</trans-unit>
<trans-unit id="LongLegs">
<source>LongLegs</source>
@@ -3516,7 +3516,7 @@
</trans-unit>
<trans-unit id="Mail Transfer (SMTP)">
<source>Mail Transfer (SMTP)</source>
- <target>Передача почты (SMTP)</target>
+ <target>SMTP</target>
</trans-unit>
<trans-unit id="Memory Usage">
<source>Memory Usage</source>
@@ -3528,7 +3528,7 @@
</trans-unit>
<trans-unit id="Opened Tables">
<source>Opened Tables</source>
- <target>Открытые таблицы</target>
+ <target>Открытые таблицы (всего)</target>
</trans-unit>
<trans-unit id="POP Mail">
<source>POP Mail</source>
@@ -3576,7 +3576,7 @@
</trans-unit>
<trans-unit id="Redo Log">
<source>Redo Log</source>
- <target>Протокол повторений (redo)</target>
+ <target>Журнал повтора</target>
</trans-unit>
<trans-unit id="Remote Ping">
<source>Remote Ping</source>
@@ -3636,11 +3636,11 @@
</trans-unit>
<trans-unit id="Table Extents">
<source>Table Extents</source>
- <target>Диапазоны таблиц</target>
+ <target>Экстенты таблиц</target>
</trans-unit>
<trans-unit id="Tablespace Usage">
<source>Tablespace Usage</source>
- <target>Использование области таблиц</target>
+ <target>Область таблиц</target>
</trans-unit>
<trans-unit id="Threads Running">
<source>Threads Running</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml
index 8bbe9ba..04c4c5f 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml
@@ -251,7 +251,7 @@
<context-group name="ctx">
<context context-type="sourcefile">Navigation Menu</context>
</context-group>
- <target>Su</target>
+ <target>Documentazione</target>
</trans-unit>
<trans-unit id="Account">
<source>Account</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml
index 3ed3508..aa071ad 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml
@@ -235,7 +235,7 @@
</trans-unit>
<trans-unit id="Warning">
<source>Warning</source>
- <target>Внимание</target>
+ <target>Предупреждение</target>
</trans-unit>
<trans-unit id="Custom">
<source>Custom</source>
@@ -715,7 +715,7 @@
<context-group name="ctx">
<context context-type="sourcefile">Navigation Menu</context>
</context-group>
- <target>Уведомление</target>
+ <target>Уведомления</target>
</trans-unit>
<trans-unit id="Out of Date">
<source>Out of Date</source>
@@ -883,7 +883,7 @@
<context-group name="ctx">
<context context-type="sourcefile">Navigation Menu</context>
</context-group>
- <target>Сохранить на сервере</target>
+ <target>Отправить настройки</target>
</trans-unit>
<trans-unit id="Search">
<source>Search</source>
@@ -2795,14 +2795,14 @@ available for this kickstart profile to function properly.
<context-group name="ctx">
<context context-type="sourcefile">/rhn/monitoring/config/ProbeSuites.do</context>
</context-group>
- <target>создать комплект обработчиков</target>
+ <target>создать комплект</target>
</trans-unit>
<trans-unit id="toolbar.create.probesuitesystem">
<source>add systems to probe suite</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/monitoring/config/ProbeSuites.do</context>
</context-group>
- <target>добавить системы к набору обработчиков</target>
+ <target>добавить системы в набор обработчиков</target>
</trans-unit>
<trans-unit id="toolbar.delete.profile">
<source>delete profile</source>
@@ -3900,7 +3900,7 @@ user before attempting to deactivate their account.</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/monitoring/config/ProbeSuiteSystemsEdit.do</context>
</context-group>
- <target>Добавить системы в комплект обработчиков</target>
+ <target>Добавить системы в набор обработчиков</target>
</trans-unit>
<trans-unit id="probesuitesystemsedit.jsp.search">
<source>Search for Systems</source>
@@ -4210,7 +4210,7 @@ user before attempting to deactivate their account.</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/monitoring/config/GeneralConfig.do</context>
</context-group>
- <target>Не произведено изменений.</target>
+ <target>Нет изменений.</target>
</trans-unit>
<trans-unit id="AD">
<source>Andorra</source>
@@ -6330,7 +6330,7 @@ user before attempting to deactivate their account.</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/admin/config/Restart.do</context>
</context-group>
- <target>Система поиска @@PRODUCT_NAME@@</target>
+ <target>Система проверки @@PRODUCT_NAME@@</target>
</trans-unit>
<trans-unit id="Panic Destination">
<source>Panic Destination</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml
index aad1773..8fb371d 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml
@@ -23206,7 +23206,7 @@ Sono necessari sia l'etichetta che il nome del canale. Essi devono avere almeno
<context-group name="ctx">
<context context-type="sourcefile">/rhn/admin/ScheduleDetail.do</context>
</context-group>
- <target>Qqui è possibile impostare una programmazione del gruppo selezionato.</target>
+ <target>Qui è possibile impostare una programmazione del gruppo selezionato.</target>
</trans-unit>
<trans-unit id="schedule.delete.jsp.introparagraph">
<source>Are you sure you want to delete the schedule? Associated bunch won't get scheduled any more. This can have a huge impact on satellite functionality. Proceed only if you know what you're doing.</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml
index e94514c..d8a8410 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml
@@ -6643,14 +6643,14 @@ value for this entitlement, excluding the default organization's consumption.</s
<context-group name="ctx">
<context context-type="sourcefile">/rhn/monitoring/config/GeneralConfig.do</context>
</context-group>
- <target>После обновления опций конфигурации, будет необходим перезапуск служб контроля этого Satellite-сервера и всех ваших серверов @@PRODUCT_NAME@@ Proxy с включенным режимом Мониторинга. Все действия будут назначены автоматически при обновлении этой страницы.</target>
+ <target>После обновления опций конфигурации, будет необходим перезапуск служб контроля этого Satellite-сервера и всех серверов @@PRODUCT_NAME@@ Proxy с включенным режимом мониторинга. Действия будут назначены автоматически при обновлении этой страницы.</target>
</trans-unit>
<trans-unit id="generalconfig.jsp.update_config">
<source>Update Config</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/monitoring/config/GeneralConfig.do</context>
</context-group>
- <target>Обновить конфигурацию</target>
+ <target>Обновить</target>
</trans-unit>
<trans-unit id="removeconfirm.jsp.confirmpackageremoval">
<source>Confirm Package Removal</source>
@@ -6891,14 +6891,14 @@ value for this entitlement, excluding the default organization's consumption.</s
<context-group name="ctx">
<context context-type="sourcefile">/rhn/systems/details/probes/ProbeEdit.do</context>
</context-group>
- <target>Система поиска</target>
+ <target>Система проверки</target>
</trans-unit>
<trans-unit id="probeedit.jsp.commandrequirements">
<source>Probe Requirements</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/systems/details/probes/ProbeEdit.do</context>
</context-group>
- <target>Требования обработчика</target>
+ <target>Требования</target>
</trans-unit>
<trans-unit id="probeedit.jsp.versionsupport">
<source>Supported Versions</source>
@@ -7011,7 +7011,7 @@ value for this entitlement, excluding the default organization's consumption.</s
<context-group name="ctx">
<context context-type="sourcefile">/rhn/systems/details/packages/ScheduleRemoteCommand.do</context>
</context-group>
- <target>Назначить исполнение команды</target>
+ <target>Назначить</target>
</trans-unit>
<trans-unit id="scheduleremote.jsp.summary">
<source>You can schedule a remote script to execute on this system below. The script will run as the user you specify.</p> <p>You must enable Remote Command execution on the target system, by adding a file to the local rhn configuration directory: <code>allowed-actions/script/run/</code>.</source>
@@ -7376,7 +7376,7 @@ value for this entitlement, excluding the default organization's consumption.</s
<context-group name="ctx">
<context context-type="sourcefile">/rhn/monitoring/config/ProbeSuiteProbeCreate.do</context>
</context-group>
- <target>Создать новый обработчик для этого комплекта</target>
+ <target>Создание обработчика в комплекте</target>
</trans-unit>
<trans-unit id="probe-edit.jsp.header1">
<source>Edit probe {0} for suite {1}</source>
@@ -7398,7 +7398,7 @@ value for this entitlement, excluding the default organization's consumption.</s
<context context-type="sourcefile">/rhn/monitoring/config/ProbeSuiteProbeCreate.do</context>
<context context-type="sourcefile">/rhn/systems/details/probes/ProbeCreate.do</context>
</context-group>
- <target>Командная группа</target>
+ <target>Группа</target>
</trans-unit>
<trans-unit id="probecreate.jsp.createprobe">
<source>Create probe</source>
@@ -7421,21 +7421,21 @@ value for this entitlement, excluding the default organization's consumption.</s
<context-group name="ctx">
<context context-type="sourcefile">/rhn/monitoring/config/ProbeSuiteSystems.do</context>
</context-group>
- <target>Добавить системы к комплекту обработчиков: {0}</target>
+ <target>Добавить системы в набор обработчиков: {0}</target>
</trans-unit>
<trans-unit id="probesuitesystemsedit.jsp.summary">
<source>This list displays Monitoring entitled systems that have not yet been added to the Suite.</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/monitoring/config/ProbeSuiteSystems.do</context>
</context-group>
- <target>Данный список отображает системы с полномочиями Мониторинга, которые еще не были добавлены к вашему комплекту.</target>
+ <target>Список отображает системы с полномочиями мониторинга, которые еще не были добавлены в комплект.</target>
</trans-unit>
<trans-unit id="probesuitesystemsedit.jsp.monscouttouse">
<source>Monitoring Scout for Systems added to this Suite:</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/monitoring/config/ProbeSuiteSystems.do</context>
</context-group>
- <target>Система поиска для систем, добавленных в этот комплект:</target>
+ <target>Система проверки для систем в составе комплекта:</target>
</trans-unit>
<trans-unit id="probesuitesystemsedit.jsp.systemname">
<source>System Name</source>
@@ -8851,7 +8851,7 @@ organization management tools if you choose to remove this role from your login.
</trans-unit>
<trans-unit id="methods.jsp.summary">
<source>Notification Methods are email addresses where Monitoring related alerts generated by Probes will be sent to.</source>
- <target>Методы уведомлений представляют собой эл.адреса, на которые будут отправлены генерируемые обработчиками сообщения, имеющие отношение к полномочию Мониторинга.</target>
+ <target>Методы уведомлений содержат адреса, на которые будут отправлены сообщения проверок, имеющих отношение к мониторингу.</target>
</trans-unit>
<trans-unit id="methods.jsp.methodname">
<source>Name</source>
@@ -8871,7 +8871,7 @@ organization management tools if you choose to remove this role from your login.
</trans-unit>
<trans-unit id="methods.jsp.logintitle">
<source>Click here to view or create Methods for this User</source>
- <target>Нажмите здесь для просмотра или создания методов данного пользователя</target>
+ <target>Нажмите здесь для просмотра или создания методов</target>
</trans-unit>
</group>
<group>
@@ -8885,7 +8885,7 @@ organization management tools if you choose to remove this role from your login.
</trans-unit>
<trans-unit id="method-create.jsp.summary">
<source>Fill out this form to create a new Notification Method. Changes to Probes that use this new Method will require a Scout Config Push.</source>
- <target>Заполните форму для создания нового метода уведомлений. Изменения обработчиков, использующих новый метод, потребуют обновить конфигурацию в поисковой системе.</target>
+ <target>Заполните форму для создания нового метода уведомлений. Изменения обработчиков, использующих новый метод, потребуют обновить конфигурацию.</target>
</trans-unit>
<trans-unit id="method-form.jspf.name">
<source>Name</source>
@@ -8905,11 +8905,11 @@ organization management tools if you choose to remove this role from your login.
</trans-unit>
<trans-unit id="method-form.jspf.pager">
<source>Pager</source>
- <target>Пэйджер</target>
+ <target>Сводка</target>
</trans-unit>
<trans-unit id="method-form.jspf.savemethod">
<source>Save Method</source>
- <target>Сохранить метод</target>
+ <target>Сохранить</target>
</trans-unit>
</group>
<trans-unit id="id">
@@ -9001,7 +9001,7 @@ organization management tools if you choose to remove this role from your login.
<context-group name="ctx">
<context context-type="sourcefile">/rhn/admin/config/GeneralConfig.do</context>
</context-group>
- <target>Ниже вы можете настроить @@PRODUCT_NAME@@. Используйте установки HTTP proxy для взаимодействия сервера @@PRODUCT_NAME@@ с родительским сервером @@PRODUCT_NAME@@. Значение HTTP proxy должно быть представлено в форме «узел:порт». Если номер порта опущен, по умолчанию используется порт 8080. Установки HTTP proxy для подключающихся к @@PRODUCT_NAME@@ клиентов могут отличаться и будут настроены позже. Если вы включили базу данных мониторинга, необходимо также включить систему поиска мониторинга или настроить ее на отдельном сервере. </target>
+ <target>Ниже вы можете настроить @@PRODUCT_NAME@@. Используйте установки HTTP proxy для взаимодействия @@PRODUCT_NAME@@ с родительским сервером @@PRODUCT_NAME@@. HTTP proxy должен быть представлен в форме «узел:порт». Если номер порта опущен, по умолчанию используется 8080. Установки HTTP proxy для клиентов @@PRODUCT_NAME@@ могут отличаться и будут настроены позже. Если вы включили базу данных мониторинга, необходимо также включить систему проверки или настроить ее на отдельном сервере. </target>
</trans-unit>
<trans-unit id="general.jsp.org.header">
<source>@@PRODUCT_NAME@@ Organizations</source>
@@ -9215,7 +9215,7 @@ administrator privileges.</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/admin/config/GeneralConfig.do</context>
</context-group>
- <target>Включить систему поиска</target>
+ <target>Включить систему проверки</target>
</trans-unit>
<trans-unit id="config.update">
<source>Update</source>
@@ -18313,7 +18313,7 @@ the <a href="/rhn/kickstart/ActivationKeysList.do?ksid={0}">Activation Key
<context-group name="ctx">
<context context-type="sourcefile">/rhn/monitoring/ProbeList.do</context>
</context-group>
- <target>Список статусов обработчика</target>
+ <target>Состояние обработчиков</target>
</trans-unit>
<trans-unit id="monitoring.probes.jsp.header2">
<source>Probes</source>
@@ -23835,7 +23835,7 @@ given channel.</source>
</trans-unit>
<trans-unit id="iss.slave.toAll">
<source>Sync All Orgs to Slave?</source>
- <target>Синхронизировать организации на подчиненном?</target>
+ <target>Синхронизировать организации?</target>
</trans-unit>
<trans-unit id="iss.slave.all">
<source>Sync All</source>
@@ -23919,7 +23919,7 @@ given channel.</source>
</trans-unit>
<trans-unit id="iss.master.cacert">
<source>Filename of this Master's CA Certificate</source>
- <target>Файл CA-сертификата</target>
+ <target>Сертификат CA</target>
</trans-unit>
<trans-unit id="iss.master.cacert.note">
<source>Note that this is the absolute path on the file system of this @@PRODUCT_NAME@@</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_ru.xml b/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_ru.xml
index 0733eaf..68c617e 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_ru.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_ru.xml
@@ -671,7 +671,7 @@
<context-group name="ctx">
<context context-type="sourcefile">Navigation Menu</context>
</context-group>
- <target>Конфигурация @@PRODUCT_NAME@@</target>
+ <target>@@PRODUCT_NAME@@</target>
</trans-unit>
<trans-unit id="ISS Configuration">
<source>ISS Configuration</source>
10 years, 7 months
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/common/db/datasource/xml/General_queries.xml | 4 +--
java/code/src/com/redhat/rhn/frontend/action/token/ActivationKeysListAction.java | 2 -
java/code/src/com/redhat/rhn/frontend/dto/ActivationKeyDto.java | 12 +++++-----
3 files changed, 9 insertions(+), 9 deletions(-)
New commits:
commit 37c5a382a4f5d152fce0d26bbcf4a0caa341f531
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Sep 18 10:22:35 2013 +0200
1007998 - fix activation key selection
'disabled' key conflicted with 'disabled' selectable item
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/General_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/General_queries.xml
index a43dd5b..ec35dc1 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/General_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/General_queries.xml
@@ -204,7 +204,7 @@ ORDER BY SEV.label
<mode name="activation_keys_for_org" class="com.redhat.rhn.frontend.dto.ActivationKeyDto">
<query params="org_id">
SELECT DISTINCT RT.id,
- RT.disabled,
+ RT.disabled AS key_disabled,
RT.note,
AK.token,
RT.usage_limit,
@@ -228,7 +228,7 @@ ORDER BY RT.note, RT.id
<mode name="active_activation_keys_for_org" class="com.redhat.rhn.frontend.dto.ActivationKeyDto">
<query params="org_id">
SELECT DISTINCT RT.id,
- RT.disabled,
+ RT.disabled AS key_disabled,
RT.note,
AK.token,
RT.usage_limit,
diff --git a/java/code/src/com/redhat/rhn/frontend/action/token/ActivationKeysListAction.java b/java/code/src/com/redhat/rhn/frontend/action/token/ActivationKeysListAction.java
index a69cb7c..ba0b931 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/token/ActivationKeysListAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/token/ActivationKeysListAction.java
@@ -76,7 +76,7 @@ public class ActivationKeysListAction extends RhnAction {
if (!context.isSubmitted()) {
set.clear();
for (ActivationKeyDto dto : dataSet) {
- if (!dto.isDisabled()) {
+ if (!dto.isKeyDisabled()) {
set.addElement(dto.getId().longValue());
}
if (dto.isOrgDefault()) {
diff --git a/java/code/src/com/redhat/rhn/frontend/dto/ActivationKeyDto.java b/java/code/src/com/redhat/rhn/frontend/dto/ActivationKeyDto.java
index 8f836ff..d9887e5 100644
--- a/java/code/src/com/redhat/rhn/frontend/dto/ActivationKeyDto.java
+++ b/java/code/src/com/redhat/rhn/frontend/dto/ActivationKeyDto.java
@@ -26,7 +26,7 @@ import org.apache.commons.lang.BooleanUtils;
public class ActivationKeyDto extends BaseDto {
private Long id;
- private boolean disabled;
+ private boolean keyDisabled;
private String note;
private String token;
private Integer usageLimit;
@@ -55,20 +55,20 @@ public class ActivationKeyDto extends BaseDto {
* Is the key disabled?
* @return Returns true if disabled, false if enabled.
*/
- public boolean isDisabled() {
- return disabled;
+ public boolean isKeyDisabled() {
+ return keyDisabled;
}
/**
* Disable (or enable) the key
* @param value 1 if the key is disabled
*/
- public void setDisabled(Integer value) {
+ public void setKeyDisabled(Integer value) {
if (value == null || (!value.equals(new Integer(1)))) {
- this.disabled = false;
+ this.keyDisabled = false;
}
else {
- this.disabled = true;
+ this.keyDisabled = true;
}
return;
10 years, 7 months
java/code
by Tomáš Kašpárek
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit daeb88f1f7efc64cb3ac085c48fed383cc01cbd0
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Tue Sep 17 16:11:50 2013 +0200
1009019 - mentioning entitlement labels in apidoc
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
index 1abaeff..9a4de41 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
@@ -3872,11 +3872,13 @@ public class SystemHandler extends BaseHandler {
* @param entitlements List of addon entitlement labels to add.
* @return 1 on success, exception thrown otherwise.
*
- * @xmlrpc.doc Add addon entitlements to a server. Entitlements a server already has
+ * @xmlrpc.doc Add entitlements to a server. Entitlements a server already has
* are quietly ignored.
* @xmlrpc.param #param("string", "sessionKey")
* @xmlrpc.param #param("int", "serverId")
- * @xmlrpc.param #array_single("string", " entitlementLabel")
+ * @xmlrpc.param #array_single("string", "entitlementLabel - one of following:
+ * monitoring_entitled, provisioning_entitled, virtualization_host,
+ * virtualization_host_platform, enterprise_entitled")
* @xmlrpc.returntype #return_int_success()
*/
public int addEntitlements(String sessionKey, Integer serverId,
10 years, 7 months
Changes to 'refs/tags/spacewalk-schema-2.1.20-1'
by Jan Dobes
Tag 'spacewalk-schema-2.1.20-1' created by Jan Dobes <jdobes(a)redhat.com> at 2013-09-17 13:36 +0000
Tagging package [spacewalk-schema] version [2.1.20-1] in directory [schema/spacewalk/].
Changes since smartpm-5.5.0-5:
Jan Dobes (3):
820225 - recount associated virtual guests entitlements even in other orgs
820225 - remove and recount entitlements before we remove guest associations
Automatic commit of package [spacewalk-schema] release [2.1.20-1].
Tomas Lestach (1):
910739 - fix systemgroup.scheduleApplyErrataToActive API doc
---
java/code/src/com/redhat/rhn/frontend/xmlrpc/systemgroup/ServerGroupHandler.java | 1
java/code/src/com/redhat/rhn/manager/system/SystemManager.java | 1
rel-eng/packages/spacewalk-schema | 2
schema/spacewalk/oracle/packages/rhn_entitlements.pkb | 6
schema/spacewalk/postgres/packages/rhn_entitlements.pkb | 8
schema/spacewalk/spacewalk-schema.spec | 5
schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/020-rhn_entitlements.pkb.sql.oracle | 1778 +++++++++
schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/020-rhn_entitlements.pkb.sql.postgresql | 1787 ++++++++++
8 files changed, 3578 insertions(+), 10 deletions(-)
---
10 years, 7 months
rel-eng/packages schema/spacewalk
by Jan Dobes
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit aa0a33abecb4fe1dce68205f5143dea5372d3256
Author: Jan Dobes <jdobes(a)redhat.com>
Date: Tue Sep 17 15:36:55 2013 +0200
Automatic commit of package [spacewalk-schema] release [2.1.20-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index 9a71bb7..211eaa1 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-2.1.19-1 schema/spacewalk/
+2.1.20-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index fdbe539..099202d 100644
--- a/schema/spacewalk/spacewalk-schema.spec
+++ b/schema/spacewalk/spacewalk-schema.spec
@@ -4,7 +4,7 @@ Name: spacewalk-schema
Group: Applications/Internet
Summary: Oracle SQL schema for Spacewalk server
-Version: 2.1.19
+Version: 2.1.20
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -71,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-sql*
%changelog
+* Tue Sep 17 2013 Jan Dobes 2.1.20-1
+- 820225 - recount associated virtual guests entitlements even in other orgs
+
* Tue Sep 17 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.19-1
- upgrade script for Oracle Linux 6 key
- Added Oracle GPG key used to sign Oracle Linux 6 packages.
10 years, 7 months
2 commits - java/code schema/spacewalk
by Jan Dobes
java/code/src/com/redhat/rhn/manager/system/SystemManager.java | 1
schema/spacewalk/oracle/packages/rhn_entitlements.pkb | 6
schema/spacewalk/postgres/packages/rhn_entitlements.pkb | 8
schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/020-rhn_entitlements.pkb.sql.oracle | 1778 +++++++++
schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/020-rhn_entitlements.pkb.sql.postgresql | 1787 ++++++++++
5 files changed, 3573 insertions(+), 7 deletions(-)
New commits:
commit a1d81d34c5e525d9c74881a128ff3669f226e028
Author: Jan Dobes <jdobes(a)redhat.com>
Date: Tue Sep 17 09:58:11 2013 +0200
820225 - remove and recount entitlements before we remove guest associations
diff --git a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
index a70b1f0..362cd16 100644
--- a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
+++ b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
@@ -353,6 +353,7 @@ public class SystemManager extends BaseManager {
}
else {
if (server.getGuests() != null) {
+ removeAllServerEntitlements(server.getId());
// Remove guest associations to the host system we're now deleting:
for (Iterator it = server.getGuests().iterator(); it.hasNext();) {
VirtualInstance vi = (VirtualInstance)it.next();
commit ebc98f2de9b97468dbeb549696592c55abc394f2
Author: Jan Dobes <jdobes(a)redhat.com>
Date: Thu Sep 12 15:27:22 2013 +0200
820225 - recount associated virtual guests entitlements even in other orgs
diff --git a/schema/spacewalk/oracle/packages/rhn_entitlements.pkb b/schema/spacewalk/oracle/packages/rhn_entitlements.pkb
index 8525816..e55eb70 100644
--- a/schema/spacewalk/oracle/packages/rhn_entitlements.pkb
+++ b/schema/spacewalk/oracle/packages/rhn_entitlements.pkb
@@ -518,7 +518,7 @@ is
-- All of server group types associated with the guests of
-- server_id_in
cursor group_types is
- select distinct sg.group_type, sgt.label
+ select distinct sg.group_type, sgt.label, sg.org_id
from
rhnServerGroupType sgt,
rhnServerGroup sg,
@@ -709,7 +709,7 @@ is
into max_members_val, sg_id
from rhnServerGroup
where group_type = a_group_type.group_type
- and org_id = org_id_val;
+ and org_id = a_group_type.org_id;
select count(sep.server_id) into current_members_calc
@@ -730,7 +730,7 @@ is
end if;
update rhnServerGroup set current_members = current_members_calc
- where org_id = org_id_val
+ where org_id = a_group_type.org_id
and group_type = a_group_type.group_type;
-- I think that's all the house-keeping we have to do...
diff --git a/schema/spacewalk/postgres/packages/rhn_entitlements.pkb b/schema/spacewalk/postgres/packages/rhn_entitlements.pkb
index 0ccc4f1..bcf1d7c 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 b34e5effdc23dd2bc7bb9c805c71a0396d947848
+-- oracle equivalent source sha1 6faf828b0838ec2be2d6922790d22f6f3c6a40b6
--
-- Copyright (c) 2008--2012 Red Hat, Inc.
--
@@ -538,7 +538,7 @@ as $$
-- All of server group types associated with the guests of
-- server_id_in
group_types cursor for
- select distinct sg.group_type, sgt.label
+ select distinct sg.group_type, sgt.label, sg.org_id
from
rhnServerGroupType sgt,
rhnServerGroup sg,
@@ -720,7 +720,7 @@ as $$
into max_members_val, sg_id
from rhnServerGroup
where group_type = a_group_type.group_type
- and org_id = org_id_val;
+ and org_id = a_group_type.org_id;
select count(sep.server_id) into current_members_calc
@@ -741,7 +741,7 @@ as $$
end if;
update rhnServerGroup set current_members = current_members_calc
- where org_id = org_id_val
+ where org_id = a_group_type.org_id
and group_type = a_group_type.group_type;
-- I think that's all the house-keeping we have to do...
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/020-rhn_entitlements.pkb.sql.oracle b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/020-rhn_entitlements.pkb.sql.oracle
new file mode 100644
index 0000000..e55eb70
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/020-rhn_entitlements.pkb.sql.oracle
@@ -0,0 +1,1778 @@
+--
+-- Copyright (c) 2008--2012 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);
+
+ if type_label_in = 'monitoring_entitled' then
+ 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, sg.org_id
+ 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
+
+ begin
+
+ -- 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);
+
+ exception when no_data_found then null;
+ end;
+
+ -- 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 = a_group_type.org_id;
+
+
+ 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 = a_group_type.org_id
+ 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';
+ 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,
+ current_timestamp, current_timestamp
+ 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
+ cursor serverchannels(tmp_quantity number, is_fve_in char) 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;
+
+ for sc in serverchannels(quantity_in, 'N') loop
+ rhn_channel.unsubscribe_server(sc.server_id, sc.channel_id, 1, 1,
+ update_family_countsYN => 0);
+ end loop;
+
+ for sc in serverchannels(flex_in, 'Y') loop
+ rhn_channel.unsubscribe_server(sc.server_id, sc.channel_id, 1, 1,
+ update_family_countsYN => 0);
+ 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-2.0-to-spacewalk-schema-2.1/020-rhn_entitlements.pkb.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/020-rhn_entitlements.pkb.sql.postgresql
new file mode 100644
index 0000000..bcf1d7c
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/020-rhn_entitlements.pkb.sql.postgresql
@@ -0,0 +1,1787 @@
+-- oracle equivalent source sha1 6faf828b0838ec2be2d6922790d22f6f3c6a40b6
+--
+-- Copyright (c) 2008--2012 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 schema rhn_entitlements;
+
+-- setup search_path so that these functions are created in appropriate schema.
+update pg_settings set setting = 'rhn_entitlements,' || setting where name = 'search_path';
+
+ create or replace function find_compatible_sg (
+ server_id_in in numeric,
+ type_label_in in varchar
+ )
+ returns numeric
+as $$
+ declare
+ servergroups cursor for
+ select sg.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$$
+language plpgsql;
+
+ -- *******************************************************************
+ -- 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
+ -- *******************************************************************
+ create or replace function remove_org_entitlements (
+ org_id_in numeric
+ ) returns void
+as $$
+ declare
+ system_ents cursor for
+ select sg.id, sg.max_members, sg.group_type
+ from rhnServerGroup sg
+ where group_type is not null
+ and org_id = org_id_in;
+
+ channel_subs cursor for
+ 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$$
+language plpgsql;
+
+ create or replace function entitlement_grants_service (
+ entitlement_in in varchar,
+ service_level_in in varchar
+ ) returns numeric
+as $$
+ 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$$
+language plpgsql;
+
+ create or replace function lookup_entitlement_group (
+ org_id_in in numeric,
+ type_label_in in varchar default 'sw_mgr_entitled'
+ ) returns numeric
+as $$
+ declare
+ server_groups cursor for
+ 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$$
+language plpgsql;
+
+ create or replace function create_entitlement_group (
+ org_id_in in numeric,
+ type_label_in in varchar default 'sw_mgr_entitled'
+ ) returns numeric
+as $$
+ declare
+ sg_id_val numeric;
+ begin
+ select nextval('rhn_server_group_id_seq')
+ into sg_id_val;
+
+ 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$$
+language plpgsql;
+
+ create or replace function can_entitle_server (
+ server_id_in in numeric,
+ type_label_in in varchar
+ )
+ returns numeric
+as $$
+ declare
+ addon_servergroups cursor (base_label_in varchar,
+ addon_label_in varchar) for
+ 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 varchar[];
+ is_base_in char := 'N';
+ is_base_current char := 'N';
+ i numeric := 0;
+ sgid numeric := 0;
+
+ begin
+
+ 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 array_upper(previous_ent, 1) is null or array_upper(previous_ent, 1) = 0 then
+ if is_base_in = 'Y' then
+ sgid := rhn_entitlements.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_base_entitlement');
+ return 0;
+ end if;
+ 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 < array_upper(previous_ent, 1)
+ 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 := rhn_entitlements.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$$
+language plpgsql;
+
+ create or replace function can_switch_base (
+ server_id_in in integer,
+ type_label_in in varchar
+ )
+ returns numeric
+as $$
+ declare
+ type_label_in_is_base char(1);
+ sgid numeric;
+
+ begin
+
+ select is_base into type_label_in_is_base
+ from rhnServerGroupType
+ where label = type_label_in;
+
+ if not found then
+ perform rhn_exception.raise_exception ( 'invalid_entitlement' );
+ end if;
+
+ if type_label_in_is_base = 'N' then
+ perform rhn_exception.raise_exception ( 'invalid_entitlement' );
+ else
+ sgid := rhn_entitlements.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$$
+language plpgsql;
+
+ create or replace function entitle_server (
+ server_id_in in numeric,
+ type_label_in in varchar default 'sw_mgr_entitled'
+ ) returns void
+as $$
+ declare
+ sgid numeric := 0;
+ is_virt numeric := 0;
+
+ begin
+
+ select 1 into is_virt
+ from rhnServerEntitlementView
+ where server_id = server_id_in
+ and label in ('virtualization_host', 'virtualization_host_platform');
+
+ if not found then
+ is_virt := 0;
+ end if;
+
+ 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 := rhn_entitlements.find_compatible_sg (server_id_in,
+ type_label_in);
+ if sgid is not null then
+ insert into rhnServerHistory ( id, server_id, summary, details )
+ values ( nextval('rhn_event_id_seq'), 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 );
+
+ perform rhn_server.insert_into_servergroup (server_id_in, sgid);
+
+ if is_virt = 1 then
+ perform rhn_entitlements.repoll_virt_guest_entitlements(server_id_in);
+ end if;
+
+ else
+ perform rhn_exception.raise_exception ('no_available_server_group');
+ end if;
+ else
+ perform rhn_exception.raise_exception ('invalid_entitlement');
+ end if;
+ end$$
+language plpgsql;
+
+ create or replace function remove_server_entitlement (
+ server_id_in in numeric,
+ type_label_in in varchar default 'sw_mgr_entitled',
+ repoll_virt_guests in numeric default 1
+ ) returns void
+as $$
+ declare
+ group_id numeric;
+ type_is_base char;
+ is_virt numeric := 0;
+ begin
+ -- would be nice if there were a virt attribute of entitlement types, not have to specify 2 different ones...
+ select 1 into is_virt
+ from rhnServerEntitlementView
+ where server_id = server_id_in
+ and label in ('virtualization_host', 'virtualization_host_platform');
+ if not found then
+ is_virt := 0;
+ end if;
+
+ 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 not found then
+ perform rhn_exception.raise_exception('invalid_server_group_member');
+ end if;
+
+ if ( type_is_base = 'Y' ) then
+ -- unentitle_server should handle everything, don't really need to do anything else special here
+ perform rhn_entitlements.unentitle_server ( server_id_in );
+ else
+
+ insert into rhnServerHistory ( id, server_id, summary, details )
+ values ( nextval('rhn_event_id_seq'), 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 );
+
+ perform rhn_server.delete_from_servergroup(server_id_in, group_id);
+
+ if type_label_in = 'monitoring_entitled' then
+ 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
+ perform rhn_entitlements.repoll_virt_guest_entitlements(server_id_in);
+ end if;
+ end if;
+
+ end$$
+language plpgsql;
+
+ create or replace function unentitle_server (
+ server_id_in in numeric
+ ) returns void
+as $$
+ declare
+ servergroups cursor for
+ 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 numeric := 0;
+
+ begin
+
+ select 1 into is_virt
+ from rhnServerEntitlementView
+ where server_id = server_id_in
+ and label in ('virtualization_host', 'virtualization_host_platform');
+
+ if not found then
+ is_virt := 0;
+ end if;
+
+ for servergroup in servergroups loop
+
+ insert into rhnServerHistory ( id, server_id, summary, details )
+ values ( nextval('rhn_event_id_seq'), 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 );
+
+ perform rhn_server.delete_from_servergroup(server_id_in,
+ servergroup.server_group_id );
+ end loop;
+
+ if is_virt = 1 then
+ perform rhn_entitlements.repoll_virt_guest_entitlements(server_id_in);
+ end if;
+
+ end$$
+language plpgsql;
+
+
+ -- *******************************************************************
+ -- 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.
+ --
+ -- *******************************************************************
+ create or replace function repoll_virt_guest_entitlements(
+ server_id_in in numeric
+ ) returns void
+as $$
+ declare
+ -- All channel families associated with the guests of server_id_in
+ families cursor for
+ 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
+ group_types cursor for
+ select distinct sg.group_type, sgt.label, sg.org_id
+ 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 specific
+ -- host that are consuming physical channel slots over the limit.
+ virt_servers_cfam cursor(family_id_in numeric, quantity_in numeric) for
+ select 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
+ limit quantity_in;
+
+ -- Virtual servers from a certain family belonging to a specific
+ -- host that are consuming physical system slots over the limit.
+ virt_servers_sgt cursor(group_type_in numeric, quantity_in numeric) for
+ select 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
+ limit quantity_in;
+
+ -- Get the orgs of Virtual guests
+ -- Since they may belong to different orgs
+ virt_guest_orgs cursor for
+ 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 numeric;
+ max_members_val numeric;
+ max_flex_val numeric;
+ current_members_calc numeric;
+ sg_id numeric;
+ is_virt numeric := 0;
+ free_slots numeric := 0;
+ begin
+ select 1 into is_virt
+ from rhnServerEntitlementView
+ where server_id = server_id_in
+ and label in ('virtualization_host', 'virtualization_host_platform');
+
+ if not found then
+ is_virt := 0;
+ end if;
+
+ 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
+ select sfc.max_members - sfc.current_members
+ into free_slots
+ from rhnServerFveCapable sfc
+ where sfc.channel_family_id = family.channel_family_id;
+ UPDATE rhnServerChannel sc set is_fve = 'Y'
+ where sc.server_id in (
+ select vi.virtual_system_id
+ 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
+ limit free_slots
+ );
+ else
+ -- if the host_server has virt
+ -- set all its flex guests to N
+ UPDATE rhnServerChannel sc set 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
+
+ perform 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?!
+ perform rhn_entitlements.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?
+ perform 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
+ perform 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 = a_group_type.org_id;
+
+
+ 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
+ perform 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 = a_group_type.org_id
+ and group_type = a_group_type.group_type;
+
+ -- I think that's all the house-keeping we have to do...
+ end loop;
+
+ end$$
+language plpgsql;
+
+ create or replace function get_server_entitlement (
+ server_id_in in numeric
+ ) returns varchar[]
+as $$
+ declare
+ server_groups cursor for
+ 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 varchar[];
+
+ begin
+
+ ent_array := '{}';
+
+ for sg in server_groups loop
+ ent_array := ent_array || sg.label;
+ end loop;
+
+ return ent_array;
+
+ end$$
+language plpgsql;
+
+ -- this desperately needs to be table driven.
+ create or replace function modify_org_service (
+ org_id_in in numeric,
+ service_label_in in varchar,
+ enable_in in char
+ ) returns void
+as $$
+ declare
+ roles_to_process varchar[];
+ roles cursor(role_label_in varchar) for
+ select label, id
+ from rhnUserGroupType
+ where label = role_label_in;
+ org_roles cursor(role_label_in varchar) for
+ 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;
+
+ ents_to_process varchar[];
+ ents cursor(ent_label_in varchar) for
+ select label, id
+ from rhnOrgEntitlementType
+ where label = ent_label_in;
+ org_ents cursor(ent_label_in varchar) for
+ 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 := '{}';
+ roles_to_process := '{}';
+ -- 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 := array_append(ents_to_process, 'sw_mgr_enterprise');
+
+ roles_to_process := array_append(roles_to_process, 'org_admin');
+
+ roles_to_process := array_append(roles_to_process, 'system_group_admin');
+
+ roles_to_process := array_append(roles_to_process, 'activation_key_admin');
+ elsif service_label_in = 'provisioning' then
+ ents_to_process := array_append(ents_to_process, 'rhn_provisioning');
+
+ roles_to_process := array_append(roles_to_process, 'system_group_admin');
+
+ roles_to_process := array_append(roles_to_process, 'activation_key_admin');
+
+ roles_to_process := array_append(roles_to_process, 'config_admin');
+ -- another nasty special case...
+ if enable_in = 'Y' then
+ ents_to_process := array_append(ents_to_process, 'sw_mgr_enterprise');
+ end if;
+ elsif service_label_in = 'monitoring' then
+ ents_to_process := array_append(ents_to_process, 'rhn_monitor');
+
+ roles_to_process := array_append(roles_to_process, 'monitoring_admin');
+ elsif service_label_in = 'virtualization' then
+ ents_to_process := array_append(ents_to_process, 'rhn_virtualization');
+
+ roles_to_process := array_append(roles_to_process, 'config_admin');
+ elsif service_label_in = 'virtualization_platform' then
+ ents_to_process := array_append(ents_to_process, 'rhn_virtualization_platform');
+ roles_to_process := array_append(roles_to_process, 'config_admin');
+ elsif service_label_in = 'nonlinux' then
+ ents_to_process := array_append(ents_to_process, 'rhn_nonlinux');
+ roles_to_process := array_append(roles_to_process, 'config_admin');
+ end if;
+
+ if enable_in = 'Y' then
+ for i in 1..array_upper(ents_to_process, 1) 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..array_upper(roles_to_process, 1) 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 nextval('rhn_user_group_id_seq'),
+ 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..coalesce(array_upper(ents_to_process, 1), 0) 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$$
+language plpgsql;
+
+ create or replace function set_customer_enterprise (
+ customer_id_in in numeric
+ ) returns void
+as $$
+ begin
+ perform rhn_entitlements.modify_org_service(customer_id_in, 'enterprise', 'Y');
+ end$$
+language plpgsql;
+
+ create or replace function set_customer_provisioning (
+ customer_id_in in numeric
+ ) returns void
+as $$
+ begin
+ perform rhn_entitlements.modify_org_service(customer_id_in, 'provisioning', 'Y');
+ end$$
+language plpgsql;
+
+ create or replace function set_customer_monitoring (
+ customer_id_in in numeric
+ ) returns void
+as $$
+ begin
+ perform rhn_entitlements.modify_org_service(customer_id_in, 'monitoring', 'Y');
+ end$$
+language plpgsql;
+
+ create or replace function set_customer_nonlinux (
+ customer_id_in in numeric
+ ) returns void
+as $$
+ begin
+ perform rhn_entitlements.modify_org_service(customer_id_in, 'nonlinux', 'Y');
+ end$$
+language plpgsql;
+
+ create or replace function unset_customer_enterprise (
+ customer_id_in in numeric
+ ) returns void
+as $$
+ begin
+ perform rhn_entitlements.modify_org_service(customer_id_in, 'enterprise', 'N');
+ end$$
+language plpgsql;
+
+ create or replace function unset_customer_provisioning (
+ customer_id_in in numeric
+ ) returns void
+as $$
+ begin
+ perform rhn_entitlements.modify_org_service(customer_id_in, 'provisioning', 'N');
+ end$$
+language plpgsql;
+
+ create or replace function unset_customer_monitoring (
+ customer_id_in in numeric
+ ) returns void
+as $$
+ begin
+ perform rhn_entitlements.modify_org_service(customer_id_in, 'monitoring', 'N');
+ end$$
+language plpgsql;
+
+ create or replace function unset_customer_nonlinux (
+ customer_id_in in numeric
+ ) returns void
+as $$
+ begin
+ perform rhn_entitlements.modify_org_service(customer_id_in, 'nonlinux', 'N');
+ end$$
+language plpgsql;
+
+ -- *******************************************************************
+ -- 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: 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
+ -- *******************************************************************
+ create or replace function assign_channel_entitlement(
+ channel_family_label_in in varchar,
+ from_org_id_in in numeric,
+ to_org_id_in in numeric,
+ quantity_in in numeric,
+ flex_in in numeric
+ ) returns void
+as $$
+ declare
+ from_org_prev_ent_count numeric;
+ from_org_prev_ent_count_flex numeric;
+ new_ent_count numeric;
+ new_ent_count_flex numeric;
+ to_org_prev_ent_count numeric;
+ to_org_prev_ent_count_flex numeric;
+ new_quantity numeric;
+ new_flex numeric;
+ cfam_id numeric;
+ 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;
+
+ 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 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;
+
+ if not found then
+ to_org_prev_ent_count := 0;
+ end if;
+
+ 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;
+
+ if not found then
+ perform rhn_exception.raise_exception(
+ 'not_enough_flex_entitlements_in_base_org');
+ end if;
+
+ 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;
+
+ if not found then
+ to_org_prev_ent_count_flex := 0;
+ end if;
+
+ select id
+ into cfam_id
+ from rhnChannelFamily
+ where label = channel_family_label_in;
+
+ if not found then
+ perform rhn_exception.raise_exception(
+ 'invalid_channel_family');
+ end if;
+
+ 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
+ perform rhn_exception.raise_exception(
+ 'not_enough_entitlements_in_base_org');
+ end if;
+
+ if new_ent_count_flex < 0 then
+ perform rhn_exception.raise_exception(
+ 'not_enough_flex_entitlements_in_base_org');
+ end if;
+
+
+
+ perform rhn_entitlements.set_family_count(from_org_id_in,
+ cfam_id,
+ new_ent_count,
+ new_ent_count_flex);
+
+ perform rhn_entitlements.set_family_count(to_org_id_in,
+ cfam_id,
+ new_quantity,
+ new_flex);
+
+ 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;
+
+ -- *******************************************************************
+ -- 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.
+ -- *******************************************************************
+ create or replace function activate_channel_entitlement(
+ org_id_in in numeric,
+ channel_family_label_in in varchar,
+ quantity_in in numeric,
+ flex_in in numeric
+ ) returns void
+as $$
+ declare
+ prev_ent_count numeric;
+ prev_flex_count numeric;
+ prev_ent_count_sum numeric;
+ cfam_id numeric;
+ reduce_quantity numeric;
+ total_flex_capable numeric;
+ to_convert_reg cursor (channel_family_id_val numeric, org_id_in numeric, quantity numeric) for
+ 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)
+ limit quantity;
+ to_convert_flex cursor (channel_family_id_val numeric, org_id_in numeric, quantity numeric) for
+ select server_id
+ from rhnServerFveCapable
+ where SERVER_ORG_ID = org_id_in and
+ channel_family_id = cfam_id
+ limit quantity;
+
+ begin
+
+ -- Fetch the current entitlement count for the org
+ -- into prev_ent_count
+ 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;
+
+ if not found then
+ prev_ent_count := 0;
+ end if;
+
+ 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;
+
+ if not found then
+ prev_flex_count := 0;
+ end if;
+
+ select id
+ into cfam_id
+ from rhnChannelFamily
+ where label = channel_family_label_in;
+
+ if not found then
+ perform rhn_exception.raise_exception(
+ 'invalid_channel_family');
+ end if;
+
+ -- 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 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
+ perform 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 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
+ perform 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
+ perform rhn_entitlements.set_family_count(org_id_in, cfam_id,
+ quantity_in, flex_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;
+
+ -- *******************************************************************
+ -- PROCEDURE: prune_family
+ -- Unsubscribes servers consuming physical slots from the channel family
+ -- that are over the org's limit.
+ -- Called by: set_family_count
+ -- *******************************************************************
+ create or replace function prune_family (
+ customer_id_in in numeric,
+ channel_family_id_in in numeric,
+ quantity_in in numeric,
+ flex_in in numeric
+ ) returns void
+as $$
+ declare
+ serverchannels cursor(tmp_quantity numeric, is_fve_in char) for
+ 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 rs.id as server_id
+ 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 rcfm.modified asc
+ offset quantity_in
+ );
+ begin
+ -- if we get a null customer_id, this is completely bogus.
+ if customer_id_in is null then
+ return;
+ end if;
+
+ for sc in serverchannels(quantity_in, 'N') loop
+ perform rhn_channel.unsubscribe_server(sc.server_id, sc.channel_id,
+ 1, 1, 0, 0);
+ end loop;
+
+ for sc in serverchannels(flex_in, 'Y') loop
+ perform rhn_channel.unsubscribe_server(sc.server_id, sc.channel_id,
+ 1, 1, 0, 0);
+ end loop;
+
+ perform rhn_channel.update_family_counts(channel_family_id_in, customer_id_in);
+ end$$
+language plpgsql;
+
+ create or replace function set_family_count (
+ customer_id_in in numeric, -- customer_id
+ channel_family_id_in in numeric, -- 246
+ quantity_in in numeric, -- 3
+ flex_in in numeric
+ ) returns void
+as $$
+ declare
+ privperms cursor for
+ select 1
+ from rhnPrivateChannelFamily
+ where org_id = customer_id_in
+ and channel_family_id = channel_family_id_in;
+ pubperms cursor for
+ select o.id org_id
+ from web_customer o,
+ rhnPublicChannelFamily pcf
+ where pcf.channel_family_id = channel_family_id_in;
+ quantity numeric;
+ done numeric := 0;
+ flex numeric;
+ 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
+ perform 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
+ perform 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$$
+language plpgsql;
+
+ -- 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.
+ create or replace function entitle_last_modified_servers (
+ customer_id_in in numeric, -- customer_id
+ type_label_in in varchar, -- 'enterprise_entitled'
+ quantity_in in numeric -- 3
+ ) returns void
+as $$
+ declare
+ -- find the servers that aren't currently in slots
+ servers cursor(cid_in numeric, quant_in numeric) for
+ select rs.id as 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
+ limit quant_in;
+ begin
+ for server in servers(customer_id_in, quantity_in) loop
+ perform rhn_entitlements.entitle_server(server.server_id, type_label_in);
+ end loop;
+ end$$
+language plpgsql;
+
+ create or replace function subscribe_newest_servers (
+ customer_id_in in numeric
+ ) returns void
+as $$
+ declare
+ -- find servers without base channels
+ servers cursor(cid_in numeric) for
+ 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 numeric;
+ 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
+ perform rhn_channel.subscribe_server(server.id, channel_id);
+ -- exception is really channel_family_no_subscriptions
+ exception
+ when others then
+ null;
+ end;
+ end if;
+ end loop;
+ 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';
10 years, 7 months
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/xmlrpc/systemgroup/ServerGroupHandler.java | 1 -
1 file changed, 1 deletion(-)
New commits:
commit 4d04d92899b04635ead8aa8a6b6c3a5d432d40d4
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Sep 17 11:17:34 2013 +0200
910739 - fix systemgroup.scheduleApplyErrataToActive API doc
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/systemgroup/ServerGroupHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/systemgroup/ServerGroupHandler.java
index 36b3634..c82da29 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/systemgroup/ServerGroupHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/systemgroup/ServerGroupHandler.java
@@ -476,7 +476,6 @@ public class ServerGroupHandler extends BaseHandler {
* @xmlrpc.param #param("string", "sessionKey")
* @xmlrpc.param #param("string", "systemGroupName")
* @xmlrpc.param #array_single("int", "errataId")
- * @xmlrpc.returntype #return_int_success()
* @xmlrpc.returntype #array_single("int", "actionId")
*/
public List<Long> scheduleApplyErrataToActive(String sessionKey, String systemGroupName,
10 years, 7 months
Changes to 'refs/tags/smartpm-5.5.0-5'
by Michael Mraka
Tag 'smartpm-5.5.0-5' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-09-17 09:03 +0000
Tagging package [smartpm] version [5.5.0-5] in directory [client/solaris/smartpm/].
Changes since rhnclient-5.5.6-1:
Michael Mraka (1):
Automatic commit of package [smartpm] minor release [5.5.0-5].
---
client/solaris/smartpm/smartpm.spec | 5 ++++-
rel-eng/packages/smartpm | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
10 years, 7 months