Change in vdsm[master]: stomp: broker cleanup
From Dan Kenigsberg: Dan Kenigsberg has submitted this change and it was merged. Change subject: stomp: broker cleanup .. stomp: broker cleanup We can remove engine 3.5 supported queue names since we do not support this version anymore. Change-Id: I972268a72f51975eb78c6bac926e29ac53178dea Signed-off-by: Piotr Kliczewski Reviewed-on: https://gerrit.ovirt.org/66300 Continuous-Integration: Jenkins CI Reviewed-by: Yaniv Bronhaim Reviewed-by: Nir Soffer --- M lib/yajsonrpc/stomp.py M lib/yajsonrpc/stompreactor.py M tests/integration/jsonRpcHelper.py M tests/stompAdapterTests.py 4 files changed, 11 insertions(+), 18 deletions(-) Approvals: Piotr Kliczewski: Verified Nir Soffer: Looks good to me, approved Yaniv Bronhaim: Looks good to me, but someone else must approve Jenkins CI: Passed CI tests -- To view, visit https://gerrit.ovirt.org/66300 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I972268a72f51975eb78c6bac926e29ac53178dea Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Piotr Kliczewski Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Irit Goihman Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Piotr Kliczewski Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: gerrit-hooks ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[master]: stomp: broker cleanup
From Yaniv Bronhaim: Yaniv Bronhaim has posted comments on this change. Change subject: stomp: broker cleanup .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/66300 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I972268a72f51975eb78c6bac926e29ac53178dea Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Piotr Kliczewski Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Irit Goihman Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Piotr Kliczewski Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[master]: stomp: broker cleanup
From Dan Kenigsberg: Dan Kenigsberg has submitted this change and it was merged. Change subject: stomp: broker cleanup .. stomp: broker cleanup We can remove engine 3.5 supported queue names since we do not support this version anymore. Change-Id: I972268a72f51975eb78c6bac926e29ac53178dca Signed-off-by: Piotr Kliczewski Reviewed-on: https://gerrit.ovirt.org/65681 Continuous-Integration: Jenkins CI Reviewed-by: Yaniv Bronhaim Reviewed-by: Irit Goihman Reviewed-by: Dan Kenigsberg --- M lib/yajsonrpc/__init__.py M lib/yajsonrpc/stomp.py M lib/yajsonrpc/stompreactor.py M tests/integration/jsonRpcHelper.py M tests/stompAdapterTests.py 5 files changed, 8 insertions(+), 23 deletions(-) Approvals: Piotr Kliczewski: Verified Yaniv Bronhaim: Looks good to me, but someone else must approve Jenkins CI: Passed CI tests Irit Goihman: Looks good to me, but someone else must approve Dan Kenigsberg: Looks good to me, approved -- To view, visit https://gerrit.ovirt.org/65681 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I972268a72f51975eb78c6bac926e29ac53178dca Gerrit-PatchSet: 7 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Piotr Kliczewski Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Irit Goihman Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Piotr Kliczewski Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: gerrit-hooks ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[master]: stomp: broker cleanup
From Dan Kenigsberg: Dan Kenigsberg has posted comments on this change. Change subject: stomp: broker cleanup .. Patch Set 6: Code-Review+2 raising score -- To view, visit https://gerrit.ovirt.org/65681 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I972268a72f51975eb78c6bac926e29ac53178dca Gerrit-PatchSet: 6 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Piotr Kliczewski Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Irit Goihman Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Piotr Kliczewski Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[master]: stomp: broker cleanup
Yaniv Bronhaim has posted comments on this change. Change subject: stomp: broker cleanup .. Patch Set 6: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/65681 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I972268a72f51975eb78c6bac926e29ac53178dca Gerrit-PatchSet: 6 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Piotr KliczewskiGerrit-Reviewer: Irit Goihman Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[master]: stomp: broker cleanup
gerrit-hooks has posted comments on this change. Change subject: stomp: broker cleanup .. Patch Set 6: * Update Tracker::IGNORE, no bug url/s found * Check Bug-Url::IGNORE, no bug url/s found * Check Public Bug::WARN, no public bug url found * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.6', 'ovirt-4.0']) -- To view, visit https://gerrit.ovirt.org/65681 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I972268a72f51975eb78c6bac926e29ac53178dca Gerrit-PatchSet: 6 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Piotr KliczewskiGerrit-Reviewer: Irit Goihman Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[master]: stomp: broker cleanup
gerrit-hooks has posted comments on this change. Change subject: stomp: broker cleanup .. Patch Set 5: * Update Tracker::IGNORE, no bug url/s found * Check Bug-Url::IGNORE, no bug url/s found * Check Public Bug::WARN, no public bug url found * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.6', 'ovirt-4.0']) -- To view, visit https://gerrit.ovirt.org/65681 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I972268a72f51975eb78c6bac926e29ac53178dca Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Piotr KliczewskiGerrit-Reviewer: Irit Goihman Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[master]: stomp: broker cleanup
gerrit-hooks has posted comments on this change. Change subject: stomp: broker cleanup .. Patch Set 4: * Update Tracker::IGNORE, no bug url/s found * Check Bug-Url::IGNORE, no bug url/s found * Check Public Bug::WARN, no public bug url found * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.6', 'ovirt-4.0']) -- To view, visit https://gerrit.ovirt.org/65681 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I972268a72f51975eb78c6bac926e29ac53178dca Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Piotr KliczewskiGerrit-Reviewer: Irit Goihman Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[master]: stomp: broker cleanup
gerrit-hooks has posted comments on this change. Change subject: stomp: broker cleanup .. Patch Set 3: * Update Tracker::IGNORE, no bug url/s found * Check Bug-Url::IGNORE, no bug url/s found * Check Public Bug::WARN, no public bug url found * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.6', 'ovirt-4.0']) -- To view, visit https://gerrit.ovirt.org/65681 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I972268a72f51975eb78c6bac926e29ac53178dca Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Piotr KliczewskiGerrit-Reviewer: Irit Goihman Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[master]: stomp: broker cleanup
gerrit-hooks has posted comments on this change. Change subject: stomp: broker cleanup .. Patch Set 2: * Update Tracker::IGNORE, no bug url/s found * Check Bug-Url::IGNORE, not relevant for branch: master * Check Public Bug::WARN, no public bug url found * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.6', 'ovirt-4.0']) -- To view, visit https://gerrit.ovirt.org/65681 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I972268a72f51975eb78c6bac926e29ac53178dca Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Piotr KliczewskiGerrit-Reviewer: Irit Goihman Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[master]: stomp: broker cleanup
gerrit-hooks has posted comments on this change. Change subject: stomp: broker cleanup .. Patch Set 1: * Update Tracker::IGNORE, no bug url/s found * Check Bug-Url::IGNORE, not relevant for branch: master * Check Public Bug::WARN, no public bug url found * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.6', 'ovirt-4.0']) -- To view, visit https://gerrit.ovirt.org/65681 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I972268a72f51975eb78c6bac926e29ac53178dca Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Piotr KliczewskiGerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[master]: stomp: broker cleanup
Piotr Kliczewski has uploaded a new change for review. Change subject: stomp: broker cleanup .. stomp: broker cleanup We can remove engine 3.5 supported queue names since we do not support this version anymore. Change-Id: I972268a72f51975eb78c6bac926e29ac53178dca Signed-off-by: Piotr Kliczewski--- M lib/yajsonrpc/stomp.py M lib/yajsonrpc/stompreactor.py 2 files changed, 2 insertions(+), 13 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/81/65681/1 diff --git a/lib/yajsonrpc/stomp.py b/lib/yajsonrpc/stomp.py index 41ac70f..558c519 100644 --- a/lib/yajsonrpc/stomp.py +++ b/lib/yajsonrpc/stomp.py @@ -22,11 +22,6 @@ from vdsm import utils import re -# REQUIRED_FOR: engine-3.5 -# safe to remove when 3.5 support is dropped -LEGACY_SUBSCRIPTION_ID_REQUEST = "/queue/_local/vdsm/requests" -LEGACY_SUBSCRIPTION_ID_RESPONSE = "/queue/_local/vdsm/reponses" - _RE_ESCAPE_SEQUENCE = re.compile(r"\\(.)") _RE_ENCODE_CHARS = re.compile(r"[\r\n\\:]") diff --git a/lib/yajsonrpc/stompreactor.py b/lib/yajsonrpc/stompreactor.py index 233bee3..42d7d01 100644 --- a/lib/yajsonrpc/stompreactor.py +++ b/lib/yajsonrpc/stompreactor.py @@ -200,11 +200,6 @@ frame.headers.get(stomp.Headers.REPLY_TO), frame.body) return -elif stomp.LEGACY_SUBSCRIPTION_ID_REQUEST == destination: -self._handle_internal(dispatcher, - stomp.LEGACY_SUBSCRIPTION_ID_RESPONSE, - frame.body) -return else: try: subs = self._sub_dests[destination] @@ -323,7 +318,7 @@ """ Sends message to all subscribes that subscribed to destination. """ -def send(self, message, destination=stomp.LEGACY_SUBSCRIPTION_ID_RESPONSE): +def send(self, message, destination): resp = json.loads(message) response_id = resp.get("id") @@ -414,8 +409,7 @@ self._reactor.wakeup() return sub -def send(self, message, destination=stomp.LEGACY_SUBSCRIPTION_ID_RESPONSE, - headers=None): +def send(self, message, destination, headers=None): self.log.debug("Sending response") self._aclient.send( destination, -- To view, visit https://gerrit.ovirt.org/65681 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I972268a72f51975eb78c6bac926e29ac53178dca Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Piotr Kliczewski ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org