spacewalk-commits May 2009

spacewalk-commits@lists.fedorahosted.org

21 participants
714 discussions

branding/spacewalk-branding.spec rel-eng/packages
by Jesus M. Rodriguez 28 May '09

28 May '09

branding/spacewalk-branding.spec | 5 ++++- rel-eng/packages/spacewalk-branding | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit 9f705584f4ac2be7a046e386e732b29076e8f63b Author: jesus m. rodriguez <jesusr(a)redhat.com> Date: Wed May 27 22:31:26 2009 -0400 Automatic commit of package [spacewalk-branding] release [0.6.5-1]. diff --git a/branding/spacewalk-branding.spec b/branding/spacewalk-branding.spec index 5362a0d..50dd3fd 100644 --- a/branding/spacewalk-branding.spec +++ b/branding/spacewalk-branding.spec @@ -1,5 +1,5 @@ Name: spacewalk-branding -Version: 0.6.4 +Version: 0.6.5 Release: 1%{?dist} Summary: Spacewalk branding data @@ -68,6 +68,9 @@ rm -rf %{buildroot} %changelog +* Wed May 27 2009 jesus m. rodriguez <jesusr(a)redhat.com> 0.6.5-1 +- 500806 - limit a:hover to links only, changed to a:link:hover (jesusr(a)redhat.com) + * Thu May 21 2009 jesus m. rodriguez <jesusr(a)redhat.com> 0.6.4-1 - 501038 - Update css to mitigate wrapping of long org names. (jortel(a)redhat.com) diff --git a/rel-eng/packages/spacewalk-branding b/rel-eng/packages/spacewalk-branding index f200b5c..8f85162 100644 --- a/rel-eng/packages/spacewalk-branding +++ b/rel-eng/packages/spacewalk-branding @@ -1 +1 @@ -0.6.4-1 branding/ +0.6.5-1 branding/

1 0

branding/css
by Jesus M. Rodriguez 28 May '09

28 May '09

branding/css/rhn-basic.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f75108e426cc8ed5388df36587918cd8cbc556b0 Author: jesus m. rodriguez <jesusr(a)redhat.com> Date: Wed May 27 22:25:47 2009 -0400 500806 - limit a:hover to links only, changed to a:link:hover diff --git a/branding/css/rhn-basic.css b/branding/css/rhn-basic.css index ac61943..77ff914 100644 --- a/branding/css/rhn-basic.css +++ b/branding/css/rhn-basic.css @@ -116,7 +116,7 @@ a:link, a:visited { color: #06c; } -a:hover { +a:link:hover { text-decoration: underline !important; }

1 0

Branch 'VADER' - branding/css
by Jesus M. Rodriguez 28 May '09

28 May '09

branding/css/rhn-basic.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b9d4c86ed6c4e5f43c6301291172711d2af4d70b Author: jesus m. rodriguez <jesusr(a)redhat.com> Date: Wed May 27 22:25:47 2009 -0400 500806 - limit a:hover to links only, changed to a:link:hover diff --git a/branding/css/rhn-basic.css b/branding/css/rhn-basic.css index ac61943..77ff914 100644 --- a/branding/css/rhn-basic.css +++ b/branding/css/rhn-basic.css @@ -116,7 +116,7 @@ a:link, a:visited { color: #06c; } -a:hover { +a:link:hover { text-decoration: underline !important; }

1 0

java/code web/html
by Partha Aji 28 May '09

28 May '09

java/code/src/com/redhat/rhn/domain/token/ActivationKey.java | 6 java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java | 4 java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java | 73 ++-------- java/code/src/com/redhat/rhn/manager/token/ActivationKeyManager.java | 32 +++- java/code/src/com/redhat/rhn/manager/token/test/ActivationKeyManagerTest.java | 35 ++++ java/code/src/com/redhat/rhn/testing/ChannelTestUtils.java | 12 - java/code/webapp/WEB-INF/nav/activation_key.xml | 3 web/html/nav/activation_key.xml | 3 8 files changed, 95 insertions(+), 73 deletions(-) New commits: commit dbec5dac44262f03bb57ceb812a5e6e9b2a0d6dd Author: Partha Aji <paji(a)redhat.com> Date: Wed May 27 20:16:31 2009 -0400 496105 - Fix for setting up activaiton key for para-host provisioning Added code to 1) Subscribe activation key to rhn tools and rhn virtualization channels 2) Include install of rhn-virtualization-host packages if a virt entitlement is selected for an activation key. diff --git a/java/code/src/com/redhat/rhn/domain/token/ActivationKey.java b/java/code/src/com/redhat/rhn/domain/token/ActivationKey.java index 4918326..7dbb1a7 100644 --- a/java/code/src/com/redhat/rhn/domain/token/ActivationKey.java +++ b/java/code/src/com/redhat/rhn/domain/token/ActivationKey.java @@ -238,6 +238,12 @@ public class ActivationKey extends BaseDomainHelper { */ public void addEntitlement(ServerGroupType entitlementIn) { this.getToken().addEntitlement(entitlementIn); + if (ServerConstants.getServerGroupTypeVirtualizationEntitled(). + equals(entitlementIn) || + ServerConstants.getServerGroupTypeVirtualizationPlatformEntitled(). + equals(entitlementIn)) { + ActivationKeyManager.getInstance().setupVirtEntitlement(this); + } } /** diff --git a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java index 74feef5..f84a434 100644 --- a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java +++ b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java @@ -790,7 +790,7 @@ public class ChannelManager extends BaseManager { * @param cid Base Channel id. * @return the list of Channel ids which the given orgid has access to. */ - public static List userAccessibleChildChannels(Long orgid, Long cid) { + public static List<Channel> userAccessibleChildChannels(Long orgid, Long cid) { return ChannelFactory.getUserAcessibleChannels(orgid, cid); } @@ -1617,7 +1617,7 @@ public class ChannelManager extends BaseManager { log.debug("subscribeToChildChannelByOSProduct returning: " + foundChannel); return foundChannel; - } + } /** * For the specified server, make a best-guess effort at what its base-channel diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java index 679d6c8..38890e7 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java @@ -14,6 +14,20 @@ */ package com.redhat.rhn.manager.kickstart; +import java.util.Collections; +import java.util.Date; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import org.apache.commons.lang.StringUtils; +import org.apache.log4j.Logger; +import org.cobbler.SystemRecord; + import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.common.db.datasource.ModeFactory; import com.redhat.rhn.common.db.datasource.SelectMode; @@ -27,11 +41,11 @@ import com.redhat.rhn.domain.action.kickstart.KickstartAction; import com.redhat.rhn.domain.channel.Channel; import com.redhat.rhn.domain.channel.ChannelArch; import com.redhat.rhn.domain.channel.ChannelFactory; -import com.redhat.rhn.domain.channel.ChannelFamily; import com.redhat.rhn.domain.kickstart.KickstartData; import com.redhat.rhn.domain.kickstart.KickstartFactory; import com.redhat.rhn.domain.kickstart.KickstartSession; import com.redhat.rhn.domain.kickstart.KickstartSessionState; +import com.redhat.rhn.domain.kickstart.KickstartVirtualizationType; import com.redhat.rhn.domain.rhnpackage.Package; import com.redhat.rhn.domain.rhnpackage.PackageFactory; import com.redhat.rhn.domain.rhnpackage.profile.Profile; @@ -57,20 +71,6 @@ import com.redhat.rhn.manager.system.BaseSystemOperation; import com.redhat.rhn.manager.system.SystemManager; import com.redhat.rhn.manager.token.ActivationKeyManager; -import org.apache.commons.lang.StringUtils; -import org.apache.log4j.Logger; -import org.cobbler.SystemRecord; - -import java.util.Collections; -import java.util.Date; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Set; - /** * Provides frequently used data for scheduling a kickstart * @@ -700,7 +700,7 @@ public class KickstartScheduleCommand extends BaseSystemOperation { // Create a new activation key for the target system. - ActivationKey key = createKickstartActivationKey(this.user, + createKickstartActivationKey(this.user, this.ksdata, getTargetServer(), this.kickstartSession, @@ -711,38 +711,6 @@ public class KickstartScheduleCommand extends BaseSystemOperation { this.createdProfile = processProfileType(this.profileType); log.debug("** profile created: " + createdProfile); - - // If there is already a target system, determine which channel families it had - // so that we can assign them to the new target system. - Map needCf = new HashMap(); - if (getTargetServer() != null) { - Iterator i = getTargetServer().getChannels().iterator(); - // Map of ChannelFamily IDs->Count values - // that tracks how many channel entitlements we need - while (i.hasNext()) { - Channel c = (Channel) i.next(); - - ChannelFamily cf = c.getChannelFamily(); - if (needCf.containsKey(cf.getId().toString())) { - Integer id = (Integer) - needCf.get(cf.getId().toString()); - id = new Integer(id.intValue() - 1); - } - else { - needCf.put(cf.getId().toString(), - new Integer(-1)); - } - } - } - log.debug("** needCF computed: " + needCf); - - if (needCf.containsKey(toolsChannel.getChannelFamily().getId().toString())) { - Integer tools = (Integer) needCf.get(toolsChannel. - getChannelFamily().getId().toString()); - tools = new Integer(tools.intValue() + 1); - } - - log.debug("** NeededChannelFamilies: " + needCf); } /** @@ -922,6 +890,11 @@ public class KickstartScheduleCommand extends BaseSystemOperation { key.setDeployConfigs(deployConfigs); key.setUsageLimit(usageLimit); key.addEntitlement(ServerConstants.getServerGroupTypeProvisioningEntitled()); + if (KickstartVirtualizationType.paraHost(). + equals(ksdata.getKickstartDefaults().getVirtualizationType())) { + //we'll have to setup the key for virt + key.addEntitlement(ServerConstants.getServerGroupTypeVirtualizationEntitled()); + } ActivationKeyFactory.save(key); @@ -941,9 +914,6 @@ public class KickstartScheduleCommand extends BaseSystemOperation { if (toolsChannel != null) { key.addChannel(toolsChannel); } - if (toolsChannel != null) { - key.addChannel(toolsChannel); - } //fix for bugzilla 450954 // We set the reactivation key's base channel to whatever @@ -961,7 +931,6 @@ public class KickstartScheduleCommand extends BaseSystemOperation { } key.setBaseChannel(chan); } - log.debug("** Saving new token"); ActivationKeyFactory.save(key); log.debug("** Saved new token: " + key.getId()); diff --git a/java/code/src/com/redhat/rhn/manager/token/ActivationKeyManager.java b/java/code/src/com/redhat/rhn/manager/token/ActivationKeyManager.java index 4bf16e4..eccae41 100644 --- a/java/code/src/com/redhat/rhn/manager/token/ActivationKeyManager.java +++ b/java/code/src/com/redhat/rhn/manager/token/ActivationKeyManager.java @@ -451,14 +451,15 @@ public class ActivationKeyManager { } /** - * Subscribe a Server to the first child channel of its base channel that contains + * Subscribe an activation key to the first child channel + * of its base channel that contains * the packagename passed in. Returns false if it can't be subscribed. * * @param key activationKey to be subbed * @param packageName to use to lookup the channel with. - * @return Channel we subscribed to, null if not. + * @return true if subscription was successful false otherwise */ - private void subscribeToChildChannelWithPackageName( + private boolean subscribeToChildChannelWithPackageName( ActivationKey key, String packageName) { log.debug("subscribeToChildChannelWithPackageName: " + key.getId() + @@ -480,7 +481,7 @@ public class ActivationKeyManager { packageName); if (cid == null) { // Didnt find it .. log.debug("didnt find a child channel with the package."); - return; + return false; } cids = new LinkedList<Long>(); cids.add(cid); @@ -490,6 +491,7 @@ public class ActivationKeyManager { Channel channel = ChannelFactory.lookupById(cid); key.addChannel(channel); } + return !cids.isEmpty(); } private void addConfigMgmtPackages(ActivationKey key) { @@ -497,7 +499,6 @@ public class ActivationKeyManager { PackageManager.RHNCFG_CLIENT, PackageManager.RHNCFG_ACTIONS}; for (String name : names) { - PackageManager.lookupPackageName(name); key.addPackage(PackageManager.lookupPackageName(name), null); } } @@ -509,10 +510,25 @@ public class ActivationKeyManager { * @param key the activation key to be updated. */ public void setupAutoConfigDeployment(ActivationKey key) { - subscribeToChildChannelWithPackageName(key, - ChannelManager.TOOLS_CHANNEL_PACKAGE_NAME); - if (!key.getChannels().isEmpty()) { + if (subscribeToChildChannelWithPackageName(key, + ChannelManager.TOOLS_CHANNEL_PACKAGE_NAME)) { addConfigMgmtPackages(key); } } + + /** + * Enables the activation key to be virtualization ready + * Adds the virt channel, the tools channel + * and adds the rn-virtualization-host package + * @param key the activation key to be updated. + */ + public void setupVirtEntitlement(ActivationKey key) { + if (subscribeToChildChannelWithPackageName(key, + ChannelManager.TOOLS_CHANNEL_PACKAGE_NAME)) { + key.addPackage(PackageManager.lookupPackageName(ChannelManager. + RHN_VIRT_HOST_PACKAGE_NAME), null); + } + subscribeToChildChannelWithPackageName(key, + ChannelManager.VIRT_CHANNEL_PACKAGE_NAME); + } } diff --git a/java/code/src/com/redhat/rhn/manager/token/test/ActivationKeyManagerTest.java b/java/code/src/com/redhat/rhn/manager/token/test/ActivationKeyManagerTest.java index 7880605..b8871e1 100644 --- a/java/code/src/com/redhat/rhn/manager/token/test/ActivationKeyManagerTest.java +++ b/java/code/src/com/redhat/rhn/manager/token/test/ActivationKeyManagerTest.java @@ -21,15 +21,19 @@ import com.redhat.rhn.domain.config.ConfigChannelListProcessor; import com.redhat.rhn.domain.role.RoleFactory; import com.redhat.rhn.domain.server.Server; import com.redhat.rhn.domain.server.ServerConstants; +import com.redhat.rhn.domain.server.ServerGroupType; import com.redhat.rhn.domain.server.test.ServerFactoryTest; import com.redhat.rhn.domain.token.ActivationKey; import com.redhat.rhn.domain.token.ActivationKeyFactory; import com.redhat.rhn.domain.token.Token; +import com.redhat.rhn.domain.token.TokenPackage; import com.redhat.rhn.domain.user.User; +import com.redhat.rhn.manager.channel.ChannelManager; import com.redhat.rhn.manager.token.ActivationKeyManager; import com.redhat.rhn.testing.BaseTestCaseWithUser; import com.redhat.rhn.testing.ChannelTestUtils; import com.redhat.rhn.testing.ConfigTestUtils; +import com.redhat.rhn.testing.TestUtils; import com.redhat.rhn.testing.UserTestUtils; import java.util.HashSet; @@ -213,7 +217,34 @@ public class ActivationKeyManagerTest extends BaseTestCaseWithUser { public ActivationKey createActivationKey() throws Exception { user.addRole(RoleFactory.ACTIVATION_KEY_ADMIN); - return manager.createNewActivationKey(user, "Test"); + return manager.createNewActivationKey(user, TestUtils.randomString()); + } + + public void testVirtEnt() throws Exception { + UserTestUtils.addUserRole(user, RoleFactory.ACTIVATION_KEY_ADMIN); + UserTestUtils.addProvisioning(user.getOrg()); + UserTestUtils.addVirtualization(user.getOrg()); + Channel baseChannel = ChannelTestUtils.createBaseChannel(user); + Channel [] channels = + ChannelTestUtils.setupBaseChannelForVirtualization(user, baseChannel); + + checkVirtEnt(ServerConstants.getServerGroupTypeVirtualizationEntitled(), + channels[ChannelTestUtils.VIRT_INDEX], + channels[ChannelTestUtils.TOOLS_INDEX]); + checkVirtEnt(ServerConstants.getServerGroupTypeVirtualizationPlatformEntitled(), + channels[ChannelTestUtils.VIRT_INDEX], + channels[ChannelTestUtils.TOOLS_INDEX]); + } + + private void checkVirtEnt(ServerGroupType sgt, + Channel virt, Channel tools) throws Exception { + ActivationKey key = createActivationKey(); + key.addEntitlement(sgt); + assertTrue(key.getChannels().contains(tools)); + assertTrue(key.getChannels().contains(virt)); + assertTrue(!key.getPackages().isEmpty()); + TokenPackage pkg = key.getPackages().iterator().next(); + assertEquals(ChannelManager.RHN_VIRT_HOST_PACKAGE_NAME, + pkg.getPackageName().getName()); } - } diff --git a/java/code/src/com/redhat/rhn/testing/ChannelTestUtils.java b/java/code/src/com/redhat/rhn/testing/ChannelTestUtils.java index cc37a5d..290e474 100644 --- a/java/code/src/com/redhat/rhn/testing/ChannelTestUtils.java +++ b/java/code/src/com/redhat/rhn/testing/ChannelTestUtils.java @@ -32,7 +32,9 @@ import java.util.Set; * @version $Rev$ */ public class ChannelTestUtils { - + public static final int VIRT_INDEX = 1; + public static final int TOOLS_INDEX = 0; + private ChannelTestUtils() { } @@ -108,12 +110,12 @@ public class ChannelTestUtils { ChannelTestUtils.addDistMapToChannel(rhelVirt, ChannelManager.VT_OS_PRODUCT, TestUtils.randomString()); - //PackageManagerTest.addPackageToChannel( - // ChannelManager.VIRT_CHANNEL_PACKAGE_NAME, rhelVirt); + PackageManagerTest.addPackageToChannel( + ChannelManager.VIRT_CHANNEL_PACKAGE_NAME, rhelVirt); Channel[] retval = new Channel[2]; - retval[0] = rhnTools; - retval[1] = rhelVirt; + retval[TOOLS_INDEX] = rhnTools; + retval[VIRT_INDEX] = rhelVirt; return retval; } diff --git a/java/code/webapp/WEB-INF/nav/activation_key.xml b/java/code/webapp/WEB-INF/nav/activation_key.xml index 1380a84..a04e2b2 100644 --- a/java/code/webapp/WEB-INF/nav/activation_key.xml +++ b/java/code/webapp/WEB-INF/nav/activation_key.xml @@ -5,8 +5,7 @@ <rhn-tab name="Child Channels" url="/network/account/activation_keys/child_channels.pxt" /> <rhn-tab name="Packages" - url="/rhn/activationkeys/packages/Packages.do" - acl="token_has_entitlement(provisioning_entitled)" /> + url="/rhn/activationkeys/packages/Packages.do"/> <rhn-tab name="Configuration" url="/rhn/activationkeys/configuration/List.do" acl="token_has_entitlement(provisioning_entitled)"> diff --git a/web/html/nav/activation_key.xml b/web/html/nav/activation_key.xml index fb34df5..a0a1202 100644 --- a/web/html/nav/activation_key.xml +++ b/web/html/nav/activation_key.xml @@ -6,8 +6,7 @@ <rhn-tab name="Child Channels" url="/network/account/activation_keys/child_channels.pxt" /> <rhn-tab name="Packages" - url="/rhn/activationkeys/packages/Packages.do" - acl="token_has_entitlement(provisioning_entitled)" /> + url="/rhn/activationkeys/packages/Packages.do"/> <rhn-tab name="Configuration" url="/rhn/activationkeys/configuration/List.do" acl="token_has_entitlement(provisioning_entitled)">

1 0

Branch 'VADER' - java/code web/html
by Partha Aji 28 May '09

28 May '09

java/code/src/com/redhat/rhn/domain/token/ActivationKey.java | 6 java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java | 4 java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java | 73 ++-------- java/code/src/com/redhat/rhn/manager/token/ActivationKeyManager.java | 32 +++- java/code/src/com/redhat/rhn/manager/token/test/ActivationKeyManagerTest.java | 35 ++++ java/code/src/com/redhat/rhn/testing/ChannelTestUtils.java | 12 - java/code/webapp/WEB-INF/nav/activation_key.xml | 3 web/html/nav/activation_key.xml | 3 8 files changed, 95 insertions(+), 73 deletions(-) New commits: commit 07d7b24906225ce5a44a41268c5e520f590ac2e9 Author: Partha Aji <paji(a)redhat.com> Date: Wed May 27 20:16:31 2009 -0400 496105 - Fix for setting up activaiton key for para-host provisioning Added code to 1) Subscribe activation key to rhn tools and rhn virtualization channels 2) Include install of rhn-virtualization-host packages if a virt entitlement is selected for an activation key. diff --git a/java/code/src/com/redhat/rhn/domain/token/ActivationKey.java b/java/code/src/com/redhat/rhn/domain/token/ActivationKey.java index 4918326..7dbb1a7 100644 --- a/java/code/src/com/redhat/rhn/domain/token/ActivationKey.java +++ b/java/code/src/com/redhat/rhn/domain/token/ActivationKey.java @@ -238,6 +238,12 @@ public class ActivationKey extends BaseDomainHelper { */ public void addEntitlement(ServerGroupType entitlementIn) { this.getToken().addEntitlement(entitlementIn); + if (ServerConstants.getServerGroupTypeVirtualizationEntitled(). + equals(entitlementIn) || + ServerConstants.getServerGroupTypeVirtualizationPlatformEntitled(). + equals(entitlementIn)) { + ActivationKeyManager.getInstance().setupVirtEntitlement(this); + } } /** diff --git a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java index 74feef5..f84a434 100644 --- a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java +++ b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java @@ -790,7 +790,7 @@ public class ChannelManager extends BaseManager { * @param cid Base Channel id. * @return the list of Channel ids which the given orgid has access to. */ - public static List userAccessibleChildChannels(Long orgid, Long cid) { + public static List<Channel> userAccessibleChildChannels(Long orgid, Long cid) { return ChannelFactory.getUserAcessibleChannels(orgid, cid); } @@ -1617,7 +1617,7 @@ public class ChannelManager extends BaseManager { log.debug("subscribeToChildChannelByOSProduct returning: " + foundChannel); return foundChannel; - } + } /** * For the specified server, make a best-guess effort at what its base-channel diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java index 679d6c8..38890e7 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java @@ -14,6 +14,20 @@ */ package com.redhat.rhn.manager.kickstart; +import java.util.Collections; +import java.util.Date; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import org.apache.commons.lang.StringUtils; +import org.apache.log4j.Logger; +import org.cobbler.SystemRecord; + import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.common.db.datasource.ModeFactory; import com.redhat.rhn.common.db.datasource.SelectMode; @@ -27,11 +41,11 @@ import com.redhat.rhn.domain.action.kickstart.KickstartAction; import com.redhat.rhn.domain.channel.Channel; import com.redhat.rhn.domain.channel.ChannelArch; import com.redhat.rhn.domain.channel.ChannelFactory; -import com.redhat.rhn.domain.channel.ChannelFamily; import com.redhat.rhn.domain.kickstart.KickstartData; import com.redhat.rhn.domain.kickstart.KickstartFactory; import com.redhat.rhn.domain.kickstart.KickstartSession; import com.redhat.rhn.domain.kickstart.KickstartSessionState; +import com.redhat.rhn.domain.kickstart.KickstartVirtualizationType; import com.redhat.rhn.domain.rhnpackage.Package; import com.redhat.rhn.domain.rhnpackage.PackageFactory; import com.redhat.rhn.domain.rhnpackage.profile.Profile; @@ -57,20 +71,6 @@ import com.redhat.rhn.manager.system.BaseSystemOperation; import com.redhat.rhn.manager.system.SystemManager; import com.redhat.rhn.manager.token.ActivationKeyManager; -import org.apache.commons.lang.StringUtils; -import org.apache.log4j.Logger; -import org.cobbler.SystemRecord; - -import java.util.Collections; -import java.util.Date; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Set; - /** * Provides frequently used data for scheduling a kickstart * @@ -700,7 +700,7 @@ public class KickstartScheduleCommand extends BaseSystemOperation { // Create a new activation key for the target system. - ActivationKey key = createKickstartActivationKey(this.user, + createKickstartActivationKey(this.user, this.ksdata, getTargetServer(), this.kickstartSession, @@ -711,38 +711,6 @@ public class KickstartScheduleCommand extends BaseSystemOperation { this.createdProfile = processProfileType(this.profileType); log.debug("** profile created: " + createdProfile); - - // If there is already a target system, determine which channel families it had - // so that we can assign them to the new target system. - Map needCf = new HashMap(); - if (getTargetServer() != null) { - Iterator i = getTargetServer().getChannels().iterator(); - // Map of ChannelFamily IDs->Count values - // that tracks how many channel entitlements we need - while (i.hasNext()) { - Channel c = (Channel) i.next(); - - ChannelFamily cf = c.getChannelFamily(); - if (needCf.containsKey(cf.getId().toString())) { - Integer id = (Integer) - needCf.get(cf.getId().toString()); - id = new Integer(id.intValue() - 1); - } - else { - needCf.put(cf.getId().toString(), - new Integer(-1)); - } - } - } - log.debug("** needCF computed: " + needCf); - - if (needCf.containsKey(toolsChannel.getChannelFamily().getId().toString())) { - Integer tools = (Integer) needCf.get(toolsChannel. - getChannelFamily().getId().toString()); - tools = new Integer(tools.intValue() + 1); - } - - log.debug("** NeededChannelFamilies: " + needCf); } /** @@ -922,6 +890,11 @@ public class KickstartScheduleCommand extends BaseSystemOperation { key.setDeployConfigs(deployConfigs); key.setUsageLimit(usageLimit); key.addEntitlement(ServerConstants.getServerGroupTypeProvisioningEntitled()); + if (KickstartVirtualizationType.paraHost(). + equals(ksdata.getKickstartDefaults().getVirtualizationType())) { + //we'll have to setup the key for virt + key.addEntitlement(ServerConstants.getServerGroupTypeVirtualizationEntitled()); + } ActivationKeyFactory.save(key); @@ -941,9 +914,6 @@ public class KickstartScheduleCommand extends BaseSystemOperation { if (toolsChannel != null) { key.addChannel(toolsChannel); } - if (toolsChannel != null) { - key.addChannel(toolsChannel); - } //fix for bugzilla 450954 // We set the reactivation key's base channel to whatever @@ -961,7 +931,6 @@ public class KickstartScheduleCommand extends BaseSystemOperation { } key.setBaseChannel(chan); } - log.debug("** Saving new token"); ActivationKeyFactory.save(key); log.debug("** Saved new token: " + key.getId()); diff --git a/java/code/src/com/redhat/rhn/manager/token/ActivationKeyManager.java b/java/code/src/com/redhat/rhn/manager/token/ActivationKeyManager.java index 4bf16e4..eccae41 100644 --- a/java/code/src/com/redhat/rhn/manager/token/ActivationKeyManager.java +++ b/java/code/src/com/redhat/rhn/manager/token/ActivationKeyManager.java @@ -451,14 +451,15 @@ public class ActivationKeyManager { } /** - * Subscribe a Server to the first child channel of its base channel that contains + * Subscribe an activation key to the first child channel + * of its base channel that contains * the packagename passed in. Returns false if it can't be subscribed. * * @param key activationKey to be subbed * @param packageName to use to lookup the channel with. - * @return Channel we subscribed to, null if not. + * @return true if subscription was successful false otherwise */ - private void subscribeToChildChannelWithPackageName( + private boolean subscribeToChildChannelWithPackageName( ActivationKey key, String packageName) { log.debug("subscribeToChildChannelWithPackageName: " + key.getId() + @@ -480,7 +481,7 @@ public class ActivationKeyManager { packageName); if (cid == null) { // Didnt find it .. log.debug("didnt find a child channel with the package."); - return; + return false; } cids = new LinkedList<Long>(); cids.add(cid); @@ -490,6 +491,7 @@ public class ActivationKeyManager { Channel channel = ChannelFactory.lookupById(cid); key.addChannel(channel); } + return !cids.isEmpty(); } private void addConfigMgmtPackages(ActivationKey key) { @@ -497,7 +499,6 @@ public class ActivationKeyManager { PackageManager.RHNCFG_CLIENT, PackageManager.RHNCFG_ACTIONS}; for (String name : names) { - PackageManager.lookupPackageName(name); key.addPackage(PackageManager.lookupPackageName(name), null); } } @@ -509,10 +510,25 @@ public class ActivationKeyManager { * @param key the activation key to be updated. */ public void setupAutoConfigDeployment(ActivationKey key) { - subscribeToChildChannelWithPackageName(key, - ChannelManager.TOOLS_CHANNEL_PACKAGE_NAME); - if (!key.getChannels().isEmpty()) { + if (subscribeToChildChannelWithPackageName(key, + ChannelManager.TOOLS_CHANNEL_PACKAGE_NAME)) { addConfigMgmtPackages(key); } } + + /** + * Enables the activation key to be virtualization ready + * Adds the virt channel, the tools channel + * and adds the rn-virtualization-host package + * @param key the activation key to be updated. + */ + public void setupVirtEntitlement(ActivationKey key) { + if (subscribeToChildChannelWithPackageName(key, + ChannelManager.TOOLS_CHANNEL_PACKAGE_NAME)) { + key.addPackage(PackageManager.lookupPackageName(ChannelManager. + RHN_VIRT_HOST_PACKAGE_NAME), null); + } + subscribeToChildChannelWithPackageName(key, + ChannelManager.VIRT_CHANNEL_PACKAGE_NAME); + } } diff --git a/java/code/src/com/redhat/rhn/manager/token/test/ActivationKeyManagerTest.java b/java/code/src/com/redhat/rhn/manager/token/test/ActivationKeyManagerTest.java index 7880605..b8871e1 100644 --- a/java/code/src/com/redhat/rhn/manager/token/test/ActivationKeyManagerTest.java +++ b/java/code/src/com/redhat/rhn/manager/token/test/ActivationKeyManagerTest.java @@ -21,15 +21,19 @@ import com.redhat.rhn.domain.config.ConfigChannelListProcessor; import com.redhat.rhn.domain.role.RoleFactory; import com.redhat.rhn.domain.server.Server; import com.redhat.rhn.domain.server.ServerConstants; +import com.redhat.rhn.domain.server.ServerGroupType; import com.redhat.rhn.domain.server.test.ServerFactoryTest; import com.redhat.rhn.domain.token.ActivationKey; import com.redhat.rhn.domain.token.ActivationKeyFactory; import com.redhat.rhn.domain.token.Token; +import com.redhat.rhn.domain.token.TokenPackage; import com.redhat.rhn.domain.user.User; +import com.redhat.rhn.manager.channel.ChannelManager; import com.redhat.rhn.manager.token.ActivationKeyManager; import com.redhat.rhn.testing.BaseTestCaseWithUser; import com.redhat.rhn.testing.ChannelTestUtils; import com.redhat.rhn.testing.ConfigTestUtils; +import com.redhat.rhn.testing.TestUtils; import com.redhat.rhn.testing.UserTestUtils; import java.util.HashSet; @@ -213,7 +217,34 @@ public class ActivationKeyManagerTest extends BaseTestCaseWithUser { public ActivationKey createActivationKey() throws Exception { user.addRole(RoleFactory.ACTIVATION_KEY_ADMIN); - return manager.createNewActivationKey(user, "Test"); + return manager.createNewActivationKey(user, TestUtils.randomString()); + } + + public void testVirtEnt() throws Exception { + UserTestUtils.addUserRole(user, RoleFactory.ACTIVATION_KEY_ADMIN); + UserTestUtils.addProvisioning(user.getOrg()); + UserTestUtils.addVirtualization(user.getOrg()); + Channel baseChannel = ChannelTestUtils.createBaseChannel(user); + Channel [] channels = + ChannelTestUtils.setupBaseChannelForVirtualization(user, baseChannel); + + checkVirtEnt(ServerConstants.getServerGroupTypeVirtualizationEntitled(), + channels[ChannelTestUtils.VIRT_INDEX], + channels[ChannelTestUtils.TOOLS_INDEX]); + checkVirtEnt(ServerConstants.getServerGroupTypeVirtualizationPlatformEntitled(), + channels[ChannelTestUtils.VIRT_INDEX], + channels[ChannelTestUtils.TOOLS_INDEX]); + } + + private void checkVirtEnt(ServerGroupType sgt, + Channel virt, Channel tools) throws Exception { + ActivationKey key = createActivationKey(); + key.addEntitlement(sgt); + assertTrue(key.getChannels().contains(tools)); + assertTrue(key.getChannels().contains(virt)); + assertTrue(!key.getPackages().isEmpty()); + TokenPackage pkg = key.getPackages().iterator().next(); + assertEquals(ChannelManager.RHN_VIRT_HOST_PACKAGE_NAME, + pkg.getPackageName().getName()); } - } diff --git a/java/code/src/com/redhat/rhn/testing/ChannelTestUtils.java b/java/code/src/com/redhat/rhn/testing/ChannelTestUtils.java index cc37a5d..290e474 100644 --- a/java/code/src/com/redhat/rhn/testing/ChannelTestUtils.java +++ b/java/code/src/com/redhat/rhn/testing/ChannelTestUtils.java @@ -32,7 +32,9 @@ import java.util.Set; * @version $Rev$ */ public class ChannelTestUtils { - + public static final int VIRT_INDEX = 1; + public static final int TOOLS_INDEX = 0; + private ChannelTestUtils() { } @@ -108,12 +110,12 @@ public class ChannelTestUtils { ChannelTestUtils.addDistMapToChannel(rhelVirt, ChannelManager.VT_OS_PRODUCT, TestUtils.randomString()); - //PackageManagerTest.addPackageToChannel( - // ChannelManager.VIRT_CHANNEL_PACKAGE_NAME, rhelVirt); + PackageManagerTest.addPackageToChannel( + ChannelManager.VIRT_CHANNEL_PACKAGE_NAME, rhelVirt); Channel[] retval = new Channel[2]; - retval[0] = rhnTools; - retval[1] = rhelVirt; + retval[TOOLS_INDEX] = rhnTools; + retval[VIRT_INDEX] = rhelVirt; return retval; } diff --git a/java/code/webapp/WEB-INF/nav/activation_key.xml b/java/code/webapp/WEB-INF/nav/activation_key.xml index 1380a84..a04e2b2 100644 --- a/java/code/webapp/WEB-INF/nav/activation_key.xml +++ b/java/code/webapp/WEB-INF/nav/activation_key.xml @@ -5,8 +5,7 @@ <rhn-tab name="Child Channels" url="/network/account/activation_keys/child_channels.pxt" /> <rhn-tab name="Packages" - url="/rhn/activationkeys/packages/Packages.do" - acl="token_has_entitlement(provisioning_entitled)" /> + url="/rhn/activationkeys/packages/Packages.do"/> <rhn-tab name="Configuration" url="/rhn/activationkeys/configuration/List.do" acl="token_has_entitlement(provisioning_entitled)"> diff --git a/web/html/nav/activation_key.xml b/web/html/nav/activation_key.xml index fb34df5..a0a1202 100644 --- a/web/html/nav/activation_key.xml +++ b/web/html/nav/activation_key.xml @@ -6,8 +6,7 @@ <rhn-tab name="Child Channels" url="/network/account/activation_keys/child_channels.pxt" /> <rhn-tab name="Packages" - url="/rhn/activationkeys/packages/Packages.do" - acl="token_has_entitlement(provisioning_entitled)" /> + url="/rhn/activationkeys/packages/Packages.do"/> <rhn-tab name="Configuration" url="/rhn/activationkeys/configuration/List.do" acl="token_has_entitlement(provisioning_entitled)">

1 0

Branch 'VADER' - backend/satellite_tools
by Pradeep Kilambi 27 May '09

27 May '09

backend/satellite_tools/satCerts.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) New commits: commit c142b9f05b1881b0edf9eb481acb087da6be1b03 Author: Pradeep Kilambi <pkilambi(a)redhat.com> Date: Wed May 27 17:04:03 2009 -0400 498517 fixing the error message to show the needed free entitlements for the activation to proceed diff --git a/backend/satellite_tools/satCerts.py b/backend/satellite_tools/satCerts.py index 07ff251..26b08b1 100644 --- a/backend/satellite_tools/satCerts.py +++ b/backend/satellite_tools/satCerts.py @@ -51,7 +51,7 @@ class NoFreeEntitlementsError(Exception): self.label = label self.quantity = quantity self.message = \ - "Error: You do not have enough unused %s entitlements in the base org. There can only be a maximum of %s used, based on your current consumption. Please un-entitle the remaining systems for the activation to proceed." % (self.label, self.quantity) + "Error: You do not have enough unused %s entitlements in the base org. You will need at least %s free entitlements, based on your current consumption. Please un-entitle the remaining systems for the activation to proceed." % (self.label, self.quantity) self.args = [self.message] def get_all_orgs(): @@ -198,7 +198,8 @@ def set_slots_from_cert(cert): activate_system_entitlement(org_id, db_label, quantity) except rhnSQL.sql_base.SQLSchemaError, e: if e[0] == 20290: - raise NoFreeEntitlementsError(db_label, quantity) + free_count = sys_ent_counts[(db_label, 1)] - quantity + raise NoFreeEntitlementsError(db_label, free_count) else: raise

1 0

backend/satellite_tools
by Pradeep Kilambi 27 May '09

27 May '09

backend/satellite_tools/satCerts.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) New commits: commit 480b60089dc138840d769f07563622a77ce5f71c Author: Pradeep Kilambi <pkilambi(a)redhat.com> Date: Wed May 27 17:04:03 2009 -0400 498517 fixing the error message to show the needed free entitlements for the activation to proceed diff --git a/backend/satellite_tools/satCerts.py b/backend/satellite_tools/satCerts.py index 07ff251..26b08b1 100644 --- a/backend/satellite_tools/satCerts.py +++ b/backend/satellite_tools/satCerts.py @@ -51,7 +51,7 @@ class NoFreeEntitlementsError(Exception): self.label = label self.quantity = quantity self.message = \ - "Error: You do not have enough unused %s entitlements in the base org. There can only be a maximum of %s used, based on your current consumption. Please un-entitle the remaining systems for the activation to proceed." % (self.label, self.quantity) + "Error: You do not have enough unused %s entitlements in the base org. You will need at least %s free entitlements, based on your current consumption. Please un-entitle the remaining systems for the activation to proceed." % (self.label, self.quantity) self.args = [self.message] def get_all_orgs(): @@ -198,7 +198,8 @@ def set_slots_from_cert(cert): activate_system_entitlement(org_id, db_label, quantity) except rhnSQL.sql_base.SQLSchemaError, e: if e[0] == 20290: - raise NoFreeEntitlementsError(db_label, quantity) + free_count = sys_ent_counts[(db_label, 1)] - quantity + raise NoFreeEntitlementsError(db_label, free_count) else: raise

1 0

Branch 'VADER' - java/code schema/spacewalk web/modules
by jdob 27 May '09

27 May '09

java/code/webapp/WEB-INF/pages/channel/manage/edit.jsp | 2 schema/spacewalk/rhnsat/packages/rhn_channel.pkb | 2 schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/118-rhn_channel.pkb.sql | 1401 ++++++++++ web/modules/sniglets/Sniglets/ChannelEditor.pm | 6 4 files changed, 1406 insertions(+), 5 deletions(-) New commits: commit bd640fc879041579c3075e3015c9a49f7b173c7d Author: Jason Dobies <jason.dobies(a)redhat.com> Date: Wed May 27 16:52:56 2009 -0400 498467 - A few changes related to the channel name limit increase. - Increased max length of create channel name text field - Clone channel destination page updated with correct new length - Stored proc changed; increased size of channel_name variable - Update script for stored proc created diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/edit.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/edit.jsp index 1a74182..3733be6 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/edit.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/edit.jsp @@ -37,7 +37,7 @@ <rhn:required-field key="channel.edit.jsp.name"/>: </th> <td class="small-form"> - <html:text property="name" maxlength="64" size="48"/> + <html:text property="name" maxlength="256" size="48"/> </td> </tr> <tr> diff --git a/schema/spacewalk/rhnsat/packages/rhn_channel.pkb b/schema/spacewalk/rhnsat/packages/rhn_channel.pkb index 9d0a5d8..d7ec67f 100644 --- a/schema/spacewalk/rhnsat/packages/rhn_channel.pkb +++ b/schema/spacewalk/rhnsat/packages/rhn_channel.pkb @@ -1011,7 +1011,7 @@ IS FUNCTION channel_priority(channel_id_in IN number) RETURN number IS - channel_name varchar2(64); + channel_name varchar2(256); priority number; end_of_life_val date; org_id_val number; diff --git a/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/118-rhn_channel.pkb.sql b/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/118-rhn_channel.pkb.sql new file mode 100644 index 0000000..d7ec67f --- /dev/null +++ b/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/118-rhn_channel.pkb.sql @@ -0,0 +1,1401 @@ +-- +-- Copyright (c) 2008 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_channel +IS + body_version varchar2(100) := ''; + + -- Cursor that fetches all the possible base channels for a + -- (server_arch_id, release, org_id) combination + cursor base_channel_cursor( + release_in in varchar2, + server_arch_id_in in number, + org_id_in in number + ) return rhnChannel%ROWTYPE is + select distinct c.* + from rhnDistChannelMap dcm, + rhnServerChannelArchCompat scac, + rhnChannel c, + rhnChannelPermissions cp + where cp.org_id = org_id_in + and cp.channel_id = c.id + and c.parent_channel is null + and c.id = dcm.channel_id + and c.channel_arch_id = dcm.channel_arch_id + and dcm.release = release_in + and scac.server_arch_id = server_arch_id_in + and scac.channel_arch_id = c.channel_arch_id; + + FUNCTION get_license_path(channel_id_in IN NUMBER) + RETURN VARCHAR2 + IS + license_val VARCHAR2(1000); + BEGIN + SELECT CFL.license_path INTO license_val + FROM rhnChannelFamilyLicense CFL, rhnChannelFamilyMembers CFM + WHERE CFM.channel_id = channel_id_in + AND CFM.channel_family_id = CFL.channel_family_id; + + RETURN license_val; + + EXCEPTION + WHEN NO_DATA_FOUND + THEN + RETURN NULL; + END get_license_path; + + + PROCEDURE license_consent(channel_id_in IN NUMBER, user_id_in IN NUMBER, server_id_in IN NUMBER) + IS + channel_family_id_val NUMBER; + BEGIN + channel_family_id_val := rhn_channel.family_for_channel(channel_id_in); + IF channel_family_id_val IS NULL + THEN + rhn_exception.raise_exception('channel_subscribe_no_family'); + END IF; + + IF rhn_channel.get_license_path(channel_id_in) IS NULL + THEN + rhn_exception.raise_exception('channel_consent_no_license'); + END IF; + + INSERT INTO rhnChannelFamilyLicenseConsent (channel_family_id, user_id, server_id) + VALUES (channel_family_id_val, user_id_in, server_id_in); + END license_consent; + + PROCEDURE subscribe_server(server_id_in IN NUMBER, channel_id_in NUMBER, immediate_in NUMBER := 1, user_id_in in number := null, recalcfamily_in NUMBER := 1) + IS + channel_parent_val rhnChannel.parent_channel%TYPE; + parent_subscribed BOOLEAN; + server_has_base_chan BOOLEAN; + server_already_in_chan BOOLEAN; + channel_family_id_val NUMBER; + server_org_id_val NUMBER; + available_subscriptions NUMBER; + consenting_user NUMBER; + allowed number := 0; + current_members_val number; + BEGIN + if user_id_in is not null then + allowed := rhn_channel.user_role_check(channel_id_in, user_id_in, 'subscribe'); + else + allowed := 1; + end if; + + if allowed = 0 then + rhn_exception.raise_exception('no_subscribe_permissions'); + end if; + + + SELECT parent_channel INTO channel_parent_val FROM rhnChannel WHERE id = channel_id_in; + + IF channel_parent_val IS NOT NULL + THEN + -- child channel; if attempting to cross-subscribe a child to the wrong base, silently ignore + parent_subscribed := FALSE; + + FOR check_subscription IN check_server_subscription(server_id_in, channel_parent_val) + LOOP + parent_subscribed := TRUE; + END LOOP check_subscription; + + IF NOT parent_subscribed + THEN + RETURN; + END IF; + ELSE + -- base channel + server_has_base_chan := FALSE; + FOR base IN server_base_subscriptions(server_id_in) + LOOP + server_has_base_chan := TRUE; + END LOOP base; + + IF server_has_base_chan + THEN + rhn_exception.raise_exception('channel_server_one_base'); + END IF; + END IF; + + FOR check_subscription IN check_server_subscription(server_id_in, channel_id_in) + LOOP + server_already_in_chan := TRUE; + END LOOP check_subscription; + + IF server_already_in_chan + THEN + RETURN; + END IF; + + channel_family_id_val := rhn_channel.family_for_channel(channel_id_in); + IF channel_family_id_val IS NULL + THEN + rhn_exception.raise_exception('channel_subscribe_no_family'); + END IF; + + -- + -- Use the org_id of the server only if the org_id of the channel = NULL. + -- This is required for subscribing to shared channels. + -- + SELECT NVL(org_id, (SELECT org_id FROM rhnServer WHERE id = server_id_in)) + INTO server_org_id_val + FROM rhnChannel + WHERE id = channel_id_in; + + select current_members + into current_members_val + from rhnPrivateChannelFamily + where org_id = server_org_id_val and channel_family_id = channel_family_id_val + for update of current_members; + + available_subscriptions := rhn_channel.available_family_subscriptions(channel_family_id_val, server_org_id_val); + + IF available_subscriptions IS NULL OR + available_subscriptions > 0 or + can_server_consume_virt_channl(server_id_in, channel_family_id_val) = 1 + THEN + + IF rhn_channel.get_license_path(channel_id_in) IS NOT NULL + THEN + BEGIN + + SELECT user_id INTO consenting_user + FROM rhnChannelFamilyLicenseConsent + WHERE channel_family_id = channel_family_id_val + AND server_id = server_id_in; + + EXCEPTION + WHEN NO_DATA_FOUND THEN + rhn_exception.raise_exception('channel_subscribe_no_consent'); + END; + END IF; + + insert into rhnServerHistory (id,server_id,summary,details) ( + select rhn_event_id_seq.nextval, + server_id_in, + 'subscribed to channel ' || SUBSTR(c.label, 0, 106), + c.label + from rhnChannel c + where c.id = channel_id_in + ); + UPDATE rhnServer SET channels_changed = sysdate WHERE id = server_id_in; + INSERT INTO rhnServerChannel (server_id, channel_id) VALUES (server_id_in, channel_id_in); + IF recalcfamily_in > 0 + THEN + rhn_channel.update_family_counts(channel_family_id_val, server_org_id_val); + END IF; + queue_server(server_id_in, immediate_in); + ELSE + rhn_exception.raise_exception('channel_family_no_subscriptions'); + END IF; + + END subscribe_server; + + function can_server_consume_virt_channl( + server_id_in in number, + family_id_in in number ) + return number + is + + cursor server_virt_families is + select vi.virtual_system_id, cfvsl.channel_family_id + from + rhnChannelFamilyVirtSubLevel cfvsl, + rhnSGTypeVirtSubLevel sgtvsl, + rhnVirtualInstance vi + where + vi.virtual_system_id = server_id_in + and sgtvsl.virt_sub_level_id = cfvsl.virt_sub_level_id + and cfvsl.channel_family_id = family_id_in + and exists ( + select 1 + from rhnServerEntitlementView sev + where vi.host_system_id = sev.server_id + and sev.server_group_type_id = sgtvsl.server_group_type_id ); + begin + + for server_virt_family in server_virt_families loop + return 1; + end loop; + + return 0; + + end; + + + PROCEDURE bulk_subscribe_server(channel_id_in IN NUMBER, set_label_in IN VARCHAR2, set_uid_in IN NUMBER) + IS + BEGIN + FOR server IN rhn_set.set_iterator(set_label_in, set_uid_in) + LOOP + rhn_channel.subscribe_server(server.element, channel_id_in, 0, set_uid_in); + END LOOP server; + END bulk_subscribe_server; + + PROCEDURE bulk_server_base_change(channel_id_in IN NUMBER, set_label_in IN VARCHAR2, set_uid_in IN NUMBER) + IS + BEGIN + FOR server IN rhn_set.set_iterator(set_label_in, set_uid_in) + LOOP + IF rhn_server.can_change_base_channel(server.element) = 1 + THEN + rhn_channel.clear_subscriptions(TO_NUMBER(server.element)); + rhn_channel.subscribe_server(server.element, channel_id_in, 0, set_uid_in); + END IF; + END LOOP server; + END bulk_server_base_change; + + procedure bulk_server_basechange_from( + set_label_in in varchar2, + set_uid_in in number, + old_channel_id_in in number, + new_channel_id_in in number + ) is + cursor servers is + select sc.server_id id + from rhnChannel nc, + rhnServerChannelArchCompat scac, + rhnServer s, + rhnChannel oc, + rhnServerChannel sc, + rhnSet st + where 1=1 + -- first, find the servers we're looking for. + and st.label = set_label_in + and st.user_id = set_uid_in + and st.element = sc.server_id + -- now, filter out anything that's not in the + -- old base channel. + and sc.channel_id = old_channel_id_in + and sc.channel_id = oc.id + and oc.parent_channel is null + -- now, see if it's compatible with the new base channel + and nc.id = new_channel_id_in + and nc.parent_channel is null + and sc.server_id = s.id + and s.server_arch_id = scac.server_arch_id + and scac.channel_arch_id = nc.channel_arch_id; + begin + for s in servers loop + insert into rhnSet ( + user_id, label, element + ) values ( + set_uid_in, + set_label_in || 'basechange', + s.id + ); + end loop channel; + bulk_server_base_change(new_channel_id_in, + set_label_in || 'basechange', + set_uid_in); + delete from rhnSet + where label = set_label_in||'basechange' + and user_id = set_uid_in; + end bulk_server_basechange_from; + + procedure bulk_guess_server_base( + set_label_in in varchar2, + set_uid_in in number + ) is + channel_id number; + begin + for server in rhn_set.set_iterator(set_label_in, set_uid_in) + loop + -- anything that doesn't work, we just ignore + begin + if rhn_server.can_change_base_channel(server.element) = 1 + then + channel_id := guess_server_base(TO_NUMBER(server.element)); + rhn_channel.clear_subscriptions(TO_NUMBER(server.element)); + rhn_channel.subscribe_server(TO_NUMBER(server.element), channel_id, 0, set_uid_in); + end if; + exception when others then + null; + end; + end loop server; + end; + + function guess_server_base( + server_id_in in number + ) RETURN number is + cursor server_cursor is + select s.server_arch_id, s.release, s.org_id + from rhnServer s + where s.id = server_id_in; + begin + for s in server_cursor loop + for channel in base_channel_cursor(s.release, + s.server_arch_id, s.org_id) + loop + return channel.id; + end loop base_channel_cursor; + end loop server_cursor; + -- Server not found, or no base channel applies to it + return null; + end; + + -- Private function + function normalize_server_arch(server_arch_in in varchar2) + return varchar2 + deterministic + is + suffix VARCHAR2(128) := '-redhat-linux'; + suffix_len NUMBER := length(suffix); + begin + if server_arch_in is NULL then + return NULL; + end if; + if instr(server_arch_in, '-') > 0 + then + -- Suffix already present + return server_arch_in; + end if; + return server_arch_in || suffix; + end normalize_server_arch; + + -- + -- + -- Raises: + -- server_arch_not_found + -- no_subscribe_permissions + function base_channel_for_release_arch( + release_in in varchar2, + server_arch_in in varchar2, + org_id_in in number := -1, + user_id_in in number := null + ) return number is + server_arch varchar2(256) := normalize_server_arch(server_arch_in); + server_arch_id number; + begin + -- Look up the server arch + begin + select id + into server_arch_id + from rhnServerArch + where label = server_arch; + exception + when no_data_found then + rhn_exception.raise_exception('server_arch_not_found'); + end; + return base_channel_rel_archid(release_in, server_arch_id, + org_id_in, user_id_in); + end base_channel_for_release_arch; + + function base_channel_rel_archid( + release_in in varchar2, + server_arch_id_in in number, + org_id_in in number := -1, + user_id_in in number := null + ) return number is + denied_channel_id number := null; + valid_org_id number := org_id_in; + valid_user_id number := user_id_in; + channel_subscribable number; + begin + if org_id_in = -1 and user_id_in is not null then + -- Get the org id from the user id + begin + select org_id + into valid_org_id + from web_contact + where id = user_id_in; + exception + when no_data_found then + -- User doesn't exist + -- XXX Only list public stuff for now + valid_user_id := null; + valid_org_id := -1; + end; + end if; + + for c in base_channel_cursor(release_in, server_arch_id_in, valid_org_id) + loop + -- This row is a possible match + if valid_user_id is null then + -- User ID not specified, so no user to channel permissions to + -- check + return c.id; + end if; + + -- Check user to channel permissions + select loose_user_role_check(c.id, user_id_in, 'subscribe') + into channel_subscribable + from dual; + + if channel_subscribable = 1 then + return c.id; + end if; + + -- Base channel exists, but is not subscribable; keep trying + denied_channel_id := c.id; + end loop base_channel_fetch; + + if denied_channel_id is not null then + rhn_exception.raise_exception('no_subscribe_permissions'); + end if; + -- No base channel applies + return NULL; + end base_channel_rel_archid; + + procedure bulk_guess_server_base_from( + set_label_in in varchar2, + set_uid_in in number, + channel_id_in in number + ) is + cursor channels(server_id_in in number) is + select rsc.channel_id + from rhnServerChannel rsc, + rhnChannel rc + where server_id_in = rsc.server_id + and rsc.channel_id = rc.id + and rc.parent_channel is null; + begin + for server in rhn_set.set_iterator(set_label_in, set_uid_in) + loop + for channel in channels(server.element) + loop + if channel.channel_id = channel_id_in + then + insert into rhnSet (user_id, label, element) values (set_uid_in, set_label_in || 'baseguess', server.element); + end if; + end loop channel; + end loop server; + bulk_guess_server_base(set_label_in||'baseguess',set_uid_in); + delete from rhnSet where label = set_label_in||'baseguess' and user_id = set_uid_in; + end; + + + PROCEDURE clear_subscriptions(server_id_in IN NUMBER, deleting_server IN NUMBER := 0 ) + IS + cursor server_channels(server_id_in in number) is + select s.org_id, sc.channel_id, cfm.channel_family_id + from rhnServer s, + rhnServerChannel sc, + rhnChannelFamilyMembers cfm + where s.id = server_id_in + and s.id = sc.server_id + and sc.channel_id = cfm.channel_id; + BEGIN + for channel in server_channels(server_id_in) + loop + unsubscribe_server(server_id_in, channel.channel_id, 1, 1, deleting_server); + rhn_channel.update_family_counts(channel.channel_family_id, channel.org_id); + end loop channel; + END clear_subscriptions; + + PROCEDURE unsubscribe_server(server_id_in IN NUMBER, channel_id_in NUMBER, immediate_in NUMBER := 1, unsubscribe_children_in number := 0, + deleting_server IN NUMBER := 0 ) + IS + channel_family_id_val NUMBER; + server_org_id_val NUMBER; + available_subscriptions NUMBER; + server_already_in_chan BOOLEAN; + cursor channel_family_is_proxy(channel_family_id_in in number) is + select 1 + from rhnChannelFamily + where id = channel_family_id_in + and label = 'rhn-proxy'; + cursor channel_family_is_satellite(channel_family_id_in in number) is + select 1 + from rhnChannelFamily + where id = channel_family_id_in + and label = 'rhn-satellite'; + -- this is *EXACTLY* like check_server_parent_membership, but if we recurse + -- with the package-level one, we get a "cursor already open", so we need a + -- copy on our call stack instead. GROAN. + cursor local_chk_server_parent_memb ( + server_id_in number, + channel_id_in number ) is + select c.id + from rhnChannel c, + rhnServerChannel sc + where 1=1 + and c.parent_channel = channel_id_in + and c.id = sc.channel_id + and sc.server_id = server_id_in; + BEGIN + FOR child IN local_chk_server_parent_memb(server_id_in, channel_id_in) + LOOP + if unsubscribe_children_in = 1 then + unsubscribe_server(server_id_in => server_id_in, + channel_id_in => child.id, + immediate_in => immediate_in, + unsubscribe_children_in => unsubscribe_children_in, + deleting_server => deleting_server); + else + rhn_exception.raise_exception('channel_unsubscribe_child_exists'); + end if; + END LOOP child; + + server_already_in_chan := FALSE; + + FOR check_subscription IN check_server_subscription(server_id_in, channel_id_in) + LOOP + server_already_in_chan := TRUE; + END LOOP check_subscription; + + IF NOT server_already_in_chan + THEN + RETURN; + END IF; + + if deleting_server = 0 then + + insert into rhnServerHistory (id,server_id,summary,details) ( + select rhn_event_id_seq.nextval, + server_id_in, + 'unsubscribed from channel ' || SUBSTR(c.label, 0, 106), + c.label + from rhnChannel c + where c.id = channel_id_in + ); + + UPDATE rhnServer SET channels_changed = sysdate WHERE id = server_id_in; + end if; + + DELETE FROM rhnServerChannel WHERE server_id = server_id_in AND channel_id = channel_id_in; + + if deleting_server = 0 then + queue_server(server_id_in, immediate_in); + end if; + + channel_family_id_val := rhn_channel.family_for_channel(channel_id_in); + IF channel_family_id_val IS NULL + THEN + rhn_exception.raise_exception('channel_unsubscribe_no_family'); + END IF; + + for ignore in channel_family_is_satellite(channel_family_id_val) loop + delete from rhnSatelliteInfo where server_id = server_id_in; + delete from rhnSatelliteChannelFamily where server_id = server_id_in; + end loop; + + for ignore in channel_family_is_proxy(channel_family_id_val) loop + delete from rhnProxyInfo where server_id = server_id_in; + end loop; + + DELETE FROM rhnChannelFamilyLicenseConsent + WHERE channel_family_id = channel_family_id_val + AND server_id = server_id_in; + + SELECT org_id INTO server_org_id_val + FROM rhnServer + WHERE id = server_id_in; + + rhn_channel.update_family_counts(channel_family_id_val, server_org_id_val); + END unsubscribe_server; + + PROCEDURE bulk_unsubscribe_server(channel_id_in IN NUMBER, set_label_in IN VARCHAR2, set_uid_in IN NUMBER) + IS + BEGIN + FOR server IN rhn_set.set_iterator(set_label_in, set_uid_in) + LOOP + rhn_channel.unsubscribe_server(server.element, channel_id_in, 0); + END LOOP server; + END bulk_unsubscribe_server; + + FUNCTION family_for_channel(channel_id_in IN NUMBER) + RETURN NUMBER + IS + channel_family_id_val NUMBER; + BEGIN + SELECT channel_family_id INTO channel_family_id_val + FROM rhnChannelFamilyMembers + WHERE channel_id = channel_id_in; + + RETURN channel_family_id_val; + EXCEPTION + WHEN NO_DATA_FOUND + THEN + RETURN NULL; + END family_for_channel; + + FUNCTION available_family_subscriptions(channel_family_id_in IN NUMBER, org_id_in IN NUMBER) + RETURN NUMBER + IS + cfp channel_family_perm_cursor%ROWTYPE; + current_members_val NUMBER; + max_members_val NUMBER; + found NUMBER; + BEGIN + IF NOT channel_family_perm_cursor%ISOPEN + THEN + OPEN channel_family_perm_cursor(channel_family_id_in, org_id_in); + END IF; + + FETCH channel_family_perm_cursor INTO cfp; + + WHILE channel_family_perm_cursor%FOUND + LOOP + found := 1; + + current_members_val := cfp.current_members; + max_members_val := cfp.max_members; + + FETCH channel_family_perm_cursor INTO cfp; + END LOOP; + + IF channel_family_perm_cursor%ISOPEN + THEN + CLOSE channel_family_perm_cursor; + END IF; + + -- not found: either the channel fam doesn't have an entry in cfp, or the org doesn't have access to it. + -- either way, there are no available subscriptions + + IF found IS NULL + THEN + RETURN 0; + END IF; + + -- null max members? in that case, pass it on; NULL means infinite + IF max_members_val IS NULL + THEN + RETURN NULL; + END IF; + + -- otherwise, return the delta + RETURN max_members_val - current_members_val; + END available_family_subscriptions; + + -- ******************************************************************* + -- FUNCTION: channel_family_current_members + -- Calculates and returns the actual count of systems consuming + -- physical channel subscriptions. + -- Called by: update_family_counts + -- rhn_entitlements.repoll_virt_guest_entitlements + -- ******************************************************************* + function channel_family_current_members(channel_family_id_in IN NUMBER, + org_id_in IN NUMBER) + return number + is + current_members_count number := 0; + begin + select count(distinct sc.server_id) + into current_members_count + from rhnChannelFamilyMembers cfm, + rhnServerChannel sc, + rhnServer s + where s.org_id = org_id_in + and s.id = sc.server_id + and cfm.channel_family_id = channel_family_id_in + and cfm.channel_id = sc.channel_id + and exists ( + select 1 + from rhnChannelFamilyServerPhysical cfsp + where cfsp.CHANNEL_FAMILY_ID = channel_family_id_in + and cfsp.server_id = s.id + ); + + return current_members_count; + end; + + PROCEDURE update_family_counts(channel_family_id_in IN NUMBER, + org_id_in IN NUMBER) + IS + BEGIN + update rhnPrivateChannelFamily + set current_members = ( + channel_family_current_members(channel_family_id_in, org_id_in) + ) + where org_id = org_id_in + and channel_family_id = channel_family_id_in; + + END update_family_counts; + + FUNCTION available_chan_subscriptions(channel_id_in IN NUMBER, + org_id_in IN NUMBER) + RETURN NUMBER + IS + channel_family_id_val NUMBER; + BEGIN + SELECT channel_family_id INTO channel_family_id_val + FROM rhnChannelFamilyMembers + WHERE channel_id = channel_id_in; + + RETURN rhn_channel.available_family_subscriptions( + channel_family_id_val, org_id_in); + END available_chan_subscriptions; + + -- ******************************************************************* + -- PROCEDURE: entitle_customer + -- Creates a chan fam bucket, or sets max_members for an existing bucket + -- Called by: rhn_ep.poll_customer_internal + -- Calls: set_family_maxmembers + update_family_counts if the row + -- already exists, else it creates it in rhnPrivateChannelFamily. + -- ******************************************************************* + procedure entitle_customer(customer_id_in in number, + channel_family_id_in in number, + quantity_in in number) + is + cursor permissions is + select 1 + from rhnPrivateChannelFamily pcf + where pcf.org_id = customer_id_in + and pcf.channel_family_id = channel_family_id_in; + begin + for perm in permissions loop + set_family_maxmembers( + customer_id_in, + channel_family_id_in, + quantity_in + ); + rhn_channel.update_family_counts( + channel_family_id_in, + customer_id_in + ); + return; + end loop; + + insert into rhnPrivateChannelFamily pcf ( + channel_family_id, org_id, max_members, current_members + ) values ( + channel_family_id_in, customer_id_in, quantity_in, 0 + ); + end; + + -- ******************************************************************* + -- PROCEDURE: set_family_maxmembers + -- Prunes an existing channel family bucket by unsubscribing the + -- necessary servers and sets max_members. + -- Called by: rhn_channel.entitle_customer + -- Calls: unsubscribe_server_from_family + -- ******************************************************************* + procedure set_family_maxmembers(customer_id_in in number, + channel_family_id_in in number, + quantity_in in number) + is + cursor servers is + select server_id from ( + select rownum row_number, server_id, modified from ( + select rcfsp.server_id, + rcfsp.modified + from rhnChannelFamilyServerPhysical rcfsp + where rcfsp.customer_id = customer_id_in + and rcfsp.channel_family_id = channel_family_id_in + order by modified + ) + where rownum > quantity_in + ); + begin + -- prune subscribed servers + for server in servers loop + rhn_channel.unsubscribe_server_from_family(server.server_id, + channel_family_id_in); + end loop; + + update rhnPrivateChannelFamily pcf + set pcf.max_members = quantity_in + where pcf.org_id = customer_id_in + and pcf.channel_family_id = channel_family_id_in; + end; + + procedure unsubscribe_server_from_family(server_id_in in number, + channel_family_id_in in number) + is + begin + delete + from rhnServerChannel rsc + where rsc.server_id = server_id_in + and channel_id in ( + select rcfm.channel_id + from rhnChannelFamilyMembers rcfm + where rcfm.channel_family_id = channel_family_id_in); + end; + + function get_org_id(channel_id_in in number) + return number + is + org_id_out number; + begin + select org_id into org_id_out + from rhnChannel + where id = channel_id_in; + + return org_id_out; + end get_org_id; + + function get_cfam_org_access(cfam_id_in in number, org_id_in in number) + return number + is + cursor families is + select 1 + from rhnOrgChannelFamilyPermissions cfp + where cfp.org_id = org_id_in; + begin + -- the idea: if we get past this query, + -- the user has the role, else catch the exception and return 0 + for family in families loop + return 1; + end loop; + return 0; + end; + + function get_org_access(channel_id_in in number, org_id_in in number) + return number + is + throwaway number; + begin + -- the idea: if we get past this query, + -- the org has access to the channel, else catch the exception and return 0 + select distinct 1 into throwaway + from rhnChannelFamilyMembers CFM, + rhnOrgChannelFamilyPermissions CFP + where cfp.org_id = org_id_in + and CFM.channel_family_id = CFP.channel_family_id + and CFM.channel_id = channel_id_in + and (CFP.max_members > 0 or CFP.max_members is null or CFP.org_id = 1); + + return 1; + exception + when no_data_found + then + return 0; + end; + + -- check if a user has a given role, or if such a role is inferrable + function user_role_check_debug(channel_id_in in number, + user_id_in in number, + role_in in varchar2, + reason_out out varchar2) + return number + is + org_id number; + begin + org_id := rhn_user.get_org_id(user_id_in); + + -- channel might be shared + if role_in = 'subscribe' and + rhn_channel.shared_user_role_check(channel_id_in, user_id_in, role_in) = 1 then + return 1; + end if; + + if role_in = 'manage' and + NVL(rhn_channel.get_org_id(channel_id_in), -1) <> org_id then + reason_out := 'channel_not_owned'; + return 0; + end if; + + if role_in = 'subscribe' and + rhn_channel.get_org_access(channel_id_in, org_id) = 0 then + reason_out := 'channel_not_available'; + return 0; + end if; + + -- channel admins have all roles + if rhn_user.check_role_implied(user_id_in, 'channel_admin') = 1 then + reason_out := 'channel_admin'; + return 1; + end if; + + -- the subscribe permission is inferred + -- UNLESS the not_globally_subscribable flag is set + if role_in = 'subscribe' + then + if rhn_channel.org_channel_setting(channel_id_in, + org_id, + 'not_globally_subscribable') = 0 then + reason_out := 'globally_subscribable'; + return 1; + end if; + end if; + + -- all other roles (manage right now) are explicitly granted + reason_out := 'direct_permission'; + return rhn_channel.direct_user_role_check(channel_id_in, + user_id_in, role_in); + end; + + -- same as above, but with no OUT param; useful in views, etc + function user_role_check(channel_id_in in number, user_id_in in number, role_in in varchar2) + return number + is + throwaway varchar2(256); + begin + return rhn_channel.user_role_check_debug(channel_id_in, user_id_in, role_in, throwaway); + end; + + -- + -- For multiorg phase II, this function simply checks to see if the user's + -- has a trust relationship that includes this channel by id. + -- + function shared_user_role_check(channel_id in number, user_id in number, role in varchar2) + return number + is + n number; + oid number; + begin + oid := rhn_user.get_org_id(user_id); + select 1 into n + from rhnSharedChannelView s + where s.id = channel_id and s.org_trust_id = oid; + return 1; + exception + when no_data_found then + return 0; + end; + + -- same as above, but returns 1 if user_id_in is null + -- This is useful in queries where user_id is not specified + function loose_user_role_check(channel_id_in in number, user_id_in in number, role_in in varchar2) + return number + is + begin + if user_id_in is null then + return 1; + end if; + return user_role_check(channel_id_in, user_id_in, role_in); + end loose_user_role_check; + + -- directly checks the table, no inferred permissions + function direct_user_role_check(channel_id_in in number, user_id_in in number, role_in in varchar2) + return number + is + throwaway number; + begin + -- the idea: if we get past this query, the user has the role, else catch the exception and return 0 + select 1 into throwaway + from rhnChannelPermissionRole CPR, + rhnChannelPermission CP + where CP.user_id = user_id_in + and CP.channel_id = channel_id_in + and CPR.label = role_in + and CP.role_id = CPR.id; + + return 1; + exception + when no_data_found + then + return 0; + end; + + -- check if an org has a certain setting + function org_channel_setting(channel_id_in in number, org_id_in in number, setting_in in varchar2) + return number + is + throwaway number; + begin + -- the idea: if we get past this query, the org has the setting, else catch the exception and return 0 + select 1 into throwaway + from rhnOrgChannelSettingsType OCST, + rhnOrgChannelSettings OCS + where OCS.org_id = org_id_in + and OCS.channel_id = channel_id_in + and OCST.label = setting_in + and OCS.setting_id = OCST.id; + + return 1; + exception + when no_data_found + then + return 0; + end; + + FUNCTION channel_priority(channel_id_in IN number) + RETURN number + IS + channel_name varchar2(256); + priority number; + end_of_life_val date; + org_id_val number; + BEGIN + + select name, end_of_life, org_id + into channel_name, end_of_life_val, org_id_val + from rhnChannel + where id = channel_id_in; + + if end_of_life_val is not null then + return -400; + end if; + + if channel_name like 'Red Hat Enterprise Linux%' or channel_name like 'RHEL%' then + priority := 1000; + if channel_name not like '%Beta%' then + priority := priority + 1000; + end if; + + priority := priority + + case + when channel_name like '%v. 5%' then 600 + when channel_name like '%v. 4%' then 500 + when channel_name like '%v. 3%' then 400 + when channel_name like '%v. 2%' then 300 + when channel_name like '%v. 1%' then 200 + else 0 + end; + + priority := priority + + case + when channel_name like 'Red Hat Enterprise Linux (v. 5%' then 60 + when (channel_name like '%AS%' and channel_name not like '%Extras%') then 50 + when (channel_name like '%ES%' and channel_name not like '%Extras%') then 40 + when (channel_name like '%WS%' and channel_name not like '%Extras%') then 30 + when (channel_name like '%Desktop%' and channel_name not like '%Extras%') then 20 + when channel_name like '%Extras%' then 10 + else 0 + end; + + priority := priority + + case + when channel_name like '%)' then 5 + else 0 + end; + + priority := priority + + case + when channel_name like '%32-bit x86%' then 4 + when channel_name like '%64-bit Intel Itanium%' then 3 + when channel_name like '%64-bit AMD64/Intel EM64T%' then 2 + else 0 + end; + elsif channel_name like 'Red Hat Desktop%' then + priority := 900; + + if channel_name not like '%Beta%' then + priority := priority + 50; + end if; + + priority := priority + + case + when channel_name like '%v. 4%' then 40 + when channel_name like '%v. 3%' then 30 + when channel_name like '%v. 2%' then 20 + when channel_name like '%v. 1%' then 10 + else 0 + end; + + priority := priority + + case + when channel_name like '%32-bit x86%' then 4 + when channel_name like '%64-bit Intel Itanium%' then 3 + when channel_name like '%64-bit AMD64/Intel EM64T%' then 2 + else 0 + end; + + elsif org_id_val is not null then + priority := 600; + else + priority := 500; + end if; + + return -priority; + + end channel_priority; + + -- right now this only does the accounting changes; the cascade + -- actually does the rhnServerChannel delete. + procedure delete_server_channels(server_id_in in number) + is + begin + update rhnPrivateChannelFamily + set current_members = current_members -1 + where org_id in ( + select org_id + from rhnServer + where id = server_id_in + ) + and channel_family_id in ( + select rcfm.channel_family_id + from rhnChannelFamilyMembers rcfm, + rhnServerChannel rsc + where rsc.server_id = server_id_in + and rsc.channel_id = rcfm.channel_id + and not exists ( + select 1 + from + rhnChannelFamilyVirtSubLevel cfvsl, + rhnSGTypeVirtSubLevel sgtvsl, + rhnServerEntitlementView sev, + rhnVirtualInstance vi + where + -- system is a virtual instance + vi.virtual_system_id = server_id_in + and vi.host_system_id = sev.server_id + -- system's host has a virt ent + and sev.label in ('virtualization_host', + 'virtualization_host_platform') + and sev.server_group_type_id = + sgtvsl.server_group_type_id + -- the host's virt ent grants a cf virt sub level + and sgtvsl.virt_sub_level_id = cfvsl.virt_sub_level_id + -- the cf is in that virt sub level + and cfvsl.channel_family_id = rcfm.channel_family_id + ) + ); + end; + + -- this could certainly be optimized to do updates if needs be + procedure refresh_newest_package(channel_id_in in number, caller_in in varchar2 := '(unknown)') + is + begin + delete from rhnChannelNewestPackage where channel_id = channel_id_in; + insert into rhnChannelNewestPackage + ( channel_id, name_id, evr_id, package_id, package_arch_id ) + ( select channel_id, + name_id, evr_id, + package_id, package_arch_id + from rhnChannelNewestPackageView + where channel_id = channel_id_in + ); + insert into rhnChannelNewestPackageAudit (channel_id, caller) + values (channel_id_in, caller_in); + update rhnChannel + set last_modified = greatest(sysdate, last_modified + 1/86400) + where id = channel_id_in; + end; + + procedure update_channel ( channel_id_in in number, invalidate_ss in number := 0, + date_to_use in date := sysdate ) + is + + channel_last_modified date; + last_modified_value date; + + cursor snapshots is + select snapshot_id id + from rhnSnapshotChannel + where channel_id = channel_id_in; + + begin + + select last_modified + into channel_last_modified + from rhnChannel + where id = channel_id_in; + + last_modified_value := date_to_use; + + if last_modified_value <= channel_last_modified then + last_modified_value := last_modified_value + 1/86400; + end if; + + update rhnChannel set last_modified = last_modified_value + where id = channel_id_in; + + if invalidate_ss = 1 then + for snapshot in snapshots loop + update rhnSnapshot + set invalid = lookup_snapshot_invalid_reason('channel_modified') + where id = snapshot.id; + end loop; + end if; + + end update_channel; + + procedure update_channels_by_package ( package_id_in in number, date_to_use in date := sysdate ) + is + + cursor channels is + select channel_id + from rhnChannelPackage + where package_id = package_id_in + order by channel_id; + + begin + for channel in channels loop + -- we want to invalidate the snapshot assocated with the channel when we + -- do this b/c we know we've added or removed or packages + rhn_channel.update_channel ( channel.channel_id, 1, date_to_use ); + end loop; + end update_channels_by_package; + + + procedure update_channels_by_errata ( errata_id_in number, date_to_use in date := sysdate ) + is + + cursor channels is + select channel_id + from rhnChannelErrata + where errata_id = errata_id_in + order by channel_id; + + begin + for channel in channels loop + -- we won't invalidate snapshots, b/c just changing the errata associated with + -- a channel shouldn't invalidate snapshots + rhn_channel.update_channel ( channel.channel_id, 0, date_to_use ); + end loop; + end update_channels_by_errata; + +END rhn_channel; +/ +SHOW ERRORS + +-- +-- Revision 1.75 2005/03/04 00:04:19 jslagle +-- bz #147617 +-- Made Red Hat Desktop sort a little better. +-- +-- Revision 1.74 2005/02/22 03:24:47 jslagle +-- bz #147617 +-- Improve channel_priority function to order channels better. +-- +-- Revision 1.73 2004/08/16 20:39:30 pjones +-- bugzilla: 129889 -- make bulk_server_basechange_from() actually work. +-- +-- Revision 1.72 2004/04/14 00:09:24 pjones +-- bugzilla: 120761 -- split rhnChannelPermissions into two tables, eliminating +-- a frequent full table scan +-- +-- Revision 1.71 2004/04/13 16:28:36 bretm +-- bugzilla: 119871 +-- +-- keep track of rhnServer.channels_changed through the pl/sql fns +-- +-- Revision 1.70 2004/03/26 18:11:32 rbb +-- Bugzilla: 114057 +-- +-- Add a script to determine channel priority. +-- +-- Revision 1.69 2004/02/17 20:16:52 pjones +-- bugzilla: none -- add cvs tags into the package as long as we're touching +-- it anyway +-- +-- Revision 1.68 2004/02/17 20:05:38 pjones +-- bugzilla: 115782 -- make bulk_server_basechange_from() filter out servers +-- with arches incompatible with the target channel +-- +-- Revision 1.67 2004/02/06 02:36:10 misa +-- Changed normalize_server_arch to allow for solaris arches +-- +-- Revision 1.66 2003/11/13 16:58:34 cturner +-- make use of new rhn_user.check_role_implied call; pragmas broke, removed them for now since I have no idea how to fix them +-- +-- Revision 1.65 2003/10/23 20:26:24 bretm +-- bugzilla: none +-- +-- note the channel label when we unsubscribe, too +-- +-- Revision 1.64 2003/10/15 14:47:17 bretm +-- bugzilla: none +-- +-- add the channel label to the server history summary line when we log a channel change +-- +-- Revision 1.63 2003/09/24 19:25:56 pjones +-- this wasn't the right fix, put it back +-- +-- Revision 1.62 2003/09/24 17:42:19 pjones +-- bugzilla: none +-- +-- limit our server base channel guess to channels with available permissions +-- +-- Revision 1.61 2003/09/22 21:00:40 cturner +-- add method for easy acl check +-- +-- Revision 1.60 2003/09/17 22:14:11 misa +-- bugzilla: 103639 Changes to allow me to move the base channel guess into plsql +-- +-- Revision 1.59 2003/08/21 13:41:17 cturner +-- bugzilla: 99187. properly test for satellite and proxy in bulk_guess_server_base; reorg code for better reuse +-- +-- Revision 1.58 2003/07/24 16:46:22 cturner +-- bugzilla: 100723, the perm check was returning duplicates, so now it just calls the function it should have called anyway +-- +-- Revision 1.57 2003/07/24 16:44:16 misa +-- bugzilla: none A function more usable on the rhnapp side +-- +-- Revision 1.56 2003/07/23 22:36:51 cturner +-- argh, max returns null even when now rows; use distinct. how revolting +-- +-- Revision 1.55 2003/07/23 22:01:31 cturner +-- oops, this one can return multiple rows; eliminate that in a lazy way +-- +-- Revision 1.54 2003/07/23 21:59:19 cturner +-- rework how rhnUserChannel works; move to plsql for speed and maintenance +-- +-- Revision 1.53 2003/07/21 17:49:12 pjones +-- bugzilla: none +-- +-- add optional user for subscribe_server +-- +-- Revision 1.52 2003/07/14 22:19:29 misa +-- bugzilla: none Updating guess_base_channel to work more like the rhnapp server code +-- +-- Revision 1.51 2003/06/26 22:09:04 pjones +-- bugzilla: none +-- +-- log subscribe and unsubscribe +-- +-- Revision 1.50 2003/06/05 19:31:15 pjones +-- bugzilla: 88278 -- make the cursor name smaller +-- +-- Revision 1.49 2003/06/05 19:18:21 pjones +-- bugzilla: 88278 +-- +-- unsubscribe_server() opens the package-level cursor when it invokes itself, +-- so we're using a local copy instead. +-- +-- Revision 1.48 2003/06/04 16:41:39 pjones +-- bugzilla: none +-- +-- make bulk_guess_server_base() silently ignore unguessables +-- +-- Revision 1.47 2003/06/04 16:27:03 pjones +-- bugzilla: 88822 +-- +-- eliminate the last outliers that remove things from channels without using +-- unsubscribe_server, I think. +-- +-- Revision 1.46 2003/06/03 20:49:37 pjones +-- bugzilla: 88822 +-- unsubscribing from rhn-satellite now clears rhnSatelliteChannelFamily +-- for the server in question +-- +-- Revision 1.45 2003/06/02 20:41:45 pjones +-- bugzilla: none - fix rhnProxyInfo/rhnSatelliteInfo channel unsubscribe +-- problem. Basicly, if you're out of the channel for any reason, you're +-- also out of rhnProxyInfo/rhnProxyInfo +-- +-- Revision 1.44 2003/03/24 15:26:28 pjones +-- bugzilla: 85812 +-- +-- bulk_server_base_change silently ignores servers that are satellites +-- or proxies, as requested. +-- +-- Revision 1.43 2003/02/26 20:28:17 pjones +-- rhn_channel.update_family_counts() in rhn_channel.entitle_customer() +-- the old codepath is: +-- +-- ep -> +-- rhn_ep.entitlement_run_me() -> +-- rhn_ep.poll_customer() -> +-- rhn_channel.entitle_customer() +-- +-- which doesn't change current_members, even though it may remove servers +-- from the family. +-- +-- There's another bug here: currently, we don't try to order forced +-- unsubscribes in any way; we just use +-- rhn_channel.unsubscribe_server_from_family . If there are any child +-- channel subscriptions, this will leave them subscribed. We really need +-- to iterate across the channels again, and subscribe any channel for which +-- there are no parent channel subscriptions. +-- +-- Ugh. +-- +-- Revision 1.42 2003/01/28 00:19:45 pjones +-- fix clear_subscriptions; AFAICT, this is only hit on the +-- bulk_server_base_change / bulk_server_base_guess codepaths, which puts +-- it infrequent enough that it could be our "bad count" culprit. +-- +-- Revision 1.41 2003/01/14 19:51:45 pjones +-- make setting current_members on rhnChannelFamilyPermissions work when +-- a server is in more than one channel in a single family. diff --git a/web/modules/sniglets/Sniglets/ChannelEditor.pm b/web/modules/sniglets/Sniglets/ChannelEditor.pm index 9ddcf97..7e39817 100644 --- a/web/modules/sniglets/Sniglets/ChannelEditor.pm +++ b/web/modules/sniglets/Sniglets/ChannelEditor.pm @@ -223,9 +223,9 @@ sub channel_edit_cb { } # bugzilla: 161517 - allow _ and / in channel labels # bugzilla: 459827 - disallow names longer than 64 characters - unless ($channel_name =~ /^[a-z][\w\d\s\-\.\'\/\_]*$/i and length($channel_name) >= 6 and length($channel_name) <= 64) { + unless ($channel_name =~ /^[a-z][\w\d\s\-\.\'\/\_]*$/i and length($channel_name) >= 6 and length($channel_name) <= 256) { $pxt->push_message(local_alert => "Invalid channel name '" . - PXT::Utils->escapeHTML($channel_name) . "' - must be at least 6 characters long and no longer than 64 characters, begin with a letter, and contain only letters, digits, spaces, '-', ' / ', '_' and '.'"); + PXT::Utils->escapeHTML($channel_name) . "' - must be at least 6 characters long and no longer than 256 characters, begin with a letter, and contain only letters, digits, spaces, '-', ' / ', '_' and '.'"); $errors++; } @@ -653,7 +653,7 @@ sub channel_edit_form { $subs{channel_label} .= '<br />Ex: custom-channel'; } if ($editable{channel_name}) { - $subs{channel_name} = PXT::HTML->text(-name => 'channel_name', -value => $subs{channel_name}, -size => 48, -maxlength => 64); + $subs{channel_name} = PXT::HTML->text(-name => 'channel_name', -value => $subs{channel_name}, -size => 48, -maxlength => 256); } if ($editable{channel_summary}) { $subs{channel_summary} = PXT::HTML->text(-name => 'channel_summary', -value => $subs{channel_summary}, -size => 40, -maxlength => 500);

1 0

java/code schema/spacewalk web/modules
by jdob 27 May '09

27 May '09

java/code/webapp/WEB-INF/pages/channel/manage/edit.jsp | 2 schema/spacewalk/rhnsat/packages/rhn_channel.pkb | 2 schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/118-rhn_channel.pkb.sql | 1401 ++++++++++ web/modules/sniglets/Sniglets/ChannelEditor.pm | 6 4 files changed, 1406 insertions(+), 5 deletions(-) New commits: commit e33a7fb3ca327feb9fd393d47c2e9fbc064b1624 Author: Jason Dobies <jason.dobies(a)redhat.com> Date: Wed May 27 16:52:56 2009 -0400 498467 - A few changes related to the channel name limit increase. - Increased max length of create channel name text field - Clone channel destination page updated with correct new length - Stored proc changed; increased size of channel_name variable - Update script for stored proc created diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/edit.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/edit.jsp index 1a74182..3733be6 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/edit.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/edit.jsp @@ -37,7 +37,7 @@ <rhn:required-field key="channel.edit.jsp.name"/>: </th> <td class="small-form"> - <html:text property="name" maxlength="64" size="48"/> + <html:text property="name" maxlength="256" size="48"/> </td> </tr> <tr> diff --git a/schema/spacewalk/rhnsat/packages/rhn_channel.pkb b/schema/spacewalk/rhnsat/packages/rhn_channel.pkb index 9d0a5d8..d7ec67f 100644 --- a/schema/spacewalk/rhnsat/packages/rhn_channel.pkb +++ b/schema/spacewalk/rhnsat/packages/rhn_channel.pkb @@ -1011,7 +1011,7 @@ IS FUNCTION channel_priority(channel_id_in IN number) RETURN number IS - channel_name varchar2(64); + channel_name varchar2(256); priority number; end_of_life_val date; org_id_val number; diff --git a/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/118-rhn_channel.pkb.sql b/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/118-rhn_channel.pkb.sql new file mode 100644 index 0000000..d7ec67f --- /dev/null +++ b/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/118-rhn_channel.pkb.sql @@ -0,0 +1,1401 @@ +-- +-- Copyright (c) 2008 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_channel +IS + body_version varchar2(100) := ''; + + -- Cursor that fetches all the possible base channels for a + -- (server_arch_id, release, org_id) combination + cursor base_channel_cursor( + release_in in varchar2, + server_arch_id_in in number, + org_id_in in number + ) return rhnChannel%ROWTYPE is + select distinct c.* + from rhnDistChannelMap dcm, + rhnServerChannelArchCompat scac, + rhnChannel c, + rhnChannelPermissions cp + where cp.org_id = org_id_in + and cp.channel_id = c.id + and c.parent_channel is null + and c.id = dcm.channel_id + and c.channel_arch_id = dcm.channel_arch_id + and dcm.release = release_in + and scac.server_arch_id = server_arch_id_in + and scac.channel_arch_id = c.channel_arch_id; + + FUNCTION get_license_path(channel_id_in IN NUMBER) + RETURN VARCHAR2 + IS + license_val VARCHAR2(1000); + BEGIN + SELECT CFL.license_path INTO license_val + FROM rhnChannelFamilyLicense CFL, rhnChannelFamilyMembers CFM + WHERE CFM.channel_id = channel_id_in + AND CFM.channel_family_id = CFL.channel_family_id; + + RETURN license_val; + + EXCEPTION + WHEN NO_DATA_FOUND + THEN + RETURN NULL; + END get_license_path; + + + PROCEDURE license_consent(channel_id_in IN NUMBER, user_id_in IN NUMBER, server_id_in IN NUMBER) + IS + channel_family_id_val NUMBER; + BEGIN + channel_family_id_val := rhn_channel.family_for_channel(channel_id_in); + IF channel_family_id_val IS NULL + THEN + rhn_exception.raise_exception('channel_subscribe_no_family'); + END IF; + + IF rhn_channel.get_license_path(channel_id_in) IS NULL + THEN + rhn_exception.raise_exception('channel_consent_no_license'); + END IF; + + INSERT INTO rhnChannelFamilyLicenseConsent (channel_family_id, user_id, server_id) + VALUES (channel_family_id_val, user_id_in, server_id_in); + END license_consent; + + PROCEDURE subscribe_server(server_id_in IN NUMBER, channel_id_in NUMBER, immediate_in NUMBER := 1, user_id_in in number := null, recalcfamily_in NUMBER := 1) + IS + channel_parent_val rhnChannel.parent_channel%TYPE; + parent_subscribed BOOLEAN; + server_has_base_chan BOOLEAN; + server_already_in_chan BOOLEAN; + channel_family_id_val NUMBER; + server_org_id_val NUMBER; + available_subscriptions NUMBER; + consenting_user NUMBER; + allowed number := 0; + current_members_val number; + BEGIN + if user_id_in is not null then + allowed := rhn_channel.user_role_check(channel_id_in, user_id_in, 'subscribe'); + else + allowed := 1; + end if; + + if allowed = 0 then + rhn_exception.raise_exception('no_subscribe_permissions'); + end if; + + + SELECT parent_channel INTO channel_parent_val FROM rhnChannel WHERE id = channel_id_in; + + IF channel_parent_val IS NOT NULL + THEN + -- child channel; if attempting to cross-subscribe a child to the wrong base, silently ignore + parent_subscribed := FALSE; + + FOR check_subscription IN check_server_subscription(server_id_in, channel_parent_val) + LOOP + parent_subscribed := TRUE; + END LOOP check_subscription; + + IF NOT parent_subscribed + THEN + RETURN; + END IF; + ELSE + -- base channel + server_has_base_chan := FALSE; + FOR base IN server_base_subscriptions(server_id_in) + LOOP + server_has_base_chan := TRUE; + END LOOP base; + + IF server_has_base_chan + THEN + rhn_exception.raise_exception('channel_server_one_base'); + END IF; + END IF; + + FOR check_subscription IN check_server_subscription(server_id_in, channel_id_in) + LOOP + server_already_in_chan := TRUE; + END LOOP check_subscription; + + IF server_already_in_chan + THEN + RETURN; + END IF; + + channel_family_id_val := rhn_channel.family_for_channel(channel_id_in); + IF channel_family_id_val IS NULL + THEN + rhn_exception.raise_exception('channel_subscribe_no_family'); + END IF; + + -- + -- Use the org_id of the server only if the org_id of the channel = NULL. + -- This is required for subscribing to shared channels. + -- + SELECT NVL(org_id, (SELECT org_id FROM rhnServer WHERE id = server_id_in)) + INTO server_org_id_val + FROM rhnChannel + WHERE id = channel_id_in; + + select current_members + into current_members_val + from rhnPrivateChannelFamily + where org_id = server_org_id_val and channel_family_id = channel_family_id_val + for update of current_members; + + available_subscriptions := rhn_channel.available_family_subscriptions(channel_family_id_val, server_org_id_val); + + IF available_subscriptions IS NULL OR + available_subscriptions > 0 or + can_server_consume_virt_channl(server_id_in, channel_family_id_val) = 1 + THEN + + IF rhn_channel.get_license_path(channel_id_in) IS NOT NULL + THEN + BEGIN + + SELECT user_id INTO consenting_user + FROM rhnChannelFamilyLicenseConsent + WHERE channel_family_id = channel_family_id_val + AND server_id = server_id_in; + + EXCEPTION + WHEN NO_DATA_FOUND THEN + rhn_exception.raise_exception('channel_subscribe_no_consent'); + END; + END IF; + + insert into rhnServerHistory (id,server_id,summary,details) ( + select rhn_event_id_seq.nextval, + server_id_in, + 'subscribed to channel ' || SUBSTR(c.label, 0, 106), + c.label + from rhnChannel c + where c.id = channel_id_in + ); + UPDATE rhnServer SET channels_changed = sysdate WHERE id = server_id_in; + INSERT INTO rhnServerChannel (server_id, channel_id) VALUES (server_id_in, channel_id_in); + IF recalcfamily_in > 0 + THEN + rhn_channel.update_family_counts(channel_family_id_val, server_org_id_val); + END IF; + queue_server(server_id_in, immediate_in); + ELSE + rhn_exception.raise_exception('channel_family_no_subscriptions'); + END IF; + + END subscribe_server; + + function can_server_consume_virt_channl( + server_id_in in number, + family_id_in in number ) + return number + is + + cursor server_virt_families is + select vi.virtual_system_id, cfvsl.channel_family_id + from + rhnChannelFamilyVirtSubLevel cfvsl, + rhnSGTypeVirtSubLevel sgtvsl, + rhnVirtualInstance vi + where + vi.virtual_system_id = server_id_in + and sgtvsl.virt_sub_level_id = cfvsl.virt_sub_level_id + and cfvsl.channel_family_id = family_id_in + and exists ( + select 1 + from rhnServerEntitlementView sev + where vi.host_system_id = sev.server_id + and sev.server_group_type_id = sgtvsl.server_group_type_id ); + begin + + for server_virt_family in server_virt_families loop + return 1; + end loop; + + return 0; + + end; + + + PROCEDURE bulk_subscribe_server(channel_id_in IN NUMBER, set_label_in IN VARCHAR2, set_uid_in IN NUMBER) + IS + BEGIN + FOR server IN rhn_set.set_iterator(set_label_in, set_uid_in) + LOOP + rhn_channel.subscribe_server(server.element, channel_id_in, 0, set_uid_in); + END LOOP server; + END bulk_subscribe_server; + + PROCEDURE bulk_server_base_change(channel_id_in IN NUMBER, set_label_in IN VARCHAR2, set_uid_in IN NUMBER) + IS + BEGIN + FOR server IN rhn_set.set_iterator(set_label_in, set_uid_in) + LOOP + IF rhn_server.can_change_base_channel(server.element) = 1 + THEN + rhn_channel.clear_subscriptions(TO_NUMBER(server.element)); + rhn_channel.subscribe_server(server.element, channel_id_in, 0, set_uid_in); + END IF; + END LOOP server; + END bulk_server_base_change; + + procedure bulk_server_basechange_from( + set_label_in in varchar2, + set_uid_in in number, + old_channel_id_in in number, + new_channel_id_in in number + ) is + cursor servers is + select sc.server_id id + from rhnChannel nc, + rhnServerChannelArchCompat scac, + rhnServer s, + rhnChannel oc, + rhnServerChannel sc, + rhnSet st + where 1=1 + -- first, find the servers we're looking for. + and st.label = set_label_in + and st.user_id = set_uid_in + and st.element = sc.server_id + -- now, filter out anything that's not in the + -- old base channel. + and sc.channel_id = old_channel_id_in + and sc.channel_id = oc.id + and oc.parent_channel is null + -- now, see if it's compatible with the new base channel + and nc.id = new_channel_id_in + and nc.parent_channel is null + and sc.server_id = s.id + and s.server_arch_id = scac.server_arch_id + and scac.channel_arch_id = nc.channel_arch_id; + begin + for s in servers loop + insert into rhnSet ( + user_id, label, element + ) values ( + set_uid_in, + set_label_in || 'basechange', + s.id + ); + end loop channel; + bulk_server_base_change(new_channel_id_in, + set_label_in || 'basechange', + set_uid_in); + delete from rhnSet + where label = set_label_in||'basechange' + and user_id = set_uid_in; + end bulk_server_basechange_from; + + procedure bulk_guess_server_base( + set_label_in in varchar2, + set_uid_in in number + ) is + channel_id number; + begin + for server in rhn_set.set_iterator(set_label_in, set_uid_in) + loop + -- anything that doesn't work, we just ignore + begin + if rhn_server.can_change_base_channel(server.element) = 1 + then + channel_id := guess_server_base(TO_NUMBER(server.element)); + rhn_channel.clear_subscriptions(TO_NUMBER(server.element)); + rhn_channel.subscribe_server(TO_NUMBER(server.element), channel_id, 0, set_uid_in); + end if; + exception when others then + null; + end; + end loop server; + end; + + function guess_server_base( + server_id_in in number + ) RETURN number is + cursor server_cursor is + select s.server_arch_id, s.release, s.org_id + from rhnServer s + where s.id = server_id_in; + begin + for s in server_cursor loop + for channel in base_channel_cursor(s.release, + s.server_arch_id, s.org_id) + loop + return channel.id; + end loop base_channel_cursor; + end loop server_cursor; + -- Server not found, or no base channel applies to it + return null; + end; + + -- Private function + function normalize_server_arch(server_arch_in in varchar2) + return varchar2 + deterministic + is + suffix VARCHAR2(128) := '-redhat-linux'; + suffix_len NUMBER := length(suffix); + begin + if server_arch_in is NULL then + return NULL; + end if; + if instr(server_arch_in, '-') > 0 + then + -- Suffix already present + return server_arch_in; + end if; + return server_arch_in || suffix; + end normalize_server_arch; + + -- + -- + -- Raises: + -- server_arch_not_found + -- no_subscribe_permissions + function base_channel_for_release_arch( + release_in in varchar2, + server_arch_in in varchar2, + org_id_in in number := -1, + user_id_in in number := null + ) return number is + server_arch varchar2(256) := normalize_server_arch(server_arch_in); + server_arch_id number; + begin + -- Look up the server arch + begin + select id + into server_arch_id + from rhnServerArch + where label = server_arch; + exception + when no_data_found then + rhn_exception.raise_exception('server_arch_not_found'); + end; + return base_channel_rel_archid(release_in, server_arch_id, + org_id_in, user_id_in); + end base_channel_for_release_arch; + + function base_channel_rel_archid( + release_in in varchar2, + server_arch_id_in in number, + org_id_in in number := -1, + user_id_in in number := null + ) return number is + denied_channel_id number := null; + valid_org_id number := org_id_in; + valid_user_id number := user_id_in; + channel_subscribable number; + begin + if org_id_in = -1 and user_id_in is not null then + -- Get the org id from the user id + begin + select org_id + into valid_org_id + from web_contact + where id = user_id_in; + exception + when no_data_found then + -- User doesn't exist + -- XXX Only list public stuff for now + valid_user_id := null; + valid_org_id := -1; + end; + end if; + + for c in base_channel_cursor(release_in, server_arch_id_in, valid_org_id) + loop + -- This row is a possible match + if valid_user_id is null then + -- User ID not specified, so no user to channel permissions to + -- check + return c.id; + end if; + + -- Check user to channel permissions + select loose_user_role_check(c.id, user_id_in, 'subscribe') + into channel_subscribable + from dual; + + if channel_subscribable = 1 then + return c.id; + end if; + + -- Base channel exists, but is not subscribable; keep trying + denied_channel_id := c.id; + end loop base_channel_fetch; + + if denied_channel_id is not null then + rhn_exception.raise_exception('no_subscribe_permissions'); + end if; + -- No base channel applies + return NULL; + end base_channel_rel_archid; + + procedure bulk_guess_server_base_from( + set_label_in in varchar2, + set_uid_in in number, + channel_id_in in number + ) is + cursor channels(server_id_in in number) is + select rsc.channel_id + from rhnServerChannel rsc, + rhnChannel rc + where server_id_in = rsc.server_id + and rsc.channel_id = rc.id + and rc.parent_channel is null; + begin + for server in rhn_set.set_iterator(set_label_in, set_uid_in) + loop + for channel in channels(server.element) + loop + if channel.channel_id = channel_id_in + then + insert into rhnSet (user_id, label, element) values (set_uid_in, set_label_in || 'baseguess', server.element); + end if; + end loop channel; + end loop server; + bulk_guess_server_base(set_label_in||'baseguess',set_uid_in); + delete from rhnSet where label = set_label_in||'baseguess' and user_id = set_uid_in; + end; + + + PROCEDURE clear_subscriptions(server_id_in IN NUMBER, deleting_server IN NUMBER := 0 ) + IS + cursor server_channels(server_id_in in number) is + select s.org_id, sc.channel_id, cfm.channel_family_id + from rhnServer s, + rhnServerChannel sc, + rhnChannelFamilyMembers cfm + where s.id = server_id_in + and s.id = sc.server_id + and sc.channel_id = cfm.channel_id; + BEGIN + for channel in server_channels(server_id_in) + loop + unsubscribe_server(server_id_in, channel.channel_id, 1, 1, deleting_server); + rhn_channel.update_family_counts(channel.channel_family_id, channel.org_id); + end loop channel; + END clear_subscriptions; + + PROCEDURE unsubscribe_server(server_id_in IN NUMBER, channel_id_in NUMBER, immediate_in NUMBER := 1, unsubscribe_children_in number := 0, + deleting_server IN NUMBER := 0 ) + IS + channel_family_id_val NUMBER; + server_org_id_val NUMBER; + available_subscriptions NUMBER; + server_already_in_chan BOOLEAN; + cursor channel_family_is_proxy(channel_family_id_in in number) is + select 1 + from rhnChannelFamily + where id = channel_family_id_in + and label = 'rhn-proxy'; + cursor channel_family_is_satellite(channel_family_id_in in number) is + select 1 + from rhnChannelFamily + where id = channel_family_id_in + and label = 'rhn-satellite'; + -- this is *EXACTLY* like check_server_parent_membership, but if we recurse + -- with the package-level one, we get a "cursor already open", so we need a + -- copy on our call stack instead. GROAN. + cursor local_chk_server_parent_memb ( + server_id_in number, + channel_id_in number ) is + select c.id + from rhnChannel c, + rhnServerChannel sc + where 1=1 + and c.parent_channel = channel_id_in + and c.id = sc.channel_id + and sc.server_id = server_id_in; + BEGIN + FOR child IN local_chk_server_parent_memb(server_id_in, channel_id_in) + LOOP + if unsubscribe_children_in = 1 then + unsubscribe_server(server_id_in => server_id_in, + channel_id_in => child.id, + immediate_in => immediate_in, + unsubscribe_children_in => unsubscribe_children_in, + deleting_server => deleting_server); + else + rhn_exception.raise_exception('channel_unsubscribe_child_exists'); + end if; + END LOOP child; + + server_already_in_chan := FALSE; + + FOR check_subscription IN check_server_subscription(server_id_in, channel_id_in) + LOOP + server_already_in_chan := TRUE; + END LOOP check_subscription; + + IF NOT server_already_in_chan + THEN + RETURN; + END IF; + + if deleting_server = 0 then + + insert into rhnServerHistory (id,server_id,summary,details) ( + select rhn_event_id_seq.nextval, + server_id_in, + 'unsubscribed from channel ' || SUBSTR(c.label, 0, 106), + c.label + from rhnChannel c + where c.id = channel_id_in + ); + + UPDATE rhnServer SET channels_changed = sysdate WHERE id = server_id_in; + end if; + + DELETE FROM rhnServerChannel WHERE server_id = server_id_in AND channel_id = channel_id_in; + + if deleting_server = 0 then + queue_server(server_id_in, immediate_in); + end if; + + channel_family_id_val := rhn_channel.family_for_channel(channel_id_in); + IF channel_family_id_val IS NULL + THEN + rhn_exception.raise_exception('channel_unsubscribe_no_family'); + END IF; + + for ignore in channel_family_is_satellite(channel_family_id_val) loop + delete from rhnSatelliteInfo where server_id = server_id_in; + delete from rhnSatelliteChannelFamily where server_id = server_id_in; + end loop; + + for ignore in channel_family_is_proxy(channel_family_id_val) loop + delete from rhnProxyInfo where server_id = server_id_in; + end loop; + + DELETE FROM rhnChannelFamilyLicenseConsent + WHERE channel_family_id = channel_family_id_val + AND server_id = server_id_in; + + SELECT org_id INTO server_org_id_val + FROM rhnServer + WHERE id = server_id_in; + + rhn_channel.update_family_counts(channel_family_id_val, server_org_id_val); + END unsubscribe_server; + + PROCEDURE bulk_unsubscribe_server(channel_id_in IN NUMBER, set_label_in IN VARCHAR2, set_uid_in IN NUMBER) + IS + BEGIN + FOR server IN rhn_set.set_iterator(set_label_in, set_uid_in) + LOOP + rhn_channel.unsubscribe_server(server.element, channel_id_in, 0); + END LOOP server; + END bulk_unsubscribe_server; + + FUNCTION family_for_channel(channel_id_in IN NUMBER) + RETURN NUMBER + IS + channel_family_id_val NUMBER; + BEGIN + SELECT channel_family_id INTO channel_family_id_val + FROM rhnChannelFamilyMembers + WHERE channel_id = channel_id_in; + + RETURN channel_family_id_val; + EXCEPTION + WHEN NO_DATA_FOUND + THEN + RETURN NULL; + END family_for_channel; + + FUNCTION available_family_subscriptions(channel_family_id_in IN NUMBER, org_id_in IN NUMBER) + RETURN NUMBER + IS + cfp channel_family_perm_cursor%ROWTYPE; + current_members_val NUMBER; + max_members_val NUMBER; + found NUMBER; + BEGIN + IF NOT channel_family_perm_cursor%ISOPEN + THEN + OPEN channel_family_perm_cursor(channel_family_id_in, org_id_in); + END IF; + + FETCH channel_family_perm_cursor INTO cfp; + + WHILE channel_family_perm_cursor%FOUND + LOOP + found := 1; + + current_members_val := cfp.current_members; + max_members_val := cfp.max_members; + + FETCH channel_family_perm_cursor INTO cfp; + END LOOP; + + IF channel_family_perm_cursor%ISOPEN + THEN + CLOSE channel_family_perm_cursor; + END IF; + + -- not found: either the channel fam doesn't have an entry in cfp, or the org doesn't have access to it. + -- either way, there are no available subscriptions + + IF found IS NULL + THEN + RETURN 0; + END IF; + + -- null max members? in that case, pass it on; NULL means infinite + IF max_members_val IS NULL + THEN + RETURN NULL; + END IF; + + -- otherwise, return the delta + RETURN max_members_val - current_members_val; + END available_family_subscriptions; + + -- ******************************************************************* + -- FUNCTION: channel_family_current_members + -- Calculates and returns the actual count of systems consuming + -- physical channel subscriptions. + -- Called by: update_family_counts + -- rhn_entitlements.repoll_virt_guest_entitlements + -- ******************************************************************* + function channel_family_current_members(channel_family_id_in IN NUMBER, + org_id_in IN NUMBER) + return number + is + current_members_count number := 0; + begin + select count(distinct sc.server_id) + into current_members_count + from rhnChannelFamilyMembers cfm, + rhnServerChannel sc, + rhnServer s + where s.org_id = org_id_in + and s.id = sc.server_id + and cfm.channel_family_id = channel_family_id_in + and cfm.channel_id = sc.channel_id + and exists ( + select 1 + from rhnChannelFamilyServerPhysical cfsp + where cfsp.CHANNEL_FAMILY_ID = channel_family_id_in + and cfsp.server_id = s.id + ); + + return current_members_count; + end; + + PROCEDURE update_family_counts(channel_family_id_in IN NUMBER, + org_id_in IN NUMBER) + IS + BEGIN + update rhnPrivateChannelFamily + set current_members = ( + channel_family_current_members(channel_family_id_in, org_id_in) + ) + where org_id = org_id_in + and channel_family_id = channel_family_id_in; + + END update_family_counts; + + FUNCTION available_chan_subscriptions(channel_id_in IN NUMBER, + org_id_in IN NUMBER) + RETURN NUMBER + IS + channel_family_id_val NUMBER; + BEGIN + SELECT channel_family_id INTO channel_family_id_val + FROM rhnChannelFamilyMembers + WHERE channel_id = channel_id_in; + + RETURN rhn_channel.available_family_subscriptions( + channel_family_id_val, org_id_in); + END available_chan_subscriptions; + + -- ******************************************************************* + -- PROCEDURE: entitle_customer + -- Creates a chan fam bucket, or sets max_members for an existing bucket + -- Called by: rhn_ep.poll_customer_internal + -- Calls: set_family_maxmembers + update_family_counts if the row + -- already exists, else it creates it in rhnPrivateChannelFamily. + -- ******************************************************************* + procedure entitle_customer(customer_id_in in number, + channel_family_id_in in number, + quantity_in in number) + is + cursor permissions is + select 1 + from rhnPrivateChannelFamily pcf + where pcf.org_id = customer_id_in + and pcf.channel_family_id = channel_family_id_in; + begin + for perm in permissions loop + set_family_maxmembers( + customer_id_in, + channel_family_id_in, + quantity_in + ); + rhn_channel.update_family_counts( + channel_family_id_in, + customer_id_in + ); + return; + end loop; + + insert into rhnPrivateChannelFamily pcf ( + channel_family_id, org_id, max_members, current_members + ) values ( + channel_family_id_in, customer_id_in, quantity_in, 0 + ); + end; + + -- ******************************************************************* + -- PROCEDURE: set_family_maxmembers + -- Prunes an existing channel family bucket by unsubscribing the + -- necessary servers and sets max_members. + -- Called by: rhn_channel.entitle_customer + -- Calls: unsubscribe_server_from_family + -- ******************************************************************* + procedure set_family_maxmembers(customer_id_in in number, + channel_family_id_in in number, + quantity_in in number) + is + cursor servers is + select server_id from ( + select rownum row_number, server_id, modified from ( + select rcfsp.server_id, + rcfsp.modified + from rhnChannelFamilyServerPhysical rcfsp + where rcfsp.customer_id = customer_id_in + and rcfsp.channel_family_id = channel_family_id_in + order by modified + ) + where rownum > quantity_in + ); + begin + -- prune subscribed servers + for server in servers loop + rhn_channel.unsubscribe_server_from_family(server.server_id, + channel_family_id_in); + end loop; + + update rhnPrivateChannelFamily pcf + set pcf.max_members = quantity_in + where pcf.org_id = customer_id_in + and pcf.channel_family_id = channel_family_id_in; + end; + + procedure unsubscribe_server_from_family(server_id_in in number, + channel_family_id_in in number) + is + begin + delete + from rhnServerChannel rsc + where rsc.server_id = server_id_in + and channel_id in ( + select rcfm.channel_id + from rhnChannelFamilyMembers rcfm + where rcfm.channel_family_id = channel_family_id_in); + end; + + function get_org_id(channel_id_in in number) + return number + is + org_id_out number; + begin + select org_id into org_id_out + from rhnChannel + where id = channel_id_in; + + return org_id_out; + end get_org_id; + + function get_cfam_org_access(cfam_id_in in number, org_id_in in number) + return number + is + cursor families is + select 1 + from rhnOrgChannelFamilyPermissions cfp + where cfp.org_id = org_id_in; + begin + -- the idea: if we get past this query, + -- the user has the role, else catch the exception and return 0 + for family in families loop + return 1; + end loop; + return 0; + end; + + function get_org_access(channel_id_in in number, org_id_in in number) + return number + is + throwaway number; + begin + -- the idea: if we get past this query, + -- the org has access to the channel, else catch the exception and return 0 + select distinct 1 into throwaway + from rhnChannelFamilyMembers CFM, + rhnOrgChannelFamilyPermissions CFP + where cfp.org_id = org_id_in + and CFM.channel_family_id = CFP.channel_family_id + and CFM.channel_id = channel_id_in + and (CFP.max_members > 0 or CFP.max_members is null or CFP.org_id = 1); + + return 1; + exception + when no_data_found + then + return 0; + end; + + -- check if a user has a given role, or if such a role is inferrable + function user_role_check_debug(channel_id_in in number, + user_id_in in number, + role_in in varchar2, + reason_out out varchar2) + return number + is + org_id number; + begin + org_id := rhn_user.get_org_id(user_id_in); + + -- channel might be shared + if role_in = 'subscribe' and + rhn_channel.shared_user_role_check(channel_id_in, user_id_in, role_in) = 1 then + return 1; + end if; + + if role_in = 'manage' and + NVL(rhn_channel.get_org_id(channel_id_in), -1) <> org_id then + reason_out := 'channel_not_owned'; + return 0; + end if; + + if role_in = 'subscribe' and + rhn_channel.get_org_access(channel_id_in, org_id) = 0 then + reason_out := 'channel_not_available'; + return 0; + end if; + + -- channel admins have all roles + if rhn_user.check_role_implied(user_id_in, 'channel_admin') = 1 then + reason_out := 'channel_admin'; + return 1; + end if; + + -- the subscribe permission is inferred + -- UNLESS the not_globally_subscribable flag is set + if role_in = 'subscribe' + then + if rhn_channel.org_channel_setting(channel_id_in, + org_id, + 'not_globally_subscribable') = 0 then + reason_out := 'globally_subscribable'; + return 1; + end if; + end if; + + -- all other roles (manage right now) are explicitly granted + reason_out := 'direct_permission'; + return rhn_channel.direct_user_role_check(channel_id_in, + user_id_in, role_in); + end; + + -- same as above, but with no OUT param; useful in views, etc + function user_role_check(channel_id_in in number, user_id_in in number, role_in in varchar2) + return number + is + throwaway varchar2(256); + begin + return rhn_channel.user_role_check_debug(channel_id_in, user_id_in, role_in, throwaway); + end; + + -- + -- For multiorg phase II, this function simply checks to see if the user's + -- has a trust relationship that includes this channel by id. + -- + function shared_user_role_check(channel_id in number, user_id in number, role in varchar2) + return number + is + n number; + oid number; + begin + oid := rhn_user.get_org_id(user_id); + select 1 into n + from rhnSharedChannelView s + where s.id = channel_id and s.org_trust_id = oid; + return 1; + exception + when no_data_found then + return 0; + end; + + -- same as above, but returns 1 if user_id_in is null + -- This is useful in queries where user_id is not specified + function loose_user_role_check(channel_id_in in number, user_id_in in number, role_in in varchar2) + return number + is + begin + if user_id_in is null then + return 1; + end if; + return user_role_check(channel_id_in, user_id_in, role_in); + end loose_user_role_check; + + -- directly checks the table, no inferred permissions + function direct_user_role_check(channel_id_in in number, user_id_in in number, role_in in varchar2) + return number + is + throwaway number; + begin + -- the idea: if we get past this query, the user has the role, else catch the exception and return 0 + select 1 into throwaway + from rhnChannelPermissionRole CPR, + rhnChannelPermission CP + where CP.user_id = user_id_in + and CP.channel_id = channel_id_in + and CPR.label = role_in + and CP.role_id = CPR.id; + + return 1; + exception + when no_data_found + then + return 0; + end; + + -- check if an org has a certain setting + function org_channel_setting(channel_id_in in number, org_id_in in number, setting_in in varchar2) + return number + is + throwaway number; + begin + -- the idea: if we get past this query, the org has the setting, else catch the exception and return 0 + select 1 into throwaway + from rhnOrgChannelSettingsType OCST, + rhnOrgChannelSettings OCS + where OCS.org_id = org_id_in + and OCS.channel_id = channel_id_in + and OCST.label = setting_in + and OCS.setting_id = OCST.id; + + return 1; + exception + when no_data_found + then + return 0; + end; + + FUNCTION channel_priority(channel_id_in IN number) + RETURN number + IS + channel_name varchar2(256); + priority number; + end_of_life_val date; + org_id_val number; + BEGIN + + select name, end_of_life, org_id + into channel_name, end_of_life_val, org_id_val + from rhnChannel + where id = channel_id_in; + + if end_of_life_val is not null then + return -400; + end if; + + if channel_name like 'Red Hat Enterprise Linux%' or channel_name like 'RHEL%' then + priority := 1000; + if channel_name not like '%Beta%' then + priority := priority + 1000; + end if; + + priority := priority + + case + when channel_name like '%v. 5%' then 600 + when channel_name like '%v. 4%' then 500 + when channel_name like '%v. 3%' then 400 + when channel_name like '%v. 2%' then 300 + when channel_name like '%v. 1%' then 200 + else 0 + end; + + priority := priority + + case + when channel_name like 'Red Hat Enterprise Linux (v. 5%' then 60 + when (channel_name like '%AS%' and channel_name not like '%Extras%') then 50 + when (channel_name like '%ES%' and channel_name not like '%Extras%') then 40 + when (channel_name like '%WS%' and channel_name not like '%Extras%') then 30 + when (channel_name like '%Desktop%' and channel_name not like '%Extras%') then 20 + when channel_name like '%Extras%' then 10 + else 0 + end; + + priority := priority + + case + when channel_name like '%)' then 5 + else 0 + end; + + priority := priority + + case + when channel_name like '%32-bit x86%' then 4 + when channel_name like '%64-bit Intel Itanium%' then 3 + when channel_name like '%64-bit AMD64/Intel EM64T%' then 2 + else 0 + end; + elsif channel_name like 'Red Hat Desktop%' then + priority := 900; + + if channel_name not like '%Beta%' then + priority := priority + 50; + end if; + + priority := priority + + case + when channel_name like '%v. 4%' then 40 + when channel_name like '%v. 3%' then 30 + when channel_name like '%v. 2%' then 20 + when channel_name like '%v. 1%' then 10 + else 0 + end; + + priority := priority + + case + when channel_name like '%32-bit x86%' then 4 + when channel_name like '%64-bit Intel Itanium%' then 3 + when channel_name like '%64-bit AMD64/Intel EM64T%' then 2 + else 0 + end; + + elsif org_id_val is not null then + priority := 600; + else + priority := 500; + end if; + + return -priority; + + end channel_priority; + + -- right now this only does the accounting changes; the cascade + -- actually does the rhnServerChannel delete. + procedure delete_server_channels(server_id_in in number) + is + begin + update rhnPrivateChannelFamily + set current_members = current_members -1 + where org_id in ( + select org_id + from rhnServer + where id = server_id_in + ) + and channel_family_id in ( + select rcfm.channel_family_id + from rhnChannelFamilyMembers rcfm, + rhnServerChannel rsc + where rsc.server_id = server_id_in + and rsc.channel_id = rcfm.channel_id + and not exists ( + select 1 + from + rhnChannelFamilyVirtSubLevel cfvsl, + rhnSGTypeVirtSubLevel sgtvsl, + rhnServerEntitlementView sev, + rhnVirtualInstance vi + where + -- system is a virtual instance + vi.virtual_system_id = server_id_in + and vi.host_system_id = sev.server_id + -- system's host has a virt ent + and sev.label in ('virtualization_host', + 'virtualization_host_platform') + and sev.server_group_type_id = + sgtvsl.server_group_type_id + -- the host's virt ent grants a cf virt sub level + and sgtvsl.virt_sub_level_id = cfvsl.virt_sub_level_id + -- the cf is in that virt sub level + and cfvsl.channel_family_id = rcfm.channel_family_id + ) + ); + end; + + -- this could certainly be optimized to do updates if needs be + procedure refresh_newest_package(channel_id_in in number, caller_in in varchar2 := '(unknown)') + is + begin + delete from rhnChannelNewestPackage where channel_id = channel_id_in; + insert into rhnChannelNewestPackage + ( channel_id, name_id, evr_id, package_id, package_arch_id ) + ( select channel_id, + name_id, evr_id, + package_id, package_arch_id + from rhnChannelNewestPackageView + where channel_id = channel_id_in + ); + insert into rhnChannelNewestPackageAudit (channel_id, caller) + values (channel_id_in, caller_in); + update rhnChannel + set last_modified = greatest(sysdate, last_modified + 1/86400) + where id = channel_id_in; + end; + + procedure update_channel ( channel_id_in in number, invalidate_ss in number := 0, + date_to_use in date := sysdate ) + is + + channel_last_modified date; + last_modified_value date; + + cursor snapshots is + select snapshot_id id + from rhnSnapshotChannel + where channel_id = channel_id_in; + + begin + + select last_modified + into channel_last_modified + from rhnChannel + where id = channel_id_in; + + last_modified_value := date_to_use; + + if last_modified_value <= channel_last_modified then + last_modified_value := last_modified_value + 1/86400; + end if; + + update rhnChannel set last_modified = last_modified_value + where id = channel_id_in; + + if invalidate_ss = 1 then + for snapshot in snapshots loop + update rhnSnapshot + set invalid = lookup_snapshot_invalid_reason('channel_modified') + where id = snapshot.id; + end loop; + end if; + + end update_channel; + + procedure update_channels_by_package ( package_id_in in number, date_to_use in date := sysdate ) + is + + cursor channels is + select channel_id + from rhnChannelPackage + where package_id = package_id_in + order by channel_id; + + begin + for channel in channels loop + -- we want to invalidate the snapshot assocated with the channel when we + -- do this b/c we know we've added or removed or packages + rhn_channel.update_channel ( channel.channel_id, 1, date_to_use ); + end loop; + end update_channels_by_package; + + + procedure update_channels_by_errata ( errata_id_in number, date_to_use in date := sysdate ) + is + + cursor channels is + select channel_id + from rhnChannelErrata + where errata_id = errata_id_in + order by channel_id; + + begin + for channel in channels loop + -- we won't invalidate snapshots, b/c just changing the errata associated with + -- a channel shouldn't invalidate snapshots + rhn_channel.update_channel ( channel.channel_id, 0, date_to_use ); + end loop; + end update_channels_by_errata; + +END rhn_channel; +/ +SHOW ERRORS + +-- +-- Revision 1.75 2005/03/04 00:04:19 jslagle +-- bz #147617 +-- Made Red Hat Desktop sort a little better. +-- +-- Revision 1.74 2005/02/22 03:24:47 jslagle +-- bz #147617 +-- Improve channel_priority function to order channels better. +-- +-- Revision 1.73 2004/08/16 20:39:30 pjones +-- bugzilla: 129889 -- make bulk_server_basechange_from() actually work. +-- +-- Revision 1.72 2004/04/14 00:09:24 pjones +-- bugzilla: 120761 -- split rhnChannelPermissions into two tables, eliminating +-- a frequent full table scan +-- +-- Revision 1.71 2004/04/13 16:28:36 bretm +-- bugzilla: 119871 +-- +-- keep track of rhnServer.channels_changed through the pl/sql fns +-- +-- Revision 1.70 2004/03/26 18:11:32 rbb +-- Bugzilla: 114057 +-- +-- Add a script to determine channel priority. +-- +-- Revision 1.69 2004/02/17 20:16:52 pjones +-- bugzilla: none -- add cvs tags into the package as long as we're touching +-- it anyway +-- +-- Revision 1.68 2004/02/17 20:05:38 pjones +-- bugzilla: 115782 -- make bulk_server_basechange_from() filter out servers +-- with arches incompatible with the target channel +-- +-- Revision 1.67 2004/02/06 02:36:10 misa +-- Changed normalize_server_arch to allow for solaris arches +-- +-- Revision 1.66 2003/11/13 16:58:34 cturner +-- make use of new rhn_user.check_role_implied call; pragmas broke, removed them for now since I have no idea how to fix them +-- +-- Revision 1.65 2003/10/23 20:26:24 bretm +-- bugzilla: none +-- +-- note the channel label when we unsubscribe, too +-- +-- Revision 1.64 2003/10/15 14:47:17 bretm +-- bugzilla: none +-- +-- add the channel label to the server history summary line when we log a channel change +-- +-- Revision 1.63 2003/09/24 19:25:56 pjones +-- this wasn't the right fix, put it back +-- +-- Revision 1.62 2003/09/24 17:42:19 pjones +-- bugzilla: none +-- +-- limit our server base channel guess to channels with available permissions +-- +-- Revision 1.61 2003/09/22 21:00:40 cturner +-- add method for easy acl check +-- +-- Revision 1.60 2003/09/17 22:14:11 misa +-- bugzilla: 103639 Changes to allow me to move the base channel guess into plsql +-- +-- Revision 1.59 2003/08/21 13:41:17 cturner +-- bugzilla: 99187. properly test for satellite and proxy in bulk_guess_server_base; reorg code for better reuse +-- +-- Revision 1.58 2003/07/24 16:46:22 cturner +-- bugzilla: 100723, the perm check was returning duplicates, so now it just calls the function it should have called anyway +-- +-- Revision 1.57 2003/07/24 16:44:16 misa +-- bugzilla: none A function more usable on the rhnapp side +-- +-- Revision 1.56 2003/07/23 22:36:51 cturner +-- argh, max returns null even when now rows; use distinct. how revolting +-- +-- Revision 1.55 2003/07/23 22:01:31 cturner +-- oops, this one can return multiple rows; eliminate that in a lazy way +-- +-- Revision 1.54 2003/07/23 21:59:19 cturner +-- rework how rhnUserChannel works; move to plsql for speed and maintenance +-- +-- Revision 1.53 2003/07/21 17:49:12 pjones +-- bugzilla: none +-- +-- add optional user for subscribe_server +-- +-- Revision 1.52 2003/07/14 22:19:29 misa +-- bugzilla: none Updating guess_base_channel to work more like the rhnapp server code +-- +-- Revision 1.51 2003/06/26 22:09:04 pjones +-- bugzilla: none +-- +-- log subscribe and unsubscribe +-- +-- Revision 1.50 2003/06/05 19:31:15 pjones +-- bugzilla: 88278 -- make the cursor name smaller +-- +-- Revision 1.49 2003/06/05 19:18:21 pjones +-- bugzilla: 88278 +-- +-- unsubscribe_server() opens the package-level cursor when it invokes itself, +-- so we're using a local copy instead. +-- +-- Revision 1.48 2003/06/04 16:41:39 pjones +-- bugzilla: none +-- +-- make bulk_guess_server_base() silently ignore unguessables +-- +-- Revision 1.47 2003/06/04 16:27:03 pjones +-- bugzilla: 88822 +-- +-- eliminate the last outliers that remove things from channels without using +-- unsubscribe_server, I think. +-- +-- Revision 1.46 2003/06/03 20:49:37 pjones +-- bugzilla: 88822 +-- unsubscribing from rhn-satellite now clears rhnSatelliteChannelFamily +-- for the server in question +-- +-- Revision 1.45 2003/06/02 20:41:45 pjones +-- bugzilla: none - fix rhnProxyInfo/rhnSatelliteInfo channel unsubscribe +-- problem. Basicly, if you're out of the channel for any reason, you're +-- also out of rhnProxyInfo/rhnProxyInfo +-- +-- Revision 1.44 2003/03/24 15:26:28 pjones +-- bugzilla: 85812 +-- +-- bulk_server_base_change silently ignores servers that are satellites +-- or proxies, as requested. +-- +-- Revision 1.43 2003/02/26 20:28:17 pjones +-- rhn_channel.update_family_counts() in rhn_channel.entitle_customer() +-- the old codepath is: +-- +-- ep -> +-- rhn_ep.entitlement_run_me() -> +-- rhn_ep.poll_customer() -> +-- rhn_channel.entitle_customer() +-- +-- which doesn't change current_members, even though it may remove servers +-- from the family. +-- +-- There's another bug here: currently, we don't try to order forced +-- unsubscribes in any way; we just use +-- rhn_channel.unsubscribe_server_from_family . If there are any child +-- channel subscriptions, this will leave them subscribed. We really need +-- to iterate across the channels again, and subscribe any channel for which +-- there are no parent channel subscriptions. +-- +-- Ugh. +-- +-- Revision 1.42 2003/01/28 00:19:45 pjones +-- fix clear_subscriptions; AFAICT, this is only hit on the +-- bulk_server_base_change / bulk_server_base_guess codepaths, which puts +-- it infrequent enough that it could be our "bad count" culprit. +-- +-- Revision 1.41 2003/01/14 19:51:45 pjones +-- make setting current_members on rhnChannelFamilyPermissions work when +-- a server is in more than one channel in a single family. diff --git a/web/modules/sniglets/Sniglets/ChannelEditor.pm b/web/modules/sniglets/Sniglets/ChannelEditor.pm index 9ddcf97..7e39817 100644 --- a/web/modules/sniglets/Sniglets/ChannelEditor.pm +++ b/web/modules/sniglets/Sniglets/ChannelEditor.pm @@ -223,9 +223,9 @@ sub channel_edit_cb { } # bugzilla: 161517 - allow _ and / in channel labels # bugzilla: 459827 - disallow names longer than 64 characters - unless ($channel_name =~ /^[a-z][\w\d\s\-\.\'\/\_]*$/i and length($channel_name) >= 6 and length($channel_name) <= 64) { + unless ($channel_name =~ /^[a-z][\w\d\s\-\.\'\/\_]*$/i and length($channel_name) >= 6 and length($channel_name) <= 256) { $pxt->push_message(local_alert => "Invalid channel name '" . - PXT::Utils->escapeHTML($channel_name) . "' - must be at least 6 characters long and no longer than 64 characters, begin with a letter, and contain only letters, digits, spaces, '-', ' / ', '_' and '.'"); + PXT::Utils->escapeHTML($channel_name) . "' - must be at least 6 characters long and no longer than 256 characters, begin with a letter, and contain only letters, digits, spaces, '-', ' / ', '_' and '.'"); $errors++; } @@ -653,7 +653,7 @@ sub channel_edit_form { $subs{channel_label} .= '<br />Ex: custom-channel'; } if ($editable{channel_name}) { - $subs{channel_name} = PXT::HTML->text(-name => 'channel_name', -value => $subs{channel_name}, -size => 48, -maxlength => 64); + $subs{channel_name} = PXT::HTML->text(-name => 'channel_name', -value => $subs{channel_name}, -size => 48, -maxlength => 256); } if ($editable{channel_summary}) { $subs{channel_summary} = PXT::HTML->text(-name => 'channel_summary', -value => $subs{channel_summary}, -size => 40, -maxlength => 500);

1 0

rel-eng/lib
by Devan Goodwin 27 May '09

27 May '09

rel-eng/lib/spacewalk/releng/tagger.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 2caf622746dfca51f39fa898d6f311726c476d69 Author: Devan Goodwin <dgoodwin(a)redhat.com> Date: Wed May 27 15:44:48 2009 -0300 Clarify a common tito error when attempting to tag a package. diff --git a/rel-eng/lib/spacewalk/releng/tagger.py b/rel-eng/lib/spacewalk/releng/tagger.py index 4c5158e..cba5e8d 100644 --- a/rel-eng/lib/spacewalk/releng/tagger.py +++ b/rel-eng/lib/spacewalk/releng/tagger.py @@ -235,7 +235,7 @@ class VersionTagger(object): new_version = self._get_spec_version_and_release() if new_version.strip() == "": - error_out("Error getting bumped package version.") + error_out("Error getting bumped package version. (can spec file be parsed?") print "Tagging new version of %s: %s -> %s" % (self.project_name, old_version, new_version) return new_version

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
72
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

spacewalk-commits May 2009