Develop 2.1.1

kharimzarequested to merge
develop_2.1.1 into master
  1. Traffic rule, field action definition updated to reflect the change in enums for FORWARD_ENCAPSULATED and DUPLICATE_ENCAPSULATED
  2. Traffic rule, field dstInterface description updated to match spec.
  3. Traffic Rule state descrirption updated to match spec.
  4. Dns rule state description updated to match spec
  5. Required changes to support the POST API for confirm_ready including the request body AppReadyConfirmation.
  6. SerAvailabilityNotificationSubscription will use CategoryRef data type now.CategoryRefs array was there but was using String, now made array of CategoryRef
  7. CategoryRef href is now explicitly defined as uri. So the format as uri was added to href attribute definition. Also added an example of uri type
  8. Get /services error code 414 is now added
  9. Get /applications/{appInstanceId}/services - error code 414 is now added
  10. Delete applications/{appInstanceId}/services/{serviceId} is now added

Following changes in spec had no impact to yaml

  1. URI data type is now named as Uri (e.g. For LinkType. This has no impact to yaml since it already uses format uri. e.g. for href attribute of LinkType
  2. Types for Sername and SerInstanceId - already taken care in the yaml

Attached the word differences between 2.1.1 and 2.0.11worddiff.docx

Merge request reports

.vscode/settings.json

0 → 100644
+3 −0
Changes for .vscode/settings.json: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line 
{

    "git.ignoreLimitWarning": true

}
 
 No newline at end of file

.jenkins.sh

+8 −7
Changes for .jenkins.sh: 8 added lines, 7 removed lines.
Original line number Diff line number Diff line 
#!/bin/bash



specfiles=$(ls | egrep -i "^Mp1.(json|yaml)")

specfiles=$(ls | egrep "^[^.]*.(json|yaml)")



fres=0

for i in $specfiles ; do

	echo "-- Validating OpenAPI file $i..."

	swagger-tools validate $i

    echo "-- Validating and linting OpenAPI file $i..."

    swagger-cli validate "$i"

    res=$?

	fres=$(($fres||$res))

	echo -e "-- Validator returned $res.\n"

    speccy lint "$i"

    res2=$?

    fres=$(($fres||$res||$res2))

    echo "--- Validator returned $res, linter returned $res2."

done



echo "-- Final validator returns $fres."

echo "-- Final validation returns $fres."



exit $fres
 
 No newline at end of file

COPYRIGHT

deleted100644 → 0
+0 −14
Changes for COPYRIGHT: 0 added lines, 14 removed lines.
Original line number Diff line number Diff line 
ETSI FORGE COPYRIGHT STATEMENT



Copyright (c) ETSI 2017.



This software is subject to copyrights owned by ETSI. Non-exclusive permission 

is hereby granted, free of charge, to copy, reproduce and amend this file 

under the following conditions: It is provided "as is", without warranty of any 

kind, expressed or implied. 



ETSI shall never be liable for any claim, damages, or other liability arising 

from its use or inability of use.This permission does not apply to any documentation 

associated with this file for which ETSI keeps all rights reserved. The present 

copyright notice shall be included in all copies of whole or part of this 

software and shall not imply any sub-license right.

LICENSE

0 → 100644
+23 −0
Changes for LICENSE: 23 added lines, 0 removed lines.
Original line number Diff line number Diff line 
Copyright 2019 ETSI



Redistribution and use in source and binary forms, with or without 

modification, are permitted provided that the following conditions are met:

1. Redistributions of source code must retain the above copyright notice, 

   this list of conditions and the following disclaimer.

2. Redistributions in binary form must reproduce the above copyright notice, 

   this list of conditions and the following disclaimer in the documentation 

   and/or other materials provided with the distribution.

3. Neither the name of the copyright holder nor the names of its contributors 

   may be used to endorse or promote products derived from this software without 

   specific prior written permission.



THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 

ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 

WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 

IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 

INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 

BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 

DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF 

LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE 

OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED 

OF THE POSSIBILITY OF SUCH DAMAGE.
 
 No newline at end of file

Mp1.json→MecAppSupportApi.json

+300 −1007

File changed and moved.

Preview size limit exceeded, changes collapsed.