chore: Remove artifacts of attach

Removed what remained after removing the `attach` command. A system is now attached upon registration. Card IDs: * CCT-603 Signed-off-by: Štěpán Tomsa <[email protected]>
candlepin · Dec 2, 2024 · 7f44ae2 · 7f44ae2
1 parent 55e250d
commit 7f44ae2
Show file tree

Hide file tree

Showing 10 changed files with 3 additions and 50 deletions.
diff --git a/etc-conf/dbus/system.d/com.redhat.RHSM1.conf b/etc-conf/dbus/system.d/com.redhat.RHSM1.conf
@@ -14,9 +14,6 @@
         <allow send_destination="com.redhat.RHSM1"
             send_interface="com.redhat.RHSM1"/>
 
-        <allow send_destination="com.redhat.RHSM1"
-            send_interface="com.redhat.RHSM1.Attach"/>
-
         <allow send_destination="com.redhat.RHSM1"
             send_interface="com.redhat.RHSM1.Products"/>
 

diff --git a/src/plugins/libdnf/README.md b/src/plugins/libdnf/README.md
@@ -115,12 +115,6 @@ To use testing repository you have to do several steps:
   subscription-manager register --username admin --password admin --org admin
   ```
 
-* Attach some subscription:
-
-  ```
-  subscription-manager attach --pool <pool_id>
-  ```
-
 * Choose some repository from output of `subscription-manager repos --list` and
   enable the repository:
   

diff --git a/src/rhsmlib/client_info.py b/src/rhsmlib/client_info.py
@@ -14,7 +14,7 @@
 """
 This module holds information about current state of client application
 like sender of D-bus method, current subscription-manager command (register,
-attach, ...), dnf command, etc.
+status...), dnf command, etc.
 """
 
 import logging

diff --git a/src/rhsmlib/dbus/constants.py b/src/rhsmlib/dbus/constants.py
@@ -24,8 +24,6 @@
     "UNREGISTER_DBUS_PATH",
     "CONFIG_INTERFACE",
     "CONFIG_DBUS_PATH",
-    "ATTACH_INTERFACE",
-    "ATTACH_DBUS_PATH",
     "PRODUCTS_INTERFACE",
     "PRODUCTS_DBUS_PATH",
     "ENTITLEMENT_INTERFACE",
@@ -69,9 +67,6 @@
 CONFIG_INTERFACE = "%s.%s" % (INTERFACE_BASE, "Config")
 CONFIG_DBUS_PATH = "%s/%s" % (ROOT_DBUS_PATH, "Config")
 
-ATTACH_INTERFACE = "%s.%s" % (INTERFACE_BASE, "Attach")
-ATTACH_DBUS_PATH = "%s/%s" % (ROOT_DBUS_PATH, "Attach")
-
 PRODUCTS_INTERFACE = "%s.%s" % (INTERFACE_BASE, "Products")
 PRODUCTS_DBUS_PATH = "%s/%s" % (ROOT_DBUS_PATH, "Products")
 

diff --git a/src/subscription_manager/entcertlib.py b/src/subscription_manager/entcertlib.py
@@ -108,9 +108,7 @@ def perform(self) -> "EntCertUpdateReport":
         log.info("certs updated:\n%s", self.report)
         self.syslog_results()
 
-        # We call EntCertlibActionInvoker.update() solo from
-        # the 'attach' cli instead of an ActionClient. So
-        # we need to refresh the ent_dir object before calling
+        # We need to refresh the ent_dir object before calling
         # content updating actions.
         self.ent_dir.refresh()
 

diff --git a/test/functional_tests/README.md b/test/functional_tests/README.md
@@ -24,7 +24,6 @@ How to run functional tests?
   cd ./ansible_playbooks
   ansible-playbook ./configure_package_manager.yml --extra-vars="candlepin_hostname=<IP_OF_TESTING_CANDLEPIN>"
   ansible-playbook ./register_system.yml
-  ansible-playbook ./attach_subscriptions.yml
   ansible-playbook ./test_install_remove_packages.yml
   ansible-playbook ./test_not_remove_prod_cert_for_disabled_repo.yml
   ```
diff --git a/test/functional_tests/ansible_playbooks/attach_subscriptions.yml b/test/functional_tests/ansible_playbooks/attach_subscriptions.yml
diff --git a/test/smoke.sh b/test/smoke.sh
@@ -226,7 +226,6 @@ run_sm "0" list --available
 run_sm "0" service-level
 run_sm "0" service-level --list
 run_sm "0" repos
-run_sm "0" attach
 
 # Note: with current test data, the awesome-os repos will never be enabled
 run_yum "0" repolist

diff --git a/test/test_managercli.py b/test/test_managercli.py
@@ -212,7 +212,7 @@ def test_unknown_args_cause_exit(self):
             sys,
             "argv",
             # test with some subcommand; sub-man prints help without it
-            ["subscription-manager", "attach", "--foo", "bar", "baz"],
+            ["subscription-manager", "register", "--foo", "bar", "baz"],
         ):
             try:
                 self.cc.main()

diff --git a/test/zypper/test_serviceplugin.py b/test/zypper/test_serviceplugin.py
@@ -40,9 +40,6 @@ def test_provides_subman_repos_if_registered_and_subscribed(self):
             "--serverurl={RHSM_URL}".format(sub_man=self.SUB_MAN, **os.environ),
             shell=True,
         )
-        subprocess.call(
-            "{sub_man} attach --pool={RHSM_POOL}".format(sub_man=self.SUB_MAN, **os.environ), shell=True
-        )
         self.assertTrue(self.has_subman_repos())
 
     def test_can_download_rpm(self):
@@ -51,9 +48,6 @@ def test_can_download_rpm(self):
             "--serverurl={RHSM_URL}".format(sub_man=self.SUB_MAN, **os.environ),
             shell=True,
         )
-        subprocess.check_call(
-            "{sub_man} attach --pool={RHSM_POOL}".format(sub_man=self.SUB_MAN, **os.environ), shell=True
-        )
         subprocess.check_call(
             "{sub_man} repos --enable={RHSM_TEST_REPO}".format(sub_man=self.SUB_MAN, **os.environ), shell=True
         )