Skip to content

Commit 3c09e6a

Browse files
authored
Remove duplicate criteria (#191)
Signed-off-by: John Mertic <jmertic@linuxfoundation.org>
1 parent b338ea4 commit 3c09e6a

2 files changed

Lines changed: 14 additions & 39 deletions

File tree

zowe_conformance/test_evaluation_guide.md

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ These Zowe Conformant criteria are applicable to the lastest Zowe v1 LTS Release
9191

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

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

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

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

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

104-
8. **UI**
105-
106-
The UI uses only relative URLs. **(required)**
107-
108-
9. **WebSocket Services**
104+
8. **WebSocket Services**
109105

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

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

114-
10. **Directory and File Ownership Permissions**
110+
9. **Directory and File Ownership Permissions**
115111

116112
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)**
117113

118114
b. A conformant application must not modify the permissions or ownership of a Zowe instance directory workspace. **(required)**
119-
11. **Lifecycling as a Zowe address space**
115+
116+
10. **Lifecycling as a Zowe address space**
120117

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

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

127124
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)**
128125

129-
12. **Support**
126+
11. **Support**
130127

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

zowe_conformance/test_evaluation_guide_table.md

Lines changed: 8 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,7 @@ These Zowe Conformance criteria are applicable to the lastest Zowe v1 LTS Releas
405405
<th style="background-color:#AAAAAA">x</th>
406406
<th style="background-color:#AAAAAA"></th>
407407
<th></th>
408-
<td>Services accept basic authentication (minimum requirement)</td>
408+
<td>Services accept basic authentication or Single-Sign-On Support as explained in the point 25 (minimum requirement)</td>
409409
</tr>
410410
<tr>
411411
<th style="background-color:#555555">25</th>
@@ -447,28 +447,6 @@ These Zowe Conformance criteria are applicable to the lastest Zowe v1 LTS Releas
447447
</tr>
448448
</table>
449449

450-
### UI
451-
452-
<table rules="all">
453-
<thead>
454-
<th style=background-color:#5555AA>Item </th>
455-
<th style=background-color:#5555AA>Ver </th>
456-
<th style=background-color:#5555AA>Required </th>
457-
<th style=background-color:#5555AA>Best Practice </th>
458-
<th style=background-color:#5555AA>Conformant </th>
459-
<th style=background-color:#5555AA>Criteria </th>
460-
</thead>
461-
462-
<tr>
463-
<th style="background-color:#555555">28</th>
464-
<th style="background-color:#555555">v1</th>
465-
<th style="background-color:#AAAAAA">x</th>
466-
<th style="background-color:#AAAAAA"></th>
467-
<th></th>
468-
<td>UI uses only relative URLs</td>
469-
</tr>
470-
</table>
471-
472450
### WebSocket Services
473451

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

484462
<tr>
485-
<th style="background-color:#555555">29</th>
463+
<th style="background-color:#555555">28</th>
486464
<th style="background-color:#555555">v1</th>
487465
<th style="background-color:#AAAAAA">x</th>
488466
<th style="background-color:#AAAAAA"></th>
489467
<th></th>
490468
<td>WebSocket connection creation, all subsequent communication between WebSocket client, and server is routed through the API ML Gateway</td>
491469
</tr>
492470
<tr>
493-
<th style="background-color:#555555">30</th>
471+
<th style="background-color:#555555">29</th>
494472
<th style="background-color:#555555">v1</th>
495473
<th style="background-color:#AAAAAA">x</th>
496474
<th style="background-color:#AAAAAA"></th>
@@ -512,15 +490,15 @@ These Zowe Conformance criteria are applicable to the lastest Zowe v1 LTS Releas
512490
</thead>
513491

514492
<tr>
515-
<th style="background-color:#555555">32</th>
493+
<th style="background-color:#555555">30</th>
516494
<th style="background-color:#555555">v1</th>
517495
<th style="background-color:#AAAAAA">x</th>
518496
<th style="background-color:#AAAAAA"></th>
519497
<th></th>
520498
<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>
521499
</tr>
522500
<tr>
523-
<th style="background-color:#555555">33</th>
501+
<th style="background-color:#555555">31</th>
524502
<th style="background-color:#555555">v1</th>
525503
<th style="background-color:#AAAAAA">x</th>
526504
<th style="background-color:#AAAAAA"></th>
@@ -542,7 +520,7 @@ These Zowe Conformance criteria are applicable to the lastest Zowe v1 LTS Releas
542520
</thead>
543521

544522
<tr>
545-
<th rowspan=4 style="background-color:#555555">34</th>
523+
<th rowspan=4 style="background-color:#555555">32</th>
546524
<th style="background-color:#555555"></th>
547525
<th colspan ="3" style="background-color:#AAAAAA">Applicable if LIFECYCLED</th>
548526
<td>Satisfy the following criteria to lifecycle a service with Zowe:</td>
@@ -571,7 +549,7 @@ These Zowe Conformance criteria are applicable to the lastest Zowe v1 LTS Releas
571549
<td>Contains a <code>configure.sh</code> script</td>
572550
</tr>
573551
<tr>
574-
<th style="background-color:#555555">35</th>
552+
<th style="background-color:#555555">33</th>
575553
<th style="background-color:#555555">v1</th>
576554
<th style="background-color:#AAAAAA">x</th>
577555
<th style="background-color:#AAAAAA"></th>
@@ -594,7 +572,7 @@ These Zowe Conformance criteria are applicable to the lastest Zowe v1 LTS Releas
594572
</thead>
595573

596574
<tr>
597-
<th style="background-color:#555555">36</th>
575+
<th style="background-color:#555555">34</th>
598576
<th style="background-color:#555555">v1</th>
599577
<th style="background-color:#AAAAAA">x</th>
600578
<th style="background-color:#AAAAAA"></th>

0 commit comments

Comments
 (0)