457 early pre published alert pkp integration into sdpi a#465
457 early pre published alert pkp integration into sdpi a#465JavierEspina wants to merge 35 commits intomasterfrom
Conversation
|
@ToddCooper, @d-gregorczyk, @PeterKranich - this PR is still in drafting and hence incomplete. But feel free to start looking at the changes before my summer holiday starts (on Aug 2). |
…ion-into-sdpi-a # Conflicts: # asciidoc/volume1/tf1-ch-12-sdpi-a.adoc
|
@PaulMartinsen, I need your help! I am struggling to merge the master into this branch. It had many changes you had made but also changes that should not get lost (esp. to Table 1:12.1-1. SDPi-A Profile - Actors and Transactions). I tried resolving conflicts in my IDE and Github, but I seem to not fully manage. My last commits keep failing... |
|
Hi @JavierEspina is the problem that the document isn't building or are the branches not merging? That is, does the latest commit contain the document changes you want from this branch + master and we need to fix the document building or have some of the changes from master not come across? In the build output I see the error
I'll take a closer look later today to see if it is just the missing oid that's causing a build problem. |
|
Turns out it was a bit more subtle than a missing oid arc. Looks like a few things got broken in the merge. Looking over
It builds locally; let's see if github can do it... |
|
Looks like it is building now. In other news:
|
|
THANK you, Paul! |
With my last two commits, I may have done the " Markup for the Distributed Alarm System Option " but have not checked the box so you can verify that I did it well and did not forget any detail somewhere. |
|
@JavierEspina - so remind me ... |
Yes, by default a DIS. DAS is an option. When the DAS option is selected transactions DEV-48 and DEV-49 kick in (i.e., become mandatory) You may want to download a build already to see how things are currently looking. There is no complete description of all steps in DEV-48 or -49 but the idea is there. |
|
Starting to look over adding in markup for the transactions I notice that in DEV-49, the alert provider is both a responder and initiator in the text but the alert consumer is listed only as an initiator. If the alert provider initiates this transaction wouldn't the alert consumer be at least a receiver as well? |
|
@JavierEspina , the markup for the Distributed Alarm System Option looks good to me. The markup doesn't support a transaction making multiple contributions (e.g., responder and initiator) currently so I'm going to have to add that to make the json export work. What's the plan for merging this one? I could tackle this as a separate issue if you're in a hurry to merge it. Json exports would be incomplete in the meantime. |
You're right. It is not consistent right now. The first table of SDP-i A shows both actors and both initiator and responder. So does the diagram in the DEV-49 section. However the actor roles table in that section does not. I am going to correct this in my next commit...or at least try! |
My current expectation is to move this PR from draft to an actual PR (i.e. content complete for review for merging) within 1-2 weeks (maybe even 3). If that provides you with sufficient time to make that fix in this PR, I'd say: go ahead! |
|
Ok. 1 week might be a little challenging, but 2-3 should work. I'll make a start and can either include it or move to a separate issue if you are ready to merge first. |

📑 Description
☑ Mandatory Tasks
The following aspects have been respected by the pull request assignee and at least one reviewer: