Skip to content

Commit 43fbe3b

Browse files
committed
CCT-1081 FEAT Remove unused classes and functions - including Conduits/Slots/Hooks for pre/post_subscribe
Remove "pre_subscribe" and "post_subscribe" plugin slots by removing classes SubscriptionConduit and PostSubscriptionConduit. CARD: CCT-1081
1 parent 8267163 commit 43fbe3b

File tree

5 files changed

+1
-101
lines changed

5 files changed

+1
-101
lines changed

example-plugins/dbus_event.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,3 @@ def pre_product_id_install_hook(self, conduit):
8383

8484
def post_product_id_install_hook(self, conduit):
8585
self._dbus_event("post_product_id_install", conduit)
86-
87-
def pre_subscribe_hook(self, conduit):
88-
self._dbus_event("pre_subscribe", conduit)
89-
90-
def post_subscribe_hook(self, conduit):
91-
self._dbus_event("post_subscribe", conduit)

example-plugins/subscribe.py

Lines changed: 0 additions & 39 deletions
This file was deleted.

src/subscription_manager/plugins.py

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -367,40 +367,6 @@ def __init__(
367367
self.ent_source: EntitlementSource = ent_source
368368

369369

370-
class SubscriptionConduit(BaseConduit):
371-
"""Conduit for subscription info."""
372-
373-
slots = ["pre_subscribe"]
374-
375-
def __init__(self, clazz: Type[SubManPlugin], consumer_uuid: str, pool_id: str, quantity: int):
376-
"""init for SubscriptionConduit
377-
378-
Args:
379-
consumer_uuid: the UUID of the consumer being subscribed
380-
pool_id: the id of the pool the subscription will come from (None if 'auto' is False)
381-
quantity: the quantity to consume from the pool (None if 'auto' is False).
382-
"""
383-
super(SubscriptionConduit, self).__init__(clazz)
384-
self.consumer_uuid: str = consumer_uuid
385-
self.pool_id: str = pool_id
386-
self.quantity: int = quantity
387-
388-
389-
class PostSubscriptionConduit(BaseConduit):
390-
slots = ["post_subscribe"]
391-
392-
def __init__(self, clazz: Type[SubManPlugin], consumer_uuid: str, entitlement_data: Dict):
393-
"""init for PostSubscriptionConduit
394-
395-
Args:
396-
consumer_uuid: the UUID of the consumer subscribed
397-
entitlement_data: the data returned by the server
398-
"""
399-
super(PostSubscriptionConduit, self).__init__(clazz)
400-
self.consumer_uuid: str = consumer_uuid
401-
self.entitlement_data: Dict = entitlement_data
402-
403-
404370
class PluginConfig:
405371
"""Represents configuation for each rhsm plugin.
406372
@@ -886,9 +852,7 @@ def _get_conduits(self) -> List[type(BaseConduit)]:
886852
RegistrationConduit,
887853
PostRegistrationConduit,
888854
FactsConduit,
889-
SubscriptionConduit,
890855
UpdateContentConduit,
891-
PostSubscriptionConduit,
892856
]
893857

894858
def _get_modules(self):

test/test_managercli.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ def test_a_msg(self):
308308
self.assertEqual("%s\n" % msg, cap.err)
309309

310310
def test_msg_unicode(self):
311-
msg: str = "\u2620 \u2603 \u203D"
311+
msg: str = "\u2620 \u2603 \u203d"
312312
with Capture() as cap:
313313
try:
314314
system_exit(1, msg)

test/test_plugins.py

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1056,25 +1056,6 @@ def test_post_registration_conduit(self):
10561056
self.assertEqual({}, conduit.facts)
10571057

10581058

1059-
class TestSubscriptionConduit(unittest.TestCase):
1060-
def test_subscription_conduit(self):
1061-
conduit = plugins.SubscriptionConduit(
1062-
StubPluginClass, consumer_uuid="123456789", pool_id="4444", quantity=4
1063-
)
1064-
self.assertEqual("123456789", conduit.consumer_uuid)
1065-
self.assertEqual(4, conduit.quantity)
1066-
self.assertEqual("4444", conduit.pool_id)
1067-
1068-
1069-
class TestPostSubscriptionConduit(unittest.TestCase):
1070-
def test_post_subscription_conduit(self):
1071-
conduit = plugins.PostSubscriptionConduit(
1072-
StubPluginClass, consumer_uuid="123456789", entitlement_data={}
1073-
)
1074-
self.assertEqual("123456789", conduit.consumer_uuid)
1075-
self.assertEqual({}, conduit.entitlement_data)
1076-
1077-
10781059
class BasePluginException(unittest.TestCase):
10791060
"""At least create and raise all the exceptions."""
10801061

0 commit comments

Comments
 (0)