Revert PAYG changes

uyuni-project · Aug 1, 2023 · ea578be · ea578be
1 parent ee1e120
commit ea578be
Show file tree

Hide file tree

Showing 148 changed files with 1,033 additions and 222,882 deletions.
diff --git a/java/buildconf/ivy/ivy-suse.xml b/java/buildconf/ivy/ivy-suse.xml
@@ -143,7 +143,6 @@
         <dependency org="org.jacoco" name="org.jacoco.ant" rev="0.8.7" transitive="false">
            <artifact name="nodeps" type="jar" url="https://repo1.maven.org/maven2/org/jacoco/org.jacoco.ant/0.8.7/org.jacoco.ant-0.8.7-nodeps.jar"/>
         </dependency>
-        <dependency org="com.github.tomakehurst" name="wiremock-standalone" rev="2.27.2" transitive="false"/>
         <!-- todo move to our org -->
         <dependency org="strutstest" name="strutstest" rev="0.0.1" transitive="false">
             <artifact name="strutstestcase" type="jar" url="https://github.com/hustodemon/strutstestcase-uyuni/releases/download/v.0.0.1-alpha/strutstest-uyuni-0.0.1.jar"/>

diff --git a/java/code/src/com/redhat/rhn/GlobalInstanceHolder.java b/java/code/src/com/redhat/rhn/GlobalInstanceHolder.java
@@ -28,7 +28,6 @@
 import com.redhat.rhn.manager.system.entitling.SystemEntitler;
 import com.redhat.rhn.manager.system.entitling.SystemUnentitler;
 
-import com.suse.cloud.CloudPaygManager;
 import com.suse.manager.kubernetes.KubernetesManager;
 import com.suse.manager.utils.SaltKeyUtils;
 import com.suse.manager.utils.SaltUtils;
@@ -62,7 +61,6 @@ private GlobalInstanceHolder() {
     private static final SaltService SALT_SERVICE = new SaltService();
     public static final SystemQuery SYSTEM_QUERY = SALT_SERVICE;
     public static final SaltApi SALT_API = SALT_SERVICE;
-    public static final CloudPaygManager PAYG_MANAGER = new CloudPaygManager();
     public static final ServerGroupManager SERVER_GROUP_MANAGER = new ServerGroupManager(SALT_API);
     public static final FormulaManager FORMULA_MANAGER = new FormulaManager(SALT_API);
     public static final SaltUtils SALT_UTILS = new SaltUtils(SYSTEM_QUERY, SALT_API);
@@ -79,9 +77,9 @@ private GlobalInstanceHolder() {
     public static final KubernetesManager KUBERNETES_MANAGER = new KubernetesManager(SALT_API);
     public static final VirtManager VIRT_MANAGER = new VirtManagerSalt(SALT_API);
     public static final RegularMinionBootstrapper REGULAR_MINION_BOOTSTRAPPER =
-            new RegularMinionBootstrapper(SYSTEM_QUERY, SALT_API, PAYG_MANAGER);
+            new RegularMinionBootstrapper(SYSTEM_QUERY, SALT_API);
     public static final SSHMinionBootstrapper SSH_MINION_BOOTSTRAPPER =
-            new SSHMinionBootstrapper(SYSTEM_QUERY, SALT_API, PAYG_MANAGER);
+            new SSHMinionBootstrapper(SYSTEM_QUERY, SALT_API);
     public static final MonitoringManager MONITORING_MANAGER = new FormulaMonitoringManager(SALT_API);
     public static final SystemEntitlementManager SYSTEM_ENTITLEMENT_MANAGER = new SystemEntitlementManager(
             new SystemUnentitler(VIRT_MANAGER, MONITORING_MANAGER, SERVER_GROUP_MANAGER),

diff --git a/java/code/src/com/redhat/rhn/common/hibernate/AnnotationRegistry.java b/java/code/src/com/redhat/rhn/common/hibernate/AnnotationRegistry.java
@@ -80,8 +80,6 @@
 import com.redhat.rhn.domain.server.virtualhostmanager.VirtualHostManagerNodeInfo;
 import com.redhat.rhn.domain.task.Task;
 
-import com.suse.cloud.domain.PaygDimensionComputation;
-import com.suse.cloud.domain.PaygDimensionResult;
 import com.suse.manager.model.maintenance.MaintenanceCalendar;
 import com.suse.manager.model.maintenance.MaintenanceSchedule;
 
@@ -165,9 +163,7 @@ private AnnotationRegistry() {
         RecurringState.class,
         RecurringConfigChannel.class,
         RecurringInternalState.class,
-        InternalState.class,
-        PaygDimensionComputation.class,
-        PaygDimensionResult.class
+        InternalState.class
     );
 
     /**

diff --git a/java/code/src/com/redhat/rhn/common/hibernate/HibernateFactory.java b/java/code/src/com/redhat/rhn/common/hibernate/HibernateFactory.java
@@ -69,7 +69,7 @@ public abstract class HibernateFactory {
 
     private static ConnectionManager connectionManager = ConnectionManagerFactory.defaultConnectionManager();
     private static final Logger LOG = LogManager.getLogger(HibernateFactory.class);
-    public static final int LIST_BATCH_MAX_SIZE = 1000;
+    private static final int LIST_BATCH_MAX_SIZE = 1000;
 
     public static final String ROLLBACK_MSG = "Error during transaction. Rolling back";
 

diff --git a/java/code/src/com/redhat/rhn/domain/channel/Channel.java b/java/code/src/com/redhat/rhn/domain/channel/Channel.java
@@ -20,7 +20,6 @@
 import com.redhat.rhn.domain.org.Org;
 import com.redhat.rhn.domain.product.SUSEProductChannel;
 import com.redhat.rhn.domain.rhnpackage.Package;
-import com.redhat.rhn.domain.rhnpackage.PackageFactory;
 import com.redhat.rhn.domain.server.Server;
 import com.redhat.rhn.domain.user.User;
 import com.redhat.rhn.manager.channel.ChannelManager;
@@ -1013,14 +1012,14 @@ private String getArchTypeLabel() {
      * @return whether the channel is a RPM chanel or not
      */
     public boolean isTypeRpm() {
-        return PackageFactory.ARCH_TYPE_RPM.equalsIgnoreCase(getArchTypeLabel());
+        return "rpm".equalsIgnoreCase(getArchTypeLabel());
     }
 
     /**
      * @return whether the channel is a DEB chanel or not
      */
     public boolean isTypeDeb() {
-        return PackageFactory.ARCH_TYPE_DEB.equalsIgnoreCase(getArchTypeLabel());
+        return "deb".equalsIgnoreCase(getArchTypeLabel());
     }
 
     /**

diff --git a/java/code/src/com/redhat/rhn/domain/channel/ChannelFamily.java b/java/code/src/com/redhat/rhn/domain/channel/ChannelFamily.java
@@ -29,6 +29,8 @@
  */
 public class ChannelFamily extends BaseDomainHelper {
 
+    public static final String TOOLS_CHANNEL_FAMILY_LABEL = "SLE-M-T";
+
     private Long id;
     private String name;
     private String label;

diff --git a/java/code/src/com/redhat/rhn/domain/channel/ChannelFamilyFactory.java b/java/code/src/com/redhat/rhn/domain/channel/ChannelFamilyFactory.java
@@ -41,10 +41,8 @@ public class ChannelFamilyFactory extends HibernateFactory {
 
     private static ChannelFamilyFactory singleton = new ChannelFamilyFactory();
     private static Logger log = LogManager.getLogger(ChannelFamilyFactory.class);
-    public static final String TOOLS_CHANNEL_FAMILY_LABEL = "SLE-M-T";
     public static final String SATELLITE_CHANNEL_FAMILY_LABEL = "SMS";
     public static final String PROXY_CHANNEL_FAMILY_LABEL = "SMP";
-    public static final String MODULE_CHANNEL_FAMILY_LABEL = "MODULE";
 
     private ChannelFamilyFactory() {
         super();
@@ -179,13 +177,6 @@ public static void save(ChannelFamily cfam) {
      * @param cfam ChannelFamily to be removed from database.
      */
     public static void remove(ChannelFamily cfam) {
-        if (cfam.isPublic()) {
-            singleton.removeObject(cfam.getPublicChannelFamily());
-        }
-        else {
-            cfam.getPrivateChannelFamilies()
-                    .forEach(pcf -> singleton.removeObject(pcf));
-        }
         singleton.removeObject(cfam);
     }
 

diff --git a/java/code/src/com/redhat/rhn/domain/cloudpayg/PaygSshDataFactory.java b/java/code/src/com/redhat/rhn/domain/cloudpayg/PaygSshDataFactory.java
@@ -97,7 +97,7 @@ public static Optional<PaygSshData> lookupById(Integer id) {
      * @return list of payg ssh daa objects
      */
     public static List<PaygSshData> lookupPaygSshData() {
-        return getSession().createQuery("FROM PaygSshData", PaygSshData.class).list();
+        return getSession().createQuery("FROM PaygSshData").list();
     }
 
     /**

diff --git a/java/code/src/com/redhat/rhn/domain/common/ArchType.java b/java/code/src/com/redhat/rhn/domain/common/ArchType.java
@@ -15,7 +15,6 @@
 package com.redhat.rhn.domain.common;
 
 import com.redhat.rhn.domain.BaseDomainHelper;
-import com.redhat.rhn.domain.rhnpackage.PackageFactory;
 import com.redhat.rhn.domain.rhnpackage.PackageType;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -80,10 +79,10 @@ public void setName(String n) {
     public PackageType getPackageType() {
         String archType = getLabel();
 
-        if (archType.equals(PackageFactory.ARCH_TYPE_DEB)) {
+        if (archType.equals("deb")) {
             return PackageType.DEB;
         }
-        else if (archType.equals(PackageFactory.ARCH_TYPE_RPM)) {
+        else if (archType.equals("rpm")) {
             return PackageType.RPM;
         }
         else {

diff --git a/java/code/src/com/redhat/rhn/domain/credentials/Credentials.hbm.xml b/java/code/src/com/redhat/rhn/domain/credentials/Credentials.hbm.xml
@@ -20,11 +20,6 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
     <property name="created" column="created" type="timestamp" insert="false" update="false"/>
     <property name="modified" column="modified" type="timestamp"/>
     <many-to-one name="paygSshData" column="payg_ssh_data_id" class="com.redhat.rhn.domain.cloudpayg.PaygSshData" />
-  </class>
 
-  <query name="Credentials.listByType">
-    <![CDATA[from com.redhat.rhn.domain.credentials.Credentials c
-                   where c.type = :type
-                   order by c.url, c.id]]>
-  </query>
+  </class>
 </hibernate-mapping>
diff --git a/java/code/src/com/redhat/rhn/domain/credentials/Credentials.java b/java/code/src/com/redhat/rhn/domain/credentials/Credentials.java
@@ -25,8 +25,6 @@
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
-import java.util.Optional;
-
 /**
  * Credentials - Java representation of the table SUSECREDENTIALS.
  *
@@ -216,19 +214,7 @@ public boolean isEmpty() {
      * is at the moment denoted by having the url field set.
      */
     public boolean isPrimarySCCCredential() {
-        return isTypeOf(TYPE_SCC) && url != null;
-    }
-
-    /**
-     * Check if this credential is of type credentialType
-     * @param credentialType type to check for
-     * @return true if the type match, otherwise false
-     */
-    public boolean isTypeOf(String credentialType) {
-        return Optional.ofNullable(getType())
-                .map(CredentialsType::getLabel)
-                .filter(s -> s.equals(credentialType))
-                .isPresent();
+        return type.getLabel().equals(TYPE_SCC) && url != null;
     }
 
     /**
@@ -241,12 +227,10 @@ public boolean equals(Object other) {
         }
         Credentials otherCredentials = (Credentials) other;
         return new EqualsBuilder()
-                .append(getType(), otherCredentials.getType())
-                .append(getUsername(), otherCredentials.getUsername())
-                .append(getPassword(), otherCredentials.getPassword())
-                .append(getUrl(), otherCredentials.getUrl())
-                .append(getExtraAuthData(), otherCredentials.getExtraAuthData())
-                .isEquals();
+            .append(getType(), otherCredentials.getType())
+            .append(getUsername(), otherCredentials.getUsername())
+            .append(getPassword(), otherCredentials.getPassword())
+            .isEquals();
     }
 
     /**

diff --git a/java/code/src/com/redhat/rhn/domain/credentials/CredentialsFactory.java b/java/code/src/com/redhat/rhn/domain/credentials/CredentialsFactory.java
@@ -20,7 +20,10 @@
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.hibernate.Criteria;
 import org.hibernate.Session;
+import org.hibernate.criterion.Order;
+import org.hibernate.criterion.Restrictions;
 
 import java.util.Date;
 import java.util.List;
@@ -90,8 +93,15 @@ public static Credentials createSCCCredentials() {
      * Helper method for looking up SCC credentials.
      * @return credentials or null
      */
-    public static List<Credentials> listSCCCredentials() {
-        return listCredentialsByType(Credentials.TYPE_SCC);
+    @SuppressWarnings("unchecked")
+    public static List<Credentials> lookupSCCCredentials() {
+        Session session = getSession();
+        Criteria c = session.createCriteria(Credentials.class);
+        c.add(Restrictions.eq("type", CredentialsFactory
+                .findCredentialsTypeByLabel(Credentials.TYPE_SCC)));
+        c.addOrder(Order.asc("url"));
+        c.addOrder(Order.asc("id"));
+        return c.list();
     }
 
     /**
@@ -154,9 +164,11 @@ public static Credentials createReportCredentials() {
      * @param username - the username
      * @param password - the password
      * @param credentialsType - credentials type
+     * @param params - optional paramaters
      * @return new Credentials instance
      */
-    public static Credentials createCredentials(String username, String password, String credentialsType) {
+    public static Credentials createCredentials(String username, String password,
+            String credentialsType, Map<String, String> params) {
         if (StringUtils.isEmpty(username)) {
             return null;
         }
@@ -187,17 +199,6 @@ else if (credentialsType.equals(Credentials.TYPE_REPORT_CREDS)) {
         return credentials;
     }
 
-    /**
-     * @param type the credential type label
-     * @return return a list of credentials of the given type
-     */
-    public static List<Credentials> listCredentialsByType(String type) {
-        return getSession()
-                .createNamedQuery("Credentials.listByType", Credentials.class)
-                .setParameter("type", findCredentialsTypeByLabel(type))
-                .list();
-    }
-
     @Override
     protected Logger getLogger() {
         return log;

diff --git a/java/code/src/com/redhat/rhn/domain/entitlement/Entitlement.java b/java/code/src/com/redhat/rhn/domain/entitlement/Entitlement.java
@@ -20,15 +20,13 @@
 import com.suse.manager.reactor.utils.ValueMap;
 
 import org.apache.commons.lang3.builder.CompareToBuilder;
-import org.apache.commons.lang3.builder.EqualsBuilder;
-import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /**
  * Entitlements
  */
 public abstract class Entitlement implements Comparable<Entitlement> {
-    private final String label;
+    private String label;
 
     /**
      * Constructs an Entitlement labeled <code>lbl</code>.
@@ -70,26 +68,6 @@ public String toString() {
             return new ToStringBuilder(this).append("label", label).toString();
     }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-
-        if (!(o instanceof Entitlement)) {
-            return false;
-        }
-
-        Entitlement that = (Entitlement) o;
-
-        return new EqualsBuilder().append(label, that.label).isEquals();
-    }
-
-    @Override
-    public int hashCode() {
-        return new HashCodeBuilder(17, 37).append(label).toHashCode();
-    }
-
     /**
      * {@inheritDoc}
      */

diff --git a/java/code/src/com/redhat/rhn/domain/errata/AdvisoryStatusEnumType.java b/java/code/src/com/redhat/rhn/domain/errata/AdvisoryStatusEnumType.java
@@ -17,12 +17,11 @@
 /**
  * AdvisoryStatusEnumType
  */
-public class AdvisoryStatusEnumType extends CustomEnumType<AdvisoryStatus, String> {
+public class AdvisoryStatusEnumType extends CustomEnumType<AdvisoryStatus> {
     /**
      * Constructor
      */
     public AdvisoryStatusEnumType() {
-        super(AdvisoryStatus.class, String.class, AdvisoryStatus::getMetadataValue,
-            s -> AdvisoryStatus.fromMetadata(s).orElse(null));
+        super(AdvisoryStatus.class, AdvisoryStatus::getMetadataValue, s -> AdvisoryStatus.fromMetadata(s).get());
     }
 }