2 commits - java/code java/spacewalk-java.spec rel-eng/packages
by Grant Gainey
java/code/src/com/redhat/rhn/frontend/action/user/test/UserEditSetupActionTest.java | 7 +++----
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 8 insertions(+), 6 deletions(-)
New commits:
commit 93b3c2307885c54027744642c87a95b7eb24db17
Author: Grant Gainey <ggainey(a)redhat.com>
Date: Sat Feb 22 16:03:57 2014 -0500
Automatic commit of package [spacewalk-java] release [2.1.163-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 7b6d4e0..956650f 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -28,7 +28,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 2.1.162
+Version: 2.1.163
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -801,6 +801,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Sat Feb 22 2014 Grant Gainey 2.1.163-1
+- Remove unused import
+
* Sat Feb 22 2014 Grant Gainey 2.1.162-1
- We rmvd DESIRED_PASS/CONFIRM params from UserEditSetupAction - rmv from
expected in test
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 1c370a1..72f3936 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-2.1.162-1 java/
+2.1.163-1 java/
commit 205ddc469e865eb9cbc5da19d4bab63758663278
Author: Grant Gainey <ggainey(a)redhat.com>
Date: Sat Feb 22 16:03:49 2014 -0500
Remove unused import
diff --git a/java/code/src/com/redhat/rhn/frontend/action/user/test/UserEditSetupActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/user/test/UserEditSetupActionTest.java
index 980c79c..555e57b 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/user/test/UserEditSetupActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/user/test/UserEditSetupActionTest.java
@@ -14,6 +14,9 @@
*/
package com.redhat.rhn.frontend.action.user.test;
+import java.util.Iterator;
+import java.util.List;
+
import com.redhat.rhn.common.conf.Config;
import com.redhat.rhn.common.conf.ConfigDefaults;
import com.redhat.rhn.domain.role.Role;
@@ -21,7 +24,6 @@ import com.redhat.rhn.domain.role.RoleFactory;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.domain.user.UserFactory;
import com.redhat.rhn.frontend.action.common.BadParameterException;
-import com.redhat.rhn.frontend.action.user.UserActionHelper;
import com.redhat.rhn.frontend.action.user.UserEditSetupAction;
import com.redhat.rhn.frontend.action.user.UserRoleStatusBean;
import com.redhat.rhn.testing.ActionHelper;
@@ -29,9 +31,6 @@ import com.redhat.rhn.testing.RhnBaseTestCase;
import com.redhat.rhn.testing.RhnMockDynaActionForm;
import com.redhat.rhn.testing.TestUtils;
-import java.util.Iterator;
-import java.util.List;
-
/**
* UserEditSetupActionTest
* @version $Rev: 1635 $
10 years, 4 months
Changes to 'refs/tags/spacewalk-java-2.1.162-1'
by Grant Gainey
Tag 'spacewalk-java-2.1.162-1' created by Grant Gainey <ggainey(a)redhat.com> at 2014-02-22 20:40 +0000
Tagging package [spacewalk-java] version [2.1.162-1] in directory [java/].
Changes since spacewalk-backend-2.1.53-1:
Grant Gainey (6):
Make checkstyle happy
Tweaking some tag Junits to work
verifyForward() and redirects-w/params do not like each other
Testing createFirstUser() now looks to be forbidden
We rmvd DESIRED_PASS/CONFIRM params from UserEditSetupAction - rmv from expected in test
Automatic commit of package [spacewalk-java] release [2.1.162-1].
---
java/code/src/com/redhat/rhn/frontend/action/test/SearchActionTest.java | 8 +++---
java/code/src/com/redhat/rhn/frontend/action/user/CreateUserAction.java | 3 ++
java/code/src/com/redhat/rhn/frontend/action/user/test/CreateUserActionTest.java | 4 +--
java/code/src/com/redhat/rhn/frontend/action/user/test/UserEditSetupActionTest.java | 3 --
java/code/src/com/redhat/rhn/frontend/html/test/HtmlTagTest.java | 4 +--
java/code/src/com/redhat/rhn/frontend/taglibs/DateTimePickerTag.java | 12 +++++++---
java/code/src/com/redhat/rhn/frontend/taglibs/LocalizedSubmitTag.java | 4 ++-
java/code/src/com/redhat/rhn/frontend/taglibs/test/LocalizedSubmitTagTest.java | 2 -
java/code/src/com/redhat/rhn/frontend/taglibs/test/ToolbarTagBasicTest.java | 2 -
java/code/src/com/redhat/rhn/frontend/taglibs/test/UnpagedListDisplayTagTest.java | 4 +--
java/spacewalk-java.spec | 10 +++++++-
rel-eng/packages/spacewalk-java | 2 -
12 files changed, 37 insertions(+), 21 deletions(-)
---
10 years, 4 months
java/spacewalk-java.spec rel-eng/packages
by Grant Gainey
java/spacewalk-java.spec | 10 +++++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 10 insertions(+), 2 deletions(-)
New commits:
commit 138d1bcb875b04cf331f308d9d821678db1d298f
Author: Grant Gainey <ggainey(a)redhat.com>
Date: Sat Feb 22 15:40:09 2014 -0500
Automatic commit of package [spacewalk-java] release [2.1.162-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index a24d2b9..7b6d4e0 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -28,7 +28,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 2.1.161
+Version: 2.1.162
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -801,6 +801,14 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Sat Feb 22 2014 Grant Gainey 2.1.162-1
+- We rmvd DESIRED_PASS/CONFIRM params from UserEditSetupAction - rmv from
+ expected in test
+- Testing createFirstUser() now looks to be forbidden
+- verifyForward() and redirects-w/params do not like each other
+- Tweaking some tag Junits to work
+- Make checkstyle happy
+
* Thu Feb 20 2014 Jan Dobes 2.1.161-1
- fixing ISE in create repo form
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 0915982..1c370a1 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-2.1.161-1 java/
+2.1.162-1 java/
10 years, 4 months
java/code
by Grant Gainey
java/code/src/com/redhat/rhn/frontend/action/user/test/UserEditSetupActionTest.java | 3 ---
1 file changed, 3 deletions(-)
New commits:
commit a910b7f6a6715d25ae28331d164dee4a63888774
Author: Grant Gainey <ggainey(a)redhat.com>
Date: Sat Feb 22 14:54:06 2014 -0500
We rmvd DESIRED_PASS/CONFIRM params from UserEditSetupAction - rmv from expected in test
diff --git a/java/code/src/com/redhat/rhn/frontend/action/user/test/UserEditSetupActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/user/test/UserEditSetupActionTest.java
index d9ffef5..980c79c 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/user/test/UserEditSetupActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/user/test/UserEditSetupActionTest.java
@@ -117,8 +117,5 @@ public class UserEditSetupActionTest extends RhnBaseTestCase {
form.addExpectedProperty("lastName", user.getLastName());
form.addExpectedProperty("title", user.getTitle());
form.addExpectedProperty("prefix", user.getPrefix());
- form.addExpectedProperty(UserActionHelper.DESIRED_PASS, "******");
- form.addExpectedProperty(UserActionHelper.DESIRED_PASS_CONFIRM, "******");
-
}
}
10 years, 4 months
java/code
by Grant Gainey
java/code/src/com/redhat/rhn/frontend/action/user/CreateUserAction.java | 3 +++
java/code/src/com/redhat/rhn/frontend/action/user/test/CreateUserActionTest.java | 4 ++--
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 03e9c0f564e694af858b54412f0e3acad5220532
Author: Grant Gainey <ggainey(a)redhat.com>
Date: Sat Feb 22 14:46:57 2014 -0500
Testing createFirstUser() now looks to be forbidden
diff --git a/java/code/src/com/redhat/rhn/frontend/action/user/CreateUserAction.java b/java/code/src/com/redhat/rhn/frontend/action/user/CreateUserAction.java
index 2e4e5bd..2bbb7a6 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/user/CreateUserAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/user/CreateUserAction.java
@@ -62,6 +62,9 @@ public class CreateUserAction extends RhnAction {
public static final String ACCOUNT_TYPE = "account_type";
+ // Where we should end up if we're told "you're not allowed to do that"
+ public static final String PERMISSION_ERROR = "/errors/Permission.do";
+
// It is ok to maintain an instance because PxtSessionDelegate does not maintain client
// state.
private PxtSessionDelegate pxtDelegate;
diff --git a/java/code/src/com/redhat/rhn/frontend/action/user/test/CreateUserActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/user/test/CreateUserActionTest.java
index 84a4a3d..714373e 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/user/test/CreateUserActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/user/test/CreateUserActionTest.java
@@ -61,15 +61,15 @@ public class CreateUserActionTest extends RhnPostMockStrutsTestCase {
assertTrue(forwardPath.startsWith("/users/ActiveList.do?uid="));
}
+ // This had better fail if there are any users created in this satellite!
public void testCreateFirstSatUser() {
-
setRequestPathInfo("/newlogin/CreateFirstUserSubmit");
RhnMockDynaActionForm form =
fillOutForm("createSatelliteForm", CreateUserAction.TYPE_CREATE_SAT);
setActionForm(form);
actionPerform();
- this.verifyForward(CreateUserAction.SUCCESS_SAT);
+ assertTrue(getActualForward().startsWith(CreateUserAction.PERMISSION_ERROR));
}
/**
10 years, 4 months
java/code
by Grant Gainey
java/code/src/com/redhat/rhn/frontend/action/test/SearchActionTest.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit d567f422e99a34d13c0519064c780c054ba306ea
Author: Grant Gainey <ggainey(a)redhat.com>
Date: Sat Feb 22 14:38:54 2014 -0500
verifyForward() and redirects-w/params do not like each other
diff --git a/java/code/src/com/redhat/rhn/frontend/action/test/SearchActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/test/SearchActionTest.java
index 5cc6dd2..a3e69f9 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/test/SearchActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/test/SearchActionTest.java
@@ -36,7 +36,7 @@ public class SearchActionTest extends RhnMockStrutsTestCase {
addRequestParameter("search_string", "test search");
addRequestParameter("search_type", "systems");
actionPerform();
- verifyForward("systems");
+ assertTrue(getActualForward().startsWith("/systems/Search.do"));
}
public void testErrataRedirect() throws Exception {
@@ -44,7 +44,7 @@ public class SearchActionTest extends RhnMockStrutsTestCase {
addRequestParameter("search_string", "test search");
addRequestParameter("search_type", "errata");
actionPerform();
- verifyForward("errata");
+ assertTrue(getActualForward().startsWith("/errata/Search.do"));
}
public void testPackageRedirect() throws Exception {
@@ -52,7 +52,7 @@ public class SearchActionTest extends RhnMockStrutsTestCase {
addRequestParameter("search_string", "test search");
addRequestParameter("search_type", "packages");
actionPerform();
- verifyForward("packages");
+ assertTrue(getActualForward().startsWith("/channels/software/Search.do"));
}
public void testDocRedirect() throws Exception {
@@ -60,7 +60,7 @@ public class SearchActionTest extends RhnMockStrutsTestCase {
addRequestParameter("search_string", "test search");
addRequestParameter("search_type", "docs");
actionPerform();
- verifyForward("docs");
+ assertTrue(getActualForward().startsWith("/help/Search.do"));
}
public void testFaultySubmit() throws Exception {
10 years, 4 months
java/code
by Grant Gainey
java/code/src/com/redhat/rhn/frontend/html/test/HtmlTagTest.java | 4 ++--
java/code/src/com/redhat/rhn/frontend/taglibs/test/LocalizedSubmitTagTest.java | 2 +-
java/code/src/com/redhat/rhn/frontend/taglibs/test/ToolbarTagBasicTest.java | 2 +-
java/code/src/com/redhat/rhn/frontend/taglibs/test/UnpagedListDisplayTagTest.java | 4 ++--
4 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 676a00c7db3d017be17ae603a61b72fabec7fd1e
Author: Grant Gainey <ggainey(a)redhat.com>
Date: Sat Feb 22 14:23:23 2014 -0500
Tweaking some tag Junits to work
diff --git a/java/code/src/com/redhat/rhn/frontend/html/test/HtmlTagTest.java b/java/code/src/com/redhat/rhn/frontend/html/test/HtmlTagTest.java
index a21f7bd..65e33d4 100644
--- a/java/code/src/com/redhat/rhn/frontend/html/test/HtmlTagTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/html/test/HtmlTagTest.java
@@ -97,9 +97,9 @@ public class HtmlTagTest extends RhnBaseTestCase {
public void testRemoveAttribute() {
HtmlTag td = new HtmlTag("td");
td.setAttribute("class", "sidebar");
- assertEquals("<td class=\"sidebar\" />", td.render());
+ assertEquals("<td class=\"sidebar\"></td>", td.render());
td.removeAttribute("class");
- assertEquals("<td />", td.render());
+ assertEquals("<td></td>", td.render());
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/test/LocalizedSubmitTagTest.java b/java/code/src/com/redhat/rhn/frontend/taglibs/test/LocalizedSubmitTagTest.java
index f2bc51b..8c1f23f 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/test/LocalizedSubmitTagTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/test/LocalizedSubmitTagTest.java
@@ -41,7 +41,7 @@ public class LocalizedSubmitTagTest extends RhnBaseTestCase {
// setup mock objects
MockJspWriter out = (MockJspWriter)tth.getPageContext().getOut();
out.setExpectedData("<input type=\"submit\"" +
- " tabindex=\"3\" value=\"(none)\">");
+ " tabindex=\"3\" value=\"(none)\" class=\"btn btn-default\">");
// ok let's test the tag
tth.assertDoStartTag(Tag.SKIP_BODY);
tth.assertDoEndTag(Tag.EVAL_PAGE);
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/test/ToolbarTagBasicTest.java b/java/code/src/com/redhat/rhn/frontend/taglibs/test/ToolbarTagBasicTest.java
index d5d7bbb..86cf66d 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/test/ToolbarTagBasicTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/test/ToolbarTagBasicTest.java
@@ -33,7 +33,7 @@ public class ToolbarTagBasicTest extends BaseTestToolbarTag {
"<img src=\"/img/rhn-icon-preferences.gif\" alt=\"Home Icon\" />" +
"<a href=\"/help/provisioning/" +
"s1-sm-your-rhn.html#S2-SM-YOUR-RHN-PREFS\" target=\"_blank\">" +
- "<i class=\"fa fa-question-circle\"></i></a></h1></div>";
+ "<i class=\"fa fa-question-circle spacewalk-help-link\"></i></a></h1></div>";
out.setExpectedData(output);
tt.setBase("h1");
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/test/UnpagedListDisplayTagTest.java b/java/code/src/com/redhat/rhn/frontend/taglibs/test/UnpagedListDisplayTagTest.java
index f7f3e04..7ebe162 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/test/UnpagedListDisplayTagTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/test/UnpagedListDisplayTagTest.java
@@ -154,7 +154,7 @@ public class UnpagedListDisplayTagTest extends MockObjectTestCase {
private static final String EXPECTED_HTML_OUT =
"<div class=\"spacewalk-list\"><div class=\"panel panel-default\">" +
- "<table class=\"table table-striped\"></tbody></table>\n" +
+ "<table class=\"table table-striped\"><thead><tr></tbody></table>\n" +
"</div>\n" +
"</div>\n";
@@ -164,7 +164,7 @@ public class UnpagedListDisplayTagTest extends MockObjectTestCase {
"<div class=\"panel-heading\"><h4 class=\"panel-title\">**Inactive Systems**</h4>" +
"<div class=\"spacewalk-list-head-addons\">" +
"<div class=\"spacewalk-list-head-addons-extra\"></div>" +
- "</div></div><table class=\"table table-striped\"></tbody></table>\n" +
+ "</div></div><table class=\"table table-striped\"><thead><tr></tbody></table>\n" +
"</div>\n" +
"</div>\n";
10 years, 4 months
java/code
by Grant Gainey
java/code/src/com/redhat/rhn/frontend/taglibs/DateTimePickerTag.java | 12 +++++++---
java/code/src/com/redhat/rhn/frontend/taglibs/LocalizedSubmitTag.java | 4 ++-
2 files changed, 12 insertions(+), 4 deletions(-)
New commits:
commit 785161559c86a408d11320836a81dcd41db5809e
Author: Grant Gainey <ggainey(a)redhat.com>
Date: Sat Feb 22 14:02:07 2014 -0500
Make checkstyle happy
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/DateTimePickerTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/DateTimePickerTag.java
index 0d715bd..d04ae6d 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/DateTimePickerTag.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/DateTimePickerTag.java
@@ -66,13 +66,17 @@ public class DateTimePickerTag extends TagSupport {
this.data = pData;
}
- @Override
+ /**
+ * {@inheritDoc}
+ */
public void release() {
this.data = null;
super.release();
}
- @Override
+ /**
+ * {@inheritDoc}
+ */
public int doEndTag() throws JspException {
try {
writePickerHtml(pageContext.getOut());
@@ -84,7 +88,9 @@ public class DateTimePickerTag extends TagSupport {
return super.doEndTag();
}
- @Override
+ /**
+ * {@inheritDoc}
+ */
public int doStartTag() throws JspException {
return super.doStartTag();
}
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/LocalizedSubmitTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/LocalizedSubmitTag.java
index e7a725e..4977409 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/LocalizedSubmitTag.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/LocalizedSubmitTag.java
@@ -45,7 +45,9 @@ public class LocalizedSubmitTag extends SubmitTag {
return this.valueKey;
}
- @Override
+ /**
+ * {@inheritDoc}
+ */
public String getStyleClass() {
if (super.getStyleClass() != null) {
return (super.getStyleClass() + " btn btn-default");
10 years, 4 months
Changes to 'refs/tags/spacewalk-backend-2.1.53-1'
by StephenHerr
Tag 'spacewalk-backend-2.1.53-1' created by Stephen Herr <sherr(a)redhat.com> at 2014-02-21 21:20 +0000
Tagging package [spacewalk-backend] version [2.1.53-1] in directory [backend/].
Changes since spacecmd-2.1.25-1:
Stephen Herr (2):
1045083 - update openstack guest requirements
Automatic commit of package [spacewalk-backend] release [2.1.53-1].
---
backend/server/handlers/xmlrpc/registration.py | 3 ++-
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
---
10 years, 4 months
2 commits - backend/server backend/spacewalk-backend.spec rel-eng/packages
by StephenHerr
backend/server/handlers/xmlrpc/registration.py | 3 ++-
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
New commits:
commit 8ddda1888f31af62fd200041973e4feb640476f6
Author: Stephen Herr <sherr(a)redhat.com>
Date: Fri Feb 21 16:20:02 2014 -0500
Automatic commit of package [spacewalk-backend] release [2.1.53-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 0515015..98f8f2a 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -11,7 +11,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 2.1.52
+Version: 2.1.53
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -632,6 +632,9 @@ rm -f %{rhnconf}/rhnSecret.py*
%{pythonrhnroot}/satellite_tools/exporter/xmlWriter.py*
%changelog
+* Fri Feb 21 2014 Stephen Herr <sherr(a)redhat.com> 2.1.53-1
+- 1045083 - update openstack guest requirements
+
* Thu Feb 20 2014 Stephen Herr <sherr(a)redhat.com> 2.1.52-1
- 1045083 - Detect OpenStack guests as virtual so they can consume flex guest
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 4f48f5e..741bd3c 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-2.1.52-1 backend/
+2.1.53-1 backend/
commit b010979b17fc1b966a93b3d5c74b434364448832
Author: Stephen Herr <sherr(a)redhat.com>
Date: Fri Feb 21 16:19:54 2014 -0500
1045083 - update openstack guest requirements
diff --git a/backend/server/handlers/xmlrpc/registration.py b/backend/server/handlers/xmlrpc/registration.py
index e8da7f7..7e76235 100644
--- a/backend/server/handlers/xmlrpc/registration.py
+++ b/backend/server/handlers/xmlrpc/registration.py
@@ -68,7 +68,8 @@ def parse_smbios(smbios):
return (rhnVirtualization.VirtualizationType.QEMU, uuid)
elif manufacturer.startswith('Red Hat') and product == 'OpenStack Nova' and uuid is not None:
return (rhnVirtualization.VirtualizationType.QEMU, uuid)
- elif vendor == 'Red Hat' and product == 'OpenStack Compute':
+ elif (manufacturer == 'Red Hat' and product == 'OpenStack Compute' and uuid
+ is not None):
return (rhnVirtualization.VirtualizationType.QEMU, uuid)
elif manufacturer == 'Microsoft Corporation' and \
product == 'Virtual Machine':
10 years, 4 months