Skip to content

Commit

Permalink
Remove duplicate criteria (#191)
Browse files Browse the repository at this point in the history
Signed-off-by: John Mertic <[email protected]>
  • Loading branch information
balhar-jakub authored Apr 15, 2021
1 parent b338ea4 commit 3c09e6a
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 39 deletions.
15 changes: 6 additions & 9 deletions zowe_conformance/test_evaluation_guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ These Zowe Conformant criteria are applicable to the lastest Zowe v1 LTS Release

a. Resources are protected by mainframe credentials. **(required)**

b. Services accept basic authentication (minimum requirement). **(required)**
b. Services accept basic authentication or Single-Sign-On Support as explained in the point 6.c (minimum requirement). **(required)**

c. Single-Sign-On Support: Services accept EITHER Zowe JWT token in the cookie OR support of PassTickets. **(required)**

Expand All @@ -101,22 +101,19 @@ These Zowe Conformant criteria are applicable to the lastest Zowe v1 LTS Release

b. The last two major versions are supported by API services. **(required)**

8. **UI**

The UI uses only relative URLs. **(required)**

9. **WebSocket Services**
8. **WebSocket Services**

a. WebSocket connection creation, all subsequent communication between WebSocket client, and server are routed through the API ML Gateway **(required)**

b. WebSocket connections are closed by the initiator through API ML Gateway. **(required)**

10. **Directory and File Ownership Permissions**
9. **Directory and File Ownership Permissions**

a. A conformant application must not modify the contents of the Zowe runtime USS directory and it must not change any directory or file permissions or ownership within the Zowe runtime. **(required)**

b. A conformant application must not modify the permissions or ownership of a Zowe instance directory workspace. **(required)**
11. **Lifecycling as a Zowe address space**

10. **Lifecycling as a Zowe address space**

a. Satisfy the following criteria to lifecycle a service with Zowe:

Expand All @@ -126,7 +123,7 @@ These Zowe Conformant criteria are applicable to the lastest Zowe v1 LTS Release

b. If the service introduces new variables to the `instance.env` file, these variables should be prefixed by the provider ID to avoid collisions. **(required)**

12. **Support**
11. **Support**

The Submitter describes how Support is provided. Support details must be clearly documented. **(required)**

Expand Down
38 changes: 8 additions & 30 deletions zowe_conformance/test_evaluation_guide_table.md
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,7 @@ These Zowe Conformance criteria are applicable to the lastest Zowe v1 LTS Releas
<th style="background-color:#AAAAAA">x</th>
<th style="background-color:#AAAAAA"></th>
<th></th>
<td>Services accept basic authentication (minimum requirement)</td>
<td>Services accept basic authentication or Single-Sign-On Support as explained in the point 25 (minimum requirement)</td>
</tr>
<tr>
<th style="background-color:#555555">25</th>
Expand Down Expand Up @@ -447,28 +447,6 @@ These Zowe Conformance criteria are applicable to the lastest Zowe v1 LTS Releas
</tr>
</table>

### UI

<table rules="all">
<thead>
<th style=background-color:#5555AA>Item </th>
<th style=background-color:#5555AA>Ver </th>
<th style=background-color:#5555AA>Required </th>
<th style=background-color:#5555AA>Best Practice </th>
<th style=background-color:#5555AA>Conformant </th>
<th style=background-color:#5555AA>Criteria </th>
</thead>

<tr>
<th style="background-color:#555555">28</th>
<th style="background-color:#555555">v1</th>
<th style="background-color:#AAAAAA">x</th>
<th style="background-color:#AAAAAA"></th>
<th></th>
<td>UI uses only relative URLs</td>
</tr>
</table>

### WebSocket Services

<table rules="all">
Expand All @@ -482,15 +460,15 @@ These Zowe Conformance criteria are applicable to the lastest Zowe v1 LTS Releas
</thead>

<tr>
<th style="background-color:#555555">29</th>
<th style="background-color:#555555">28</th>
<th style="background-color:#555555">v1</th>
<th style="background-color:#AAAAAA">x</th>
<th style="background-color:#AAAAAA"></th>
<th></th>
<td>WebSocket connection creation, all subsequent communication between WebSocket client, and server is routed through the API ML Gateway</td>
</tr>
<tr>
<th style="background-color:#555555">30</th>
<th style="background-color:#555555">29</th>
<th style="background-color:#555555">v1</th>
<th style="background-color:#AAAAAA">x</th>
<th style="background-color:#AAAAAA"></th>
Expand All @@ -512,15 +490,15 @@ These Zowe Conformance criteria are applicable to the lastest Zowe v1 LTS Releas
</thead>

<tr>
<th style="background-color:#555555">32</th>
<th style="background-color:#555555">30</th>
<th style="background-color:#555555">v1</th>
<th style="background-color:#AAAAAA">x</th>
<th style="background-color:#AAAAAA"></th>
<th></th>
<td>A conformant application must not modify the contents of the Zowe runtime USS directory and must not change any directory or file permissions or ownership within the Zowe runtime</td>
</tr>
<tr>
<th style="background-color:#555555">33</th>
<th style="background-color:#555555">31</th>
<th style="background-color:#555555">v1</th>
<th style="background-color:#AAAAAA">x</th>
<th style="background-color:#AAAAAA"></th>
Expand All @@ -542,7 +520,7 @@ These Zowe Conformance criteria are applicable to the lastest Zowe v1 LTS Releas
</thead>

<tr>
<th rowspan=4 style="background-color:#555555">34</th>
<th rowspan=4 style="background-color:#555555">32</th>
<th style="background-color:#555555"></th>
<th colspan ="3" style="background-color:#AAAAAA">Applicable if LIFECYCLED</th>
<td>Satisfy the following criteria to lifecycle a service with Zowe:</td>
Expand Down Expand Up @@ -571,7 +549,7 @@ These Zowe Conformance criteria are applicable to the lastest Zowe v1 LTS Releas
<td>Contains a <code>configure.sh</code> script</td>
</tr>
<tr>
<th style="background-color:#555555">35</th>
<th style="background-color:#555555">33</th>
<th style="background-color:#555555">v1</th>
<th style="background-color:#AAAAAA">x</th>
<th style="background-color:#AAAAAA"></th>
Expand All @@ -594,7 +572,7 @@ These Zowe Conformance criteria are applicable to the lastest Zowe v1 LTS Releas
</thead>

<tr>
<th style="background-color:#555555">36</th>
<th style="background-color:#555555">34</th>
<th style="background-color:#555555">v1</th>
<th style="background-color:#AAAAAA">x</th>
<th style="background-color:#AAAAAA"></th>
Expand Down

0 comments on commit 3c09e6a

Please sign in to comment.