java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java
| 23 ++++++++++
java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/XmlRpcConfigChannelHelper.java
| 5 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/ServerConfigHandler.java
| 3 +
java/code/src/com/redhat/rhn/testing/RhnMockHttpServletRequest.java
| 18 +++++++
web/conf/rhn_web.conf
| 2
5 files changed, 49 insertions(+), 2 deletions(-)
New commits:
commit f38392ceb6f2c206185acdf59851e16bd073ea6f
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Wed Dec 16 14:28:13 2009 -0500
adding channel.software.regenerateYumCache() api call
diff --git
a/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java
b/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java
index 318cca3..5cab24d 100644
---
a/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java
+++
b/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java
@@ -1869,4 +1869,27 @@ public class ChannelSoftwareHandler extends BaseHandler {
return 1;
}
+ /**
+ * Regenerate the yum cache for a specific channel.
+ * @param sessionKey the session key
+ * @param channelLabel the channel label
+ * @return int - 1 on success!
+ *
+ * @xmlrpc.doc Regenerate yum cache for the specified channel.
+ * @xmlrpc.param #session_key()
+ * @xmlrpc.param #param_desc("string", "channelLabel", "the
label of the
+ * channel")
+ * @xmlrpc.returntype #return_int_success()
+ *
+ */
+ public int regenerateYumCache(String sessionKey, String channelLabel) {
+ User loggedInUser = getLoggedInUser(sessionKey);
+ channelAdminPermCheck(loggedInUser);
+ Channel chan = lookupChannelByLabel(loggedInUser, channelLabel);
+ ChannelManager.queueChannelChange(channelLabel,
+ "api: regenerateYumCache", "api called");
+ return 1;
+
+ }
+
}
diff --git a/web/conf/rhn_web.conf b/web/conf/rhn_web.conf
index 1f05c90..221edb1 100644
--- a/web/conf/rhn_web.conf
+++ b/web/conf/rhn_web.conf
@@ -236,7 +236,7 @@ web.config_delim_end = |}
web.version = 0.7
# the version of API
-web.apiversion = 10.10
+web.apiversion = 10.11
# maximum size for a config file
web.maximum_config_file_size = 131072
commit e2c7058aa973e117b8fa90328d638e5b30099f2b
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Wed Dec 16 14:25:03 2009 -0500
making selinux not required for server.config.createOrUpdate() api call, also adding
selinux_ctx to the documentation
diff --git
a/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/XmlRpcConfigChannelHelper.java
b/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/XmlRpcConfigChannelHelper.java
index df3d61c..cadd96b 100644
---
a/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/XmlRpcConfigChannelHelper.java
+++
b/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/XmlRpcConfigChannelHelper.java
@@ -139,7 +139,10 @@ public class XmlRpcConfigChannelHelper {
form.setOwner((String)data.get(ConfigRevisionSerializer.OWNER));
form.setGroup((String)data.get(ConfigRevisionSerializer.GROUP));
form.setPermissions((String)data.get(ConfigRevisionSerializer.PERMISSIONS));
- form.setSelinuxCtx((String)data.get(ConfigRevisionSerializer.SELINUX_CTX));
+ String selinux = (String)data.get(ConfigRevisionSerializer.SELINUX_CTX);
+ form.setSelinuxCtx(selinux == null ? "" : selinux);
+
+
ConfigFileBuilder helper = ConfigFileBuilder.getInstance();
try {
diff --git
a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/ServerConfigHandler.java
b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/ServerConfigHandler.java
index b5dcab0..f79db3d 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/ServerConfigHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/ServerConfigHandler.java
@@ -141,6 +141,9 @@ public class ServerConfigHandler extends BaseHandler {
* #prop_desc("string","macro-end-delimiter",
* "Config file macro end delimiter. Use null or empty string
* to accept the default. (ignored if working with a directory)")
+ * #prop_desc("string","selinux_ctx",
+ * "SeLinux context (optional)")
+ *
* #struct_end()
* @xmlrpc.param #param("int","commitToLocal")
* #options()
commit 80741820ddb85725981982e990d3e2cb437cc8b4
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Tue Dec 15 17:43:04 2009 -0500
changing mock request to default to a POST request
diff --git a/java/code/src/com/redhat/rhn/testing/RhnMockHttpServletRequest.java
b/java/code/src/com/redhat/rhn/testing/RhnMockHttpServletRequest.java
index 7e5f619..98ec475 100644
--- a/java/code/src/com/redhat/rhn/testing/RhnMockHttpServletRequest.java
+++ b/java/code/src/com/redhat/rhn/testing/RhnMockHttpServletRequest.java
@@ -43,6 +43,7 @@ public class RhnMockHttpServletRequest extends MockHttpServletRequest {
private boolean secure;
private List cookies;
private String encoding;
+ private String method;
private Enumeration headerNames;
/**
@@ -59,6 +60,7 @@ public class RhnMockHttpServletRequest extends MockHttpServletRequest {
setupGetRequestURI("/rhn/network/somepage.do");
setLocale(Locale.getDefault());
setSession(new RhnMockHttpSession());
+ setMethod("POST");
}
/**
@@ -220,4 +222,20 @@ public class RhnMockHttpServletRequest extends MockHttpServletRequest
{
public void setCharacterEncoding(String encodingIn) {
this.encoding = encodingIn;
}
+
+
+ /**
+ * @return Returns the method.
+ */
+ public String getMethod() {
+ return method;
+ }
+
+
+ /**
+ * @param methodIn The method to set.
+ */
+ public void setMethod(String methodIn) {
+ this.method = methodIn;
+ }
}
Show replies by date