diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..ed021d207e99e62eeb964c50447b549c8824bab6
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,46 @@
+.idea
+.git
+# Byte-compiled / optimized / DLL files
+__pycache__/
+./libraries/__pycache__/*.py[cod]
+*.py[cod]
+*$py.class
+*.DS_Store
+*.key
+*.csr
+*.pem
+*.crt
+*.zip
+*.srl
+services/nginx/certs/sign_req_body.json
+services/easy_rsa/certs/pki
+services/easy_rsa/certs/*EasyRSA*
+services/easy_rsa/certs/*.profile
+services/easy_rsa/certs/*.csr
+
+
+monitoring/grafana/*grafana_db*
+monitoring/prometheus/*prometheus_db
+monitoring/prometheus/*.rules
+monitoring/tempo/*tempo-data
+
+
+
+
+
+
+
+!docs/testing_with_curl/exposer.key
+!docs/testing_with_curl/invoker.key
+
+
+services/docker-elk/elasticsearch/_state
+services/docker-elk/elasticsearch/snapshot_cache
+services/docker-elk/elasticsearch/indices
+services/docker-elk/elasticsearch/node.lock
+services/docker-elk/elasticsearch/nodes
+
+results
+
+helm/capif/*.lock
+helm/capif/charts
\ No newline at end of file
diff --git a/CITATION.cff b/CITATION.cff
new file mode 100644
index 0000000000000000000000000000000000000000..ef7f8ff7765f6d33008f868f696db3f7e15b25aa
--- /dev/null
+++ b/CITATION.cff
@@ -0,0 +1,9 @@
+cff-version: 2.1.0
+message: "If you use this software, please cite it as below."
+authors:
+- family-names: "EVOLVED-5g"
+  given-names: "EVOLVED-5g"
+title: "CAPIF_API_Services"
+version: 2.1
+date-released: 2022-01-30
+url: "https://github.com/EVOLVED-5G/CAPIF_API_Services"
diff --git a/FAQ.md b/FAQ.md
new file mode 100644
index 0000000000000000000000000000000000000000..14a88ff4fbd25be37448551307c9f4773f9587b9
--- /dev/null
+++ b/FAQ.md
@@ -0,0 +1,88 @@
+[**[Return To Main]**]
+
+# FAQ
+
+### Does the user have to develop the 3 elements of the provider (AEF, AMF and APF)?
+No, you only have to make the request to the "/onboarding" endpoint. In it you must specify a CSR for the AEF, APF and AMF and you will receive the certificates for each of them in the response.
+
+### There is one party that publishes the API and another that exposes it, what is the difference?
+There are different services, the APF, intended for publishing the APIs, and the AEF, intended so that the invoker can call it. The APF is what connects to the Capif Core Function to publish the service and when the service is up, you need the AEF service so that invokers can connect to it.
+
+
+### Before publishing an API, do you have to be registered in CAPIF?
+Yes, before publishing an API you must register using the POST /register endpoint.
+
+
+### Where is the registration done?
+Registration is done in a REST API outside of the CAPIF specification taht we have implemented.
+
+
+### Is the username and password chosen by the user when registering or is it assigned when requesting registration to CAPIF public instance?
+When you make the request to the "/endpoint" of register, you will be returned a username and a password determined by CAPIF.
+
+
+### What is a CSR?
+A CSR is a Certificate Signing Request. It is a generated data block where the certificate is planned to be installed and contains key information such as public key, organization, and location, and is used to request a certificate from a certificate authority (CA). In CAPIF, 3 CSRs are necessary to register a provider, for AEF, APF and AMF.
+
+
+### When doing the register_provider where can I find the CSRs that are generated?
+When using the "register_provider" command, if you add the "debug" option, it shows you a json with the data used to register the provider. There we can find in the body a list of 3 elements corresponding to AEF, APF and AMF. IN each of them, the apiProbPubKey field corresponds to the CSR.
+
+
+### How to use the example client (CAPIF_INVOKER_GUI)?
+First you have to make a "./run.sh host:port" indicating the address of the public CAPIF. Once the Docker containers are up, you have to do a "./terminal_to_py_netapp.sh" and then a "python main.py". At this point we will find ourselves in a console with some predefined commands to use the Client. If we press tab twice it will bring up the list of available commands.
+
+
+### Where is the CAPIF public instance located?
+The CAPIF public instance can be found at the following URLs:
+- capif.mobilesandbox.cloud:37211 (HTTPS)
+- capif.mobilesandbox.cloud:37212 (HTTP)
+
+
+### Do you have to publish 3 APIs? one for each instance?
+No, you only have to publish a single API but each component is responsible for a specific service, whether publishing or exposing.
+
+
+### Once the API is published, is it always active? Or do you have to republish it every time you want to use it?
+It is better to unsubscribe the API every time you exit the application since otherwise it could be republished and it would be double.
+
+
+### Would the same username and password be valid for different invokers?
+Yes, a user can have multiple invokers at the same time, and as such, the username and password would be the same.
+
+
+### What is the notfication destination field in the register_invoker request?
+This is the callback URL used to notify events. CAPIF has an Event service to subscribe to that notifies actions such as a subscription to an API, a change in the state of an API...
+
+
+### Is the notification_destination a required field in the register_invoker
+No, it is not mandatory, but if you do not enter it you will not receive any CAPIF events. For example, the APF may delete the API, you will not be notified that the API is no longer available.
+
+
+### What is the purpose of the "discover_service" function in the invoker client?
+The discover_service returns a json with all the services that exist exposed in CAPIF at that moment.
+
+
+### What is the purpose of the "get_security_auth" function in the invoker client?
+Sirve para pedir el token o para refrescarlo en caso de que haya caducado. You have to use that token to call the API from the invoker.
+
+
+### What is the purpose of the "register_security_context" function in the invoker client?
+To consume the API it is necessary to have a Security Context registered with the data and the authentication method.
+
+
+### Is a user the same as an exposer?
+No, a user registers in CAPIF and once done can have the role of invoker, provider or both.
+
+
+### Where can I put my endpoint?
+You have to set your endpoint when doing the "publish_service" functionality:  
+    ```
+    publish_service capif_ops/config_files/service_api_description_hello.json
+    ```
+
+In the file "service_api_description_hello.json" you configure the service that is going to be exposed and by developing one to suit you, you expose your API.
+
+
+
+ [Return To Main]: ./README.md#faq-documentation
\ No newline at end of file
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000000000000000000000000000000000000..94a9ed024d3859793618152ea559a168bbcbb5e2
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/README.md b/README.md
index c150cd3fb3767ff92119cc46c56ea2ff19629dbf..27dc1bdc8fe55f13d31bb386232b10c1a16805ef 100644
--- a/README.md
+++ b/README.md
@@ -1,92 +1,176 @@
-# capif
+# Common API Framework (CAPIF)
+
+- [Common API Framework (CAPIF)](#common-api-framework-capif)
+- [Repository structure](#repository-structure)
+- [CAPIF\_API\_Services](#capif_api_services)
+  - [How to run CAPIF services in this Repository](#how-to-run-capif-services-in-this-repository)
+    - [Run All CAPIF Services locally with Docker images](#run-all-capif-services-locally-with-docker-images)
+    - [Run All CAPIF Services locally with Docker images and deploy monitoring stack](#run-all-capif-services-locally-with-docker-images-and-deploy-monitoring-stack)
+    - [Run each service using Docker](#run-each-service-using-docker)
+    - [Run each service using Python](#run-each-service-using-python)
+- [How to test CAPIF APIs](#how-to-test-capif-apis)
+  - [Test Plan Documentation](#test-plan-documentation)
+  - [Robot Framework](#robot-framework)
+  - [Using Curl](#using-curl)
+  - [Using PostMan](#using-postman)
+- [Important urls:](#important-urls)
+  - [Mongo DB Dashboard](#mongo-db-dashboard)
+- [FAQ Documentation](#faq-documentation)
+- [CAPIF Release 1.0](#capif-release-10)
+
+
+# Repository structure
 
+```
+CAPIF_API_Services
+└───docs
+│    └───test_plan
+│    └───testing_with_postman
+└───services
+└───tests
+└───tools
+    └───robot
+    └───open_api_script
+```
+* **services**: Services developed following CAPIF API specifications. Also, other complementary services (e.g., NGINX and JWTauth services for the authentication of API consuming entities).
+* **tools**: Auxiliary tools. Robot Framework related code and OpenAPI scripts.
+* **test**: Tests developed using Robot Framework.
 
+* **docs**: Documents related to the code in the repository.
+  * images: images used in the repository
+  * test_plan: test plan descriptions for each API service referring to the test that are executed with the Robot Framework.
+  * testing_with_postman: auxiliary JSON file needed for the Postman-based examples.
 
-## Getting started
+# CAPIF_API_Services
+This repository has the python-flask Mockup servers created with openapi-generator related with CAPIF APIS defined here:
+[Open API Descriptions of 3GPP 5G APIs]
 
-To make it easy for you to get started with GitLab, here's a list of recommended next steps.
+## How to run CAPIF services in this Repository
+Capif services are developed under /service/ folder.
 
-Already a pro? Just edit this README.md and make it your own. Want to make it easy? [Use the template at the bottom](#editing-this-readme)!
+### Run All CAPIF Services locally with Docker images
+To run using docker and docker compose, version 2.10 or higher, you must ensure you have that tools installed at your machine. Also to simplify the process, we have 3 script to control docker images to deploy, check and cleanup.
 
-## Add your files
+To run all CAPIF APIs locally using docker and docker-compose you can execute:
+```
+cd services/
 
-- [ ] [Create](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#create-a-file) or [upload](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#upload-a-file) files
-- [ ] [Add files using the command line](https://docs.gitlab.com/ee/gitlab-basics/add-file.html#add-a-file-using-the-command-line) or push an existing Git repository with the following command:
+./run.sh
+```
+This will build and run all services using docker images, including mongodb and nginx locally and in background, and import ca.crt to nginx.
 
+Nginx deployed by default use **capifcore** hostname, but can add a parameter when run.sh is executed setting a different hostname, for example,
 ```
-cd existing_repo
-git remote add origin https://labs.etsi.org/rep/ocf/capif.git
-git branch -M main
-git push -uf origin main
+./run.sh openshift.evolved-5g.eu
 ```
 
-## Integrate with your tools
+If you want to check if all CAPIF services are running properly in local machine after execute run.sh, we can use:
+```
+./check_services_are_running.sh
+```
+This shell script will return 0 if all services are running properly.
 
-- [ ] [Set up project integrations](https://labs.etsi.org/rep/ocf/capif/-/settings/integrations)
+When we need to stop CAPIF services, we can use next bash script:
+```
+./clean_capif_docker_services.sh
+```
 
-## Collaborate with your team
+or also the next script:
+```
+./stop.sh
+```
 
-- [ ] [Invite team members and collaborators](https://docs.gitlab.com/ee/user/project/members/)
-- [ ] [Create a new merge request](https://docs.gitlab.com/ee/user/project/merge_requests/creating_merge_requests.html)
-- [ ] [Automatically close issues from merge requests](https://docs.gitlab.com/ee/user/project/issues/managing_issues.html#closing-issues-automatically)
-- [ ] [Enable merge request approvals](https://docs.gitlab.com/ee/user/project/merge_requests/approvals/)
-- [ ] [Automatically merge when pipeline succeeds](https://docs.gitlab.com/ee/user/project/merge_requests/merge_when_pipeline_succeeds.html)
+This shell script will remove and clean all CAPIF services started previously with run.sh
 
-## Test and Deploy
+### Run All CAPIF Services locally with Docker images and deploy monitoring stack
+It is now possible to deploy a monitoring stack for CAPIF with Grafana, Prometheus, FluentBit, Loki, Cadvisor, Tempo and Opentelemetry.
 
-Use the built-in continuous integration in GitLab.
+To deploy CAPIF together with the monitoring stack, it is only necessary to execute the following.
 
-- [ ] [Get started with GitLab CI/CD](https://docs.gitlab.com/ee/ci/quick_start/index.html)
-- [ ] [Analyze your code for known vulnerabilities with Static Application Security Testing(SAST)](https://docs.gitlab.com/ee/user/application_security/sast/)
-- [ ] [Deploy to Kubernetes, Amazon EC2, or Amazon ECS using Auto Deploy](https://docs.gitlab.com/ee/topics/autodevops/requirements.html)
-- [ ] [Use pull-based deployments for improved Kubernetes management](https://docs.gitlab.com/ee/user/clusters/agent/)
-- [ ] [Set up protected environments](https://docs.gitlab.com/ee/ci/environments/protected_environments.html)
+```
+./run.sh --m true
+```
 
-***
+After they have been built, the different panels can be consulted in Grafana at the url
 
-# Editing this README
+```
+http:<0.0.0.0>:3000
+```
 
-When you're ready to make this README your own, just edit this file and use the handy template below (or feel free to structure it however you want - this is just a starting point!). Thank you to [makeareadme.com](https://www.makeareadme.com/) for this template.
+By default, the monitoring option is set to false. Once up, all data sources and dashboards are automatically provisioned
 
-## Suggestions for a good README
-Every project is different, so consider which of these sections apply to yours. The sections used in the template are suggestions for most open source projects. Also keep in mind that while a README can be too long and detailed, too long is better than too short. If you think your README is too long, consider utilizing another form of documentation rather than cutting out information.
+### Run each service using Docker
 
-## Name
-Choose a self-explaining name for your project.
+Also you can run service by service using docker:
+```
+cd <Service>
+docker build -t capif_security .
+docker run -p 8080:8080 capif_security
+```
+
+### Run each service using Python
+
+Run using python
+```
+cd <Service>
+pip3 install -r requirements.txt
+python3 -m <service>
+```
+
+# How to test CAPIF APIs
+The above APIs can be tested either with "curl" command, POSTMAN tool or running developed tests with Robot Framework.
+## Test Plan Documentation
+
+Complete documentation of tests is here: [Test Plan Directory]
+## Robot Framework
 
-## Description
-Let people know what your project can do specifically. Provide context and add a link to any reference visitors might be unfamiliar with. A list of Features or a Background subsection can also be added here. If there are alternatives to your project, this is a good place to list differentiating factors.
+In order to ensure modifications over CAPIF services still accomplish the required functionality, Robot Framework test suite must be success.
 
-## Badges
-On some READMEs, you may see small images that convey metadata, such as whether or not all the tests are passing for the project. You can use Shields to add some to your README. Many services also have instructions for adding a badge.
+Test suite implemented accomplish requirements described under test plan at [Test Plan Directory] folder.
 
-## Visuals
-Depending on what you are making, it can be a good idea to include screenshots or even a video (you'll frequently see GIFs rather than actual videos). Tools like ttygif can help, but check out Asciinema for a more sophisticated method.
+Please go to [Testing with Robot Framework] Section
 
-## Installation
-Within a particular ecosystem, there may be a common way of installing things, such as using Yarn, NuGet, or Homebrew. However, consider the possibility that whoever is reading your README is a novice and would like more guidance. Listing specific steps helps remove ambiguity and gets people to using your project as quickly as possible. If it only runs in a specific context like a particular programming language version or operating system or has dependencies that have to be installed manually, also add a Requirements subsection.
+## Using Curl
 
-## Usage
-Use examples liberally, and show the expected output if you can. It's helpful to have inline the smallest example of usage that you can demonstrate, while providing links to more sophisticated examples if they are too long to reasonably include in the README.
+Please go to [Testing Using Curl] section.
 
-## Support
-Tell people where they can go to for help. It can be any combination of an issue tracker, a chat room, an email address, etc.
+## Using PostMan
+You can test the CAPIF flow using the Postman tool. To do this, we have created a collection with some examples of CAPIF requests with everything necessary to carry them out.
+
+For more information on how to test the APIs with POSTMAN, follow this [Document](docs/testing_with_postman/README.md).
+Also you have here the [POSTMAN Collection](docs/testing_with_postman/CAPIF.postman_collection.json)
+
+# Important urls:
+
+## Mongo DB Dashboard
+```
+http://0.0.0.0:8082/ (if accessed from localhost) 
+
+or
+
+http://<Mongo Express Host IP>:8082/ (if accessed from another host)
+```
+# FAQ Documentation
 
-## Roadmap
-If you have ideas for releases in the future, it is a good idea to list them in the README.
+Frequently asked questions can be found here: [FAQ Directory]
 
-## Contributing
-State if you are open to contributions and what your requirements are for accepting them.
+# CAPIF Release 1.0
 
-For people who want to make changes to your project, it's helpful to have some documentation on how to get started. Perhaps there is a script that they should run or some environment variables that they need to set. Make these steps explicit. These instructions could also be useful to your future self.
+The APIs included in release 1.0 are:
+- JWT Authentication APIs
+- CAPIF Invoker Management API
+- CAPIF Publish API
+- CAPIF Discover API
+- CAPIF Security API
+- CAPIF Events API
+- CAPIF Provider Management API
 
-You can also document commands to lint the code or run tests. These steps help to ensure high code quality and reduce the likelihood that the changes inadvertently break something. Having instructions for running tests is especially helpful if it requires external setup, such as starting a Selenium server for testing in a browser.
+Testing Suite of all services.
 
-## Authors and acknowledgment
-Show your appreciation to those who have contributed to the project.
 
-## License
-For open source projects, say how it is licensed.
 
-## Project status
-If you have run out of energy or time for your project, put a note at the top of the README saying that development has slowed down or stopped completely. Someone may choose to fork your project or volunteer to step in as a maintainer or owner, allowing your project to keep going. You can also make an explicit request for maintainers.
+[Open API Descriptions of 3GPP 5G APIs]: https://forge.3gpp.org/rep/all/5G_APIs  "Open API Descriptions of 3GPP 5G APIs"
+[Test Plan Directory]: ./docs/test_plan/README.md  "Test Plan Directory"
+[Testing Using Curl]: ./docs/testing_with_curl/README.md  "Testing Using Curl"
+[Testing with Robot Framework]: ./docs/testing_with_robot/README.md  "Testing with Robot Framework"
+[FAQ Directory]: ./FAQ.md "FAQ directory"
\ No newline at end of file
diff --git a/cicd/exclusions b/cicd/exclusions
new file mode 100644
index 0000000000000000000000000000000000000000..84a40a8a92a6c882240ee99fa3dbb01a54520e1a
--- /dev/null
+++ b/cicd/exclusions
@@ -0,0 +1,5 @@
+../helm/capif/README.md
+../helm/capif/values.yaml
+../services/docker-compose-capif.yml
+../docs/
+../monitoring/
\ No newline at end of file
diff --git a/cicd/ruff.toml b/cicd/ruff.toml
new file mode 100644
index 0000000000000000000000000000000000000000..bff59ea8f304e0f1172c8077fdc4a4d161dce2cb
--- /dev/null
+++ b/cicd/ruff.toml
@@ -0,0 +1,3 @@
+line-length = 120
+target-version = "py39"
+select = ["E", "W"]
\ No newline at end of file
diff --git a/docs/images/flows/01 - Register del AEF.png b/docs/images/flows/01 - Register del AEF.png
new file mode 100644
index 0000000000000000000000000000000000000000..f1454c8bffe50c74247e2ddbd9e3ae4a4da77579
Binary files /dev/null and b/docs/images/flows/01 - Register del AEF.png differ
diff --git a/docs/images/flows/02 - AEF API Provider registration.png b/docs/images/flows/02 - AEF API Provider registration.png
new file mode 100644
index 0000000000000000000000000000000000000000..3b42e21185ae36c97f3c6504624757a80e282ef6
Binary files /dev/null and b/docs/images/flows/02 - AEF API Provider registration.png differ
diff --git a/docs/images/flows/03 - AEF Publish.png b/docs/images/flows/03 - AEF Publish.png
new file mode 100644
index 0000000000000000000000000000000000000000..dfe3a3e09ff3183fa93eab95e1df107a2dfa9638
Binary files /dev/null and b/docs/images/flows/03 - AEF Publish.png differ
diff --git a/docs/images/flows/04 - Invoker Register.png b/docs/images/flows/04 - Invoker Register.png
new file mode 100644
index 0000000000000000000000000000000000000000..571f2af8098ba390a31cf5676ba0cd180b55d983
Binary files /dev/null and b/docs/images/flows/04 - Invoker Register.png differ
diff --git a/docs/images/flows/05 - Invoker Onboarding.png b/docs/images/flows/05 - Invoker Onboarding.png
new file mode 100644
index 0000000000000000000000000000000000000000..9cd4b2d9fc99daa0f285a0f9e5cf77d9c51ea17c
Binary files /dev/null and b/docs/images/flows/05 - Invoker Onboarding.png differ
diff --git a/docs/images/flows/06 - Invoker Discover AEF.png b/docs/images/flows/06 - Invoker Discover AEF.png
new file mode 100644
index 0000000000000000000000000000000000000000..20b2f04f94444833bbea04832620434593f89bc0
Binary files /dev/null and b/docs/images/flows/06 - Invoker Discover AEF.png differ
diff --git a/docs/images/flows/07 - Invoker Create Security Context.png b/docs/images/flows/07 - Invoker Create Security Context.png
new file mode 100644
index 0000000000000000000000000000000000000000..bb655e0e38e8394b3aaa024ada0f13c2f21c2b4c
Binary files /dev/null and b/docs/images/flows/07 - Invoker Create Security Context.png differ
diff --git a/docs/images/flows/08 - Invoker Get Token.png b/docs/images/flows/08 - Invoker Get Token.png
new file mode 100644
index 0000000000000000000000000000000000000000..2e39f52a3d12efa8c19ea3032957e9f48d890d0e
Binary files /dev/null and b/docs/images/flows/08 - Invoker Get Token.png differ
diff --git a/docs/images/flows/09 - Invoker Send Request to AEF Service API.png b/docs/images/flows/09 - Invoker Send Request to AEF Service API.png
new file mode 100644
index 0000000000000000000000000000000000000000..1e4a87c54b04d2d6524da2617fa615dab7318dc7
Binary files /dev/null and b/docs/images/flows/09 - Invoker Send Request to AEF Service API.png differ
diff --git a/docs/images/robot_log_example.png b/docs/images/robot_log_example.png
new file mode 100644
index 0000000000000000000000000000000000000000..6c15a031e26eae47fed53b21a1e69e2f7bfa89db
Binary files /dev/null and b/docs/images/robot_log_example.png differ
diff --git a/docs/images/robot_report_example.png b/docs/images/robot_report_example.png
new file mode 100644
index 0000000000000000000000000000000000000000..1cf36d8766753d08938be73c87e958f4c8d56068
Binary files /dev/null and b/docs/images/robot_report_example.png differ
diff --git a/docs/test_plan/README.md b/docs/test_plan/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..d25099756a27c799848098e6e343564298a2f0c2
--- /dev/null
+++ b/docs/test_plan/README.md
@@ -0,0 +1,16 @@
+[**[Return To Main]**]
+
+# Testplans
+List of Common API Services implemented:
+* [Api Invoker Management](./api_invoker_management/README.md)
+* [Api Provider Management](./api_provider_management/README.md)
+* [Api Publish Service](./api_publish_service/README.md)
+* [Api Discover Service](./api_discover_service/README.md)
+* [Api Events Service](./api_events_service/README.md)
+* [Api Security Service](./api_security_service/README.md)
+* [Api Logging Service](./api_logging_service/README.md)
+* [Api Auditing Service](./api_auditing_service/README.md)
+* [Api Access Control Policy](./api_access_control_policy/README.md)
+
+
+ [Return To Main]: ../../README.md#test-plan-documentation
\ No newline at end of file
diff --git a/docs/test_plan/api_access_control_policy/README.md b/docs/test_plan/api_access_control_policy/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..05a9e63227702c7972790a6ea248d6f9a1dea864
--- /dev/null
+++ b/docs/test_plan/api_access_control_policy/README.md
@@ -0,0 +1,813 @@
+[**[Return To All Test Plans]**]
+
+- [Test Plan for CAPIF Api Access Control Policy](#test-plan-for-capif-api-access-control-policy)
+- [Tests](#tests)
+  - [Test Case 1: Retrieve ACL](#test-case-1-retrieve-acl)
+  - [Test Case 2: Retrieve ACL with 2 Service APIs published](#test-case-2-retrieve-acl-with-2-service-apis-published)
+  - [Test Case 3: Retrieve ACL with security context created by two different Invokers](#test-case-3-retrieve-acl-with-security-context-created-by-two-different-invokers)
+  - [Test Case 4: Retrieve ACL filtered by api-invoker-id](#test-case-4-retrieve-acl-filtered-by-api-invoker-id)
+  - [Test Case 5: Retrieve ACL filtered by supported-features](#test-case-5-retrieve-acl-filtered-by-supported-features)
+  - [Test Case 6: Retrieve ACL with aef-id not valid](#test-case-6-retrieve-acl-with-aef-id-not-valid)
+  - [Test Case 7: Retrieve ACL with service-id not valid](#test-case-7-retrieve-acl-with-service-id-not-valid)
+  - [Test Case 8: Retrieve ACL with service-api-id and aef-id not valid](#test-case-8-retrieve-acl-with-service-api-id-and-aef-id-not-valid)
+  - [Test Case 9: Retrieve ACL without SecurityContext created previously by Invoker](#test-case-9-retrieve-acl-without-securitycontext-created-previously-by-invoker)
+  - [Test Case 10: Retrieve ACL filtered by api-invoker-id not present](#test-case-10-retrieve-acl-filtered-by-api-invoker-id-not-present)
+  - [Test Case 11: Retrieve ACL with APF Certificate](#test-case-11-retrieve-acl-with-apf-certificate)
+  - [Test Case 12: Retrieve ACL with AMF Certificate](#test-case-12-retrieve-acl-with-amf-certificate)
+  - [Test Case 13: Retrieve ACL with Invoker Certificate](#test-case-13-retrieve-acl-with-invoker-certificate)
+  - [Test Case 14: No ACL for invoker after be removed](#test-case-14-no-acl-for-invoker-after-be-removed)
+
+ 
+
+
+# Test Plan for CAPIF Api Access Control Policy
+At this documentation you will have all information and related files and examples of test plan for this API.
+
+# Tests
+
+## Test Case 1: Retrieve ACL
+* **Test ID**: ***capif_api_acl-1***
+* **Description**:
+  
+  This test case will check that an API Provider can retrieve ACL from CAPIF
+* **Pre-Conditions**:
+  
+  * API Provider had a Service API Published on CAPIF
+  * API Invoker had a Security Context for Service API published.
+
+* **Information of Test**:
+
+  1. Perform [Provider Registration]
+
+  2. Publish Service API at CCF:
+     * Send Post to ccf_publish_url *https://{CAPIF_HOSTNAME}/published-apis/v1/{apfId}/service-apis*
+     * body [service api description] with apiName service_1
+     * Store *serviceApiId*
+     * Use APF Certificate
+  
+  3. Perform [Invoker Onboarding] store apiInvokerId
+  4. Discover published APIs
+  5. Create Security Context for this Invoker
+     * Send PUT *https://{CAPIF_HOSTNAME}/trustedInvokers/{apiInvokerId}*
+     * body [service security body]
+     * Use Invoker Certificate
+
+  6. Provider Retrieve ACL
+     * Send GET *https://{CAPIF_HOSTNAME}/access-control-policy/v1/accessControlPolicyList/${serviceApiId}?aef-id=${aef_id}*
+     * Use *serviceApiId* and *aefId*
+     * Use AEF Provider Certificate
+
+* **Execution Steps**:
+  
+  1. Register and onboard Provider at CCF.
+  2. Publish a provider API with name service_1
+  3. Register and onboard Invoker at CCF
+  4. Store signed Certificate
+  5. Create Security Context
+  6. Provider Get ACL information.
+   
+* **Expected Result**:
+
+  1. ACL Response:
+     1. **200 OK** Response.
+     2. body returned must accomplish **AccessControlPolicyList** data structure.
+     3. apiInvokerPolicies must:
+        1. contain only one object.
+        2. apiInvokerId must match apiInvokerId registered previously.
+
+
+## Test Case 2: Retrieve ACL with 2 Service APIs published
+* **Test ID**: ***capif_api_acl-2***
+* **Description**:
+  
+  This test case will check that an API Provider can retrieve ACL from CAPIF for 2 different serviceApis published.
+* **Pre-Conditions**:
+  
+  * API Provider had two Service API Published on CAPIF
+  * API Invoker had a Security Context for both Service APIs published.
+
+* **Information of Test**:
+
+  1. Perform [Provider Registration]
+
+  2. Publish Service API at CCF:
+     * Send Post to ccf_publish_url *https://{CAPIF_HOSTNAME}/published-apis/v1/{apfId}/service-apis*
+     * body [service api description] with apiName service_1
+     * Store *serviceApiId*
+     * Use APF Certificate
+
+  3. Publish Service API at CCF:
+     * Send Post to ccf_publish_url *https://{CAPIF_HOSTNAME}/published-apis/v1/{apfId}/service-apis*
+     * body [service api description] with apiName service_2
+     * Store *serviceApiId*
+     * Use APF Certificate
+  
+  4. Perform [Invoker Onboarding] store apiInvokerId
+  5. Discover published APIs
+  6. Create Security Context for this Invoker for both published APIs
+     * Send PUT *https://{CAPIF_HOSTNAME}/trustedInvokers/{apiInvokerId}*
+     * body [service security body]
+     * Use Invoker Certificate
+
+  7. Provider Retrieve ACL for serviceApiId1
+     * Send GET *https://{CAPIF_HOSTNAME}/access-control-policy/v1/accessControlPolicyList/${serviceApiId1}?aef-id=${aef_id}*
+     * Use *serviceApiId* and *aefId*
+     * Use AEF Provider Certificate
+
+  8. Provider Retrieve ACL for serviceApiId2
+     * Send GET *https://{CAPIF_HOSTNAME}/access-control-policy/v1/accessControlPolicyList/${serviceApiId2}?aef-id=${aef_id}*
+     * Use *serviceApiId* and *aefId*
+     * Use AEF Provider Certificate
+
+* **Execution Steps**:
+  
+  1. Register and onboard Provider at CCF.
+  2. Publish a provider API with name service_1 and service_2
+  3. Register and onboard Invoker at CCF
+  4. Store signed Certificate
+  5. Create Security Context
+  6. Provider Get ACL information for service_1.
+  7. Provider Get ACL information for service_2.
+   
+* **Expected Result**:
+
+  1. ACL Response:
+     1. **200 OK** Response.
+     2. body returned must accomplish **AccessControlPolicyList** data structure.
+     3. apiInvokerPolicies must:
+        1. contain one object.
+        2. apiInvokerId must match apiInvokerId registered previously.
+
+## Test Case 3: Retrieve ACL with security context created by two different Invokers
+* **Test ID**: ***capif_api_acl-3***
+* **Description**:
+  
+  This test case will check that an API Provider can retrieve ACL from CAPIF containing 2 objects.
+* **Pre-Conditions**:
+  
+  * API Provider had a Service API Published on CAPIF
+  * Two API Invokers had a Security Context for same Service API published by provider.
+
+* **Information of Test**:
+
+  1. Perform [Provider Registration]
+
+  2. Publish Service API at CCF:
+     * Send Post to ccf_publish_url *https://{CAPIF_HOSTNAME}/published-apis/v1/{apfId}/service-apis*
+     * body [service api description] with apiName service_1
+     * Store *serviceApiId*
+     * Use APF Certificate
+  
+  3. Perform [Invoker Onboarding] store apiInvokerId
+  4. Discover published APIs
+  5. Create Security Context for this Invoker for both published APIs
+     * Send PUT *https://{CAPIF_HOSTNAME}/trustedInvokers/{apiInvokerId}*
+     * body [service security body]
+     * Use Invoker Certificate
+
+  6. Repeat previous 3 steps in order to have a new Invoker.
+
+  7. Provider Retrieve ACL for serviceApiId
+     * Send GET *https://{CAPIF_HOSTNAME}/access-control-policy/v1/accessControlPolicyList/${serviceApiId1}?aef-id=${aef_id}*
+     * Use *serviceApiId* and *aefId*
+     * Use AEF Provider Certificate
+
+* **Execution Steps**:
+  
+  1. Register and onboard Provider at CCF.
+  2. Publish a provider API with name service_1 and service_2
+  3. Register and onboard Invoker at CCF
+  4. Store signed Certificate
+  5. Create Security Context
+  6. Provider Get ACL information.
+   
+* **Expected Result**:
+
+  1. ACL Response:
+     1. **200 OK** Response.
+     2. body returned must accomplish **AccessControlPolicyList** data structure.
+     3. apiInvokerPolicies must:
+        1. Contain two objects.
+        2. One object must match with apiInvokerId1 and the other one with apiInvokerId2 an registered previously.
+   
+## Test Case 4: Retrieve ACL filtered by api-invoker-id
+* **Test ID**: ***capif_api_acl-4***
+* **Description**:
+  
+  This test case will check that an API Provider can retrieve ACL filtering by apiInvokerId from CAPIF containing 1 objects.
+* **Pre-Conditions**:
+  
+  * API Provider had a Service API Published on CAPIF
+  * Two API Invokers had a Security Context for same Service API published by provider.
+
+* **Information of Test**:
+
+  1. Perform [Provider Registration]
+
+  2. Publish Service API at CCF:
+     * Send Post to ccf_publish_url *https://{CAPIF_HOSTNAME}/published-apis/v1/{apfId}/service-apis*
+     * body [service api description] with apiName service_1
+     * Store *serviceApiId*
+     * Use APF Certificate
+  
+  4. Perform [Invoker Onboarding] store apiInvokerId
+  6. Discover published APIs
+  7. Create Security Context for this Invoker for both published APIs
+     * Send PUT *https://{CAPIF_HOSTNAME}/trustedInvokers/{apiInvokerId}*
+     * body [service security body]
+     * Use Invoker Certificate
+
+  8. Repeat previous 3 steps in order to have a new Invoker.
+
+  9. Provider Retrieve ACL for serviceApiId
+     * Send GET *https://{CAPIF_HOSTNAME}/access-control-policy/v1/accessControlPolicyList/${serviceApiId1}?aef-id=${aef_id}&api-invoker-id={apiInvokerId1}*
+     * Use *serviceApiId*, *aefId* and apiInvokerId1
+     * Use AEF Provider Certificate
+
+  10. Provider Retrieve ACL for serviceApiId
+     * Send GET *https://{CAPIF_HOSTNAME}/access-control-policy/v1/accessControlPolicyList/${serviceApiId1}?aef-id=${aef_id}&api-invoker-id={apiInvokerId2}*
+     * Use *serviceApiId*, *aefId* and apiInvokerId2
+     * Use AEF Provider Certificate
+
+* **Execution Steps**:
+  
+  1. Register and onboard Provider at CCF.
+  2. Publish a provider API with name service_1 and service_2
+  3. Register and onboard Invoker at CCF
+  4. Store signed Certificate
+  5. Create Security Context
+  6. Provider Get ACL information with query parameter indicating first api-invoker-id.
+  7. Provider Get ACL information with query parameter indicating second api-invoker-id.
+   
+* **Expected Result**:
+
+  1. ACL Response:
+     1. **200 OK** Response.
+     2. body returned must accomplish **AccessControlPolicyList** data structure.
+     3. apiInvokerPolicies must:
+        1. Contain one objects.
+        2. Object must match with apiInvokerId1.
+
+  2. ACL Response:
+     1. **200 OK** Response.
+     2. body returned must accomplish **AccessControlPolicyList** data structure.
+     3. apiInvokerPolicies must:
+        1. Contain one objects.
+        2. Object must match with apiInvokerId2.
+
+## Test Case 5: Retrieve ACL filtered by supported-features
+* **Test ID**: ***capif_api_acl-5***
+* **Description**:
+  **CURRENTLY NOT SUPPORTED FEATURE**
+  
+  This test case will check that an API Provider can retrieve ACL filtering by supportedFeatures from CAPIF containing 1 objects.
+
+* **Pre-Conditions**:
+  
+  * API Provider had a Service API Published on CAPIF
+  * Two API Invokers had a Security Context for same Service API published by provider.
+
+* **Information of Test**:
+
+  1. Perform [Provider Registration]
+
+  2. Publish Service API at CCF:
+     * Send Post to ccf_publish_url *https://{CAPIF_HOSTNAME}/published-apis/v1/{apfId}/service-apis*
+     * body [service api description] with apiName service_1
+     * Store *serviceApiId*
+     * Use APF Certificate
+  
+  3. Perform [Invoker Onboarding] store apiInvokerId
+  4. Discover published APIs
+  5. Create Security Context for this Invoker for both published APIs
+     * Send PUT *https://{CAPIF_HOSTNAME}/trustedInvokers/{apiInvokerId}*
+     * body [service security body]
+     * Use Invoker Certificate
+
+  6. Repeat previous 3 steps in order to have a new Invoker.
+
+  7. Provider Retrieve ACL for serviceApiId
+     * Send GET *https://{CAPIF_HOSTNAME}/access-control-policy/v1/accessControlPolicyList/${serviceApiId1}?aef-id=${aef_id}&supported-features={apiInvokerId1}*
+     * Use *serviceApiId*, *aefId* and apiInvokerId1
+     * Use AEF Provider Certificate
+
+  8.  Provider Retrieve ACL for serviceApiId
+     * Send GET *https://{CAPIF_HOSTNAME}/access-control-policy/v1/accessControlPolicyList/${serviceApiId1}?aef-id=${aef_id}&supported-features={apiInvokerId2}*
+     * Use *serviceApiId*, *aefId* and apiInvokerId2
+     * Use AEF Provider Certificate
+
+* **Execution Steps**:
+  
+  1. Register and onboard Provider at CCF.
+  2. Publish a provider API with name service_1 and service_2
+  3. Register and onboard Invoker at CCF
+  4. Store signed Certificate
+  5. Create Security Context
+  6. Provider Get ACL information with query parameter indicating first supported-features.
+  7. Provider Get ACL information with query parameter indicating second supported-features.
+   
+* **Expected Result**:
+
+  1. ACL Response:
+     1. **200 OK** Response.
+     2. body returned must accomplish **AccessControlPolicyList** data structure.
+     3. apiInvokerPolicies must:
+        1. Contain one objects.
+        2. Object must match with supportedFeatures1.
+
+  2. ACL Response:
+     1. **200 OK** Response.
+     2. body returned must accomplish **AccessControlPolicyList** data structure.
+     3. apiInvokerPolicies must:
+        1. Contain one objects.
+        2. Object must match with supportedFeatures1.
+
+
+## Test Case 6: Retrieve ACL with aef-id not valid
+* **Test ID**: ***capif_api_acl-6***
+* **Description**:
+  
+  This test case will check that an API Provider can't retrieve ACL from CAPIF if aef-id is not valid
+* **Pre-Conditions**:
+  
+  * API Provider had a Service API Published on CAPIF
+  * API Invoker had a Security Context for Service API published.
+
+* **Information of Test**:
+
+  1. Perform [Provider Registration]
+
+  2. Publish Service API at CCF:
+     * Send Post to ccf_publish_url *https://{CAPIF_HOSTNAME}/published-apis/v1/{apfId}/service-apis*
+     * body [service api description] with apiName service_1
+     * Store *serviceApiId*
+     * Use APF Certificate
+  
+  3. Perform [Invoker Onboarding] store apiInvokerId
+  4. Discover published APIs
+  5. Create Security Context for this Invoker
+     * Send PUT *https://{CAPIF_HOSTNAME}/trustedInvokers/{apiInvokerId}*
+     * body [service security body]
+     * Use Invoker Certificate
+
+  6. Provider Retrieve ACL
+     * Send GET *https://{CAPIF_HOSTNAME}/access-control-policy/v1/accessControlPolicyList/${serviceApiId}?aef-id=${AEF_ID_NOT_VALID}*
+     * Use *serviceApiId* and *AEF_ID_NOT_VALID*
+     * Use AEF Provider Certificate
+
+* **Execution Steps**:
+  
+  1. Register and onboard Provider at CCF.
+  2. Publish a provider API with name service_1
+  3. Register and onboard Invoker at CCF
+  4. Store signed Certificate
+  5. Create Security Context
+  6. Provider Get ACL information.
+   
+* **Expected Result**:
+
+  1. ACL Response:
+     1. **404 Not Found** Response.
+     2. body returned must accomplish **Problem Details** data structure.
+     3. apiInvokerPolicies must:
+        * status **404**
+        * title with message "Not Found"
+        * detail with message "No ACLs found for the requested service: {service_api_id}, aef_id: {aef_id}, invoker: {api_invoker_id} and supportedFeatures: {supported_features}".
+        * cause with message "Wrong id".
+
+
+## Test Case 7: Retrieve ACL with service-id not valid
+* **Test ID**: ***capif_api_acl-7***
+* **Description**:
+  
+  This test case will check that an API Provider can't retrieve ACL from CAPIF if service-api-id is not valid
+* **Pre-Conditions**:
+  
+  * API Provider had a Service API Published on CAPIF
+  * API Invoker had a Security Context for Service API published.
+
+* **Information of Test**:
+
+  1. Perform [Provider Registration]
+
+  2. Publish Service API at CCF:
+     * Send Post to ccf_publish_url *https://{CAPIF_HOSTNAME}/published-apis/v1/{apfId}/service-apis*
+     * body [service api description] with apiName service_1
+     * Store *serviceApiId*
+     * Use APF Certificate
+  
+  3. Perform [Invoker Onboarding] store apiInvokerId
+  4. Discover published APIs
+  5. Create Security Context for this Invoker
+     * Send PUT *https://{CAPIF_HOSTNAME}/trustedInvokers/{apiInvokerId}*
+     * body [service security body]
+     * Use Invoker Certificate
+
+  6. Provider Retrieve ACL
+     * Send GET *https://{CAPIF_HOSTNAME}/access-control-policy/v1/accessControlPolicyList/${NOT_VALID_SERVICE_API_ID}?aef-id=${aef_id}*
+     * Use *NOT_VALID_SERVICE_API_ID* and *aef_id*
+     * Use AEF Provider Certificate
+
+* **Execution Steps**:
+  
+  1. Register and onboard Provider at CCF.
+  2. Publish a provider API with name service_1
+  3. Register and onboard Invoker at CCF
+  4. Store signed Certificate
+  5. Create Security Context
+  6. Provider Get ACL information.
+   
+* **Expected Result**:
+
+  1. ACL Response:
+     1. **404 Not Found** Response.
+     2. body returned must accomplish **Problem Details** data structure.
+     3. apiInvokerPolicies must:
+        * status **404**
+        * title with message "Not Found"
+        * detail with message "No ACLs found for the requested service: {service_api_id}, aef_id: {aef_id}, invoker: {api_invoker_id} and supportedFeatures: {supported_features}".
+        * cause with message "Wrong id".
+
+## Test Case 8: Retrieve ACL with service-api-id and aef-id not valid
+* **Test ID**: ***capif_api_acl-8***
+* **Description**:
+  
+  This test case will check that an API Provider can't retrieve ACL from CAPIF if service-api-id and aef-id are not valid
+* **Pre-Conditions**:
+  
+  * API Provider had a Service API Published on CAPIF
+  * API Invoker had a Security Context for Service API published.
+
+* **Information of Test**:
+
+  1. Perform [Provider Registration]
+
+  2. Publish Service API at CCF:
+     * Send Post to ccf_publish_url *https://{CAPIF_HOSTNAME}/published-apis/v1/{apfId}/service-apis*
+     * body [service api description] with apiName service_1
+     * Store *serviceApiId*
+     * Use APF Certificate
+  
+  3. Perform [Invoker Onboarding] store apiInvokerId
+  4. Discover published APIs
+  5. Create Security Context for this Invoker
+     * Send PUT *https://{CAPIF_HOSTNAME}/trustedInvokers/{apiInvokerId}*
+     * body [service security body]
+     * Use Invoker Certificate
+
+  6. Provider Retrieve ACL
+     * Send GET *https://{CAPIF_HOSTNAME}/access-control-policy/v1/accessControlPolicyList/${NOT_VALID_SERVICE_API_ID}?aef-id=${AEF_ID_NOT_VALID}*
+     * Use *NOT_VALID_SERVICE_API_ID* and *aef_id*
+     * Use AEF Provider Certificate
+
+* **Execution Steps**:
+  
+  1. Register and onboard Provider at CCF.
+  2. Publish a provider API with name service_1
+  3. Register and onboard Invoker at CCF
+  4. Store signed Certificate
+  5. Create Security Context
+  6. Provider Get ACL information.
+   
+* **Expected Result**:
+
+  1. ACL Response:
+     1. **404 Not Found** Response.
+     2. body returned must accomplish **Problem Details** data structure.
+     3. apiInvokerPolicies must:
+        * status **404**
+        * title with message "Not Found"
+        * detail with message "No ACLs found for the requested service: {NOT_VALID_SERVICE_API_ID}, aef_id: {AEF_ID_NOT_VALID}, invoker: {api_invoker_id} and supportedFeatures: {supported_features}".
+        * cause with message "Wrong id".
+
+
+## Test Case 9: Retrieve ACL without SecurityContext created previously by Invoker
+* **Test ID**: ***capif_api_acl-9***
+* **Description**:
+  
+  This test case will check that an API Provider can't retrieve ACL if no invoker had requested Security Context to CAPIF
+* **Pre-Conditions**:
+  
+  * API Provider had a Service API Published on CAPIF
+  * API Invoker created but no Security Context for Service API published had been requested.
+
+* **Information of Test**:
+
+  1. Perform [Provider Registration]
+
+  2. Publish Service API at CCF:
+     * Send Post to ccf_publish_url *https://{CAPIF_HOSTNAME}/published-apis/v1/{apfId}/service-apis*
+     * body [service api description] with apiName service_1
+     * Store *serviceApiId*
+     * Use APF Certificate
+  
+  3. Perform [Invoker Onboarding] store apiInvokerId
+  4. Discover published APIs
+
+  5. Provider Retrieve ACL
+     * Send GET *https://{CAPIF_HOSTNAME}/access-control-policy/v1/accessControlPolicyList/${serviceApiId}?aef-id=${aef_id}*
+     * Use *serviceApiId* and *aefId*
+     * Use AEF Provider Certificate
+
+* **Execution Steps**:
+  
+  1. Register and onboard Provider at CCF.
+  2. Publish a provider API with name service_1
+  3. Register and onboard Invoker at CCF
+  4. Store signed Certificate
+  5. Create Security Context
+  6. Provider Get ACL information.
+   
+* **Expected Result**:
+
+  1. ACL Response:
+     1. **404 Not Found** Response.
+     2. body returned must accomplish **Problem Details** data structure.
+     3. apiInvokerPolicies must:
+        * status **404**
+        * title with message "Not Found"
+        * detail with message "No ACLs found for the requested service: {NOT_VALID_SERVICE_API_ID}, aef_id: {AEF_ID_NOT_VALID}, invoker: {api_invoker_id} and supportedFeatures: {supported_features}".
+        * cause with message "Wrong id".
+
+## Test Case 10: Retrieve ACL filtered by api-invoker-id not present
+* **Test ID**: ***capif_api_acl-10***
+* **Description**:
+  
+  This test case will check that an API Provider get not found response if filter by not valid api-invoker-id doesn't match any registered ACL.
+* **Pre-Conditions**:
+  
+  * API Provider had a Service API Published on CAPIF
+  * API Invoker had a Security Context for Service API published.
+
+* **Information of Test**:
+
+  1. Perform [Provider Registration]
+
+  2. Publish Service API at CCF:
+     * Send Post to ccf_publish_url *https://{CAPIF_HOSTNAME}/published-apis/v1/{apfId}/service-apis*
+     * body [service api description] with apiName service_1
+     * Store *serviceApiId*
+     * Use APF Certificate
+  
+  3. Perform [Invoker Onboarding] store apiInvokerId
+  4. Discover published APIs
+  5. Create Security Context for this Invoker
+     * Send PUT *https://{CAPIF_HOSTNAME}/trustedInvokers/{apiInvokerId}*
+     * body [service security body]
+     * Use Invoker Certificate
+
+  6. Provider Retrieve ACL
+     * Send GET *https://{CAPIF_HOSTNAME}/access-control-policy/v1/accessControlPolicyList/${serviceApiId}?aef-id=${aef_id}&api-invoker-id={NOT_VALID_API_INVOKER_ID}*
+     * Use *serviceApiId*, *aefId* and *NOT_VALID_API_INVOKER_ID*
+     * Use AEF Provider Certificate
+
+* **Execution Steps**:
+  
+  1. Register and onboard Provider at CCF.
+  2. Publish a provider API with name service_1
+  3. Register and onboard Invoker at CCF
+  4. Store signed Certificate
+  5. Create Security Context
+  6. Provider Get ACL information.
+   
+* **Expected Result**:
+
+  1. ACL Response:
+     1. **404 Not Found** Response.
+     2. body returned must accomplish **Problem Details** data structure.
+     3. apiInvokerPolicies must:
+        * status **404**
+        * title with message "Not Found"
+        * detail with message "No ACLs found for the requested service: {NOT_VALID_SERVICE_API_ID}, aef_id: {AEF_ID_NOT_VALID}, invoker: {api_invoker_id} and supportedFeatures: {supported_features}".
+        * cause with message "Wrong id".
+
+## Test Case 11: Retrieve ACL with APF Certificate
+* **Test ID**: ***capif_api_acl-11***
+* **Description**:
+
+  This test case will check that an API Provider can't retrieve ACL from CAPIF using APF Certificate
+* **Pre-Conditions**:
+
+  * API Provider had a Service API Published on CAPIF
+  * API Invoker had a Security Context for Service API published.
+
+* **Information of Test**:
+
+  1. Perform [Provider Registration]
+
+  2. Publish Service API at CCF:
+     * Send Post to ccf_publish_url *https://{CAPIF_HOSTNAME}/published-apis/v1/{apfId}/service-apis*
+     * body [service api description] with apiName service_1
+     * Store *serviceApiId*
+     * Use APF Certificate
+
+  3. Perform [Invoker Onboarding] store apiInvokerId
+  4. Discover published APIs
+  5. Create Security Context for this Invoker
+     * Send PUT *https://{CAPIF_HOSTNAME}/trustedInvokers/{apiInvokerId}*
+     * body [service security body]
+     * Use Invoker Certificate
+
+  6. Provider Retrieve ACL
+     * Send GET *https://{CAPIF_HOSTNAME}/access-control-policy/v1/accessControlPolicyList/${serviceApiId}?aef-id=${aef_id}*
+     * Use *serviceApiId* and *aefId*
+     * Use APF Provider Certificate
+
+* **Execution Steps**:
+
+  1. Register and onboard Provider at CCF.
+  2. Publish a provider API with name service_1
+  3. Register and onboard Invoker at CCF
+  4. Store signed Certificate
+  5. Create Security Context
+  6. Provider Get ACL information.
+
+* **Expected Result**:
+
+  1. Response to Logging Service must accomplish:
+     1. **401 Unauthorized**
+     2. Error Response Body must accomplish with **ProblemDetails** data structure with:
+        * status 401
+        * title with message "Unauthorized"
+        * detail with message "Role not authorized for this API route".
+        * cause with message "Certificate not authorized".
+
+## Test Case 12: Retrieve ACL with AMF Certificate
+* **Test ID**: ***capif_api_acl-12***
+* **Description**:
+
+  This test case will check that an API Provider can't retrieve ACL from CAPIF using AMF Certificate
+* **Pre-Conditions**:
+
+  * API Provider had a Service API Published on CAPIF
+  * API Invoker had a Security Context for Service API published.
+
+* **Information of Test**:
+
+  1. Perform [Provider Registration]
+
+  2. Publish Service API at CCF:
+     * Send Post to ccf_publish_url *https://{CAPIF_HOSTNAME}/published-apis/v1/{apfId}/service-apis*
+     * body [service api description] with apiName service_1
+     * Store *serviceApiId*
+     * Use APF Certificate
+
+  3. Perform [Invoker Onboarding] store apiInvokerId
+  4. Discover published APIs
+  5. Create Security Context for this Invoker
+     * Send PUT *https://{CAPIF_HOSTNAME}/trustedInvokers/{apiInvokerId}*
+     * body [service security body]
+     * Use Invoker Certificate
+
+  6. Provider Retrieve ACL
+     * Send GET *https://{CAPIF_HOSTNAME}/access-control-policy/v1/accessControlPolicyList/${serviceApiId}?aef-id=${aef_id}*
+     * Use *serviceApiId* and *aefId*
+     * Use AMF Provider Certificate
+
+* **Execution Steps**:
+
+  1. Register and onboard Provider at CCF.
+  2. Publish a provider API with name service_1
+  3. Register and onboard Invoker at CCF
+  4. Store signed Certificate
+  5. Create Security Context
+  6. Provider Get ACL information.
+
+* **Expected Result**:
+
+  1. Response to Logging Service must accomplish:
+     1. **401 Unauthorized**
+     2. Error Response Body must accomplish with **ProblemDetails** data structure with:
+        * status 401
+        * title with message "Unauthorized"
+        * detail with message "Role not authorized for this API route".
+        * cause with message "Certificate not authorized".
+
+## Test Case 13: Retrieve ACL with Invoker Certificate
+* **Test ID**: ***capif_api_acl-13***
+* **Description**:
+
+  This test case will check that an API Provider can't retrieve ACL from CAPIF using Invoker Certificate
+* **Pre-Conditions**:
+
+  * API Provider had a Service API Published on CAPIF
+  * API Invoker had a Security Context for Service API published.
+
+* **Information of Test**:
+
+  1. Perform [Provider Registration]
+
+  2. Publish Service API at CCF:
+     * Send Post to ccf_publish_url *https://{CAPIF_HOSTNAME}/published-apis/v1/{apfId}/service-apis*
+     * body [service api description] with apiName service_1
+     * Store *serviceApiId*
+     * Use APF Certificate
+
+  3. Perform [Invoker Onboarding] store apiInvokerId
+  4. Discover published APIs
+  5. Create Security Context for this Invoker
+     * Send PUT *https://{CAPIF_HOSTNAME}/trustedInvokers/{apiInvokerId}*
+     * body [service security body]
+     * Use Invoker Certificate
+
+  6. Provider Retrieve ACL
+     * Send GET *https://{CAPIF_HOSTNAME}/access-control-policy/v1/accessControlPolicyList/${serviceApiId}?aef-id=${aef_id}*
+     * Use *serviceApiId* and *aefId*
+     * Use Invoker Certificate
+
+* **Execution Steps**:
+
+  1. Register and onboard Provider at CCF.
+  2. Publish a provider API with name service_1
+  3. Register and onboard Invoker at CCF
+  4. Store signed Certificate
+  5. Create Security Context
+  6. Provider Get ACL information.
+
+* **Expected Result**:
+
+  1. Response to Logging Service must accomplish:
+     1. **401 Unauthorized**
+     2. Error Response Body must accomplish with **ProblemDetails** data structure with:
+        * status 401
+        * title with message "Unauthorized"
+        * detail with message "Role not authorized for this API route".
+        * cause with message "Certificate not authorized".
+
+## Test Case 14: No ACL for invoker after be removed
+* **Test ID**: ***capif_api_acl-14***
+* **Description**:
+
+  This test case will check that ACLs are removed after invoker is removed.
+* **Pre-Conditions**:
+
+  * API Provider had a Service API Published on CAPIF
+  * API Invoker had a Security Context for Service API published and ACL is present
+
+* **Information of Test**:
+
+  1. Perform [Provider Registration]
+
+  2. Publish Service API at CCF:
+     * Send Post to ccf_publish_url *https://{CAPIF_HOSTNAME}/published-apis/v1/{apfId}/service-apis*
+     * body [service api description] with apiName service_1
+     * Store *serviceApiId*
+     * Use APF Certificate
+  
+  3. Perform [Invoker Onboarding] store apiInvokerId
+  4. Discover published APIs
+  5. Create Security Context for this Invoker
+     * Send PUT *https://{CAPIF_HOSTNAME}/trustedInvokers/{apiInvokerId}*
+     * body [service security body]
+     * Use Invoker Certificate
+
+  6. Provider Retrieve ACL
+     * Send GET *https://{CAPIF_HOSTNAME}/access-control-policy/v1/accessControlPolicyList/${serviceApiId}?aef-id=${aef_id}&api-invoker-id={api-invoker-id}*
+     * Use *serviceApiId*, *aefId* and *api-invoker-id*
+     * Use AEF Provider Certificate
+  7. Remove Invoker from CAPIF
+  8. Provider Retrieve ACL
+     * Send GET *https://{CAPIF_HOSTNAME}/access-control-policy/v1/accessControlPolicyList/${serviceApiId}?aef-id=${aef_id}&api-invoker-id={api-invoker-id}*
+     * Use *serviceApiId*, *aefId* and *api-invoker-id*
+     * Use AEF Provider Certificate
+
+* **Execution Steps**:
+  
+  1. Register and onboard Provider at CCF.
+  2. Publish a provider API with name service_1
+  3. Register and onboard Invoker at CCF
+  4. Store signed Certificate
+  5. Create Security Context
+  6. Provider Get ACL information of invoker.
+  7. Remove Invoker from CAPIF.
+  8. Provider Get ACL information of invoker.
+   
+* **Expected Result**:
+  1. ACL Response:
+     1. **200 OK** Response.
+     2. body returned must accomplish **AccessControlPolicyList** data structure.
+     3. apiInvokerPolicies must:
+        1. contain only one object.
+        2. apiInvokerId must match apiInvokerId registered previously.
+
+  2. ACL Response:
+     1. **404 Not Found** Response.
+     2. body returned must accomplish **Problem Details** data structure.
+     3. apiInvokerPolicies must:
+        * status **404**
+        * title with message "Not Found"
+        * detail with message "No ACLs found for the requested service: {NOT_VALID_SERVICE_API_ID}, aef_id: {AEF_ID_NOT_VALID}, invoker: None and supportedFeatures: None".
+        * cause with message "Wrong id".
+
+
+
+[Return To All Test Plans]: ../README.md
+
+[service api description]: ../api_publish_service/service_api_description_post_example.json  "Service API Description Request"
+[publisher register body]: ../api_publish_service/publisher_register_body.json  "Publish register Body"
+[service security body]: ./service_security.json  "Service Security Request"
+[security notification body]: ./security_notification.json  "Security Notification Request"
+[access token req body]: ./access_token_req.json  "Access Token Request"
+[example]: ./access_token_req.json  "Access Token Request Example"
+[invoker onboarding]: ../common_operations/README.md#register-an-invoker "Invoker Onboarding"
+[provider registration]: ../common_operations/README.md#register-a-provider "Provider Registration"
diff --git a/docs/test_plan/api_access_control_policy/service_api_description_post_example.json b/docs/test_plan/api_access_control_policy/service_api_description_post_example.json
new file mode 100644
index 0000000000000000000000000000000000000000..b725b428629509bf39a79c030f1bf93f4b6f18f6
--- /dev/null
+++ b/docs/test_plan/api_access_control_policy/service_api_description_post_example.json
@@ -0,0 +1,113 @@
+{
+  "apiName": "service_1",
+  "aefProfiles": [
+    {
+      "aefId": "string",
+      "versions": [
+        {
+          "apiVersion": "v1",
+          "expiry": "2021-11-30T10:32:02.004Z",
+          "resources": [
+            {
+              "resourceName": "string",
+              "commType": "REQUEST_RESPONSE",
+              "uri": "string",
+              "custOpName": "string",
+              "operations": [
+                "GET"
+              ],
+              "description": "string"
+            }
+          ],
+          "custOperations": [
+            {
+              "commType": "REQUEST_RESPONSE",
+              "custOpName": "string",
+              "operations": [
+                "GET"
+              ],
+              "description": "string"
+            }
+          ]
+        }
+      ],
+      "protocol": "HTTP_1_1",
+      "dataFormat": "JSON",
+      "securityMethods": ["PSK"],
+      "interfaceDescriptions": [
+        {
+          "ipv4Addr": "string",
+          "port": 65535,
+          "securityMethods": ["PSK"]
+        },
+        {
+          "ipv4Addr": "string",
+          "port": 65535,
+          "securityMethods": ["PSK"]
+        }
+      ]
+    },
+    {
+      "aefId": "string",
+      "versions": [
+        {
+          "apiVersion": "v1",
+          "expiry": "2021-11-30T10:32:02.004Z",
+          "resources": [
+            {
+              "resourceName": "string",
+              "commType": "REQUEST_RESPONSE",
+              "uri": "string",
+              "custOpName": "string",
+              "operations": [
+                "GET"
+              ],
+              "description": "string"
+            }
+          ],
+          "custOperations": [
+            {
+              "commType": "REQUEST_RESPONSE",
+              "custOpName": "string",
+              "operations": [
+                "GET"
+              ],
+              "description": "string"
+            }
+          ]
+        }
+      ],
+      "protocol": "HTTP_1_1",
+      "dataFormat": "JSON",
+      "securityMethods": ["PSK"],
+      "interfaceDescriptions": [
+        {
+          "ipv4Addr": "string",
+          "port": 65535,
+          "securityMethods": ["PSK"]
+        },
+        {
+          "ipv4Addr": "string",
+          "port": 65535,
+          "securityMethods": ["PSK"]
+        }
+      ]
+    }
+  ],
+  "description": "string",
+  "supportedFeatures": "fffff",
+  "shareableInfo": {
+    "isShareable": true,
+    "capifProvDoms": [
+      "string"
+    ]
+  },
+  "serviceAPICategory": "string",
+  "apiSuppFeats": "fffff",
+  "pubApiPath": {
+    "ccfIds": [
+      "string"
+    ]
+  },
+  "ccfId": "string"
+}
\ No newline at end of file
diff --git a/docs/test_plan/api_auditing_service/README.md b/docs/test_plan/api_auditing_service/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..bd3204c0aa3cc0eeb63b3f85f6f6629914957aa4
--- /dev/null
+++ b/docs/test_plan/api_auditing_service/README.md
@@ -0,0 +1,244 @@
+[**[Return To All Test Plans]**]
+
+- [Test Plan for CAPIF Api Auditing Service](#test-plan-for-capif-api-auditing-service)
+- [Tests](#tests)
+  - [Test Case 1: Get a CAPIF Log Entry.](#test-case-1-creates-a-new-individual-capif-log-entry)
+
+
+# Test Plan for CAPIF Api Auditing Service
+At this documentation you will have all information and related files and examples of test plan for this API.
+
+# Tests
+
+## Test Case 1: Get CAPIF Log Entry.
+* Test ID: ***capif_api_auditing-1***
+* Description:
+
+  This test case will check that a CAPIF AMF can get log entry to Logging Service
+* Pre-Conditions:
+  
+  *  CAPIF provider is pre-authorised (has valid AMF cert from CAPIF Authority)
+  *  Service exist in CAPIF
+  *  Invoker exist in CAPIF
+  *  Log Entry exist in CAPIF
+
+* Information of Test:
+
+  1. Perform [provider onboarding], [invoker onboarding] 
+
+  2. Publish Service API at CCF:
+    - Send Post to ccf_publish_url https://{CAPIF_HOSTNAME}/published-apis/v1/{apfId}/service-apis
+    - body [service api description] with apiName service_1
+    - Use APF Certificate
+
+  3. Create Log Entry:
+     - Send POST to *https://{CAPIF_HOSTNAME}/api-invocation-logs/v1/{aefId}/logs*
+     - body [log entry request body]
+     - Use AEF Certificate
+
+  4. Get Log:
+     1. Send GET to *https://{CAPIF_HOSTNAME}/logs/v1/apiInvocationLogs?aef-id={aefId}&api-invoker-id={api-invoker-id}*
+     2. Use AMF Certificate
+
+* Execution Steps:
+  1. Register Provider and Invoker CCF
+  2. Publish Service
+  3. Create Log Entry
+  4. Get Log Entry
+
+* Expected Result:
+
+  1. Response to Logging Service must accomplish:
+     1. **200 OK**
+     2. Response Body must follow **InvocationLog** data structure with:
+        * aefId
+        * apiInvokerId
+        * logs
+
+## Test Case 2: Get CAPIF Log Entry With no Log entry in CAPIF.
+* Test ID: ***capif_api_auditing-2***
+* Description:
+
+  This test case will check that a CAPIF AEF can create log entry to Logging Service
+* Pre-Conditions:
+
+  *  CAPIF provider is pre-authorised (has valid AMF cert from CAPIF Authority)
+  *  Service exist in CAPIF
+  *  Invoker exist in CAPIF
+
+
+* Information of Test:
+
+  1. Perform [provider onboarding], [invoker onboarding] 
+
+  2. Publish Service API at CCF:
+    - Send Post to ccf_publish_url https://{CAPIF_HOSTNAME}/published-apis/v1/{apfId}/service-apis
+    - body [service api description] with apiName service_1
+    - Use APF Certificate
+
+  4. Get Log:
+     1. Send GET to *https://{CAPIF_HOSTNAME}/logs/v1/apiInvocationLogs?aef-id={aefId}&api-invoker-id={api-invoker-id}*
+     2. Use AMF Certificate
+
+* Execution Steps:
+  1. Register Provider and Invoker CCF
+  2. Publish Service
+  3. Get Log Entry
+
+* Expected Result:
+
+  1. Response to Logging Service must accomplish:
+     1. **404 Not Found**
+    2. Error Response Body must accomplish with **ProblemDetails** data structure with:
+        * status 404
+        * title with message "Not Found Log Entry in CAPIF".
+        * cause with message "Not Exist Logs with the filters applied".
+
+
+## Test Case 3: Get CAPIF Log Entry without aef-id and api-invoker-id.
+* Test ID: ***capif_api_auditing-3***
+* Description:
+
+  This test case will check that a CAPIF AEF can create log entry to Logging Service
+* Pre-Conditions:
+
+  *  CAPIF provider is no pre-authorised (has no valid AMF cert from CAPIF Authority)
+  *  Service exist in CAPIF
+  *  Invoker exist in CAPIF
+  *  Log Entry exist in CAPIF
+
+* Information of Test:
+
+  1. Perform [provider onboarding], [invoker onboarding] 
+
+  2. Publish Service API at CCF:
+    - Send Post to ccf_publish_url https://{CAPIF_HOSTNAME}/published-apis/v1/{apfId}/service-apis
+    - body [service api description] with apiName service_1
+    - Use APF Certificate
+
+  3. Create Log Entry:
+     - Send POST to *https://{CAPIF_HOSTNAME}/api-invocation-logs/v1/{aefId}/logs*
+     - body [log entry request body]
+     - Use AEF Certificate
+
+  4. Get Log:
+     1. Send GET to *https://{CAPIF_HOSTNAME}/logs/v1/apiInvocationLogs
+     2. Use AMF Certificate
+
+* Execution Steps:
+  1. Register Provider and Invoker CCF
+  2. Publish Service
+  3. Create Log Entry
+  4. Get Log Entry
+
+* Expected Result:
+
+  1. Response to Logging Service must accomplish:
+     1. **400 Bad Request**
+     2. Error Response Body must accomplish with **ProblemDetails** data structure with:
+        * status 400
+        * title with message "Bad Request"
+        * detail with message "aef_id and api_invoker_id parameters are mandatory".
+        * cause with message "Mandatory parameters missing".
+
+
+## Test Case 4: Get CAPIF Log Entry with filtter api-version.
+* Test ID: ***capif_api_auditing-4***
+* Description:
+
+  This test case will check that a CAPIF AMF can get log entry to Logging Service
+* Pre-Conditions:
+
+  *  CAPIF provider is pre-authorised (has valid AMF cert from CAPIF Authority)
+  *  Service exist in CAPIF
+  *  Invoker exist in CAPIF
+  *  Log Entry exist in CAPIF
+
+* Information of Test:
+
+  1. Perform [provider onboarding], [invoker onboarding] 
+
+  2. Publish Service API at CCF:
+    - Send Post to ccf_publish_url https://{CAPIF_HOSTNAME}/published-apis/v1/{apfId}/service-apis
+    - body [service api description] with apiName service_1
+    - Use APF Certificate
+
+  3. Create Log Entry:
+     - Send POST to *https://{CAPIF_HOSTNAME}/api-invocation-logs/v1/{aefId}/logs*
+     - body [log entry request body]
+     - Use AEF Certificate
+
+  4. Get Log:
+     1. Send GET to *https://{CAPIF_HOSTNAME}/logs/v1/apiInvocationLogs?aef-id={aefId}&api-invoker-id={api-invoker-id}&api-version={v1}*
+     2. Use AMF Certificate
+
+* Execution Steps:
+  1. Register Provider and Invoker CCF
+  2. Publish Service
+  3. Create Log Entry
+  4. Get Log Entry
+
+* Expected Result:
+
+  1. Response to Logging Service must accomplish:
+     1. **200 OK**
+     2. Response Body must follow **InvocationLog** data structure with:
+        * aefId
+        * apiInvokerId
+        * logs
+
+
+## Test Case 5: Get CAPIF Log Entry with filter api-version but not exist in log entry.
+* Test ID: ***capif_api_auditing-4***
+* Description:
+
+  This test case will check that a CAPIF AMF can get log entry to Logging Service
+* Pre-Conditions:
+
+  *  CAPIF provider is pre-authorised (has valid AMF cert from CAPIF Authority)
+  *  Service exist in CAPIF
+  *  Invoker exist in CAPIF
+  *  Log Entry exist in CAPIF
+
+* Information of Test:
+
+  1. Perform [provider onboarding], [invoker onboarding] 
+
+  2. Publish Service API at CCF:
+    - Send Post to ccf_publish_url https://{CAPIF_HOSTNAME}/published-apis/v1/{apfId}/service-apis
+    - body [service api description] with apiName service_1
+    - Use APF Certificate
+
+  3. Create Log Entry:
+     - Send POST to *https://{CAPIF_HOSTNAME}/api-invocation-logs/v1/{aefId}/logs*
+     - body [log entry request body]
+     - Use AEF Certificate
+
+  4. Get Log:
+     1. Send GET to *https://{CAPIF_HOSTNAME}/logs/v1/apiInvocationLogs?aef-id={aefId}&api-invoker-id={api-invoker-id}&api-version={v58}*
+     2. Use AMF Certificate
+
+* Execution Steps:
+  1. Register Provider and Invoker CCF
+  2. Publish Service
+  3. Create Log Entry
+  4. Get Log Entry
+
+* Expected Result:
+
+  1. Response to Logging Service must accomplish:
+     1. **404 Not Found**
+     2. Error Response Body must accomplish with **ProblemDetails** data structure with:
+        * status 404
+        * detail with message "Parameters do not match any log entry"
+        * cause with message "No logs found".
+
+
+
+[log entry request body]: ../api_logging_service/invocation_log.json "Log Request Body"
+
+[invoker onboarding]: ../common_operations/README.md#register-an-invoker "Invoker Onboarding"
+
+[provider onboarding]: ../common_operations/README.md#register-a-provider "Provider Onboarding"
+
+[Return To All Test Plans]: ../README.md
\ No newline at end of file
diff --git a/docs/test_plan/api_discover_service/README.md b/docs/test_plan/api_discover_service/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..3125c888c96eadcbda6a7b6a688aa721f2714000
--- /dev/null
+++ b/docs/test_plan/api_discover_service/README.md
@@ -0,0 +1,336 @@
+[**[Return To All Test Plans]**]
+
+- [Test Plan for CAPIF Discover Service](#test-plan-for-capif-discover-service)
+- [Tests](#tests)
+  - [Test Case 1: Discover Published service APIs by Authorised API Invoker](#test-case-1-discover-published-service-apis-by-authorised-api-invoker)
+  - [Test Case 2: Discover Published service APIs by Non Authorised API Invoker](#test-case-2-discover-published-service-apis-by-non-authorised-api-invoker)
+  - [Test Case 3: Discover Published service APIs by not registered API Invoker](#test-case-3-discover-published-service-apis-by-not-registered-api-invoker)
+  - [Test Case 4: Discover Published service APIs by registered API Invoker with 1 result filtered](#test-case-4-discover-published-service-apis-by-registered-api-invoker-with-1-result-filtered)
+  - [Test Case 5: Discover Published service APIs by registered API Invoker filtered with no match](#test-case-5-discover-published-service-apis-by-registered-api-invoker-filtered-with-no-match)
+  - [Test Case 6: Discover Published service APIs by registered API Invoker not filtered](#test-case-6-discover-published-service-apis-by-registered-api-invoker-not-filtered)
+
+
+# Test Plan for CAPIF Discover Service
+At this documentation you will have all information and related files and examples of test plan for this API.
+
+# Tests
+
+## Test Case 1: Discover Published service APIs by Authorised API Invoker
+* **Test ID**: ***capif_api_discover_service-1***
+* **Description**:
+
+  This test case will check if NetApp (Invoker) can discover published service APIs.
+* **Pre-Conditions**:
+  * Service APIs are published.
+  * NetApp was registered previously
+  * NetApp was onboarded previously with {onboardingId}
+  
+* **Information of Test**:
+  1. Perform [Provider Registration] and [Invoker Onboarding]
+  2. Publish Service API at CCF:
+     * Send Post to ccf_publish_url *https://{CAPIF_HOSTNAME}/published-apis/v1/{apfId}/service-apis*
+     * body [service api description] with apiName service_1
+     * Use APF Certificate
+  3. Request Discover Published APIs:
+     * Send GET to *https://{CAPIF_HOSTNAME}/service-apis/v1/allServiceAPIs?api-invoker-id={apiInvokerId}*
+     * Param api-invoker-id is mandatory
+     * Use Invoker Certificate
+
+* **Execution Steps**:
+  
+  1. Register Provider at CCF, store certificates and Publish Service API at CCF
+  2. Register Invoker and Onboard Invoker at CCF
+  3. Discover Service APIs by Invoker
+
+* **Expected Result**:
+
+  1. Response to Publish request must accomplish:
+     1. **201 Created**
+     2. Response Body must follow **ServiceAPIDescription** data structure with:
+        * apiId
+     3. Response Header **Location** must be received with URI to new resource created, following this structure: *{apiRoot}/published-apis/v1/{apfId}/service-apis/{serviceApiId}*
+
+  2. Response to Onboard request must accomplish:
+     1. **201 Created**
+     2. Response Body must follow **APIInvokerEnrolmentDetails** data structure with:
+        * apiInvokerId
+        * onboardingInformation->apiInvokerCertificate must contain the public key signed.
+     3. Response Header **Location** must be received with URI to new resource created, following this structure: *{apiRoot}/api-invoker-management/{apiVersion}/onboardedInvokers/{onboardingId}*
+  3. Response to Discover Request By Invoker:
+     1. **200 OK** response.
+     2. Response body must follow **DiscoveredAPIs** data structure:
+        * Check if DiscoveredAPIs contains the API Published previously
+
+
+## Test Case 2: Discover Published service APIs by Non Authorised API Invoker
+* **Test ID**: ***capif_api_discover_service-2***
+* **Description**:
+
+  This test case will check that an API Publisher can't discover published APIs because is not authorized.
+
+* **Pre-Conditions**:
+  * Service APIs are published.
+  
+* **Information of Test**:
+  1. Perform [Provider Registration] and [Invoker Onboarding]
+  2. Publish Service API at CCF:
+     * Send Post to ccf_publish_url *https://{CAPIF_HOSTNAME}/published-apis/v1/{apfId}/service-apis*
+     * body [service api description] with apiName service_1
+     * Use APF Certificate
+  3.  Request Discover Published APIs by no invoker entity:
+     * Send GET to *https://{CAPIF_HOSTNAME}/service-apis/v1/allServiceAPIs?api-invoker-id={apiInvokerId}*
+     * Param api-invoker-id is mandatory
+     * Use not Invoker Certificate
+
+* **Execution Steps**:
+  1. Register Provider at CCF, store certificates and Publish Service API at CCF
+  2. Register Invoker and Onboard Invoker at CCF
+  3. Discover Service APIs by no invoker entity
+
+* **Expected Result**:
+
+  1. Response to Publish request must accomplish:
+     1. **201 Created**
+     2. Response Body must follow **ServiceAPIDescription** data structure with:
+        * apiId
+     3. Response Header **Location** must be received with URI to new resource created, following this structure: *{apiRoot}/published-apis/v1/{apfId}/service-apis/{serviceApiId}*
+
+  2. Response to Onboard request must accomplish:
+     1. **201 Created**
+     2. Response Body must follow **APIInvokerEnrolmentDetails** data structure with:
+        * apiInvokerId
+        * onboardingInformation->apiInvokerCertificate must contain the public key signed.
+     3. Response Header **Location** must be received with URI to new resource created, following this structure: *{apiRoot}/api-invoker-management/{apiVersion}/onboardedInvokers/{onboardingId}*
+
+  3. Response to Discover Request By no invoker entity:
+     1. **401 Unauthorized**
+     2. Error Response Body must accomplish with **ProblemDetails** data structure with:
+        * status 401
+        * title with message "Unauthorized"
+        * detail with message "User not authorized".
+        * cause with message "Certificate not authorized".
+
+
+## Test Case 3: Discover Published service APIs by not registered API Invoker
+* **Test ID**: ***capif_api_discover_service-3***
+* **Description**:
+
+  This test case will check that a not registered invoker is forbidden to discover published APIs.
+
+* **Pre-Conditions**:
+  * Service APIs are published.
+  
+* **Information of Test**:
+  1. Perform [Provider Registration] and [Invoker Onboarding]
+  2. Publish Service API at CCF:
+     * Send Post to ccf_publish_url *https://{CAPIF_HOSTNAME}/published-apis/v1/{apfId}/service-apis*
+     * body [service api description] with apiName service_1
+     * Use APF Certificate
+  3.  Request Discover Published APIs with not valid apiInvoker:
+     * Send GET to *https://{CAPIF_HOSTNAME}/service-apis/v1/allServiceAPIs?api-invoker-id={INVOKER_NOT_REGISTERED}*
+     * Param api-invoker-id is mandatory
+     * Using invoker certificate
+
+* **Execution Steps**:
+  1. Register Provider at CCF, store certificates and Publish Service API at CCF
+  2. Register Invoker and Onboard Invoker at CCF
+  3. Discover Service APIs by Publisher
+
+* **Expected Result**:
+  1. Response to Publish request must accomplish:
+     1. **201 Created**
+     2. Response Body must follow **ServiceAPIDescription** data structure with:
+        * apiId
+     3. Response Header **Location** must be received with URI to new resource created, following this structure: *{apiRoot}/published-apis/v1/{apfId}/service-apis/{serviceApiId}*
+
+  2. Response to Onboard request must accomplish:
+     1. **201 Created**
+     2. Response Body must follow **APIInvokerEnrolmentDetails** data structure with:
+        * apiInvokerId
+        * onboardingInformation->apiInvokerCertificate must contain the public key signed.
+     3. Response Header **Location** must be received with URI to new resource created, following this structure: *{apiRoot}/api-invoker-management/{apiVersion}/onboardedInvokers/{onboardingId}*
+
+  3. Response to Discover Request By Invoker:
+     1. **404 Not Found**
+     2. Error Response Body must accomplish with **ProblemDetails** data structure with:
+        * status 404
+        * title with message "Not Found"
+        * detail with message "API Invoker does not exist".
+        * cause with message "API Invoker id not found".
+
+
+## Test Case 4: Discover Published service APIs by registered API Invoker with 1 result filtered
+* **Test ID**: ***capif_api_discover_service-4***
+* **Description**:
+
+  This test case will check if NetApp (Invoker) can discover published service APIs.
+* **Pre-Conditions**:
+  * At least 2 Service APIs are published.
+  * NetApp was registered previously
+  * NetApp was onboarded previously with {onboardingId}
+  
+* **Information of Test**:
+  1. Perform [Provider Registration] and [Invoker Onboarding]
+  2. Publish Service API at CCF:
+     * Send Post to ccf_publish_url *https://{CAPIF_HOSTNAME}/published-apis/v1/{apfId}/service-apis*
+     * body [service api description] with apiName service_1
+     * Use APF Certificate
+  3. Publish Service API at CCF:
+     * Send Post to ccf_publish_url *https://{CAPIF_HOSTNAME}/published-apis/v1/{apfId}/service-apis*
+     * body [service api description] with apiName service_2
+     * Use APF Certificate
+  4.  Request Discover Published APIs filtering by api-name:
+     * Send GET to ccf_discover_url *https://{CAPIF_HOSTNAME}/service-apis/v1/allServiceAPIs?api-invoker-id={apiInvokerId}&api-name=service_1*
+     * Param api-invoker-id is mandatory
+     * Using invoker certificate
+     * filter by api-name service_1
+
+* **Execution Steps**:
+  1. Register Provider at CCF, store certificates and Publish Service API service_1 and service_2 at CCF
+  2. Register Invoker and Onboard Invoker at CCF
+  3. Discover Service APIs by Invoker.
+  4. Discover filtered by api-name service_1 Service APIs by Invoker
+
+* **Expected Result**:
+  1. Response to Publish request must accomplish:
+     1. **201 Created**
+     2. Response Body must follow **ServiceAPIDescription** data structure with:
+        * apiId
+     3. Response Header **Location** must be received with URI to new resource created, following this structure: *{apiRoot}/published-apis/v1/{apfId}/service-apis/{serviceApiId}*
+  2. Response to Onboard request must accomplish:
+     1. **201 Created**
+     2. Response Body must follow **APIInvokerEnrolmentDetails** data structure with:
+        * apiInvokerId
+        * onboardingInformation->apiInvokerCertificate must contain the public key signed.
+     3. Response Header **Location** must be received with URI to new resource created, following this structure: *{apiRoot}/api-invoker-management/{apiVersion}/onboardedInvokers/{onboardingId}*
+  3. Response to Discover Request By Invoker:
+     1. **200 OK** response.
+     2. Response body must follow **DiscoveredAPIs** data structure:
+        * Check if DiscoveredAPIs contains previously registered Service APIs published.
+  4. Response to Discover Request By Invoker:
+     1. **200 OK** response.
+     2. Response body must follow **DiscoveredAPIs** data structure:
+        * Check if DiscoveredAPIs contains only Service API published with api-name service_1
+
+
+## Test Case 5: Discover Published service APIs by registered API Invoker filtered with no match
+* **Test ID**: ***capif_api_discover_service-5***
+* **Description**:
+  This test case will check if NetApp (Invoker) can discover published service APIs.
+* **Pre-Conditions**:
+  * At least 2 Service APIs are published.
+  * NetApp was registered previously
+  * NetApp was onboarded previously with {onboardingId}
+  
+* **Information of Test**:
+  1. Perform [Provider Registration] and [Invoker Onboarding]
+  2. Publish Service API at CCF:
+     * Send Post to ccf_publish_url *https://{CAPIF_HOSTNAME}/published-apis/v1/{apfId}/service-apis*
+     * body [service api description] with apiName service_1
+     * Use APF Certificate
+  3. Publish Service API at CCF:
+     * Send Post to ccf_publish_url *https://{CAPIF_HOSTNAME}/published-apis/v1/{apfId}/service-apis*
+     * body [service api description] with apiName service_2
+     * Use APF Certificate
+  4.  Request Discover Published APIs filtering by api-name not published:
+     * Send GET to ccf_discover_url *https://{CAPIF_HOSTNAME}/service-apis/v1/allServiceAPIs?api-invoker-id={apiInvokerId}&api-name=NOT_VALID_NAME*
+     * Param api-invoker-id is mandatory
+     * Using invoker certificate
+     * filter by api-name NOT_VALID_NAME
+
+* **Execution Steps**:
+  1. Register Provider at CCF, store certificates and Publish Service API service_1 and service_2 at CCF
+  2. Register Invoker and Onboard Invoker at CCF
+  3. Discover Service APIs by Invoker.
+  4. Discover filtered by api-name not published Service APIs by Invoker
+
+* **Expected Result**:
+  1. Response to Publish request must accomplish:
+     1. **201 Created**
+     2. Response Body must follow **ServiceAPIDescription** data structure with:
+        * apiId
+     3. Response Header **Location** must be received with URI to new resource created, following this structure: *{apiRoot}/published-apis/v1/{apfId}/service-apis/{serviceApiId}*
+  2. Response to Onboard request must accomplish:
+     1. **201 Created**
+     2. Response Body must follow **APIInvokerEnrolmentDetails** data structure with:
+        * apiInvokerId
+        * onboardingInformation->apiInvokerCertificate must contain the public key signed.
+     3. Response Header **Location** must be received with URI to new resource created, following this structure: *{apiRoot}/api-invoker-management/{apiVersion}/onboardedInvokers/{onboardingId}*
+  3. Response to Discover Request By Invoker:
+     1. **200 OK** response.
+     2. Response body must follow **DiscoveredAPIs** data structure:
+        * Check if DiscoveredAPIs contains previously registered Service APIs published.
+  4. Response to Discover Request By Invoker:
+     1. **404 Not Found** response.
+     2. Error Response Body must accomplish with **ProblemDetails** data structure with:
+        * status 404
+        * title with message "Not Found"
+        * detail with message "API Invoker {api_invoker_id} has no API Published that accomplish filter conditions".
+        * cause with message "No API Published accomplish filter conditions".
+
+
+## Test Case 6: Discover Published service APIs by registered API Invoker not filtered
+* **Test ID**: ***capif_api_discover_service-6***
+* **Description**:
+
+  This test case will check if NetApp (Invoker) can discover published service APIs.
+* **Pre-Conditions**:
+  * 2 Service APIs are published.
+  * NetApp was registered previously
+  * NetApp was onboarded previously with {onboardingId}
+  
+* **Information of Test**:
+  1. Perform [Provider Registration] and [Invoker Onboarding]
+  2. Publish Service API at CCF:
+     * Send Post to ccf_publish_url *https://{CAPIF_HOSTNAME}/published-apis/v1/{apfId}/service-apis*
+     * body [service api description] with apiName service_1
+     * Use APF Certificate
+  3. Publish Service API at CCF:
+     * Send Post to ccf_publish_url *https://{CAPIF_HOSTNAME}/published-apis/v1/{apfId}/service-apis*
+     * body [service api description] with apiName service_2
+     * Use APF Certificate
+  4.  Request Discover Published APIs not filtered:
+     * Send GET to ccf_discover_url *https://{CAPIF_HOSTNAME}/service-apis/v1/allServiceAPIs?api-invoker-id={apiInvokerId}*
+     * Param api-invoker-id is mandatory
+     * Using invoker certificate
+
+* **Execution Steps**:
+  1. Register Provider at CCF, store certificates and Publish Service API service_1 and service_2 at CCF
+  2. Register Invoker and Onboard Invoker at CCF
+  3. Discover Service APIs by Invoker.
+  4. Discover without filter by Invoker
+
+* **Expected Result**:
+
+  1. Response to Publish request must accomplish:
+     1. **201 Created**
+     2. Response Body must follow **ServiceAPIDescription** data structure with:
+        * apiId
+     3. Response Header **Location** must be received with URI to new resource created, following this structure: *{apiRoot}/published-apis/v1/{apfId}/service-apis/{serviceApiId}*
+
+  2. Response to Onboard request must accomplish:
+     1. **201 Created**
+     2. Response Body must follow **APIInvokerEnrolmentDetails** data structure with:
+        * apiInvokerId
+        * onboardingInformation->apiInvokerCertificate must contain the public key signed.
+     3. Response Header **Location** must be received with URI to new resource created, following this structure: *{apiRoot}/api-invoker-management/{apiVersion}/onboardedInvokers/{onboardingId}*
+
+  3. Response to Discover Request By Invoker:
+     1. **200 OK** response.
+     2. Response body must follow **DiscoveredAPIs** data structure:
+        * Check if DiscoveredAPIs contains the 2 previously registered Service APIs published.
+
+
+
+   [service api description]: ./api_publish_service/service_api_description_post_example.json  "Service API **Description** Request"
+   [publisher register body]: ./api_publish_service/publisher_register_body.json  "Publish register Body"
+   [invoker onboarding body]: ../api_invoker_management/invoker_details_post_example.json  "API Invoker Request"
+   [invoker register body]: ../api_invoker_management/invoker_register_body.json  "Invoker Register Body"
+   [provider request body]: ../api_provider_management/provider_details_post_example.json  "API Provider Enrolment Request"
+   [provider request patch body]: ../api_provider_management/provider_details_enrolment_details_patch_example.json  "API Provider Enrolment Patch Request"
+   [provider getauth body]: ../api_provider_management/provider_getauth_example.json    "Get Auth Example"
+   [invoker onboarding]: ../common_operations/README.md#register-an-invoker "Invoker Onboarding"
+   [provider registration]: ../common_operations/README.md#register-a-provider "Provider Registration"
+
+
+[Return To All Test Plans]: ../README.md
diff --git a/docs/test_plan/api_events_service/README.md b/docs/test_plan/api_events_service/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..417c1aa623671fde54b4e894b8e359ee03dd9d36
--- /dev/null
+++ b/docs/test_plan/api_events_service/README.md
@@ -0,0 +1,265 @@
+[**[Return To All Test Plans]**]
+
+- [Test Plan for CAPIF Api Events Service](#test-plan-for-capif-api-events-service)
+- [Tests](#tests)
+  - [Test Case 1: Creates a new individual CAPIF Event Subscription.](#test-case-1-creates-a-new-individual-capif-event-subscription)
+  - [Test Case 2: Creates a new individual CAPIF Event Subscription with Invalid SubscriberId](#test-case-2-creates-a-new-individual-capif-event-subscription-with-invalid-subscriberid)
+  - [Test Case 3: Deletes an individual CAPIF Event Subscription](#test-case-3-deletes-an-individual-capif-event-subscription)
+  - [Test Case 4: Deletes an individual CAPIF Event Subscription with invalid SubscriberId](#test-case-4-deletes-an-individual-capif-event-subscription-with-invalid-subscriberid)
+  - [Test Case 5: Deletes an individual CAPIF Event Subscription with invalid SubscriptionId](#test-case-5-deletes-an-individual-capif-event-subscription-with-invalid-subscriptionid)
+ 
+
+
+# Test Plan for CAPIF Api Events Service
+At this documentation you will have all information and related files and examples of test plan for this API.
+
+# Tests
+
+## Test Case 1: Creates a new individual CAPIF Event Subscription.
+* Test ID: ***capif_api_events-1***
+* Description:
+
+  This test case will check that a CAPIF subscriber (Invoker or Publisher) can Subscribe to Events
+* Pre-Conditions:
+  
+  * CAPIF subscriber is pre-authorised (has valid InvokerId or apfId from CAPIF Authority)
+
+* Information of Test:
+
+  1. Perform [Invoker Onboarding]
+
+  2. Event Subscription:
+     1. Send POST to *https://{CAPIF_HOSTNAME}/capif-events/v1/{subscriberId}/subscriptions*
+     2. body [event subscription request body]
+     3. Use Invoker Certificate
+
+* Execution Steps:
+  
+  1. Register Invoker and Onboard Invoker at CCF
+  2. Subscribe to Events
+  3. Retrieve {subscriberId} and {subscriptionId} from Location Header
+   
+* Expected Result:
+
+  1. Response to Onboard request must accomplish:
+     1. **201 Created**
+     2. Response Body must follow **APIInvokerEnrolmentDetails** data structure with:
+        * apiInvokerId
+        * onboardingInformation->apiInvokerCertificate must contain the public key signed.
+     3. Response Header **Location** must be received with URI to new resource created, following this structure: *{apiRoot}/api-invoker-management/{apiVersion}/onboardedInvokers/{onboardingId}*
+
+  2. Response to Event Subscription must accomplish:
+     1. **201 Created**
+     2. The URI of the created resource shall be returned in the "Location" HTTP header, following this structure: *{apiRoot}/capif-events/{apiVersion}/{subscriberId}/subscriptions/{subscriptionId}
+     3. Response Body must follow **EventSubscription** data structure.
+
+  3. Event Subscriptions are stored in CAPIF Database
+
+
+## Test Case 2: Creates a new individual CAPIF Event Subscription with Invalid SubscriberId
+* Test ID: ***capif_api_events-2***
+* Description:
+
+  This test case will check that a CAPIF subscriber (Invoker or Publisher) cannot Subscribe to Events without valid SubcriberId
+* Pre-Conditions:
+  
+  * CAPIF subscriber is not pre-authorised (has invalid InvokerId or apfId)
+
+* Information of Test:
+
+  1. Perform [Invoker Onboarding]
+
+  2. Event Subscription:
+     1. Send POST to *https://{CAPIF_HOSTNAME}/capif-events/v1/{SUBSCRIBER_NOT_REGISTERED}/subscriptions*
+     2. body [event subscription request body]
+     3. Use Invoker Certificate
+
+* Execution Steps:
+  
+  1. Register Invoker and Onboard Invoker at CCF
+  2. Subscribe to Events
+   
+* Expected Result:
+
+  1. Response to Onboard request must accomplish:
+     1. **201 Created**
+     2. Response Body must follow **APIInvokerEnrolmentDetails** data structure with:
+        * apiInvokerId
+        * onboardingInformation->apiInvokerCertificate must contain the public key signed.
+     3. Response Header **Location** must be received with URI to new resource created, following this structure: *{apiRoot}/api-invoker-management/{apiVersion}/onboardedInvokers/{onboardingId}*
+
+  2. Response to Event Subscription must accomplish:
+     1. **404 Not Found**
+     2. Error Response Body must accomplish with **ProblemDetails** data structure with:
+        * status 404
+        * title with message "Not Found"
+        * detail with message "Invoker or APF or AEF or AMF Not found".
+        * cause with message "Subscriber Not Found".
+
+  3. Event Subscriptions are not stored in CAPIF Database
+
+  
+## Test Case 3: Deletes an individual CAPIF Event Subscription
+* Test ID: ***capif_api_events-3***
+* Description:
+
+  This test case will check that a CAPIF subscriber (Invoker or Publisher) can Delete an Event Subscription
+* Pre-Conditions:
+  
+  * CAPIF subscriber is pre-authorised (has valid InvokerId or apfId from CAPIF Authority)
+
+* Information of Test:
+
+  1. Perform [Invoker Onboarding]
+
+  2. Event Subscription:
+     1. Send POST to *https://{CAPIF_HOSTNAME}/capif-events/v1/{subscriberId}/subscriptions*
+     2. body [event subscription request body]
+     3. Use Invoker Certificate
+
+  3. Remove Event Subscription:
+     1. Send DELETE to *https://{CAPIF_HOSTNAME}/capif-events/v1/{subscriberId}/subscriptions*
+     2. Use Invoker Certificate
+
+* Execution Steps:
+  
+  1. Register Invoker and Onboard Invoker at CCF
+  2. Subscribe to Events
+  3. Retrieve {subscriberId} and {subscriptionId} from Location Header
+  4. Remove Event Subscription
+   
+* Expected Result:
+
+  1. Response to Onboard request must accomplish:
+     1. **201 Created**
+     2. Response Body must follow **APIInvokerEnrolmentDetails** data structure with:
+        * apiInvokerId
+        * onboardingInformation->apiInvokerCertificate must contain the public key signed.
+     3. Response Header **Location** must be received with URI to new resource created, following this structure: *{apiRoot}/api-invoker-management/{apiVersion}/onboardedInvokers/{onboardingId}*
+
+  2. Response to Event Subscription must accomplish:
+     1. **201 Created**
+     2. The URI of the created resource shall be returned in the "Location" HTTP header, following this structure: *{apiRoot}/capif-events/{apiVersion}/{subscriberId}/subscriptions/{subscriptionId}
+     3. Response Body must follow **EventSubscription** data structure.
+
+  3. Event Subscriptions are stored in CAPIF Database
+  4. Remove Event Subscription:
+     1. **204 No Content**
+
+  5. Event Subscription is not present at CAPIF Database.
+
+
+## Test Case 4: Deletes an individual CAPIF Event Subscription with invalid SubscriberId
+* Test ID: ***capif_api_events-4***
+* Description:
+
+  This test case will check that a CAPIF subscriber (Invoker or Publisher) cannot Delete to Events without valid SubcriberId
+* Pre-Conditions:
+  
+  * CAPIF subscriber is pre-authorised (has valid InvokerId or apfId).
+  * CAPIF subscriber is subscribed to Events.
+
+* Information of Test:
+
+  1. Perform [Invoker Onboarding]
+
+  2. Event Subscription:
+     1. Send POST to https://{CAPIF_HOSTNAME}/capif-events/v1/{subscriberId}/subscriptions
+     2. body [event subscription request body]
+     3. Use Invoker Certificate
+
+  3. Remove Event Subcription with not valid subscriber:
+     1. Send DELETE to to https://{CAPIF_HOSTNAME}/capif-events/v1/{SUBSCRIBER_ID_NOT_VALID}/subscriptions/{subcriptionId}
+     2. Use Invoker Certificate
+
+* Execution Steps:
+  
+  1. Register Invoker and Onboard Invoker at CCF
+  2. Subscribe to Events
+  3. Retrieve Location Header with subscriptionId.
+  4. Remove Event Subscribed with not valid Subscriber.
+   
+* Expected Result:
+
+  1. Response to Onboard request must accomplish:
+     1. **201 Created**
+     2. Response Body must follow **APIInvokerEnrolmentDetails** data structure with:
+        * apiInvokerId
+        * onboardingInformation->apiInvokerCertificate must contain the public key signed.
+     3. Response Header **Location** must be received with URI to new resource created, following this structure: *{apiRoot}/api-invoker-management/{apiVersion}/onboardedInvokers/{onboardingId}*
+
+  2. Response to Event Subscription must accomplish:
+     1. 201 Created
+     2. The URI of the created resource shall be returned in the "Location" HTTP header, following this structure: *{apiRoot}/capif-events/{apiVersion}/{subscriberId}/subscriptions/{subscriptionId}
+     3. Response Body must follow **EventSubscription** data structure.
+
+  3. Event Subscriptions are stored in CAPIF Database
+  4. Error Response Body must accomplish with **ProblemDetails** data structure with:
+        * status 404
+        * title with message "Not Found"
+        * detail with message "Invoker or APF or AEF or AMF Not found".
+        * cause with message "Subscriber Not Found".
+
+
+## Test Case 5: Deletes an individual CAPIF Event Subscription with invalid SubscriptionId
+* Test ID: ***capif_api_events-5***
+* Description:
+
+  This test case will check that a CAPIF subscriber (Invoker or Publisher) cannot Delete an Event Subscription without valid SubscriptionId
+* Pre-Conditions:
+  
+  * CAPIF subscriber is pre-authorised (has invalid InvokerId or apfId).
+  * CAPIF subscriber is subscribed to Events.
+
+* Information of Test:
+
+  1. Perform [Invoker Onboarding]
+
+  2. Event Subscription:
+     1. Send POST to https://{CAPIF_HOSTNAME}/capif-events/v1/{subscriberId}/subscriptions
+     2. body [event subscription request body]
+     3. Use Invoker Certificate
+
+  3. Remove Event Subcription with not valid subscriber:
+     1. Send DELETE to to https://{CAPIF_HOSTNAME}/capif-events/v1/{subcriberId}/subscriptions/{SUBSCRIPTION_ID_NOT_VALID}
+     2. Use Invoker Certificate
+
+* Execution Steps:
+  
+  1. Register Invoker and Onboard Invoker at CCF
+  2. Subscribe to Events
+  3. Retrieve Location Header with subscriptionId.
+  4. Remove Event Subscribed with not valid Subscriber.
+   
+* Expected Result:
+
+  1. Response to Onboard request must accomplish:
+     1. **201 Created**
+     2. Response Body must follow **APIInvokerEnrolmentDetails** data structure with:
+        * apiInvokerId
+        * onboardingInformation->apiInvokerCertificate must contain the public key signed.
+     3. Response Header **Location** must be received with URI to new resource created, following this structure: *{apiRoot}/api-invoker-management/{apiVersion}/onboardedInvokers/{onboardingId}*
+
+  2. Response to Event Subscription must accomplish:
+     1. **201 Created**
+     2. The URI of the created resource shall be returned in the "Location" HTTP header, following this structure: *{apiRoot}/capif-events/{apiVersion}/{subscriberId}/subscriptions/{subscriptionId}
+     3. Response Body must follow **EventSubscription** data structure.
+
+  3. Event Subscriptions are stored in CAPIF Database
+  4. Remove Event Subscription with not valid subscriber:
+     1. **404 Not Found**
+     2. Error Response Body must accomplish with **ProblemDetails** data structure with:
+        * status 404
+        * detail with message "Service API not existing".
+        * cause with message "Event API subscription id not found".
+
+
+
+
+[invoker register body]: ../api_invoker_management/invoker_register_body.json  "Invoker Register Body"
+[invoker onboard request body]: ../api_invoker_management/invoker_details_post_example.json  "API Invoker Request"
+[event subscription request body]: ./event_subscription.json  "Event Subscription Request"
+[invoker onboarding]: ../common_operations/README.md#register-an-invoker "Invoker Onboarding"
+
+
+[Return To All Test Plans]: ../README.md
diff --git a/docs/test_plan/api_events_service/event_subscription.json b/docs/test_plan/api_events_service/event_subscription.json
new file mode 100644
index 0000000000000000000000000000000000000000..40dc09bb1ca5236fa9cb23ff1a25ad5dccd28844
--- /dev/null
+++ b/docs/test_plan/api_events_service/event_subscription.json
@@ -0,0 +1,31 @@
+{
+  "eventFilters": [
+    {
+      "aefIds": ["aefIds", "aefIds"],
+      "apiIds": ["apiIds", "apiIds"],
+      "apiInvokerIds": ["apiInvokerIds", "apiInvokerIds"]
+    },
+    {
+      "aefIds": ["aefIds", "aefIds"],
+      "apiIds": ["apiIds", "apiIds"],
+      "apiInvokerIds": ["apiInvokerIds", "apiInvokerIds"]
+    }
+  ],
+  "eventReq": {
+    "grpRepTime": 5,
+    "immRep": true,
+    "maxReportNbr": 0,
+    "monDur": "2000-01-23T04:56:07+00:00",
+    "partitionCriteria": ["string1", "string2"],
+    "repPeriod": 6,
+    "sampRatio": 15
+  },
+  "events": ["SERVICE_API_AVAILABLE", "API_INVOKER_ONBOARDED"],
+  "notificationDestination": "http://robot.testing",
+  "requestTestNotification": true,
+  "supportedFeatures": "aaa",
+  "websockNotifConfig": {
+    "requestWebsocketUri": true,
+    "websocketUri": "websocketUri"
+  }
+}
diff --git a/docs/test_plan/api_invoker_management/README.md b/docs/test_plan/api_invoker_management/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..9846c960d9e8fda5d84676a2242f820aa54f53cf
--- /dev/null
+++ b/docs/test_plan/api_invoker_management/README.md
@@ -0,0 +1,306 @@
+[**[Return To All Test Plans]**]
+
+- [Test Plan for CAPIF Api Invoker Management](#test-plan-for-capif-api-invoker-management)
+- [Tests](#tests)
+  - [Test Case 1: Onboard NetApp](#test-case-1-onboard-netapp)
+  - [Test Case 2: Onboard NetApp Already onboarded](#test-case-2-onboard-netapp-already-onboarded)
+  - [Test Case 3: Update Onboarded NetApp](#test-case-3-update-onboarded-netapp)
+  - [Test Case 4: Update Not Onboarded NetApp](#test-case-4-update-not-onboarded-netapp)
+  - [Test Case 5: Offboard NetApp](#test-case-5-offboard-netapp)
+  - [Test Case 6: Offboard Not previsouly Onboarded NetApp](#test-case-6-offboard-not-previsouly-onboarded-netapp)
+  - [Test Case 7: Update Onboarded NetApp Certificate](#test-case-7-update-onboarded-netapp-certificate)
+
+
+# Test Plan for CAPIF Api Invoker Management
+At this documentation you will have all information and related files and examples of test plan for this API.
+
+# Tests
+
+## Test Case 1: Onboard NetApp
+* **Test ID**: ***capif_api_invoker_management-1***
+* **Description**:
+
+  This test will try to register new NetApp at CAPIF Core.
+* **Pre-Conditions**:
+
+  * NetApp was not registered previously
+  * NetApp was not onboarded previously
+
+* **Information of Test**:
+
+  1. Create public and private key at invoker
+
+  2. Register of Invoker at CCF:
+     * Send POST to *http://{CAPIF_HOSTNAME}:{CAPIF_HTTP_PORT}/register* 
+     * body [invoker register body]
+
+  3. Obtain Access Token:
+     * Send POST to *http://{CAPIF_HOSTNAME}/getauth*
+     * Body [invoker getauth body]
+
+  4. Onboard Invoker:
+     * Send POST to *https://{CAPIF_HOSTNAME}/api-invoker-management/v1/onboardedInvokers*
+     * Reference Request Body: [invoker onboarding body]
+     * "onboardingInformation"->"apiInvokerPublicKey": must contain public key generated by Invoker.
+     * Send at Authorization Header the Bearer access_token obtained previously (Authorization:Bearer ${access_token})
+
+* **Execution Steps**:
+  1. Register Invoker at CCF
+  2. Onboard Invoker at CCF
+  3. Store signed Certificate
+   
+* **Expected Result**:
+  1. Response to Onboard request must accomplish:
+     1. **201 Created**
+     2. Response Body must follow **APIInvokerEnrolmentDetails** data structure with:
+        * apiInvokerId
+        * onboardingInformation->apiInvokerCertificate must contain the public key signed.
+     3. Response Header **Location** must be received with URI to new resource created, following this structure: *{apiRoot}/api-invoker-management/{apiVersion}/onboardedInvokers/{onboardingId}*
+
+
+## Test Case 2: Onboard NetApp Already onboarded
+
+* **Test ID**: ***capif_api_invoker_management-2***
+* **Description**:
+
+  This test will check second onboard of same NetApp is not allowed.
+
+* **Pre-Conditions**:
+
+  * NetApp was registered previously
+  * NetApp was onboarded previously
+
+* **Information of Test**:
+
+  1. Perform [Invoker Onboarding]
+
+  2. Repeat Onboard Invoker:
+     * Send POST to *https://{CAPIF_HOSTNAME}/api-invoker-management/v1/onboardedInvokers*
+     * Reference Request Body: [invoker onboarding body]
+     * "onboardingInformation"->"apiInvokerPublicKey": must contain public key generated by Invoker.
+     * Send at Authorization Header the Bearer access_token obtained previously (Authorization:Bearer ${access_token})
+
+* **Execution Steps**:
+  1. Register NetApp at CCF
+  2. Onboard NetApp at CCF
+  3. Store signed Certificate at NetApp
+  4. Onboard Again the NetApp at CCF
+  
+* **Expected Result**:
+  1. Response to Onboard request must accomplish:
+     1. **201 Created**
+     2. Response Body must follow **APIInvokerEnrolmentDetails** data structure with:
+        * apiInvokerId
+        * onboardingInformation->apiInvokerCertificate must contain the public key signed.
+     3. Response Header **Location** must be received with URI to new resource created, following this structure: *{apiRoot}/api-invoker-management/{apiVersion}/onboardedInvokers/{onboardingId}*
+  2. Response to Second Onboard of NetApp must accomplish:
+     1. **403 Forbidden**
+     2. Error Response Body must accomplish with **ProblemDetails** data structure with:
+        * status 403
+        * title with message "Forbidden"
+        * detail with message "Invoker Already registered".
+        * cause with message "Identical invoker public key".
+
+
+## Test Case 3: Update Onboarded NetApp  
+* **Test ID**: ***capif_api_invoker_management-3***
+* **Description**:
+
+  This test will try to update information of previous onboard NetApp at CAPIF Core.
+* **Pre-Conditions**:
+
+  * NetApp was registered previously
+  * NetApp was onboarded previously with {onboardingId}
+  
+* **Information of Test**:
+
+  1. Perform [Invoker Onboarding]
+
+  2. Update information of previously onboarded Invoker:
+     * Send PUT to *https://{CAPIF_HOSTNAME}/api-invoker-management/v1/onboardedInvokers/{onboardingId}*
+     * Reference Request Body is: [put invoker onboarding body]
+       * "notificationDestination": "*http://host.docker.internal:8086/netapp_new_callback*",
+
+* **Execution Steps**:
+  
+  1. Register Invoker at CCF
+  2. Onboard Invoker at CCF
+  3. Store signed Certificate
+  4. Update Onboarding Information at CCF with a minor change on "notificationDestination"
+   
+* **Expected Result**:
+  
+  1. Response to Onboard request must accomplish:
+     1. **201 Created**
+     2. Response Body must follow **APIInvokerEnrolmentDetails** data structure with:
+        * apiInvokerId
+        * onboardingInformation->apiInvokerCertificate must contain the public key signed.
+     3. Response Header **Location** must be received with URI to new resource created, following this structure: *{apiRoot}/api-invoker-management/{apiVersion}/onboardedInvokers/{onboardingId}*
+  2. Response to Update Request (PUT) with minor change must contain:
+     1. **200 OK** response.
+     2. notificationDestination on response must contain the new value
+
+
+## Test Case 4: Update Not Onboarded NetApp
+* **Test ID**: ***capif_api_invoker_management-4***
+* **Description**:
+
+  This test will try to update information of not onboarded NetApp at CAPIF Core.
+* **Pre-Conditions**:
+
+  * NetApp was registered previously
+  * NetApp was not onboarded previously
+  
+* **Information of Test**:
+
+  1. Perform [Invoker Onboarding]
+
+  2. Update information of not onboarded Invoker:
+     * Send PUT to *https://{CAPIF_HOSTNAME}/api-invoker-management/v1/onboardedInvokers/{INVOKER_NOT_REGISTERED}*
+     * Reference Request Body is: [put invoker onboarding body]
+
+* **Execution Steps**:
+  
+  1. Register Invoker at CCF
+  2. Onboard Invoker at CCF
+  3. Update Onboarding Information at CCF of not onboarded
+   
+* **Expected Result**:
+  
+  1. Response to Onboard request must accomplish:
+     1. **201 Created**
+  2. Response to Update Request (PUT) must contain:
+     1. **404 Not Found**
+     2. Error Response Body must accomplish with **ProblemDetails** data structure with:
+        * status 404
+        * title with message "Not Found"
+        * detail with message "Please provide an existing Netapp ID".
+        * cause with message "Not exist NetappID".
+
+
+
+## Test Case 5: Offboard NetApp
+* **Test ID**: ***capif_api_invoker_management-5***
+* **Description**:
+
+  This test case will check that a Registered NetApp can be deleted.
+* **Pre-Conditions**:
+
+  * NetApp was registered previously
+  * NetApp was onboarded previously
+
+* **Information of Test**:
+
+  1. Perform [Invoker Onboarding]
+
+  2. Offboard:
+     * Send Delete to *https://{CAPIF_HOSTNAME}/api-invoker-management/v1/onboardedInvokers/{onboardingId}*
+
+* **Execution Steps**:
+
+  1. Register Invoker at CCF
+  2. Onboard Invoker at CCF
+  3. Offboard Invoker at CCF
+   
+* **Expected Result**:
+
+  1. Response to Onboard request must accomplish:
+     1. **201 Created**
+  2. Response to Offboard Request (DELETE) must contain:
+     1. **204 No Content**
+
+
+## Test Case 6: Offboard Not previsouly Onboarded NetApp
+* **Test ID**: ***capif_api_invoker_management-6***
+* **Description**:
+
+  This test case will check that a Non-Registered NetApp cannot be deleted
+* **Pre-Conditions**:
+
+  * NetApp was registered previously
+  * NetApp was not onboarded previously
+
+* **Information of Test**:
+
+  1. Perform [Invoker Onboarding]
+
+  2. Offboard:
+     * Send Delete to *https://{CAPIF_HOSTNAME}/api-invoker-management/v1/onboardedInvokers/{INVOKER_NOT_REGISTERED}*
+
+* **Execution Steps**:
+
+  1. Register Invoker at CCF
+  2. Offboard Invoker at CCF
+
+* **Expected Result**:
+
+  1. Response to Offboard Request (DELETE) must contain:
+     1. **404 Not Found**
+     2. Error Response Body must accomplish with **ProblemDetails** data structure with:
+        * status 404
+        * title with message "Not Found"
+        * detail with message "Please provide an existing Netapp ID".
+        * cause with message "Not exist NetappID".
+
+## Test Case 7: Update Onboarded NetApp Certificate
+* **Test ID**: ***capif_api_invoker_management-7***
+* **Description**:
+
+  This test will try to update public key and get a new signed certificate by CAPIF Core.
+* **Pre-Conditions**:
+
+  * NetApp was registered previously
+  * NetApp was onboarded previously with {onboardingId} and {public_key_1}
+
+* **Information of Test**:
+
+  1. Perform [Invoker Onboarding] with public_key_1.
+
+  2. Create {public_key_2}
+
+  3. Update information of previously onboarded Invoker:
+     * Send PUT to *https://{CAPIF_HOSTNAME}/api-invoker-management/v1/onboardedInvokers/{onboardingId}*
+     * Reference Request Body is: [put invoker onboarding body]
+       * ["onboardingInformation"]["apiInvokerPublicKey"]: {public_key_2},
+     * Store new certificate.
+
+  4. Update information of previously onboarded Invoker Using new certificate:
+     * Send PUT to *https://{CAPIF_HOSTNAME}/api-invoker-management/v1/onboardedInvokers/{onboardingId}*
+     * Reference Request Body is: [put invoker onboarding body]
+       * "notificationDestination": "*http://host.docker.internal:8086/netapp_new_callback*",
+     * Use new invoker certificate
+
+* **Execution Steps**:
+
+  1. Register Invoker at CCF
+  2. Onboard Invoker at CCF
+  3. Store signed Certificate
+  4. Update Onboarding Information at CCF with new public key
+  5. Update Onboarding Information at CCF with minor change
+
+* **Expected Result**:
+
+  1. Response to Onboard request must accomplish:
+     1. **201 Created**
+     2. Response Body must follow **APIInvokerEnrolmentDetails** data structure with:
+        * apiInvokerId
+        * onboardingInformation->apiInvokerCertificate must contain the public key signed.
+     3. Response Header **Location** must be received with URI to new resource created, following this structure: *{apiRoot}/api-invoker-management/{apiVersion}/onboardedInvokers/{onboardingId}*
+  2. Response to Update Request (PUT) with new public key:
+     1. **200 OK** response.
+     2. apiInvokerCertificate with new certificate on response -> store to use.
+  3. Response to Update Request (PUT) with minor change must contain:
+     1. **200 OK** response.
+     2. notificationDestination on response must contain the new value
+
+
+
+
+[invoker onboarding body]: ./invoker_details_post_example.json  "API Invoker Request"
+[invoker register body]: ./invoker_register_body.json  "Invoker Register Body"
+[put register body]: ./invoker_details_put_example.json  "API Invoker Update Request"
+[invoker getauth body]: ./invoker_getauth_example.json    "Get Auth Example"
+
+[invoker onboarding]: ../common_operations/README.md#register-an-invoker "Invoker Onboarding"
+
+[Return To All Test Plans]: ../README.md
\ No newline at end of file
diff --git a/docs/test_plan/api_invoker_management/invoker_details_post_example.json b/docs/test_plan/api_invoker_management/invoker_details_post_example.json
new file mode 100644
index 0000000000000000000000000000000000000000..c306a17e2d04f55da35a5b3638775af9d63e769f
--- /dev/null
+++ b/docs/test_plan/api_invoker_management/invoker_details_post_example.json
@@ -0,0 +1,15 @@
+{
+  "notificationDestination": "http://host.docker.internal:8086/netapp_callback",
+  "supportedFeatures": "fffffff",
+  "apiInvokerInformation": "ROBOT_TESTING_INVOKER",
+  "websockNotifConfig": {
+    "requestWebsocketUri": true,
+    "websocketUri": "websocketUri"
+  },
+  "onboardingInformation": {
+    "apiInvokerPublicKey": "{PUBLIC_KEY}",
+    "onboardingSecret": "onboardingSecret",
+    "apiInvokerCertificate": "apiInvokerCertificate"
+  },
+  "requestTestNotification": true
+}
diff --git a/docs/test_plan/api_invoker_management/invoker_details_put_example.json b/docs/test_plan/api_invoker_management/invoker_details_put_example.json
new file mode 100644
index 0000000000000000000000000000000000000000..37a1eefbb05a2df1058b20429477cbf17f412cb8
--- /dev/null
+++ b/docs/test_plan/api_invoker_management/invoker_details_put_example.json
@@ -0,0 +1,393 @@
+{
+  "notificationDestination": "http://host.docker.internal:8086/netapp_new_callback",
+  "supportedFeatures": "fffffff",
+  "apiInvokerInformation": "ROBOT_TESTING_INVOKER",
+  "websockNotifConfig": {
+    "requestWebsocketUri": true,
+    "websocketUri": "websocketUri"
+  },
+  "onboardingInformation": {
+    "apiInvokerPublicKey": "{PUBLIC_KEY}",
+    "onboardingSecret": "onboardingSecret",
+    "apiInvokerCertificate": "apiInvokerCertificate"
+  },
+  "requestTestNotification": true,
+  "apiList": [
+    {
+      "serviceAPICategory": "serviceAPICategory",
+      "ccfId": "ccfId",
+      "apiName": "apiName",
+      "shareableInfo": {
+        "capifProvDoms": ["capifProvDoms", "capifProvDoms"],
+        "isShareable": true
+      },
+      "supportedFeatures": "fffffff",
+      "description": "description",
+      "apiSuppFeats": "fffffff",
+      "apiId": "apiId",
+      "aefProfiles": [
+        {
+          "securityMethods": ["PSK"],
+          "versions": [
+            {
+              "apiVersion": "apiVersion",
+              "resources": [
+                {
+                  "operations": ["GET"],
+                  "description": "description",
+                  "resourceName": "resourceName",
+                  "custOpName": "custOpName",
+                  "uri": "uri",
+                  "commType": "REQUEST_RESPONSE"
+                },
+                {
+                  "operations": ["GET"],
+                  "description": "description",
+                  "resourceName": "resourceName",
+                  "custOpName": "custOpName",
+                  "uri": "uri",
+                  "commType": "REQUEST_RESPONSE"
+                }
+              ],
+              "custOperations": [
+                {
+                  "operations": ["GET"],
+                  "description": "description",
+                  "custOpName": "custOpName",
+                  "commType": "REQUEST_RESPONSE"
+                },
+                {
+                  "operations": ["GET"],
+                  "description": "description",
+                  "custOpName": "custOpName",
+                  "commType": "REQUEST_RESPONSE"
+                }
+              ],
+              "expiry": "2000-01-23T04:56:07.000+00:00"
+            },
+            {
+              "apiVersion": "apiVersion",
+              "resources": [
+                {
+                  "operations": ["GET"],
+                  "description": "description",
+                  "resourceName": "resourceName",
+                  "custOpName": "custOpName",
+                  "uri": "uri",
+                  "commType": "REQUEST_RESPONSE"
+                },
+                {
+                  "operations": ["GET"],
+                  "description": "description",
+                  "resourceName": "resourceName",
+                  "custOpName": "custOpName",
+                  "uri": "uri",
+                  "commType": "REQUEST_RESPONSE"
+                }
+              ],
+              "custOperations": [
+                {
+                  "operations": ["GET"],
+                  "description": "description",
+                  "custOpName": "custOpName",
+                  "commType": "REQUEST_RESPONSE"
+                },
+                {
+                  "operations": ["GET"],
+                  "description": "description",
+                  "custOpName": "custOpName",
+                  "commType": "REQUEST_RESPONSE"
+                }
+              ],
+              "expiry": "2000-01-23T04:56:07.000+00:00"
+            }
+          ],
+          "aefId": "aefId",
+          "interfaceDescriptions": [
+            {
+              "securityMethods": ["PSK"],
+              "port": 5248,
+              "ipv4Addr": "ipv4Addr"
+            },
+            { "securityMethods": ["PSK"], "port": 5248, "ipv4Addr": "ipv4Addr" }
+          ]
+        },
+        {
+          "securityMethods": ["PSK"],
+          "versions": [
+            {
+              "apiVersion": "apiVersion",
+              "resources": [
+                {
+                  "operations": ["GET"],
+                  "description": "description",
+                  "resourceName": "resourceName",
+                  "custOpName": "custOpName",
+                  "uri": "uri",
+                  "commType": "REQUEST_RESPONSE"
+                },
+                {
+                  "operations": ["GET"],
+                  "description": "description",
+                  "resourceName": "resourceName",
+                  "custOpName": "custOpName",
+                  "uri": "uri",
+                  "commType": "REQUEST_RESPONSE"
+                }
+              ],
+              "custOperations": [
+                {
+                  "operations": ["GET"],
+                  "description": "description",
+                  "custOpName": "custOpName",
+                  "commType": "REQUEST_RESPONSE"
+                },
+                {
+                  "operations": ["GET"],
+                  "description": "description",
+                  "custOpName": "custOpName",
+                  "commType": "REQUEST_RESPONSE"
+                }
+              ],
+              "expiry": "2000-01-23T04:56:07.000+00:00"
+            },
+            {
+              "apiVersion": "apiVersion",
+              "resources": [
+                {
+                  "operations": ["GET"],
+                  "description": "description",
+                  "resourceName": "resourceName",
+                  "custOpName": "custOpName",
+                  "uri": "uri",
+                  "commType": "REQUEST_RESPONSE"
+                },
+                {
+                  "operations": ["GET"],
+                  "description": "description",
+                  "resourceName": "resourceName",
+                  "custOpName": "custOpName",
+                  "uri": "uri",
+                  "commType": "REQUEST_RESPONSE"
+                }
+              ],
+              "custOperations": [
+                {
+                  "operations": ["GET"],
+                  "description": "description",
+                  "custOpName": "custOpName",
+                  "commType": "REQUEST_RESPONSE"
+                },
+                {
+                  "operations": ["GET"],
+                  "description": "description",
+                  "custOpName": "custOpName",
+                  "commType": "REQUEST_RESPONSE"
+                }
+              ],
+              "expiry": "2000-01-23T04:56:07.000+00:00"
+            }
+          ],
+          "aefId": "aefId",
+          "interfaceDescriptions": [
+            {
+              "securityMethods": ["PSK"],
+              "port": 5248,
+              "ipv4Addr": "ipv4Addr"
+            },
+            { "securityMethods": ["PSK"], "port": 5248, "ipv4Addr": "ipv4Addr" }
+          ]
+        }
+      ],
+      "pubApiPath": { "ccfIds": ["ccfIds", "ccfIds"] }
+    },
+    {
+      "serviceAPICategory": "serviceAPICategory",
+      "ccfId": "ccfId",
+      "apiName": "apiName2",
+      "shareableInfo": {
+        "capifProvDoms": ["capifProvDoms", "capifProvDoms"],
+        "isShareable": true
+      },
+      "supportedFeatures": "fffffff",
+      "description": "description",
+      "apiSuppFeats": "fffffff",
+      "apiId": "apiId",
+      "aefProfiles": [
+        {
+          "securityMethods": ["PSK"],
+          "versions": [
+            {
+              "apiVersion": "apiVersion",
+              "resources": [
+                {
+                  "operations": ["GET"],
+                  "description": "description",
+                  "resourceName": "resourceName",
+                  "custOpName": "custOpName",
+                  "uri": "uri",
+                  "commType": "REQUEST_RESPONSE"
+                },
+                {
+                  "operations": ["GET"],
+                  "description": "description",
+                  "resourceName": "resourceName",
+                  "custOpName": "custOpName",
+                  "uri": "uri",
+                  "commType": "REQUEST_RESPONSE"
+                }
+              ],
+              "custOperations": [
+                {
+                  "operations": ["GET"],
+                  "description": "description",
+                  "custOpName": "custOpName",
+                  "commType": "REQUEST_RESPONSE"
+                },
+                {
+                  "operations": ["GET"],
+                  "description": "description",
+                  "custOpName": "custOpName",
+                  "commType": "REQUEST_RESPONSE"
+                }
+              ],
+              "expiry": "2000-01-23T04:56:07.000+00:00"
+            },
+            {
+              "apiVersion": "apiVersion",
+              "resources": [
+                {
+                  "operations": ["GET"],
+                  "description": "description",
+                  "resourceName": "resourceName",
+                  "custOpName": "custOpName",
+                  "uri": "uri",
+                  "commType": "REQUEST_RESPONSE"
+                },
+                {
+                  "operations": ["GET"],
+                  "description": "description",
+                  "resourceName": "resourceName",
+                  "custOpName": "custOpName",
+                  "uri": "uri",
+                  "commType": "REQUEST_RESPONSE"
+                }
+              ],
+              "custOperations": [
+                {
+                  "operations": ["GET"],
+                  "description": "description",
+                  "custOpName": "custOpName",
+                  "commType": "REQUEST_RESPONSE"
+                },
+                {
+                  "operations": ["GET"],
+                  "description": "description",
+                  "custOpName": "custOpName",
+                  "commType": "REQUEST_RESPONSE"
+                }
+              ],
+              "expiry": "2000-01-23T04:56:07.000+00:00"
+            }
+          ],
+          "aefId": "aefId",
+          "interfaceDescriptions": [
+            {
+              "securityMethods": ["PSK"],
+              "port": 5248,
+              "ipv4Addr": "ipv4Addr"
+            },
+            { "securityMethods": ["PSK"], "port": 5248, "ipv4Addr": "ipv4Addr" }
+          ]
+        },
+        {
+          "securityMethods": ["PSK"],
+          "versions": [
+            {
+              "apiVersion": "apiVersion",
+              "resources": [
+                {
+                  "operations": ["GET"],
+                  "description": "description",
+                  "resourceName": "resourceName",
+                  "custOpName": "custOpName",
+                  "uri": "uri",
+                  "commType": "REQUEST_RESPONSE"
+                },
+                {
+                  "operations": ["GET"],
+                  "description": "description",
+                  "resourceName": "resourceName",
+                  "custOpName": "custOpName",
+                  "uri": "uri",
+                  "commType": "REQUEST_RESPONSE"
+                }
+              ],
+              "custOperations": [
+                {
+                  "operations": ["GET"],
+                  "description": "description",
+                  "custOpName": "custOpName",
+                  "commType": "REQUEST_RESPONSE"
+                },
+                {
+                  "operations": ["GET"],
+                  "description": "description",
+                  "custOpName": "custOpName",
+                  "commType": "REQUEST_RESPONSE"
+                }
+              ],
+              "expiry": "2000-01-23T04:56:07.000+00:00"
+            },
+            {
+              "apiVersion": "apiVersion",
+              "resources": [
+                {
+                  "operations": ["GET"],
+                  "description": "description",
+                  "resourceName": "resourceName",
+                  "custOpName": "custOpName",
+                  "uri": "uri",
+                  "commType": "REQUEST_RESPONSE"
+                },
+                {
+                  "operations": ["GET"],
+                  "description": "description",
+                  "resourceName": "resourceName",
+                  "custOpName": "custOpName",
+                  "uri": "uri",
+                  "commType": "REQUEST_RESPONSE"
+                }
+              ],
+              "custOperations": [
+                {
+                  "operations": ["GET"],
+                  "description": "description",
+                  "custOpName": "custOpName",
+                  "commType": "REQUEST_RESPONSE"
+                },
+                {
+                  "operations": ["GET"],
+                  "description": "description",
+                  "custOpName": "custOpName",
+                  "commType": "REQUEST_RESPONSE"
+                }
+              ],
+              "expiry": "2000-01-23T04:56:07.000+00:00"
+            }
+          ],
+          "aefId": "aefId",
+          "interfaceDescriptions": [
+            {
+              "securityMethods": ["PSK"],
+              "port": 5248,
+              "ipv4Addr": "ipv4Addr"
+            },
+            { "securityMethods": ["PSK"], "port": 5248, "ipv4Addr": "ipv4Addr" }
+          ]
+        }
+      ],
+      "pubApiPath": { "ccfIds": ["ccfIds", "ccfIds"] }
+    }
+  ]
+}
diff --git a/docs/test_plan/api_invoker_management/invoker_getauth_example.json b/docs/test_plan/api_invoker_management/invoker_getauth_example.json
new file mode 100644
index 0000000000000000000000000000000000000000..a66dad58adb1894b70b802193164301a429abdc1
--- /dev/null
+++ b/docs/test_plan/api_invoker_management/invoker_getauth_example.json
@@ -0,0 +1,4 @@
+{
+  "username": "ROBOT_TESTING_INVOKER",
+  "password": "password"
+}
diff --git a/docs/test_plan/api_invoker_management/invoker_register_body.json b/docs/test_plan/api_invoker_management/invoker_register_body.json
new file mode 100644
index 0000000000000000000000000000000000000000..e5bf1fc5b89682c56416c62530a95a5a86037885
--- /dev/null
+++ b/docs/test_plan/api_invoker_management/invoker_register_body.json
@@ -0,0 +1,7 @@
+{
+  "password": "password",
+  "username": "ROBOT_TESTING_INVOKER",
+  "role": "invoker",
+  "description": "Testing",
+  "cn": "ROBOT_TESTING_INVOKER"
+}
diff --git a/docs/test_plan/api_logging_service/README.md b/docs/test_plan/api_logging_service/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..913a652ba779bc66dcae07c64502a5312bf3fdce
--- /dev/null
+++ b/docs/test_plan/api_logging_service/README.md
@@ -0,0 +1,241 @@
+[**[Return To All Test Plans]**]
+
+- [Test Plan for CAPIF Api Logging Service](#test-plan-for-capif-api-logging-service)
+- [Tests](#tests)
+  - [Test Case 1: Creates a new individual CAPIF Log Entry.](#test-case-1-creates-a-new-individual-capif-log-entry)
+  - [Test Case 2: Creates a new individual CAPIF Log Entry with Invalid aefID](#test-case-2-creates-a-new-individual-capif-log-entry-with-invalid-aefid)
+  - [Test Case 3: Creates a new individual CAPIF Log Entry with Invalid serviceAPI](#test-case-3-creates-a-new-individual-capif-log-entry-with-invalid-serviceapi)
+  - [Test Case 4: Creates a new individual CAPIF Log Entry with Invalid apiInvokerId](#test-case-4-creates-a-new-individual-capif-log-entry-with-invalid-apiinvokerid)
+
+  - [Test Case 5: Creates a new individual CAPIF Log Entry with differnted aef_id in body and request](#test-case-5-creates-a-new-individual-capif-log-entry-with-invalid-aefid-in-body)
+
+
+# Test Plan for CAPIF Api Logging Service
+At this documentation you will have all information and related files and examples of test plan for this API.
+
+# Tests
+
+## Test Case 1: Creates a new individual CAPIF Log Entry.
+* Test ID: ***capif_api_logging-1***
+* Description:
+
+  This test case will check that a CAPIF AEF can create log entry to Logging Service
+* Pre-Conditions:
+  
+  *  CAPIF provider is pre-authorised (has valid aefId from CAPIF Authority)
+  *  Service exist in CAPIF
+  *  Invoker exist in CAPIF
+
+* Information of Test:
+
+  1. Perform [provider onboarding] and [invoker onboarding]
+
+  2. Publish Service API at CCF:
+    - Send Post to ccf_publish_url https://{CAPIF_HOSTNAME}/published-apis/v1/{apfId}/service-apis
+    - body [service api description] with apiName service_1
+    - Use APF Certificate
+
+  3. Log Entry:
+     1. Send POST to *https://{CAPIF_HOSTNAME}/api-invocation-logs/v1/{aefId}/logs*
+     2. body [log entry request body]
+     3. Use AEF Certificate
+
+* Execution Steps:
+  1. Register Provider and Invoker CCF
+  2. Publish Service
+  3. Create Log Entry
+
+* Expected Result:
+
+  1. Response to Logging Service must accomplish:
+     1. **201 Created**
+     2. Response Body must follow **InvocationLog** data structure with:
+        * aefId
+        * apiInvokerId
+        * logs
+     3. Response Header **Location** must be received with URI to new resource created, following this structure: *{apiRoot}/api-invocation-logs/v1/{aefId}/logs/{logId}*
+
+
+
+
+## Test Case 2:  Creates a new individual CAPIF Log Entry with Invalid aefId
+* Test ID: ***capif_api_logging-2***
+* Description:
+
+  This test case will check that a CAPIF subscriber (AEF) cannot create Log Entry without valid aefId
+* Pre-Conditions:
+
+  * CAPIF provider is not pre-authorised (has not valid aefId from CAPIF Authority)
+  *  Service exist in CAPIF
+  *  Invoker exist in CAPIF
+
+* Information of Test:
+
+  1. Perform [provider onboarding] and [invoker onboarding]
+
+  2. Publish Service API at CCF:
+    - Send Post to ccf_publish_url https://{CAPIF_HOSTNAME}/published-apis/v1/{apfId}/service-apis
+    - body [service api description] with apiName service_1
+    - Use APF Certificate
+
+  3. Log Entry:
+     1. Send POST to *https://{CAPIF_HOSTNAME}/api-invocation-logs/v1/{not-valid-aefId}/logs*
+     2. body [log entry request body]
+     3. Use AEF Certificate
+
+* Execution Steps:
+  1. Register Provider and Invoker CCF
+  2. Publish Service
+  3. Create Log Entry
+   
+* Expected Result:
+
+  1. Response to Logging Service must accomplish:
+     1. **404 Not Found**
+     2. Error Response Body must accomplish with **ProblemDetails** data structure with:
+        * status 404
+        * title with message "Not Found"
+        * detail with message "Exposer not exist".
+        * cause with message "Exposer id not found".
+
+## Test Case 3:  Creates a new individual CAPIF Log Entry with Invalid serviceAPI
+* Test ID: ***capif_api_logging-3***
+* Description:
+
+  This test case will check that a CAPIF subscriber (AEF) cannot create Log Entry without valid aefId
+* Pre-Conditions:
+  
+  * CAPIF subscriber is pre-authorised (has valid aefId from CAPIF Authority)
+
+* Information of Test:
+
+  1. Perform [provider onboarding] and [invoker onboarding]
+
+  2. Publish Service API at CCF:
+    - Send Post to ccf_publish_url https://{CAPIF_HOSTNAME}/published-apis/v1/{apfId}/service-apis
+    - body [service api description] with apiName service_1
+    - Use APF Certificate
+
+  3. Log Entry:
+     1. Send POST to *https://{CAPIF_HOSTNAME}/api-invocation-logs/v1/{aefId}/logs*
+     2. body [log entry request body with serviceAPI apiName apiId not valid]
+     3. Use AEF Certificate
+
+* Execution Steps:
+  1. Register Provider and Invoker CCF
+  2. Publish Service
+  3. Create Log Entry
+
+* Expected Result:
+
+  1. Response to Logging Service must accomplish:
+     1. **404 Not Found**
+     2. Error Response Body must accomplish with **ProblemDetails** data structure with:
+        * status 404
+        * title with message "Not Found"
+        * detail with message "Invoker not exist".
+        * cause with message "Invoker id not found".
+
+
+
+## Test Case 4:  Creates a new individual CAPIF Log Entry with Invalid apiInvokerId
+* Test ID: ***capif_api_logging-4***
+* Description:
+
+  This test case will check that a CAPIF subscriber (AEF) cannot create Log Entry without valid aefId
+* Pre-Conditions:
+  
+  * CAPIF subscriber is pre-authorised (has valid aefId from CAPIF Authority)
+
+* Information of Test:
+
+  1. Perform [provider onboarding] and [invoker onboarding]
+
+  2. Publish Service API at CCF:
+    - Send Post to ccf_publish_url https://{CAPIF_HOSTNAME}/published-apis/v1/{apfId}/service-apis
+    - body [service api description] with apiName service_1
+    - Use APF Certificate
+
+  3. Log Entry:
+     1. Send POST to *https://{CAPIF_HOSTNAME}/api-invocation-logs/v1/{aefId}/logs*
+     2. body [log entry request body with invokerId not valid]
+     3. Use AEF Certificate
+
+* Execution Steps:
+  1. Register Provider and Invoker CCF
+  2. Publish Service
+  3. Create Log Entry
+   
+* Expected Result:
+
+  1. Response to Onboard request must accomplish:
+     1. **201 Created** response.
+     2. body returned must accomplish **APIProviderEnrolmentDetails** data structure.
+     3. For each **apiProvFuncs**, we must check:
+        1. **apiProvFuncId** is set
+        2. **apiProvCert** under **regInfo** is set properly
+     5. Location Header must contain the new resource URL *{apiRoot}/api-provider-management/v1/registrations/{registrationId}*
+
+  2. Response to Logging Service must accomplish:
+     1. **404 Not Found**
+     2. Error Response Body must accomplish with **ProblemDetails** data structure with:
+        * status 404
+        * title with message "Not Found"
+        * detail with message "Invoker not exist".
+        * cause with message "Invoker id not found".
+
+  3. Log Entry are not stored in CAPIF Database
+
+
+## Test Case 5:  Creates a new individual CAPIF Log Entry with Invalid aefId in body
+* Test ID: ***capif_api_logging-5***
+* Description:
+
+  This test case will check that a CAPIF subscriber (AEF) cannot create Log Entry without valid aefId in body
+* Pre-Conditions:
+
+  *  CAPIF provider is pre-authorised (has valid apfId from CAPIF Authority)
+  *  Service exist in CAPIF
+  *  Invoker exist in CAPIF
+
+* Information of Test:
+
+  1. Perform [provider onboarding] and [invoker onboarding]
+
+  2. Publish Service API at CCF:
+    - Send Post to ccf_publish_url https://{CAPIF_HOSTNAME}/published-apis/v1/{apfId}/service-apis
+    - body [service api description] with apiName service_1
+    - Use APF Certificate
+
+  3. Log Entry:
+     1. Send POST to *https://{CAPIF_HOSTNAME}/api-invocation-logs/v1/{aefId}/logs*
+     2. body [log entry request body with bad aefId] 
+     3. Use AEF Certificate
+
+* Execution Steps:
+  1. Register Provider and Invoker CCF
+  2. Publish Service
+  3. Create Log Entry
+  
+* Expected Result:
+
+  1. Response to Logging Service must accomplish:
+     1. **401 Unauthorized**
+     2. Error Response Body must accomplish with **ProblemDetails** data structure with:
+        * status 401
+        * title with message "Unauthorized"
+        * detail with message "AEF id not matching in request and body".
+        * cause with message "Not identical AEF id".
+
+
+
+
+
+
+[log entry request body]: ./invocation_log.json "Log Request Body"
+
+[invoker onboarding]: ../common_operations/README.md#register-an-invoker "Invoker Onboarding"
+
+[provider onboarding]: ../common_operations/README.md#register-a-provider "Provider Onboarding"
+
+[Return To All Test Plans]: ../README.md
diff --git a/docs/test_plan/api_logging_service/invocation_log.json b/docs/test_plan/api_logging_service/invocation_log.json
new file mode 100644
index 0000000000000000000000000000000000000000..ceabcf02016e116566cd2b13c99a87a6adcef5d3
--- /dev/null
+++ b/docs/test_plan/api_logging_service/invocation_log.json
@@ -0,0 +1,45 @@
+{
+    "aefId": "aefId",
+    "apiInvokerId": "apiInvokerId",
+    "logs": [
+      {
+        "apiId": "apiId",
+        "apiName": "apiName",
+        "apiVersion": "string",
+        "resourceName": "string",
+        "uri": "string",
+        "protocol": "HTTP_1_1",
+        "operation": "GET",
+        "result": "string",
+        "invocationTime": "2023-03-30T10:30:21.404Z",
+        "invocationLatency": 0,
+        "inputParameters": "string",
+        "outputParameters": "string",
+        "srcInterface": {
+          "ipv4Addr": "string",
+          "ipv6Addr": "string",
+          "fqdn": "string",
+          "port": 65535,
+          "apiPrefix": "string",
+          "securityMethods": [
+            "PSK",
+            "Oauth"
+          ]
+        },
+        "destInterface": {
+          "ipv4Addr": "string",
+          "ipv6Addr": "string",
+          "fqdn": "string",
+          "port": 65535,
+          "apiPrefix": "string",
+          "securityMethods": [
+            "PSK",
+            "string"
+          ]
+        },
+        "fwdInterface": "string"
+      }
+    ],
+    "supportedFeatures": "string"
+  }
+  
\ No newline at end of file
diff --git a/docs/test_plan/api_provider_management/README.md b/docs/test_plan/api_provider_management/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..547d654d69308c7dbbcc2b89f168df911e9e75dc
--- /dev/null
+++ b/docs/test_plan/api_provider_management/README.md
@@ -0,0 +1,398 @@
+[**[Return To All Test Plans]**]
+
+- [Test Plan for CAPIF Api Provider Management](#test-plan-for-capif-api-provider-management)
+- [Tests](#tests)
+  - [Test Case 1: Register Api Provider](#test-case-1-register-api-provider)
+  - [Test Case 2: Register Api Provider Already registered](#test-case-2-register-api-provider-already-registered)
+  - [Test Case 3: Update Registered Api Provider](#test-case-3-update-registered-api-provider)
+  - [Test Case 4: Update Not Registered Api Provider](#test-case-4-update-not-registered-api-provider)
+  - [Test Case 5: Partially Update Registered Api Provider](#test-case-5-partially-update-registered-api-provider)
+  - [Test Case 6: Partially Update Not Registered Api Provider](#test-case-6-partially-update-not-registered-api-provider)
+  - [Test Case 7: Delete Registered Api Provider](#test-case-7-delete-registered-api-provider)
+  - [Test Case 8: Delete Not Registered Api Provider](#test-case-8-delete-not-registered-api-provider)
+
+
+# Test Plan for CAPIF Api Provider Management
+At this documentation you will have all information and related files and examples of test plan for this API.
+
+# Tests
+
+## Test Case 1: Register Api Provider
+* **Test ID**: ***capif_api_provider_management-1***
+* **Description**:
+  
+  This test case will check that Api Provider can be registered con CCF
+* **Pre-Conditions**:
+  
+  * Provider is pre-authorised (has valid certificate from CAPIF Authority)
+
+* **Information of Test**:
+
+  1. Create public and private key at provider for provider itself and each function (apf, aef and amf)
+
+  2. Register of Provider at CCF:
+     * Send POST to *http://{CAPIF_HOSTNAME}:{CAPIF_HTTP_PORT}/register*
+     * body [provider register body]
+  
+  3. Obtain Access Token:
+     * Send POST to *http://{CAPIF_HOSTNAME}/getauth*
+     * Body [provider getauth body]
+
+  4. Register Provider:
+     * Send POST *https://{CAPIF_HOSTNAME}/api-provider-management/v1/registrations*
+     * body [provider request body]
+     * Authentication Bearer with access_token
+     * Store each cert in a file with according name.
+
+* **Execution Steps**:
+  
+  1. Create private and public key for provider and each function to register.
+  2. Register Provider.
+   
+* **Expected Result**:
+
+  1. Register Provider at Provider Management:
+     1. **201 Created** response.
+     2. body returned must accomplish **APIProviderEnrolmentDetails** data structure.
+     3. For each **apiProvFuncs**, we must check:
+        1. **apiProvFuncId** is set
+        2. **apiProvCert** under **regInfo** is set properly
+     5. Location Header must contain the new resource URL *{apiRoot}/api-provider-management/v1/registrations/{registrationId}*
+
+## Test Case 2: Register Api Provider Already registered
+* **Test ID**: ***capif_api_provider_management-2***
+* **Description**:
+  
+  This test case will check that a Api Provider previously registered cannot be re-registered
+* **Pre-Conditions**:
+  
+  * Api Provider was registered previously and there is a {registerId} for his Api Provider in the DB
+
+* **Information of Test**:
+
+  1. Create public and private key at provider for provider itself and each function (apf, aef and amf)
+
+  2. Register of Provider at CCF:
+     * Send POST to *http://{CAPIF_HOSTNAME}:{CAPIF_HTTP_PORT}/register*
+     * body [provider register body]
+  
+  3. Obtain Access Token:
+     * Send POST to *http://{CAPIF_HOSTNAME}/getauth*
+     * Body [provider getauth body]
+
+  4. Register Provider:
+     * Send POST *https://{CAPIF_HOSTNAME}/api-provider-management/v1/registrations*
+     * body [provider request body]
+     * Authentication Bearer with access_token
+     * Store each cert in a file with according name.
+
+  5. Re-Register Provider:
+     * Same regSec than Previous registration
+
+* **Execution Steps**:
+  
+  1. Create private and public key for provider and each function to register.
+  2. Register Provider.
+  3. Re-Register Provider.
+   
+* **Expected Result**:
+
+  1. Re-Register Provider:
+     1. **403 Forbidden** response.
+     2. body returned must accomplish **ProblemDetails** data structure, with:
+        * status 403
+        * title with message "Forbidden"
+        * detail with message "Provider already registered".
+        * cause with message "Identical provider reg sec".
+
+## Test Case 3: Update Registered Api Provider  
+* **Test ID**: ***capif_api_provider_management-3***
+* **Description**:
+  
+  This test case will check that a Registered Api Provider can be updated
+* **Pre-Conditions**:
+  
+  * Api Provider was registered previously and there is a {registerId} for his Api Provider in the DB
+
+* **Information of Test**:
+
+  1. Create public and private key at provider for provider itself and each function (apf, aef and amf)
+
+  2. Register of Provider at CCF:
+     * Send POST to *http://{CAPIF_HOSTNAME}:{CAPIF_HTTP_PORT}/register*
+     * body [provider register body]
+  
+  3. Obtain Access Token:
+     * Send POST to *http://{CAPIF_HOSTNAME}/getauth*
+     * Body [provider getauth body]
+
+  4. Register Provider:
+     * Send POST *https://{CAPIF_HOSTNAME}/api-provider-management/v1/registrations*
+     * body [provider request body]
+     * Authentication Bearer with access_token
+     * Get Resource URL from Location
+
+  5. Update Provider:
+     * Send PUT to Resource URL returned at registration *https://{CAPIF_HOSTNAME}/api-provider-management/v1/registrations/{registrationId}*
+     * body [provider request body] with apiProvDomInfo set to ROBOT_TESTING_MOD
+     * Use AMF Certificate.
+
+
+* **Execution Steps**:
+  
+  1. Create private and public key for provider and each function to register.
+  2. Register Provider
+  3. Update Provider
+   
+* **Expected Result**:
+  1. Register Provider:
+     1. **201 Created** response.
+     2. body returned must accomplish **APIProviderEnrolmentDetails** data structure.
+     3. Location Header must contain the new resource URL *{apiRoot}/api-provider-management/v1/registrations/{registrationId}*
+
+
+  2. Update Provider:
+     1. **200 OK** response.
+     2. body returned must accomplish **APIProviderEnrolmentDetails** data structure, with:
+        * apiProvDomInfo set to ROBOT_TESTING_MOD
+
+
+## Test Case 4: Update Not Registered Api Provider 
+* **Test ID**: ***capif_api_provider_management-4***
+* **Description**:
+  
+  This test case will check that a Non-Registered Api Provider cannot be updated
+* **Pre-Conditions**:
+  
+  * Api Provider was not registered previously
+
+* **Information of Test**:
+
+  1. Create public and private key at provider for provider itself and each function (apf, aef and amf)
+
+  2. Register of Provider at CCF:
+     * Send POST to *http://{CAPIF_HOSTNAME}:{CAPIF_HTTP_PORT}/register*
+     * body [provider register body]
+  
+  3. Obtain Access Token:
+     * Send POST to *http://{CAPIF_HOSTNAME}/getauth*
+     * Body [provider getauth body]
+
+  4. Register Provider:
+     * Send POST *https://{CAPIF_HOSTNAME}/api-provider-management/v1/registrations*
+     * body [provider request body]
+     * Authentication Bearer with access_token
+     * Store each cert in a file with according name.
+
+  5. Update Not Registered Provider:
+     * Send PUT *https://{CAPIF_HOSTNAME}/api-provider-management/v1/registrations/{API_PROVIDER_NOT_REGISTERED}*
+     * body [provider request body]
+     * Use AMF Certificate.
+
+* **Execution Steps**:
+  
+  1. Register Provider at CCF
+  3. Update Not Registered Provider
+   
+* **Expected Result**:
+
+  1. Update Not Registered Provider:
+     1. **404 Not Found** response.
+     2. body returned must accomplish **ProblemDetails** data structure, with:
+        * status 404
+        * title with message "Not Found"
+        * detail with message "Not Exist Provider Enrolment Details".
+        * cause with message "Not found registrations to send this api provider details".
+
+## Test Case 5: Partially Update Registered Api Provider  
+* **Test ID**: ***capif_api_provider_management-5***
+* **Description**:
+  
+  This test case will check that a Registered Api Provider can be partially updated
+* **Pre-Conditions**:
+  
+  * Api Provider was registered previously and there is a {registerId} for his Api Provider in the DB
+
+* **Information of Test**:
+
+  1. Create public and private key at provider for provider itself and each function (apf, aef and amf)
+
+  2. Register of Provider at CCF:
+     * Send POST to *http://{CAPIF_HOSTNAME}:{CAPIF_HTTP_PORT}/register*
+     * body [provider register body]
+  
+  3. Obtain Access Token:
+     * Send POST to *http://{CAPIF_HOSTNAME}/getauth*
+     * Body [provider getauth body]
+
+  4. Register Provider:
+     * Send POST *https://{CAPIF_HOSTNAME}/api-provider-management/v1/registrations*
+     * body [provider request body]
+     * Authentication Bearer with access_token
+     * Store each cert in a file with according name.
+
+  5. Partial update provider:
+     * Send PATCH *https://{CAPIF_HOSTNAME}/api-provider-management/v1/registrations/{registrationId}*
+     * body [provider request patch body]
+     * Use AMF Certificate.
+
+* **Execution Steps**:
+  
+  1. Register Provider at CCF
+  2. Register Provider
+  3. Partial update provider
+   
+* **Expected Result**:
+
+  1. Partial update provider at Provider Management:
+     1. **200 OK** response.
+     2. body returned must accomplish **APIProviderEnrolmentDetails** data structure, with:
+        * apiProvDomInfo with "ROBOT_TESTING_MOD"
+
+## Test Case 6: Partially Update Not Registered Api Provider 
+* **Test ID**: ***capif_api_provider_management-6***
+* **Description**:
+  
+  This test case will check that a Non-Registered Api Provider cannot be partially updated  
+
+* **Pre-Conditions**:
+  
+  * Api Provider was not registered previously
+
+* **Information of Test**:
+
+  1. Create public and private key at provider for provider itself and each function (apf, aef and amf)
+
+  2. Register of Provider at CCF:
+     * Send POST to *http://{CAPIF_HOSTNAME}:{CAPIF_HTTP_PORT}/register*
+     * body [provider register body]
+  
+  3. Obtain Access Token:
+     * Send POST to *http://{CAPIF_HOSTNAME}/getauth*
+     * Body [provider getauth body]
+
+  4. Register Provider:
+     * Send POST *https://{CAPIF_HOSTNAME}/api-provider-management/v1/registrations*
+     * body [provider request body]
+     * Authentication Bearer with access_token
+     * Store each cert in a file with according name.
+
+  5. Partial update Provider:
+     * Send PATCH *https://{CAPIF_HOSTNAME}/api-provider-management/v1/registrations/{API_API_PROVIDER_NOT_REGISTERED}*
+     * body [provider request patch body]
+     * Use AMF Certificate.
+  
+
+* **Execution Steps**:
+  
+  1. Register Provider at CCF
+  2. Register Provider
+  3. Partial update provider
+   
+* **Expected Result**:
+
+  1. Partial update provider:
+     1. **404 Not Found** response.
+     2. body returned must accomplish **ProblemDetails** data structure, with:
+        * status 404
+        * title with message "Not Found"
+        * detail with message "Not Exist Provider Enrolment Details".
+        * cause with message "Not found registrations to send this api provider details".
+
+## Test Case 7: Delete Registered Api Provider   
+* **Test ID**: ***capif_api_provider_management-7***
+* **Description**:
+  
+  This test case will check that a Registered Api Provider can be deleted
+* **Pre-Conditions**:
+  
+  * Api Provider was registered previously
+
+* **Information of Test**:
+
+  1. Create public and private key at provider for provider itself and each function (apf, aef and amf)
+
+  2. Register of Provider at CCF:
+     * Send POST to *http://{CAPIF_HOSTNAME}:{CAPIF_HTTP_PORT}/register*
+     * body [provider register body]
+  
+  3. Obtain Access Token:
+     * Send POST to *http://{CAPIF_HOSTNAME}/getauth*
+     * Body [provider getauth body]
+
+  4. Register Provider:
+     * Send POST *https://{CAPIF_HOSTNAME}/api-provider-management/v1/registrations*
+     * body [provider request body]
+     * Authentication Bearer with access_token
+     * Store each cert in a file with according name.
+
+  5. Delete registered provider:
+     * Send DELETE *https://{CAPIF_HOSTNAME}/api-provider-management/v1/registrations/{registrationId}*
+     * Use AMF Certificate.
+
+* **Execution Steps**:
+  
+  1. Register Provider at CCF
+  2. Register Provider
+  3. Delete Provider
+   
+* **Expected Result**:
+
+  1. Delete Provider:
+     1. **204 No Content** response.
+
+## Test Case 8: Delete Not Registered Api Provider
+* **Test ID**: ***capif_api_provider_management-8***
+* **Description**:
+  
+  This test case will check that a Non-Registered Api Provider cannot be deleted
+* **Pre-Conditions**:
+  
+  * Api Provider was not registered previously
+
+* **Information of Test**:
+
+  1. Create public and private key at provider for provider itself and each function (apf, aef and amf)
+
+  2. Register of Provider at CCF:
+     * Send POST to *http://{CAPIF_HOSTNAME}:{CAPIF_HTTP_PORT}/register*
+     * body [provider register body]
+  
+  3. Obtain Access Token:
+     * Send POST to *http://{CAPIF_HOSTNAME}/getauth*
+     * Body [provider getauth body]
+
+  4. Register Provider:
+     * Send POST *https://{CAPIF_HOSTNAME}/api-provider-management/v1/registrations*
+     * body [provider request body]
+     * Authentication Bearer with access_token
+     * Store each cert in a file with according name.
+
+  5. Delete registered provider at Provider Management:
+     * Send DELETE *https://{CAPIF_HOSTNAME}/api-provider-management/v1/registrations/{API_PROVIDER_NOT_REGISTERED}*
+     * Use AMF Certificate.
+
+* **Execution Steps**:
+  
+  1. Register Provider at CCF
+  2. Delete Provider
+   
+* **Expected Result**:
+
+  1. Delete Provider:
+     1. **404 Not Found** response.
+     2. body returned must accomplish **ProblemDetails** data structure, with:
+        * status 404
+        * title with message "Not Found"
+        * detail with message "Not Exist Provider Enrolment Details".
+        * cause with message "Not found registrations to send this api provider details".
+
+[provider register body]: ./provider_details_post_example.json  "API Provider Enrolment Request"
+
+[provider request body]: ./provider_details_post_example.json  "API Provider Enrolment Request"
+
+[provider request patch body]: ./provider_details_enrolment_details_patch_example.json  "API Provider Enrolment Patch Request"
+
+[provider getauth body]: ./provider_getauth_example.json    "Get Auth Example"
+
+[Return To All Test Plans]: ../README.md
diff --git a/docs/test_plan/api_provider_management/provider_details_enrolment_details_patch_example.json b/docs/test_plan/api_provider_management/provider_details_enrolment_details_patch_example.json
new file mode 100644
index 0000000000000000000000000000000000000000..4dac4f409eccfc7201c4eaf615b55f70c38b54e4
--- /dev/null
+++ b/docs/test_plan/api_provider_management/provider_details_enrolment_details_patch_example.json
@@ -0,0 +1,29 @@
+{
+  "regSec": "<public provider key>",
+  "apiProvFuncs": [
+    {
+      "regInfo": {
+        "apiProvPubKey": "<public provider apf key>"
+      },
+      "apiProvFuncRole": "APF",
+      "apiProvFuncInfo": "APF_ROBOT_TESTING_PROVIDER"
+    },
+    {
+      "regInfo": {
+        "apiProvPubKey": "<public provider aef key>"
+      },
+      "apiProvFuncRole": "AEF",
+      "apiProvFuncInfo": "AEF_ROBOT_TESTING_PROVIDER"
+    },
+    {
+      "regInfo": {
+        "apiProvPubKey": "<public provider amf key>"
+      },
+      "apiProvFuncRole": "AMF",
+      "apiProvFuncInfo": "AMF_ROBOT_TESTING_PROVIDER"
+    }
+  ],
+  "apiProvDomInfo": "ROBOT_TESTING",
+  "suppFeat": "string",
+  "failReason": "string"
+}
\ No newline at end of file
diff --git a/docs/test_plan/api_provider_management/provider_details_post_example.json b/docs/test_plan/api_provider_management/provider_details_post_example.json
new file mode 100644
index 0000000000000000000000000000000000000000..48e91bacf24899e55221babf610598b9d4132b61
--- /dev/null
+++ b/docs/test_plan/api_provider_management/provider_details_post_example.json
@@ -0,0 +1,17 @@
+{
+  "regSec": "string",
+  "apiProvFuncs": [
+    {
+      "apiProvFuncId": "string",
+      "regInfo": {
+        "apiProvPubKey": "string",
+        "apiProvCert": "string"
+      },
+      "apiProvFuncRole": "AEF",
+      "apiProvFuncInfo": "string"
+    }
+  ],
+  "apiProvDomInfo": "string",
+  "suppFeat": "string",
+  "failReason": "string"
+}
\ No newline at end of file
diff --git a/docs/test_plan/api_provider_management/provider_getauth_example.json b/docs/test_plan/api_provider_management/provider_getauth_example.json
new file mode 100644
index 0000000000000000000000000000000000000000..8fc82aeebfc9531651fa746bf10be11c6aa347f3
--- /dev/null
+++ b/docs/test_plan/api_provider_management/provider_getauth_example.json
@@ -0,0 +1,4 @@
+{
+  "username": "ROBOT_TESTING_PROVIDER",
+  "password": "password"
+}
diff --git a/docs/test_plan/api_provider_management/provider_register_body.json b/docs/test_plan/api_provider_management/provider_register_body.json
new file mode 100644
index 0000000000000000000000000000000000000000..fc26db2141eab904b1f2f8d96e963f2ec0efcbe1
--- /dev/null
+++ b/docs/test_plan/api_provider_management/provider_register_body.json
@@ -0,0 +1,7 @@
+{
+  "password": "password",
+  "username": "ROBOT_TESTING_PUBLISHER",
+  "role": "provider",
+  "description": "Testing",
+  "cn": "ROBOT_TESTING_PUBLISHER"
+}
diff --git a/docs/test_plan/api_publish_service/README.md b/docs/test_plan/api_publish_service/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..8487f5d5cc582ab65c393c5e437267e51b23a089
--- /dev/null
+++ b/docs/test_plan/api_publish_service/README.md
@@ -0,0 +1,599 @@
+[**[Return To All Test Plans]**]
+
+- [Test Plan for CAPIF Api Publish Service](#test-plan-for-capif-api-publish-service)
+- [Tests](#tests)
+  - [Test Case 1: Publish API by Authorised API Publisher](#test-case-1-publish-api-by-authorised-api-publisher)
+  - [Test Case 2: Publish API by NON Authorised API Publisher](#test-case-2-publish-api-by-non-authorised-api-publisher)
+  - [Test Case 3: Retrieve all APIs Published by Authorised apfId](#test-case-3-retrieve-all-apis-published-by-authorised-apfid)
+  - [Test Case 4: Retrieve all APIs Published by NON Authorised apfId](#test-case-4-retrieve-all-apis-published-by-non-authorised-apfid)
+  - [Test Case 5: Retrieve single APIs Published by Authorised apfId](#test-case-5-retrieve-single-apis-published-by-authorised-apfid)
+  - [Test Case 6: Retrieve single APIs non Published by Authorised apfId](#test-case-6-retrieve-single-apis-non-published-by-authorised-apfid)
+  - [Test Case 7: Retrieve single APIs Published by NON Authorised apfId](#test-case-7-retrieve-single-apis-published-by-non-authorised-apfid)
+  - [Test Case 8: Update API Published by Authorised apfId with valid serviceApiId](#test-case-8-update-api-published-by-authorised-apfid-with-valid-serviceapiid)
+  - [Test Case 9: Update APIs Published by Authorised apfId with invalid serviceApiId](#test-case-9-update-apis-published-by-authorised-apfid-with-invalid-serviceapiid)
+  - [Test Case 10: Update APIs Published by NON Authorised apfId](#test-case-10-update-apis-published-by-non-authorised-apfid)
+  - [Test Case 11: Delete API Published by Authorised apfId with valid serviceApiId](#test-case-11-delete-api-published-by-authorised-apfid-with-valid-serviceapiid)
+  - [Test Case 12: Delete APIs Published by Authorised apfId with invalid serviceApiId](#test-case-12-delete-apis-published-by-authorised-apfid-with-invalid-serviceapiid)
+  - [Test Case 13: Delete APIs Published by NON Authorised apfId](#test-case-13-delete-apis-published-by-non-authorised-apfid)
+
+
+# Test Plan for CAPIF Api Publish Service
+At this documentation you will have all information and related files and examples of test plan for this API.
+
+# Tests
+
+## Test Case 1: Publish API by Authorised API Publisher
+* **Test ID**: ***capif_api_publish_service-1***
+* **Description**:
+  
+  This test case will check that an API Publisher can Publish an API 
+* **Pre-Conditions**:
+  
+  * CAPIF subscriber is pre-authorised (has valid apfId from CAPIF Authority)
+
+* **Information of Test**:
+  1. Perform [Provider Registration]
+
+  2. Publish Service API at CCF:
+     * Send Post to ccf_publish_url *https://{CAPIF_HOSTNAME}/published-apis/v1/{apfId}/service-apis*
+     * body [service api description] with apiName service_1
+     * Use APF Certificate
+
+* **Execution Steps**:
+  1. Register Provider at CCF and store certificates.
+  2. Publish Service API
+  3. Retrieve {apiId} from body and Location header with new resource created from response
+   
+* **Expected Result**:
+  1. Response to Publish request must accomplish:
+     1. **201 Created**
+     2. Response Body must follow **ServiceAPIDescription** data structure with:
+        * apiId
+     3. Response Header **Location** must be received with URI to new resource created, following this structure: *{apiRoot}/published-apis/v1/{apfId}/service-apis/{serviceApiId}*
+
+  2. Published Service API is stored in CAPIF Database
+
+## Test Case 2: Publish API by NON Authorised API Publisher
+* **Test ID**: ***capif_api_publish_service-2***
+* **Description**:
+  
+  This test case will check that an API Publisher cannot Publish an API withot valid apfId 
+* **Pre-Conditions**:
+  
+  * CAPIF subscriber is NOT pre-authorised (has invalid apfId from CAPIF Authority)
+
+* **Information of Test**:
+  1. Perform [Provider Registration]
+
+  2. Publish Service API with invalid APF ID at CCF:
+     * Send Post to ccf_publish_url *https://{CAPIF_HOSTNAME}/published-apis/v1/{APF_ID_NOT_VALID}/service-apis*
+     * body [service api description] with apiName service_1
+     * Use APF Certificate
+
+* **Execution Steps**:
+  1. Register Provider at CCF and store certificates.
+  2. Publish Service API with invalid APF ID
+
+* **Expected Result**:
+  1. Response to Publish request must accomplish:
+     1. **401 Unauthorized**
+     2. Error Response Body must accomplish with **ProblemDetails** data structure with:
+        * status **401**
+        * title with message "Unauthorized"
+        * detail with message "Publisher not existing".
+        * cause with message "Publisher id not found".
+
+  2. Service API is NOT stored in CAPIF Database
+
+
+## Test Case 3: Retrieve all APIs Published by Authorised apfId 
+* **Test ID**: ***capif_api_publish_service-3***
+* **Description**:
+
+  This test case will check that an API Publisher can Retrieve all API published
+* **Pre-Conditions**:
+
+  * CAPIF subscriber is pre-authorised (has valid apfId from CAPIF Authority)
+  * At least 2 service APIs are published.
+
+* **Information of Test**:
+  1. Perform [Provider Registration]
+
+  2. Publish Service API at CCF:
+     * Send Post to *https://{CAPIF_HOSTNAME}/published-apis/v1/{apfId}/service-apis*
+     * body [service api description] with apiName service_1
+     * Get apiId
+     * Use APF Certificate
+
+  3. Publish Other Service API at CCF:
+     * Send Post to ccf_publish_url *https://{CAPIF_HOSTNAME}/published-apis/v1/{apfId}/service-apis*
+     * body [service api description] with apiName service_2
+     * Get apiId
+     * Use APF Certificate
+
+  4. Retrieve all published APIs:
+     * Send Get to ccf_publish_url *https://{CAPIF_HOSTNAME}/published-apis/v1/{apfId}/service-apis*
+     * Use APF Certificate
+
+* **Execution Steps**:
+  1. Register Provider at CCF and store certificates.
+  2. Publish Service API service_1
+  3. Retrieve {apiId1} from body and Location header with new resource created from response
+  4. Publish Service API service_2
+  5. Retrieve {apiId2} from body and Location header with new resource created from response
+  6. Retrieve All published APIs and check if both are present.
+
+* **Expected Result**:
+  1. Response to service 1 Publish request must accomplish:
+     1. **201 Created**
+     2. Response Body must follow **ServiceAPIDescription** data structure with:
+        * apiId
+     3. Response Header **Location** must be received with URI to new resource created, following this structure: *{apiRoot}/published-apis/v1/{apfId}/service-apis/{serviceApiId1}*
+
+  2. Response to service 2 Publish request must accomplish:
+     1. **201 Created**
+     2. Response Body must follow **ServiceAPIDescription** data structure with:
+        * apiId
+     3. Response Header **Location** must be received with URI to new resource created, following this structure: *{apiRoot}/published-apis/v1/{apfId}/service-apis/{serviceApiId2}*
+
+  3. Published Service APIs are stored in CAPIF Database
+
+  4. Response to Retrieve all published APIs:
+     1. **200 OK**
+     2. Response body must return an array of **ServiceAPIDescription** data.
+     3. Array must contain all previously published APIs.
+
+## Test Case 4: Retrieve all APIs Published by NON Authorised apfId 
+* **Test ID**: ***capif_api_publish_service-4***
+* **Description**:
+
+  This test case will check that an API Publisher cannot Retrieve API published when apfId is not authorised 
+* **Pre-Conditions**:
+
+  * CAPIF subscriber is NOT pre-authorised (has invalid apfId from CAPIF Authority)
+
+* **Information of Test**:
+  1. Perform [Provider Registration]
+
+  2. Retrieve all published APIs:
+     * Send Get to *https://{CAPIF_HOSTNAME}/published-apis/v1/{APF_ID_NOT_VALID}/service-apis*
+     * Use APF Certificate
+
+* **Execution Steps**:
+  1. Register Provider at CCF and store certificates.
+  2. Retrieve All published APIs
+   
+* **Expected Result**:
+  1. Response to Publish request must accomplish:
+     1. **401 Non Authorized**
+     2. Error Response Body must accomplish with **ProblemDetails** data structure with:
+        * status **401**
+        * title with message "Unauthorized"
+        * detail with message "Provider not existing".
+        * cause with message "Provider id not found".
+
+  2. Service API is NOT stored in CAPIF Database
+
+## Test Case 5: Retrieve single APIs Published by Authorised apfId
+* **Test ID**: ***capif_api_publish_service-5***
+* **Description**:
+  
+  This test case will check that an API Publisher can Retrieve API published one by one
+* **Pre-Conditions**:
+  
+  * CAPIF subscriber is pre-authorised (has valid apfId from CAPIF Authority)
+  * At least 2 service APIs are published.
+
+* **Information of Test**:
+  1. Perform [Provider Registration]
+
+  2. Publish Service API at CCF:
+     * Send Post to ccf_publish_url *https://{CAPIF_HOSTNAME}/published-apis/v1/{apfId}/service-apis*
+     * body [service api description] with apiName service_1
+     * Get apiId
+     * Use APF Certificate
+
+  3. Publish Other Service API at CCF:
+     * Send Post to ccf_publish_url *https://{CAPIF_HOSTNAME}/published-apis/v1/{apfId}/service-apis*
+     * body [service api description] with apiName service_2
+     * Get apiId
+     * Use APF Certificate
+
+  4. Retrieve service_1 published APIs detail:
+     * Send Get to ccf_publish_url *https://{CAPIF_HOSTNAME}/published-apis/v1/{apfId}/service-apis/{apiId1}*
+     * Use APF Certificate
+
+  5. Retrieve service_2 published APIs detail:
+     * Send Get to ccf_publish_url *https://{CAPIF_HOSTNAME}/published-apis/v1/{apfId}/service-apis/{apiId2}*
+     * Use APF Certificate
+
+* **Execution Steps**:
+  1. Register Provider at CCF and store certificates.
+  2. Publish Service API service_1.
+  3. Retrieve {apiId1} from body and Location header with new resource created from response.
+  4. Publish Service API service_2.
+  5. Retrieve {apiId2} from body and Location header with new resource created from response.
+  6. Retrieve service_1 API Detail.
+  7. Retrieve service_2 API Detail.
+
+* **Expected Result**:
+  1. Response to service 1 Publish request must accomplish:
+     1. **201 Created**
+     2. Response Body must follow **ServiceAPIDescription** data structure with:
+        * apiId
+     3. Response Header **Location** must be received with URI to new resource created, following this structure: *{apiRoot}/published-apis/v1/{apfId}/service-apis/{serviceApiId1}*
+
+  2. Response to service 2 Publish request must accomplish:
+     1. **201 Created**
+     2. Response Body must follow **ServiceAPIDescription** data structure with:
+        * apiId
+     3. Response Header **Location** must be received with URI to new resource created, following this structure: *{apiRoot}/published-apis/v1/{apfId}/service-apis/{serviceApiId2}*
+
+  3. Published Service APIs are stored in CAPIF Database
+
+  4. Response to Retrieve service_1 published API using apiId1:
+     1. **200 OK**
+     2. Response body must return a **ServiceAPIDescription** data.
+     3. Array must contain same information than service_1 published registration response.
+
+  5. Response to Retrieve service_2 published API using apiId2:
+     1. **200 OK**
+     2. Response body must return a **ServiceAPIDescription** data.
+     3. Array must contain same information than service_2 published registration response.
+
+
+## Test Case 6: Retrieve single APIs non Published by Authorised apfId 
+* **Test ID**: ***capif_api_publish_service-6***
+* **Description**:
+  
+  This test case will check that an API Publisher try to get detail of not published api.
+* **Pre-Conditions**:
+  
+  * CAPIF subscriber is pre-authorised (has valid apfId from CAPIF Authority)
+  * No published api
+
+* **Information of Test**:
+  1. Perform [Provider Registration]
+  2. Retrieve not published APIs detail:
+     * Send Get to ccf_publish_url *https://{CAPIF_HOSTNAME}/published-apis/v1/{apfId}/service-apis/{SERVICE_API_ID_NOT_VALID}*
+     * Use APF Certificate
+
+* **Execution Steps**:
+  1. Register Provider at CCF and store certificates.
+  2. Retrieve not published API Detail.
+
+* **Expected Result**:
+  1. Response to Retrieve for NOT published API must accomplish:
+     1. **404 Not Found**
+     2. Error Response Body must accomplish with **ProblemDetails** data structure with:
+        * status **404**
+        * title with message "Not Found"
+        * detail with message "Service API not found".
+        * cause with message "No Service with specific credentials exists".
+
+
+## Test Case 7: Retrieve single APIs Published by NON Authorised apfId 
+* **Test ID**: ***capif_api_publish_service-7***
+* **Description**:
+  
+  This test case will check that an API Publisher cannot Retrieve detailed API published when apfId is not authorised 
+* **Pre-Conditions**:
+  
+  * CAPIF subscriber is NOT pre-authorised (has invalid apfId from CAPIF Authority)
+
+* **Information of Test**:
+  1. Perform [Provider Registration] and [Invoker Onboarding]
+
+  2. Publish Service API at CCF:
+     * Send Post to ccf_publish_url *https://{CAPIF_HOSTNAME}/published-apis/v1/{apfId}/service-apis*
+     * body [service api description] with apiName service_1
+     * Get apiId
+     * Use APF Certificate
+
+  3. Retrieve detailed published APIs:
+     * Send Get to *https://{CAPIF_HOSTNAME}/published-apis/v1/{apfId}/service-apis/${apiId}*
+     * Use Invoker certificate
+
+* **Execution Steps**:
+  1. Register Provider at CCF and store certificates.
+  2. Publish Service API at CCF
+  3. Retrieve {apiId} from body and Location header with new resource created from response.
+  4. Register and onboard Invoker at CCF
+  5. Store signed Invoker Certificate
+  6. Retrieve detailed published API acting as Invoker
+   
+* **Expected Result**:
+  1. Response to Retrieve Detailed published API acting as Invoker must accomplish:
+     1. **401 Unauthorized**
+     2. Error Response Body must accomplish with **ProblemDetails** data structure with:
+        * status **401**
+        * title with message "Unauthorized"
+        * detail with message "User not authorized".
+        * cause with message "Certificate not authorized".
+
+  2. Service API is NOT stored in CAPIF Database
+
+
+## Test Case 8: Update API Published by Authorised apfId with valid serviceApiId
+* **Test ID**: ***capif_api_publish_service-8***
+* **Description**:
+  
+  This test case will check that an API Publisher can Update published API with a valid serviceApiId 
+* **Pre-Conditions**:
+  
+  * CAPIF subscriber is pre-authorised (has valid apfId from CAPIF Authority)
+  * A service APIs is published.
+
+* **Information of Test**:
+  1. Perform [Provider Registration]
+
+  2. Publish Service API at CCF:
+     * Send Post to ccf_publish_url *https://{CAPIF_HOSTNAME}/published-apis/v1/{apfId}/service-apis*
+     * body [service api description] with apiName service_1
+     * Get apiId
+     * get resource url from location Header.
+     * Use APF Certificate
+
+  3. Update published API at CCF:
+     * Send PUT to resource URL *https://{CAPIF_HOSTNAME}/published-apis/v1/{apfId}/service-apis/{serivceApiId}*
+     * body [service api description] with overrided apiName to service_1_modified
+     * Use APF Certificate
+
+  4. Retrieve detail of service API:
+     * Send Get to resource URL *https://{CAPIF_HOSTNAME}/published-apis/v1/{apfId}/service-apis/{serivceApiId}*
+     * check apiName is service_1_modified
+     * Use APF Certificate
+
+* **Execution Steps**:
+  1. Register Provider at CCF and store certificates.
+  2. Publish Service API
+  3. Retrieve {apiId} from body and Location header with new resource url created from response
+  4. Update published Service API.
+  5. Retrieve detail of Service API
+   
+* **Expected Result**:
+  1. Response to Publish request must accomplish:
+     1. **201 Created**
+     2. Response Body must follow **ServiceAPIDescription** data structure with:
+        * apiId
+     3. Response Header **Location** must be received with URI to new resource created, following this structure: *{apiRoot}/published-apis/v1/{apfId}/service-apis/{serviceApiId}*
+
+  2. Response to Update Published Service API:
+     1. **200 OK**
+     2. Response Body must follow **ServiceAPIDescription** data structure with:
+        * apiName service_1_modified
+
+  3. Response to Retrieve detail of Service API:
+     1. **200 OK**
+     2. Response Body must follow **ServiceAPIDescription** data structure with:
+        * apiName service_1_modified.
+  
+
+## Test Case 9: Update APIs Published by Authorised apfId with invalid serviceApiId  
+* **Test ID**: ***capif_api_publish_service-9***
+* **Description**:
+  
+  This test case will check that an API Publisher cannot Update published API with a invalid serviceApiId
+* **Pre-Conditions**:
+  
+  * CAPIF subscriber is pre-authorised (has valid apfId from CAPIF Authority)
+
+* **Information of Test**:
+  1. Perform [Provider Registration]
+
+  2. Publish Service API at CCF:
+     * Send Post to ccf_publish_url *https://{CAPIF_HOSTNAME}/published-apis/v1/{apfId}/service-apis*
+     * body [service api description] with apiName service_1
+     * Get apiId
+     * Use APF Certificate
+
+  3. Update published API at CCF:
+     * Send PUT to resource URL *https://{CAPIF_HOSTNAME}/published-apis/v1/{apfId}/service-apis/{SERVICE_API_ID_NOT_VALID}*
+     * body [service api description] with overrided apiName to ***service_1_modified***
+     * Use APF Certificate
+
+* **Execution Steps**:
+  1. Register Provider at CCF and store certificates.
+  2. Update published Service API.
+   
+* **Expected Result**:
+  1. Response to Publish request must accomplish:
+     1. **201 Created**
+     2. Response Body must follow **ServiceAPIDescription** data structure with:
+        * apiId
+     3. Response Header **Location** must be received with URI to new resource created, following this structure: *{apiRoot}/published-apis/v1/{apfId}/service-apis/{serviceApiId}*
+
+  2. Response to Update Published Service API:
+     1. **404 Not Found**
+     2. Error Response Body must accomplish with **ProblemDetails** data structure with:
+        * status **404**
+        * title with message "Not Found"
+        * detail with message "Service API not found".
+        * cause with message "Service API id not found".
+
+  ## Test Case 10: Update APIs Published by NON Authorised apfId  
+* **Test ID**: ***capif_api_publish_service-10***
+* **Description**:
+  
+  This test case will check that an API Publisher cannot Update API published when apfId is not authorised
+* **Pre-Conditions**:
+  
+  * CAPIF subscriber is NOT pre-authorised (has invalid apfId from CAPIF Authority)
+
+* **Information of Test**:
+  1. Perform [Provider Registration] and [Invoker Onboarding]
+
+  2. Publish Service API at CCF:
+     * Send Post to ccf_publish_url *https://{CAPIF_HOSTNAME}/published-apis/v1/{apfId}/service-apis*
+     * body [service api description] with apiName service_1
+     * Get apiId
+     * Use APF Certificate
+
+  3. Update published API at CCF:
+     * Send PUT to resource URL *https://{CAPIF_HOSTNAME}/published-apis/v1/{apfId}/service-apis/{serviceApiId}*
+     * body [service api description] with overrided apiName to ***service_1_modified***
+     * Use invoker certificate
+
+  4.  Retrieve detail of service API:
+     * Send Get to resource URL *https://{CAPIF_HOSTNAME}/published-apis/v1/{apfId}/service-apis/{serivceApiId}*
+     * check apiName is service_1
+     * Use APF Certificate
+
+* **Execution Steps**:
+  1. Register Provider at CCF and store certificates.
+  2. Publish Service API at CCF
+  3. Retrieve {apiId} from body and Location header with new resource created from response.
+  4. Register and onboard Invoker at CCF
+  5. Store signed Invoker Certificate
+  6. Update published API at CCF as Invoker
+  7. Retrieve detail of Service API as publisher
+   
+* **Expected Result**:
+  1. Response to Update published API acting as Invoker must accomplish:
+     1. **401 Unauthorized**
+     2. Error Response Body must accomplish with **ProblemDetails** data structure with:
+        * status **401**
+        * title with message "Unauthorized"
+        * detail with message "User not authorized".
+        * cause with message "Certificate not authorized".
+
+  2. Response to Retrieve Detail of Service API:
+     1. **200 OK**
+     2. Response Body must follow **ServiceAPIDescription** data structure with:
+        * apiName service_1.
+
+
+## Test Case 11: Delete API Published by Authorised apfId with valid serviceApiId
+* **Test ID**: ***capif_api_publish_service-11***
+* **Description**:
+  
+  This test case will check that an API Publisher can Delete published API with a valid serviceApiId
+* **Pre-Conditions**:
+  
+  * CAPIF subscriber is pre-authorised (has valid apfId from CAPIF Authority).
+  * A service APIs is published.
+
+* **Information of Test**:
+  1. Perform [Provider Registration]
+
+  2. Publish Service API at CCF:
+     * Send Post to ccf_publish_url *https://{CAPIF_HOSTNAME}/published-apis/v1/{apfId}/service-apis*
+     * body [service api description] with apiName service_1
+     * Get apiId
+     * Use APF Certificate
+
+  3. Remove published Service API at CCF:
+     * Send DELETE to resource URL *https://{CAPIF_HOSTNAME}/published-apis/v1/{apfId}/service-apis/{serviceApiId}*
+     * Use APF Certificate
+  4. Retrieve detail of service API:
+     * Send Get to resource URL *https://{CAPIF_HOSTNAME}/published-apis/v1/{apfId}/service-apis/{serivceApiId}*
+     * Use APF Certificate
+
+* **Execution Steps**:
+  1. Register Provider at CCF and store certificates.
+  2. Publish Service API
+  3. Retrieve {apiId} from body and Location header with new resource created from response
+  4. Remove published API at CCF
+  5. Try to retreive deleted service API from CCF
+   
+* **Expected Result**:
+  1. Response to Publish request must accomplish:
+     1. **201 Created**
+     2. Response Body must follow **ServiceAPIDescription** data structure with:
+        * apiId
+     3. Response Header **Location** must be received with URI to new resource created, following this structure: *{apiRoot}/published-apis/v1/{apfId}/service-apis/{serviceApiId}*
+
+  2. Published Service API is stored in CAPIF Database
+
+  3. Response to Remove published Service API at CCF:
+     1. **204 No Content**
+
+  4. Response to Retrieve for DELETED published API must accomplish:
+     1. **404 Not Found**
+     2. Error Response Body must accomplish with **ProblemDetails** data structure with:
+        * status 404
+        * title with message "Not Found"
+        * detail with message "Service API not found".
+        * cause with message "No Service with specific credentials exists".
+
+
+## Test Case 12: Delete APIs Published by Authorised apfId with invalid serviceApiId
+* **Test ID**: ***capif_api_publish_service-12***
+* **Description**:
+  
+  This test case will check that an API Publisher cannot Delete with invalid serviceApiId
+* **Pre-Conditions**:
+  
+  * CAPIF subscriber is pre-authorised (has valid apfId from CAPIF Authority).
+
+* **Information of Test**:
+  1. Perform [Provider Registration]
+
+  2. Remove published Service API at CCF with invalid serviceId:
+     * Send DELETE to resource URL *https://{CAPIF_HOSTNAME}/published-apis/v1/{apfId}/service-apis/{SERVICE_API_ID_NOT_VALID}*
+     * Use APF Certificate
+
+* **Execution Steps**:
+  1. Register Provider at CCF and store certificates.
+  2. Remove published API at CCF with invalid serviceId
+   
+* **Expected Result**:
+  1. Response to Remove published Service API at CCF:
+     1. **404 Not Found**
+     2. Error Response Body must accomplish with **ProblemDetails** data structure with:
+        * status 404
+        * title with message "Not Found"
+        * detail with message "Service API not found".
+        * cause with message "Service API id not found".
+
+
+## Test Case 13: Delete APIs Published by NON Authorised apfId
+* **Test ID**: ***capif_api_publish_service-12***
+* **Description**:
+  
+  This test case will check that an API Publisher cannot Delete API published when apfId is not authorised
+* **Pre-Conditions**:
+  
+  * CAPIF subscriber is pre-authorised (has valid apfId from CAPIF Authority).
+
+* **Information of Test**:
+  1. Perform [Provider Registration] and [Invoker Onboarding]
+
+  2. Publish Service API at CCF:
+     * Send Post to ccf_publish_url *https://{CAPIF_HOSTNAME}/published-apis/v1/{apfId}/service-apis*
+     * body [service api description] with apiName service_1
+     * Get apiId
+     * Use APF Certificate
+
+  3. Remove published Service API at CCF with invalid serviceId as Invoker:
+     * Send DELETE to resource URL *https://{CAPIF_HOSTNAME}/published-apis/v1/{apfId}/service-apis/{SERVICE_API_ID_NOT_VALID}*
+     * Use invoker certificate.
+
+* **Execution Steps**:
+  1. Register Provider at CCF and store certificates.
+  2. Register Invoker and onboard Invoker at CCF
+  3. Remove published API at CCF with invalid serviceId as Invoker
+   
+* **Expected Result**:
+  1. Response to Remove published Service API at CCF:
+     1. **401 Unauthorized**
+     2. Error Response Body must accomplish with **ProblemDetails** data structure with:
+        * status **401**
+        * title with message "Unauthorized"
+        * detail with message "User not authorized".
+        * cause with message "Certificate not authorized".
+
+
+   [service api description]: ./service_api_description_post_example.json  "Service API Description Request"
+   [publisher register body]: ./publisher_register_body.json  "Publish register Body"
+   [invoker onboarding body]: ../api_invoker_management/invoker_details_post_example.json  "API Invoker Request"
+   [invoker register body]: ../api_invoker_management/invoker_register_body.json  "Invoker Register Body"
+   [provider request body]: ../api_provider_management/provider_details_post_example.json  "API Provider Enrolment Request"
+   [provider request patch body]: ../api_provider_management/provider_details_enrolment_details_patch_example.json  "API Provider Enrolment Patch Request"
+   [provider getauth body]: ../api_provider_management/provider_getauth_example.json    "Get Auth Example"
+
+   [invoker onboarding]: ../common_operations/README.md#register-an-invoker "Invoker Onboarding"
+   [provider registration]: ../common_operations/README.md#register-a-provider "Provider Registration"
+
+
+  [Return To All Test Plans]: ../README.md
\ No newline at end of file
diff --git a/docs/test_plan/api_publish_service/publisher_register_body.json b/docs/test_plan/api_publish_service/publisher_register_body.json
new file mode 100644
index 0000000000000000000000000000000000000000..fc26db2141eab904b1f2f8d96e963f2ec0efcbe1
--- /dev/null
+++ b/docs/test_plan/api_publish_service/publisher_register_body.json
@@ -0,0 +1,7 @@
+{
+  "password": "password",
+  "username": "ROBOT_TESTING_PUBLISHER",
+  "role": "provider",
+  "description": "Testing",
+  "cn": "ROBOT_TESTING_PUBLISHER"
+}
diff --git a/docs/test_plan/api_publish_service/service_api_description_post_example.json b/docs/test_plan/api_publish_service/service_api_description_post_example.json
new file mode 100644
index 0000000000000000000000000000000000000000..b725b428629509bf39a79c030f1bf93f4b6f18f6
--- /dev/null
+++ b/docs/test_plan/api_publish_service/service_api_description_post_example.json
@@ -0,0 +1,113 @@
+{
+  "apiName": "service_1",
+  "aefProfiles": [
+    {
+      "aefId": "string",
+      "versions": [
+        {
+          "apiVersion": "v1",
+          "expiry": "2021-11-30T10:32:02.004Z",
+          "resources": [
+            {
+              "resourceName": "string",
+              "commType": "REQUEST_RESPONSE",
+              "uri": "string",
+              "custOpName": "string",
+              "operations": [
+                "GET"
+              ],
+              "description": "string"
+            }
+          ],
+          "custOperations": [
+            {
+              "commType": "REQUEST_RESPONSE",
+              "custOpName": "string",
+              "operations": [
+                "GET"
+              ],
+              "description": "string"
+            }
+          ]
+        }
+      ],
+      "protocol": "HTTP_1_1",
+      "dataFormat": "JSON",
+      "securityMethods": ["PSK"],
+      "interfaceDescriptions": [
+        {
+          "ipv4Addr": "string",
+          "port": 65535,
+          "securityMethods": ["PSK"]
+        },
+        {
+          "ipv4Addr": "string",
+          "port": 65535,
+          "securityMethods": ["PSK"]
+        }
+      ]
+    },
+    {
+      "aefId": "string",
+      "versions": [
+        {
+          "apiVersion": "v1",
+          "expiry": "2021-11-30T10:32:02.004Z",
+          "resources": [
+            {
+              "resourceName": "string",
+              "commType": "REQUEST_RESPONSE",
+              "uri": "string",
+              "custOpName": "string",
+              "operations": [
+                "GET"
+              ],
+              "description": "string"
+            }
+          ],
+          "custOperations": [
+            {
+              "commType": "REQUEST_RESPONSE",
+              "custOpName": "string",
+              "operations": [
+                "GET"
+              ],
+              "description": "string"
+            }
+          ]
+        }
+      ],
+      "protocol": "HTTP_1_1",
+      "dataFormat": "JSON",
+      "securityMethods": ["PSK"],
+      "interfaceDescriptions": [
+        {
+          "ipv4Addr": "string",
+          "port": 65535,
+          "securityMethods": ["PSK"]
+        },
+        {
+          "ipv4Addr": "string",
+          "port": 65535,
+          "securityMethods": ["PSK"]
+        }
+      ]
+    }
+  ],
+  "description": "string",
+  "supportedFeatures": "fffff",
+  "shareableInfo": {
+    "isShareable": true,
+    "capifProvDoms": [
+      "string"
+    ]
+  },
+  "serviceAPICategory": "string",
+  "apiSuppFeats": "fffff",
+  "pubApiPath": {
+    "ccfIds": [
+      "string"
+    ]
+  },
+  "ccfId": "string"
+}
\ No newline at end of file
diff --git a/docs/test_plan/api_security_service/README.md b/docs/test_plan/api_security_service/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..c0d3e71b06da6e40e9fdaeff50064ad230b76c57
--- /dev/null
+++ b/docs/test_plan/api_security_service/README.md
@@ -0,0 +1,1244 @@
+[**[Return To All Test Plans]**]
+
+- [Test Plan for CAPIF Api Security Service](#test-plan-for-capif-api-security-service)
+- [Tests](#tests)
+  - [Test Case 1: Create a security context for an API invoker](#test-case-1-create-a-security-context-for-an-api-invoker)
+  - [Test Case 2: Create a security context for an API invoker with Provider role](#test-case-2-create-a-security-context-for-an-api-invoker-with-provider-role)
+  - [Test Case 3: Create a security context for an API invoker with Provider entity role and invalid apiInvokerId](#test-case-3-create-a-security-context-for-an-api-invoker-with-provider-entity-role-and-invalid-apiinvokerid)
+  - [Test Case 4: Create a security context for an API invoker with Invoker entity role and invalid apiInvokerId](#test-case-4-create-a-security-context-for-an-api-invoker-with-invoker-entity-role-and-invalid-apiinvokerid)
+  - [Test Case 5: Retrieve the Security Context of an API Invoker](#test-case-5-retrieve-the-security-context-of-an-api-invoker)
+  - [Test Case 6: Retrieve the Security Context of an API Invoker with invalid apiInvokerID](#test-case-6-retrieve-the-security-context-of-an-api-invoker-with-invalid-apiinvokerid)
+  - [Test Case 7: Retrieve the Security Context of an API Invoker with invalid apfId](#test-case-7-retrieve-the-security-context-of-an-api-invoker-with-invalid-apfid)
+  - [Test Case 8: Delete the Security Context of an API Invoker](#test-case-8-delete-the-security-context-of-an-api-invoker)
+  - [Test Case 9: Delete the Security Context of an API Invoker with Invoker entity role](#test-case-9-delete-the-security-context-of-an-api-invoker-with-invoker-entity-role)
+  - [Test Case 10: Delete the Security Context of an API Invoker with Invoker entity role and invalid apiInvokerID](#test-case-10-delete-the-security-context-of-an-api-invoker-with-invoker-entity-role-and-invalid-apiinvokerid)
+  - [Test Case 11: Delete the Security Context of an API Invoker with invalid apiInvokerID](#test-case-11-delete-the-security-context-of-an-api-invoker-with-invalid-apiinvokerid)
+  - [Test Case 12: Update the Security Context of an API Invoker](#test-case-12-update-the-security-context-of-an-api-invoker)
+  - [Test Case 13: Update the Security Context of an API Invoker with Provider entity role](#test-case-13-update-the-security-context-of-an-api-invoker-with-provider-entity-role)
+  - [Test Case 14: Update the Security Context of an API Invoker with AEF entity role and invalid apiInvokerId](#test-case-14-update-the-security-context-of-an-api-invoker-with-aef-entity-role-and-invalid-apiinvokerid)
+  - [Test Case 15: Update the Security Context of an API Invoker with invalid apiInvokerID](#test-case-15-update-the-security-context-of-an-api-invoker-with-invalid-apiinvokerid)
+  - [Test Case 16: Revoke the authorization of the API invoker for APIs.](#test-case-16-revoke-the-authorization-of-the-api-invoker-for-apis)
+  - [Test Case 17: Revoke the authorization of the API invoker for APIs without valid apfID.](#test-case-17-revoke-the-authorization-of-the-api-invoker-for-apis-without-valid-apfid)
+  - [Test Case 18: Revoke the authorization of the API invoker for APIs with invalid apiInvokerId.](#test-case-18-revoke-the-authorization-of-the-api-invoker-for-apis-with-invalid-apiinvokerid)
+  - [Test Case 19: Retrieve access token](#test-case-19-retrieve-access-token)
+  - [Test Case 20: Retrieve access token by Provider](#test-case-20-retrieve-access-token-by-provider)
+  - [Test Case 21: Retrieve access token by Provider with invalid apiInvokerId](#test-case-21-retrieve-access-token-by-provider-with-invalid-apiinvokerid)
+  - [Test Case 22: Retrieve access token with invalid apiInvokerId](#test-case-22-retrieve-access-token-with-invalid-apiinvokerid)
+  - [Test Case 23: Retrieve access token with invalid client\_id](#test-case-23-retrieve-access-token-with-invalid-client_id)
+  - [Test Case 24: Retrieve access token with unsupported grant\_type](#test-case-24-retrieve-access-token-with-unsupported-grant_type)
+  - [Test Case 25: Retrieve access token with invalid scope](#test-case-25-retrieve-access-token-with-invalid-scope)
+  - [Test Case 26: Retrieve access token with invalid aefid at scope](#test-case-26-retrieve-access-token-with-invalid-aefid-at-scope)
+  - [Test Case 27: Retrieve access token with invalid apiName at scope](#test-case-27-retrieve-access-token-with-invalid-apiname-at-scope)
+ 
+
+
+# Test Plan for CAPIF Api Security Service
+At this documentation you will have all information and related files and examples of test plan for this API.
+
+# Tests
+
+## Test Case 1: Create a security context for an API invoker
+* **Test ID**: ***capif_security_api-1***
+* **Description**:
+  
+  This test case will check that an API Invoker can create a Security context
+* **Pre-Conditions**:
+  
+  * API Invoker is pre-authorised (has valid apiInvokerID from CAPIF Authority)
+
+* **Information of Test**:
+  1. Perform [Invoker Onboarding]
+  2. Create Security Context for this Invoker
+     * Send PUT *https://{CAPIF_HOSTNAME}/trustedInvokers/{apiInvokerId}*
+     * body [service security body]
+     * Use Invoker Certificate
+
+* **Execution Steps**:
+  
+  1. Register and onboard Invoker at CCF
+  2. Store signed Certificate
+  3. Create Security Context
+   
+* **Expected Result**:
+
+  1. Create security context:
+     1. **201 Created** response.
+     2. body returned must accomplish **ServiceSecurity** data structure.
+     3. Location Header must contain the new resource URL *{apiRoot}/capif-security/v1/trustedInvokers/{apiInvokerId}*
+
+
+## Test Case 2: Create a security context for an API invoker with Provider role
+* **Test ID**: ***capif_security_api-2***
+* **Description**:
+  
+  This test case will check that an Provider cannot create a Security context with valid apiInvokerId.
+* **Pre-Conditions**:
+  
+  * API Invoker is pre-authorised (has valid apiInvokerID), but user that create Security Context with Provider role
+
+* **Information of Test**:
+
+  1. Perform [Provider Registration] and [Invoker Onboarding]
+
+  2. Create Security Context for this Invoker but using Provider certificate.
+     * Send PUT *https://{CAPIF_HOSTNAME}/trustedInvokers/{apiInvokerId}*
+     * body [service security body]
+     * Using AEF certificate
+
+* **Execution Steps**:
+  
+  1. Register and onboard Invoker at CCF
+  2. Register Provider at CCF
+  3. Create Security Context using Provider certificate
+   
+* **Expected Result**:
+
+  1. Create security context using Provider certificate:
+     1. **401 Unauthorized** response.
+     2. body returned must accomplish **ProblemDetails** data structure, with:
+        * status **401**
+        * title with message "Unauthorized"
+        * detail with message "Role not authorized for this API route".
+        * cause with message "User role must be invoker".
+
+  2. No context stored at DB
+
+## Test Case 3: Create a security context for an API invoker with Provider entity role and invalid apiInvokerId
+* **Test ID**: ***capif_security_api-3***
+* **Description**:
+
+  This test case will check that an Provider cannot create a Security context with invalid apiInvokerID.
+* **Pre-Conditions**:
+  
+  * API Invoker is pre-authorised (has valid apiInvokerID), but user that create Security Context with Provider role
+
+* **Information of Test**:
+
+  1. Perform [Provider Registration]
+
+  2. Create Security Context for this not valid apiInvokerId and using Provider certificate.
+     * Send PUT *https://{CAPIF_HOSTNAME}/trustedInvokers/{API_INVOKER_NOT_VALID}*
+     * body [service security body]
+     * Using AEF certificate
+
+* **Execution Steps**:
+  
+  1. Register Provider at CCF
+  2. Create Security Context using Provider certificate
+   
+* **Expected Result**:
+
+  1. Create security context using Provider certificate:
+     1. **401 Unauthorized** response.
+     2. body returned must accomplish **ProblemDetails** data structure, with:
+        * status **401**
+        * title with message "Unauthorized"
+        * detail with message "Role not authorized for this API route".
+        * cause with message "User role must be invoker".
+  2. No context stored at DB
+
+## Test Case 4: Create a security context for an API invoker with Invoker entity role and invalid apiInvokerId
+* **Test ID**: ***capif_security_api-4***
+* **Description**:
+  
+  This test case will check that an Invoker cannot create a Security context with valid apiInvokerId.
+* **Pre-Conditions**:
+  
+  * API Invoker is pre-authorised (has valid apiInvokerID), but user that create Security Context with invalid apiInvokerId
+
+* **Information of Test**:
+  1. Perform [Invoker Onboarding]
+
+  2. Create Security Context for this Invoker:
+     * Send PUT *https://{CAPIF_HOSTNAME}/trustedInvokers/{API_INVOKER_NOT_VALID}*
+     * body [service security body]
+     * Use Invoker Certificate
+
+* **Execution Steps**:
+  
+  1. Register and onboard Invoker at CCF
+  2. Create Security Context using Provider certificate
+   
+* **Expected Result**:
+
+  1. Create security context using Provider certificate:
+     1. **404 Not Found** response.
+     2. body returned must accomplish **ProblemDetails** data structure, with:
+        * status **404**
+        * title with message "Not Found"
+        * detail with message "Invoker not found".
+        * cause with message "API Invoker not exists or invalid ID".
+
+  2. No context stored at DB
+
+  
+## Test Case 5: Retrieve the Security Context of an API Invoker
+* **Test ID**: ***capif_security_api-5***
+* **Description**:
+  
+  This test case will check that an provider can retrieve the Security context of an API Invoker
+* **Pre-Conditions**:
+  
+  * Provider is pre-authorised (has valid apfId from CAPIF Authority) and API Invoker has created a valid Security Context
+
+* **Information of Test**:
+
+  1. Perform [Provider Registration] and [Invoker Onboarding]
+
+  2. Create Security Context for this Invoker.
+     * Send PUT *https://{CAPIF_HOSTNAME}/trustedInvokers/{apiInvokerId}*
+     * body [service security body]
+     * Using Invoker certificate
+
+  3. Retrieve Security Context of Invoker by Provider:
+     * Send GET *https://{CAPIF_HOSTNAME}/trustedInvokers/{apiInvokerId}*
+     * Using AEF Certificate
+
+* **Execution Steps**:
+  
+  1. Register and onboard Invoker at CCF
+  2. Register Provider at CCF
+  3. Create Security Context using Provider certificate
+  4. Retrieve Security Context by Provider
+   
+* **Expected Result**:
+  1. Retrieve security context:
+     1. **200 OK** response.
+     2. body returned must accomplish **ServiceSecurity** data structure.
+
+
+## Test Case 6: Retrieve the Security Context of an API Invoker with invalid apiInvokerID
+* **Test ID**: ***capif_security_api-6***
+* **Description**:
+  
+  This test case will check that an provider can retrieve the Security context of an API Invoker
+* **Pre-Conditions**:
+  
+  * Provider is pre-authorised (has valid apfId from CAPIF Authority) and API Invoker has created a valid Security Context
+
+* **Information of Test**:
+
+  1. Perform [Provider Registration]
+
+  2. Retrieve Security Context of invalid Invoker by Provider:
+     * Send GET *https://{CAPIF_HOSTNAME}/trustedInvokers/{API_INVOKER_NOT_VALID}*
+     * Using AEF Certificate.
+
+* **Execution Steps**:
+  
+  2. Register Provider at CCF
+  3. Create Security Context using Provider certificate
+  4. Retrieve Security Context by Provider of invalid invoker
+   
+* **Expected Result**:
+  1. Retrieve security context:
+     1. **404 Not Found** response.
+     2. body returned must accomplish **ProblemDetails** data structure, with:
+        * status **404**
+        * title with message "Not Found"
+        * detail with message "Invoker not found".
+        * cause with message "API Invoker not exists or invalid ID".
+
+
+## Test Case 7: Retrieve the Security Context of an API Invoker with invalid apfId
+* **Test ID**: ***capif_security_api-7***
+* **Description**:
+  
+  This test case will check that an Provider cannot retrieve the Security context of an API Invoker without valid apfId
+* **Pre-Conditions**:
+  
+  * API Exposure Function is not pre-authorised (has invalid apfId)
+
+* **Information of Test**:
+
+  1. Perform [Provider Registration] and [Invoker Onboarding]
+
+  2. Create Security Context for this Invoker
+     * Send PUT *https://{CAPIF_HOSTNAME}/trustedInvokers/{apiInvokerId}*
+     * body [service security body]
+     * Using Invoker Certificate
+
+  3. Retrieve Security Context as Invoker role:
+     * Send GET *https://{CAPIF_HOSTNAME}/trustedInvokers/{apiInvokerId}*
+     * Using Invoker Certificate
+
+* **Execution Steps**:
+  
+  1. Register and onboard Invoker at CCF
+  2. Store signed Certificate
+  3. Create Security Context
+  4. Retrieve Security Context as Provider.
+   
+* **Expected Result**:
+
+  1. Create security context:
+     1. **401 Unauthorized** response.
+     2. body returned must accomplish **ProblemDetails** data structure, with:
+        * status **401**
+        * title with message "Unauthorized"
+        * detail with message "Role not authorized for this API route".
+        * cause with message "User role must be aef".
+
+
+## Test Case 8: Delete the Security Context of an API Invoker
+* **Test ID**: ***capif_security_api-8***
+* **Description**:
+  
+  This test case will check that an Provider can delete a Security context
+* **Pre-Conditions**:
+  
+  * Provider is pre-authorised (has valid apfId from CAPIF Authority) and API Invoker has created a valid Security Context
+
+* **Information of Test**:
+
+  1. Perform [Provider Registration] and [Invoker Onboarding]
+
+  2. Create Security Context for this Invoker but using Provider certificate.
+     * Send PUT *https://{CAPIF_HOSTNAME}/trustedInvokers/{apiInvokerId}*
+     * body [service security body]
+     * Using AEF certificate
+
+  3. Delete Security Context of Invoker by Provider:
+     * Send DELETE *https://{CAPIF_HOSTNAME}/trustedInvokers/{apiInvokerId}*
+     * Use AEF certificate
+
+  4. Retrieve Security Context of Invoker by Provider:
+     * Send GET *https://{CAPIF_HOSTNAME}/trustedInvokers/{apiInvokerId}*
+     * Using AEF Certificate
+
+* **Execution Steps**:
+  
+  1. Register and onboard Invoker at CCF
+  2. Register Provider at CCF
+  3. Create Security Context using Provider certificate
+  4. Delete Security Context by Provider
+   
+* **Expected Result**:
+
+  1. Delete security context:
+     1. **204 No Content** response.
+
+  2. Retrieve security context:
+     1. **404 Not Found** response.
+     2. body returned must accomplish **ProblemDetails** data structure, with:
+        * status **404**
+        * title with message "Not Found"
+        * detail with message "Security context not found".
+        * cause with message "API Invoker not exists or invalid ID".
+
+
+## Test Case 9: Delete the Security Context of an API Invoker with Invoker entity role
+* **Test ID**: ***capif_security_api-9***
+* **Description**:
+  
+  This test case will check that an Invoker cannot delete a Security context
+* **Pre-Conditions**:
+  
+  * Provider is pre-authorised (has valid apfId from CAPIF Authority) and API Invoker has created a valid Security Context
+
+* **Information of Test**:
+
+  1. Perform [Provider Registration] and [Invoker Onboarding]
+
+  2. Create Security Context for this Invoker:
+     * Send PUT *https://{CAPIF_HOSTNAME}/trustedInvokers/{apiInvokerId}*
+     * body [service security body]
+     * Using Invoker certificate
+
+  3. Delete Security Context of Invoker:
+     * Send DELETE *https://{CAPIF_HOSTNAME}/trustedInvokers/{apiInvokerId}*
+     * Use Invoker certificate
+
+* **Execution Steps**:
+  
+  1. Register Provider at CCF
+  2. Create Security Context using Provider certificate
+  3. Delete Security Context by Invoker
+   
+* **Expected Result**:
+
+  1. Delete security context:
+     1. **401 Unauthorized** response.
+     2. body returned must accomplish **ProblemDetails** data structure, with:
+        * status **401**
+        * title with message "Unauthorized"
+        * detail with message "Role not authorized for this API route".
+        * cause with message "User role must be aef".
+
+
+## Test Case 10: Delete the Security Context of an API Invoker with Invoker entity role and invalid apiInvokerID
+* **Test ID**: ***capif_security_api-10***
+* **Description**:
+  
+  This test case will check that an Invoker cannot delete a Security context with invalid 
+* **Pre-Conditions**:
+  
+  * Invoker is pre-authorised.
+
+* **Information of Test**:
+
+  1. Perform [Invoker Onboarding]
+
+  2. Delete Security Context of Invoker:
+     * Send DELETE *https://{CAPIF_HOSTNAME}/trustedInvokers/{API_INVOKER_NOT_VALID}*
+     * Use Invoker certificate
+
+* **Execution Steps**:
+  
+  1. Register Provider at CCF
+  2. Delete Security Context by invoker
+   
+* **Expected Result**:
+
+  1. Delete security context:
+     1. **401 Unauthorized** response.
+     2. body returned must accomplish **ProblemDetails** data structure, with:
+        * status **401**
+        * title with message "Unauthorized"
+        * detail with message "Role not authorized for this API route".
+        * cause with message "User role must be aef".
+
+
+## Test Case 11: Delete the Security Context of an API Invoker with invalid apiInvokerID
+* **Test ID**: ***capif_security_api-11***
+* **Description**:
+  
+  This test case will check that an Provider cannot delete a Security context of invalid apiInvokerId
+* **Pre-Conditions**:
+  
+  * Provider is pre-authorised (has valid apfId from CAPIF Authority).
+
+* **Information of Test**:
+
+  1. Perform [Provider Registration]
+
+  2. Delete Security Context of Invoker by Provider:
+     * Send DELETE *https://{CAPIF_HOSTNAME}/trustedInvokers/{API_INVOKER_NOT_VALID}*
+     * Use AEF certificate
+
+* **Execution Steps**:
+  
+  1. Register Provider at CCF
+  2. Delete Security Context by provider
+   
+* **Expected Result**:
+
+  1. Retrieve security context:
+     1. **404 Not Found** response.
+     2. body returned must accomplish **ProblemDetails** data structure, with:
+        * status **404**
+        * title with message "Not Found"
+        * detail with message "Invoker not found".
+        * cause with message "API Invoker not exists or invalid ID".
+
+
+## Test Case 12: Update the Security Context of an API Invoker 
+* **Test ID**: ***capif_security_api-12***
+* **Description**:
+  
+  This test case will check that an API Invoker can update a Security context
+* **Pre-Conditions**:
+  
+  * API Invoker is pre-authorised (has valid apiInvokerID from CAPIF Authority) and Provider is also authorized
+
+* **Information of Test**:
+
+  1. Perform [Provider Registration] and [Invoker Onboarding]
+
+  2. Create Security Context for this Invoker:
+     * Send PUT *https://{CAPIF_HOSTNAME}/trustedInvokers/{apiInvokerId}*
+     * body [service security body]
+     * Using Invoker Certificate.
+ 
+  3. Update Security Context of Invoker:
+     * Send POST *https://{CAPIF_HOSTNAME}/trustedInvokers/{apiInvokerId}/update*
+     * body [service security body] but with notification destination modified to http://robot.testing2
+     * Using Invoker Certificate.
+
+  4. Retrieve Security Context of Invoker by Provider:
+     * Send GET *https://{CAPIF_HOSTNAME}/trustedInvokers/{apiInvokerId}*
+     * Using AEF Certificate.
+
+* **Execution Steps**:
+  
+  1. Register and onboard Invoker at CCF
+  2. Register Provider at CCF
+  3. Create Security Context By Invoker
+  4. Update Security Context By Invoker
+  5. Retrieve Security Context By Provider
+   
+* **Expected Result**:
+
+  1. Update security context:
+     1. **200 OK** response.
+     2. body returned must accomplish **ServiceSecurity** data structure.
+ 
+  2. Retrieve security context:
+     1. **200 OK** response.
+     2. body returned must accomplish **ServiceSecurity** data structure.
+        1. Check is this returned object match with modified one.
+
+
+## Test Case 13: Update the Security Context of an API Invoker with Provider entity role
+* **Test ID**: ***capif_security_api-13***
+* **Description**:
+  
+  This test case will check that an Provider cannot update a Security context
+
+* **Pre-Conditions**:
+  
+  * API Invoker is pre-authorised (has valid apiInvokerID from CAPIF Authority) and Provider is also authorized.
+  * Invoker has created the Security Context previously.
+
+* **Information of Test**:
+
+  1. Perform [Provider Registration] and [Invoker Onboarding]
+
+  2. Create Security Context for this Invoker:
+     * Send PUT *https://{CAPIF_HOSTNAME}/trustedInvokers/{apiInvokerId}*
+     * body [service security body]
+     * Using Invoker Certificate.
+ 
+  3. Update Security Context of Invoker by Provider:
+     * Send POST *https://{CAPIF_HOSTNAME}/trustedInvokers/{apiInvokerId}/update*
+     * body [service security body] but with notification destination modified to http://robot.testing2
+     * Using AEF Certificate
+
+* **Execution Steps**:
+  
+  1. Register and onboard Invoker at CCF
+  2. Register Provider at CCF
+  3. Create Security Context
+  4. Update Security Context as Provider
+   
+* **Expected Result**:
+
+  1. Update security context:
+     1. **401 Unauthorized** response.
+     2. body returned must accomplish **ProblemDetails** data structure, with:
+        * status **401**
+        * title with message "Unauthorized"
+        * detail with message "Role not authorized for this API route".
+        * cause with message "User role must be invoker". 
+
+
+## Test Case 14: Update the Security Context of an API Invoker with AEF entity role and invalid apiInvokerId
+* **Test ID**: ***capif_security_api-14***
+* **Description**:
+  
+  This test case will check that an Provider cannot update a Security context of invalid apiInvokerId
+
+* **Pre-Conditions**:
+  
+  * API Invoker is pre-authorised (has valid apiInvokerID from CAPIF Authority) and Provider is also authorized.
+  * Invoker has created the Security Context previously.
+
+* **Information of Test**:
+
+  1. Perform [Provider Registration]
+ 
+  4. Update Security Context of Invoker by Provider:
+     * Send POST *https://{CAPIF_HOSTNAME}/trustedInvokers/{API_INVOKER_NOT_VALID}/update*
+     * body [service security body]
+     * Using AEF Certificate
+
+* **Execution Steps**:
+  
+  1. Register Provider at CCF
+  2. Update Security Context as Provider
+   
+* **Expected Result**:
+
+  1. Update security context:
+     1. **401 Unauthorized** response.
+     2. body returned must accomplish **ProblemDetails** data structure, with:
+        * status **401**
+        * title with message "Unauthorized"
+        * detail with message "Role not authorized for this API route".
+        * cause with message "User role must be invoker". 
+
+
+## Test Case 15: Update the Security Context of an API Invoker with invalid apiInvokerID
+* **Test ID**: ***capif_security_api-15***
+* **Description**:
+  
+  This test case will check that an API Invoker cannot update a Security context not valid apiInvokerId
+* **Pre-Conditions**:
+  
+  * API Invoker is pre-authorised (has valid apiInvokerID from CAPIF Authority)
+
+* **Information of Test**:
+
+  1. Perform [Provider Registration] and [Invoker Onboarding]
+ 
+  2. Update Security Context of Invoker:
+     * Send POST *https://{CAPIF_HOSTNAME}/trustedInvokers/{API_INVOKER_NOT_VALID}/update*
+     * body [service security body]
+     * Using Invoker Certificate.
+
+* **Execution Steps**:
+  
+  1. Register and onboard Invoker at CCF
+  2. Update Security Context
+   
+* **Expected Result**:
+
+1. Retrieve security context:
+     1. **404 Not Found** response.
+     2. body returned must accomplish **ProblemDetails** data structure, with:
+        * status **404**
+        * title with message "Not Found"
+        * detail with message "Invoker not found".
+        * cause with message "API Invoker not exists or invalid ID".
+
+
+## Test Case 16: Revoke the authorization of the API invoker for APIs.
+* **Test ID**: ***capif_security_api-16***
+* **Description**:
+  
+  This test case will check that a Provider can revoke the authorization for APIs
+
+* **Pre-Conditions**:
+  
+  * API Invoker is pre-authorised (has valid apiInvokerID from CAPIF Authority) and Provider is also authorized
+
+* **Information of Test**:
+
+  1. Perform [Provider Registration] and [Invoker Onboarding]
+
+  2. Create Security Context By Invoker:
+     * Send PUT *https://{CAPIF_HOSTNAME}/trustedInvokers/{apiInvokerId}*
+     * body [service security body]
+     * Using Invoker Certificate
+ 
+  3. Revoke Authorization by Provider:
+     * Send POST *https://{CAPIF_HOSTNAME}/trustedInvokers/{apiInvokerId}/delete*
+     * body [security notification body]
+     * Using AEF Certificate.
+
+  4. Retrieve Security Context by Provider:
+     * Send GET *https://{CAPIF_HOSTNAME}/trustedInvokers/{apiInvokerId}*
+     * Using AEF Certificate.
+
+
+* **Execution Steps**:
+  
+  1. Register and onboard Invoker at CCF
+  2. Register Provider at CCF
+  3. Create Security Context by Invoker
+  4. Revoke Security Context by Provider
+  5. Retrieve Security Context by Provider
+   
+* **Expected Result**:
+
+  1. Revoke Authorization:
+     1. **204 No Content** response.
+
+  2. Retrieve security context:
+     1. **404 Not Found** response.
+     2. body returned must accomplish **ProblemDetails** data structure, with:
+        * status **404**
+        * title with message "Not Found"
+        * detail with message "Security context not found".
+        * cause with message "API Invoker has no security context".
+
+
+## Test Case 17: Revoke the authorization of the API invoker for APIs without valid apfID.
+* **Test ID**: ***capif_security_api-17***
+* **Description**:
+  
+  This test case will check that an Invoker can't revoke the authorization for APIs
+
+* **Pre-Conditions**:
+  
+  * API Invoker is pre-authorised (has valid apiInvokerID from CAPIF Authority) and Provider is also authorized
+
+* **Information of Test**:
+
+  1. Perform [Provider Registration] and [Invoker Onboarding]
+
+  2. Create Security Context for this Invoker:
+     * Send PUT *https://{CAPIF_HOSTNAME}/trustedInvokers/{apiInvokerId}*
+     * body [service security body]
+     * Using Invoker Certificate.
+ 
+  3. Revoke Authorization by invoker:
+     * Send POST *https://{CAPIF_HOSTNAME}/trustedInvokers/{apiInvokerId}/delete*
+     * body [security notification body]
+     * Using Invoker Certificate
+
+  4. Retrieve Security Context of Invoker by Provider:
+     * Send GET *https://{CAPIF_HOSTNAME}/trustedInvokers/{apiInvokerId}*
+     * Using Provider Certificate
+
+* **Execution Steps**:
+  
+  1. Register and onboard Invoker at CCF
+  2. Register Provider at CCF
+  3. Create Security Context
+  4. Revoke Security Context by invoker
+  5. Retrieve Security Context
+   
+* **Expected Result**:
+
+  1. Revoke Security Context by invoker:
+     1. **401 Unauthorized** response.
+     2. body returned must accomplish **ProblemDetails** data structure, with:
+        * status **401**
+        * title with message "Unauthorized"
+        * detail with message "Role not authorized for this API route".
+        * cause with message "User role must be provider". 
+
+  3. Retrieve security context:
+     1. **200 OK** response.
+     2. body returned must accomplish **ServiceSecurity** data structure.
+        1. Check is this returned object match with created one.
+
+
+## Test Case 18: Revoke the authorization of the API invoker for APIs with invalid apiInvokerId.
+* **Test ID**: ***capif_security_api-18***
+* **Description**:
+  
+  This test case will check that an API Exposure Function cannot revoke the authorization for APIs for invalid apiInvokerId
+
+* **Pre-Conditions**:
+  
+  * API Invoker is pre-authorised (has valid apiInvokerID from CAPIF Authority) and Provider is also authorized
+
+* **Information of Test**:
+
+  1. Perform [Provider Registration] and [Invoker Onboarding]
+
+  2. Create Security Context for this Invoker:
+     * Send PUT *https://{CAPIF_HOSTNAME}/trustedInvokers/{apiInvokerId}*
+     * body [service security body]
+     * Using Invoker Certificate.
+ 
+  3. Revoke Authorization by Provider:
+     * Send POST *https://{CAPIF_HOSTNAME}/trustedInvokers/{API_INVOKER_NOT_VALID}/delete*
+     * body [security notification body]
+     * Using AEF Certificate.
+
+  4. Retrieve Security Context of Invoker by Provider:
+     * Send GET *https://{CAPIF_HOSTNAME}/trustedInvokers/{apiInvokerId}?authenticationInfo=true&authorizationInfo=true*
+     * This request will ask with parameter to retrieve authenticationInfo and authorizationInfo
+     * Using AEF Certificate.
+
+* **Execution Steps**:
+  
+  1. Register and onboard Invoker at CCF
+  2. Register Provider at CCF
+  3. Create Security Context
+  4. Revoke Security Context by Provider
+  5. Retrieve Security Context
+   
+* **Expected Result**:
+
+  1. Revoke Security Context by invoker:
+     1. **404 Not Found** response.
+     2. body returned must accomplish **ProblemDetails** data structure, with:
+        * status **404**
+        * title with message "Not Found"
+        * detail with message "Invoker not found".
+        * cause with message "API Invoker not exists or invalid ID".
+
+  3. Retrieve security context:
+     1. **200 OK** response.
+     2. body returned must accomplish **ServiceSecurity** data structure.
+        1. Check is this return one object that match with created one.
+
+
+## Test Case 19: Retrieve access token
+* **Test ID**: ***capif_security_api-19***
+* **Description**:
+  
+  This test case will check that an API Invoker can retrieve a security access token OAuth 2.0.
+* **Pre-Conditions**:
+  
+  * API Invoker is pre-authorised (has valid apiInvokerId)
+  * Service API of Provider is published
+
+* **Information of Test**:
+
+  1. Perform [Provider Registration] and [Invoker Onboarding]
+
+  2. Publish Service API at CCF:
+     * Send Post to ccf_publish_url https://{CAPIF_HOSTNAME}/published-apis/v1/{apfId}/service-apis
+     * body [service api description] with apiName service_1
+     * Use APF Certificate
+
+  3. Request Discover Published APIs not filtered:
+     * Send GET to ccf_discover_url *https://{CAPIF_HOSTNAME}/service-apis/v1/allServiceAPIs?api-invoker-id={apiInvokerId}*
+     * Param api-invoker-id is mandatory
+     * Using invoker certificate
+
+  4. Create Security Context for this Invoker
+     * Send PUT *https://{CAPIF_HOSTNAME}/trustedInvokers/{apiInvokerId}*
+     * body [service security body]
+     * Using Invoker Certificate.
+     * Create Security Information Body with one **securityInfo** for each aef present at each serviceAPIDescription present at Discover.
+
+  5. Request Access Token by invoker:
+     * Sent POST *https://{CAPIF_HOSTNAME}/securities/{securityId}/token*:
+     * body [access token req body] and example [example]
+       * ***securityId*** is apiInvokerId.
+       * ***grant_type=client_credentials***.
+       * Create Scope properly for request: ***3gpp#{aef_id}:{api_name}***
+     * Using Invoker Certificate.
+  
+* **Execution Steps**:
+  
+  1. Register Provider at CCF, store certificates and Publish Service API service_1 at CCF
+  2. Register and onboard Invoker at CCF
+  3. Discover Service APIs by Invoker.
+  4. Create Security Context According to Service APIs discovered.
+  5. Request Access Token
+   
+* **Expected Result**:
+
+  1. Response to Request of Access Token:
+     1. **200 OK**
+     2. body must follow **AccessTokenRsp** with:
+        1. access_token present
+        2. token_type=Bearer
+
+## Test Case 20: Retrieve access token by Provider
+* **Test ID**: ***capif_security_api-20***
+* **Description**:
+  
+  This test case will check that an API Exposure Function cannot revoke the authorization for APIs for invalid apiInvokerId
+
+* **Pre-Conditions**:
+  
+  * API Invoker is pre-authorised (has valid apiInvokerID from CAPIF Authority) and Provider is also authorized
+
+* **Information of Test**:
+
+  1. Perform [Provider Registration] and [Invoker Onboarding]
+
+  2. Publish Service API at CCF:
+     * Send Post to ccf_publish_url https://{CAPIF_HOSTNAME}/published-apis/v1/{apfId}/service-apis
+     * body [service api description] with apiName service_1
+     * Use APF Certificate
+
+  3. Request Discover Published APIs not filtered:
+     * Send GET to ccf_discover_url *https://{CAPIF_HOSTNAME}/service-apis/v1/allServiceAPIs?api-invoker-id={apiInvokerId}*
+     * Param api-invoker-id is mandatory
+     * Using invoker certificate
+
+  4. Create Security Context for this Invoker
+     * Send PUT *https://{CAPIF_HOSTNAME}/trustedInvokers/{apiInvokerId}*
+     * body [service security body]
+     * Using Invoker Certificate.
+     * Create Security Information Body with one **securityInfo** for each aef present at each serviceAPIDescription present at Discover.
+
+  5. Request Access Token by provider:
+     * Sent POST *https://{CAPIF_HOSTNAME}/securities/{securityId}/token*:
+     * body [access token req body]
+       * ***securityId*** is apiInvokerId
+       * ***grant_type=client_credentials***
+     * Using AEF certificate
+
+* **Execution Steps**:
+  1. Register Provider at CCF, store certificates and Publish Service API service_1 at CCF
+  2. Register and onboard Invoker at CCF
+  3. Discover Service APIs by Invoker.
+  4. Create Security Context According to Service APIs discovered.
+  5. Request Access Token by Provider
+   
+* **Expected Result**:
+
+  1. Response to Request of Access Token:
+     1. **401 Unauthorized** response.
+     2. body returned must accomplish **AccessTokenErr** data structure, with:
+        * error unauthorized_client
+        * error_description=Role not authorized for this API route
+
+## Test Case 21: Retrieve access token by Provider with invalid apiInvokerId
+* **Test ID**: ***capif_security_api-21***
+* **Description**:
+  
+  This test case will check that an API Exposure Function cannot retrieve a security access token without valid apiInvokerId
+
+* **Pre-Conditions**:
+  
+  * API Invoker is pre-authorised and Provider is also authorized
+
+
+* **Information of Test**:
+
+  1. Perform [Provider Registration] and [Invoker Onboarding]
+
+  2. Publish Service API at CCF:
+     * Send Post to ccf_publish_url https://{CAPIF_HOSTNAME}/published-apis/v1/{apfId}/service-apis
+     * body [service api description] with apiName service_1
+     * Use APF Certificate
+
+  3. Request Discover Published APIs not filtered:
+     * Send GET to ccf_discover_url *https://{CAPIF_HOSTNAME}/service-apis/v1/allServiceAPIs?api-invoker-id={apiInvokerId}*
+     * Param api-invoker-id is mandatory
+     * Using invoker certificate
+
+  4. Create Security Context for this Invoker
+     * Send PUT *https://{CAPIF_HOSTNAME}/trustedInvokers/{apiInvokerId}*
+     * body [service security body]
+     * Using Invoker Certificate.
+     * Create Security Information Body with one **securityInfo** for each aef present at each serviceAPIDescription present at Discover.
+
+  5. Request Access Token by provider:
+     * Sent POST *https://{CAPIF_HOSTNAME}/securities/{API_INVOKER_NOT_VALID}/token*.
+     * body [access token req body]
+       * ***securityId*** is apiInvokerId
+       * ***grant_type=client_credentials***
+     * Using AEF certificate
+
+* **Execution Steps**:
+  1. Register Provider at CCF, store certificates and Publish Service API service_1 at CCF
+  2. Register and onboard Invoker at CCF
+  3. Discover Service APIs by Invoker.
+  4. Create Security Context According to Service APIs discovered.
+  5. Request Access Token by Provider
+   
+* **Expected Result**:
+
+  1. Response to Request of Access Token:
+     1. **401 Unauthorized** response.
+     2. body returned must accomplish **AccessTokenErr** data structure, with:
+        * error unauthorized_client
+        * error_description=Role not authorized for this API route
+   
+
+## Test Case 22: Retrieve access token with invalid apiInvokerId
+* **Test ID**: ***capif_security_api-22***
+* **Description**:
+  
+  This test case will check that an API Invoker can't retrieve a security access token without valid apiInvokerId
+
+* **Pre-Conditions**:
+  
+  * API Invoker is pre-authorised (has valid apiInvokerId)
+
+* **Information of Test**:
+
+  1. Perform [Provider Registration] and [Invoker Onboarding]
+  2. Publish Service API at CCF:
+     * Send Post to ccf_publish_url https://{CAPIF_HOSTNAME}/published-apis/v1/{apfId}/service-apis
+     * body [service api description] with apiName service_1
+     * Use APF Certificate
+  3. Request Discover Published APIs not filtered:
+     * Send GET to ccf_discover_url *https://{CAPIF_HOSTNAME}/service-apis/v1/allServiceAPIs?api-invoker-id={apiInvokerId}*
+     * Param api-invoker-id is mandatory
+     * Using invoker certificate
+  4. Create Security Context for this Invoker
+     * Send PUT *https://{CAPIF_HOSTNAME}/trustedInvokers/{apiInvokerId}*
+     * body [service security body]
+     * Using Invoker Certificate.
+     * Create Security Information Body with one **securityInfo** for each aef present at each serviceAPIDescription present at Discover.
+  5. Request Access Token by invoker:
+     * Sent POST *https://{CAPIF_HOSTNAME}/securities/{API_INVOKER_NOT_VALID}/token*.
+     * body [access token req body]
+       * ***securityId*** is apiInvokerId
+       * ***grant_type=client_credentials***
+     * Using Invoker certificate
+
+* **Execution Steps**:
+  1. Register Provider at CCF, store certificates and Publish Service API service_1 at CCF
+  2. Register and onboard Invoker at CCF
+  3. Discover Service APIs by Invoker.
+  4. Create Security Context According to Service APIs discovered.
+  5. Request Access Token by Invoker
+
+* **Expected Result**:
+
+  1. Response to Request of Access Token:
+     1. **404 Not Found** response.
+     2. body returned must accomplish **ProblemDetails29571** data structure, with:
+        * status 404
+        * title Not Found
+        * detail Security context not found
+        * cause API Invoker has no security context
+
+
+**NOTE: ProblemDetails29571 is the definition present for this request at swagger of ProblemDetails, and this is different from definition of ProblemDetails across other CAPIF Services**
+
+## Test Case 23: Retrieve access token with invalid client_id
+* **Test ID**: ***capif_security_api-23***
+* **Description**:
+  
+  This test case will check that an API Exposure Function cannot retrieve a security access token without valid client_id at body
+
+* **Pre-Conditions**:
+  
+  * API Invoker is pre-authorised and Provider is also authorized
+
+* **Information of Test**:
+
+  1. Perform [Provider Registration] and [Invoker Onboarding]
+
+  2. Publish Service API at CCF:
+     * Send Post to ccf_publish_url https://{CAPIF_HOSTNAME}/published-apis/v1/{apfId}/service-apis
+     * body [service api description] with apiName service_1
+     * Use APF Certificate
+
+  3. Request Discover Published APIs not filtered:
+     * Send GET to ccf_discover_url *https://{CAPIF_HOSTNAME}/service-apis/v1/allServiceAPIs?api-invoker-id={apiInvokerId}*
+     * Param api-invoker-id is mandatory
+     * Using invoker certificate
+
+  4. Create Security Context for this Invoker
+     * Send PUT *https://{CAPIF_HOSTNAME}/trustedInvokers/{apiInvokerId}*
+     * body [service security body]
+     * Using Invoker Certificate.
+     * Create Security Information Body with one **securityInfo** for each aef present at each serviceAPIDescription present at Discover.
+
+  5. Request Access Token by invoker:
+     * Sent POST *https://{CAPIF_HOSTNAME}/securities/{securityId}/token*.
+     * body [access token req body]
+       * ***securityId*** is apiInvokerId
+       * ***grant_type=client_credentials***
+       * **client_id is not-valid** 
+     * Using Invoker certificate
+
+* **Execution Steps**:
+  1. Register Provider at CCF, store certificates and Publish Service API service_1 at CCF
+  2. Register and onboard Invoker at CCF
+  3. Discover Service APIs by Invoker.
+  4. Create Security Context According to Service APIs discovered.
+  5. Request Access Token by Invoker
+   
+* **Expected Result**:
+
+  1. Response to Request of Access Token:
+     1. **400 Bad Request** response.
+     2. body returned must accomplish **AccessTokenErr** data structure, with:
+        * error invalid_client
+        * error_description=Client Id not found
+
+
+## Test Case 24: Retrieve access token with unsupported grant_type
+* **Test ID**: ***capif_security_api-24***
+* **Description**:
+  
+  This test case will check that an API Exposure Function cannot retrieve a security access token with unsupported grant_type
+
+* **Pre-Conditions**:
+  
+  * API Invoker is pre-authorised and Provider is also authorized
+
+* **Information of Test**:
+
+  1. Perform [Provider Registration] and [Invoker Onboarding]
+   
+  2. Publish Service API at CCF:
+     * Send Post to ccf_publish_url https://{CAPIF_HOSTNAME}/published-apis/v1/{apfId}/service-apis
+     * body [service api description] with apiName service_1
+     * Use APF Certificate
+
+  3. Request Discover Published APIs not filtered:
+     * Send GET to ccf_discover_url *https://{CAPIF_HOSTNAME}/service-apis/v1/allServiceAPIs?api-invoker-id={apiInvokerId}*
+     * Param api-invoker-id is mandatory
+     * Using invoker certificate
+
+  4. Create Security Context for this Invoker
+     * Send PUT *https://{CAPIF_HOSTNAME}/trustedInvokers/{apiInvokerId}*
+     * body [service security body]
+     * Using Invoker Certificate.
+     * Create Security Information Body with one **securityInfo** for each aef present at each serviceAPIDescription present at Discover.
+
+  5. Request Access Token by invoker:
+     * Sent POST *https://{CAPIF_HOSTNAME}/securities/{securityId}/token*.
+     * body [access token req body]
+       * ***securityId*** is apiInvokerId
+       * ***grant_type=not_valid***
+     * Using Invoker certificate
+
+* **Execution Steps**:
+  1. Register Provider at CCF, store certificates and Publish Service API service_1 at CCF
+  2. Register and onboard Invoker at CCF
+  3. Discover Service APIs by Invoker.
+  4. Create Security Context According to Service APIs discovered.
+  5. Request Access Token by Invoker
+   
+* **Expected Result**:
+
+  1. Response to Request of Access Token:
+     1. **400 Bad Request** response.
+     2. body returned must accomplish **AccessTokenErr** data structure, with:
+        * error unsupported_grant_type
+        * error_description=Invalid value for `grant_type` \\(${grant_type}\\), must be one of \\['client_credentials'\\] - 'grant_type'
+
+## Test Case 25: Retrieve access token with invalid scope
+* **Test ID**: ***capif_security_api-25***
+* **Description**:
+  
+  This test case will check that an API Exposure Function cannot retrieve a security access token with complete invalid scope
+
+* **Pre-Conditions**:
+  
+  * API Invoker is pre-authorised and Provider is also authorized
+
+* **Information of Test**:
+
+  1. Perform [Provider Registration] and [Invoker Onboarding]
+
+  2. Publish Service API at CCF:
+     * Send Post to ccf_publish_url https://{CAPIF_HOSTNAME}/published-apis/v1/{apfId}/service-apis
+     * body [service api description] with apiName service_1
+     * Use APF Certificate
+
+  3. Request Discover Published APIs not filtered:
+     * Send GET to ccf_discover_url *https://{CAPIF_HOSTNAME}/service-apis/v1/allServiceAPIs?api-invoker-id={apiInvokerId}*
+     * Param api-invoker-id is mandatory
+     * Using invoker certificate
+
+  4. Create Security Context for this Invoker
+     * Send PUT *https://{CAPIF_HOSTNAME}/trustedInvokers/{apiInvokerId}*
+     * body [service security body]
+     * Using Invoker Certificate.
+     * Create Security Information Body with one **securityInfo** for each aef present at each serviceAPIDescription present at Discover.
+
+  5. Request Access Token by invoker:
+     * Sent POST *https://{CAPIF_HOSTNAME}/securities/{securityId}/token*.
+     * body [access token req body]
+       * ***securityId*** is apiInvokerId
+       * ***grant_type=client_credentials***
+       * ***scope=not-valid-scope***
+     * Using Invoker certificate
+
+* **Execution Steps**:
+  1. Register Provider at CCF, store certificates and Publish Service API service_1 at CCF
+  2. Register and onboard Invoker at CCF
+  3. Discover Service APIs by Invoker.
+  4. Create Security Context According to Service APIs discovered.
+  5. Request Access Token by Invoker
+   
+* **Expected Result**:
+
+  1. Response to Request of Access Token:
+     1. **400 Bad Request** response.
+     2. body returned must accomplish **AccessTokenErr** data structure, with:
+        * error invalid_scope
+        * error_description=The first characters must be '3gpp'
+
+
+## Test Case 26: Retrieve access token with invalid aefid at scope
+* **Test ID**: ***capif_security_api-26***
+* **Description**:
+  
+  This test case will check that an API Exposure Function cannot retrieve a security access token with invalid aefId at scope
+
+* **Pre-Conditions**:
+  
+  * API Invoker is pre-authorised and Provider is also authorized
+
+* **Information of Test**:
+
+  1. Perform [Provider Registration] and [Invoker Onboarding]
+
+  2. Publish Service API at CCF:
+     * Send Post to ccf_publish_url https://{CAPIF_HOSTNAME}/published-apis/v1/{apfId}/service-apis
+     * body [service api description] with apiName service_1
+     * Use APF Certificate
+
+  3. Request Discover Published APIs not filtered:
+     * Send GET to ccf_discover_url *https://{CAPIF_HOSTNAME}/service-apis/v1/allServiceAPIs?api-invoker-id={apiInvokerId}*
+     * Param api-invoker-id is mandatory
+     * Using invoker certificate
+
+  4. Create Security Context for this Invoker
+     * Send PUT *https://{CAPIF_HOSTNAME}/trustedInvokers/{apiInvokerId}*
+     * body [service security body]
+     * Using Invoker Certificate.
+     * Create Security Information Body with one **securityInfo** for each aef present at each serviceAPIDescription present at Discover.
+
+  5. Request Access Token by invoker:
+     * Sent POST *https://{CAPIF_HOSTNAME}/securities/{securityId}/token*.
+     * body [access token req body]
+       * ***securityId*** is apiInvokerId
+       * ***grant_type=client_credentials***
+       * ***scope=3gpp#1234:service_1***
+     * Using Invoker certificate
+
+* **Execution Steps**:
+  1. Register Provider at CCF, store certificates and Publish Service API service_1 at CCF
+  2. Register and onboard Invoker at CCF
+  3. Discover Service APIs by Invoker.
+  4. Create Security Context According to Service APIs discovered.
+  5. Request Access Token by Invoker
+   
+* **Expected Result**:
+
+  1. Response to Request of Access Token:
+     1. **400 Bad Request** response.
+     2. body returned must accomplish **AccessTokenErr** data structure, with:
+        * error invalid_scope
+        * error_description=One of aef_id not belongs of your security context
+
+
+## Test Case 27: Retrieve access token with invalid apiName at scope
+* **Test ID**: ***capif_security_api-27***
+* **Description**:
+  
+  This test case will check that an API Exposure Function cannot retrieve a security access token with invalid apiName at scope
+
+* **Pre-Conditions**:
+  
+  * API Invoker is pre-authorised and Provider is also authorized
+
+* **Information of Test**:
+
+  1. Perform [Provider Registration] and [Invoker Onboarding]
+
+  2. Publish Service API at CCF:
+     * Send Post to ccf_publish_url https://{CAPIF_HOSTNAME}/published-apis/v1/{apfId}/service-apis
+     * body [service api description] with apiName service_1
+     * Use APF Certificate
+
+  3. Request Discover Published APIs not filtered:
+     * Send GET to ccf_discover_url *https://{CAPIF_HOSTNAME}/service-apis/v1/allServiceAPIs?api-invoker-id={apiInvokerId}*
+     * Param api-invoker-id is mandatory
+     * Using invoker certificate
+
+  4. Create Security Context for this Invoker
+     * Send PUT *https://{CAPIF_HOSTNAME}/trustedInvokers/{apiInvokerId}*
+     * body [service security body]
+     * Using Invoker Certificate.
+     * Create Security Information Body with one **securityInfo** for each aef present at each serviceAPIDescription present at Discover.
+
+  5. Request Access Token by invoker:
+     * Sent POST *https://{CAPIF_HOSTNAME}/securities/{securityId}/token*.
+     * body [access token req body]
+       * ***securityId*** is apiInvokerId
+       * ***grant_type=client_credentials***
+       * ***scope=3gpp#{aef_id}:not-valid***
+     * Using Invoker certificate
+
+* **Execution Steps**:
+  1. Register Provider at CCF, store certificates and Publish Service API service_1 at CCF
+  2. Register and onboard Invoker at CCF
+  3. Discover Service APIs by Invoker.
+  4. Create Security Context According to Service APIs discovered.
+  5. Request Access Token by Invoker
+   
+* **Expected Result**:
+
+  1. Response to Request of Access Token:
+     1. **400 Bad Request** response.
+     2. body returned must accomplish **AccessTokenErr** data structure, with:
+        * error invalid_scope
+        * error_description=One of the api names does not exist or is not associated with the aef id provided
+
+
+  [Return To All Test Plans]: ../README.md
+
+
+
+  [service security body]: ./service_security.json  "Service Security Request"
+  [security notification body]: ./security_notification.json  "Security Notification Request"
+  [access token req body]: ./access_token_req.json  "Access Token Request"
+  [example]: ./access_token_req.json  "Access Token Request Example"
+
+  [invoker onboarding]: ../common_operations/README.md#register-an-invoker "Invoker Onboarding"
+  [provider registration]: ../common_operations/README.md#register-a-provider "Provider Registration"
+
+
diff --git a/docs/test_plan/api_security_service/access_token_req.json b/docs/test_plan/api_security_service/access_token_req.json
new file mode 100644
index 0000000000000000000000000000000000000000..8504736e1fb40d49c3bcb4c6a8bca4dbb6d9f855
--- /dev/null
+++ b/docs/test_plan/api_security_service/access_token_req.json
@@ -0,0 +1,6 @@
+{
+    "client_id": "client_id",
+    "client_secret": "client_secret",
+    "grant_type": "client_credentials",
+    "scope": "scope"
+}
\ No newline at end of file
diff --git a/docs/test_plan/api_security_service/access_token_req_example.json b/docs/test_plan/api_security_service/access_token_req_example.json
new file mode 100644
index 0000000000000000000000000000000000000000..070a717db975b76a80792117b50957ce4267cf6b
--- /dev/null
+++ b/docs/test_plan/api_security_service/access_token_req_example.json
@@ -0,0 +1,5 @@
+{
+  "client_id": "bb260b4d0b3a0f954fa23f42d979ca",
+  "grant_type": "client_credentials",
+  "scope": "3gpp#af7e4cf70063814770e7b00b87273e:service_1"
+}
diff --git a/docs/test_plan/api_security_service/security_notification.json b/docs/test_plan/api_security_service/security_notification.json
new file mode 100644
index 0000000000000000000000000000000000000000..6b94eb5497ed8b6bde547dda6a4abc71783bc998
--- /dev/null
+++ b/docs/test_plan/api_security_service/security_notification.json
@@ -0,0 +1,9 @@
+{
+    "aefId": "aefId",
+    "apiIds": [
+        "apiIds",
+        "apiIds"
+    ],
+    "apiInvokerId": "api_invoker_id",
+    "cause": "OVERLIMIT_USAGE"
+}
\ No newline at end of file
diff --git a/docs/test_plan/api_security_service/service_security.json b/docs/test_plan/api_security_service/service_security.json
new file mode 100644
index 0000000000000000000000000000000000000000..ad7bc1ad5c64f6dc979a294044b5b44f5f43c68a
--- /dev/null
+++ b/docs/test_plan/api_security_service/service_security.json
@@ -0,0 +1,25 @@
+{
+    "notificationDestination": "http://robot.testing",
+    "supportedFeatures": "fffffff",
+    "securityInfo": [{
+        "authenticationInfo": "authenticationInfo",
+        "authorizationInfo": "authorizationInfo",
+        "interfaceDetails": {
+            "ipv4Addr": "127.0.0.1",
+            "securityMethods": ["PSK"],
+            "port": 5248
+        },
+        "prefSecurityMethods": ["PSK", "PKI", "OAUTH"],
+    },
+    {
+        "authenticationInfo": "authenticationInfo",
+        "authorizationInfo": "authorizationInfo",
+        "prefSecurityMethods": ["PSK", "PKI", "OAUTH"],
+        "aefId": "aefId"
+    }],
+    "websockNotifConfig": {
+        "requestWebsocketUri": true,
+        "websocketUri": "websocketUri"
+    },
+    "requestTestNotification": true
+}
diff --git a/docs/test_plan/common_operations/README.md b/docs/test_plan/common_operations/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..ff39d943278ac7760f370dac2810fde776a28d5d
--- /dev/null
+++ b/docs/test_plan/common_operations/README.md
@@ -0,0 +1,86 @@
+
+# Register an Invoker
+
+## Steps to perform operation
+  1. Create public and private key at invoker
+  2. Register of Invoker at CCF:
+     * Send POST to http://{CAPIF_HOSTNAME}:{CAPIF_HTTP_PORT}/register
+     * Body [invoker register body]
+
+  3. Obtain Access Token:
+     * Send POST to *http://{CAPIF_HOSTNAME}/getauth*
+     * Body [invoker getauth body]
+
+  4.  Onboard Invoker:     
+         * Send POST to https://{CAPIF_HOSTNAME}/api-invoker-management/v1/onboardedInvokers
+         * Reference Request Body: [invoker onboarding body]
+         * "onboardingInformation"->"apiInvokerPublicKey": must contain public key generated by Invoker.
+         * Send at Authorization Header the Bearer access_token obtained previously (Authorization:Bearer ${access_token})
+
+## Checks to ensure onboarding
+   1. Response to Register:
+      1. **201 Created**
+
+   2. Response to Get Auth:
+      1. **200 OK**
+      2. ***access_token*** returned.
+
+   3. Response to Onboard request must accomplish:
+      1. **201 Created**
+      2. Response Body must follow **APIInvokerEnrolmentDetails** data structure with:
+         * apiInvokerId
+         * onboardingInformation->apiInvokerCertificate must contain the public key signed.
+      3. Response Header **Location** must be received with URI to new resource created, following this structure: *{apiRoot}/api-invoker-management/{apiVersion}/onboardedInvokers/{onboardingId}*
+
+
+# Register a Provider
+
+## Steps to Perform operation
+  1. Create public and private key at provider for provider itself and each function (apf, aef and amf)
+  2. Register of Provider at CCF:
+     * Send POST to *http://{CAPIF_HOSTNAME}:{CAPIF_HTTP_PORT}/register*
+     * body [provider register body]
+
+  3. Obtain Access Token:
+     * Send POST to *http://{CAPIF_HOSTNAME}/getauth*
+     * Body [provider getauth body]
+
+  4. Register Provider:
+     * Send POST *https://{CAPIF_HOSTNAME}/api-provider-management/v1/registrations*
+     * body [provider request body]
+     * Send at Authorization Header the Bearer access_token obtained previously (Authorization:Bearer ${access_token})
+     * Store each cert in a file with according name.
+
+## Checks to ensure provider registration
+   1. Response to Register:
+      1. **201 Created**
+
+   2. Response to Get Auth:
+      1. **200 OK**
+      2. ***access_token*** returned.
+
+   3. Register Provider at Provider Management:
+      1. **201 Created** response.
+      2. body returned must accomplish **APIProviderEnrolmentDetails** data structure.
+      3. For each **apiProvFuncs**, we must check:
+         1. **apiProvFuncId** is set
+         2. **apiProvCert** under **regInfo** is set properly
+      4. Location Header must contain the new resource URL *{apiRoot}/api-provider-management/v1/registrations/{registrationId}*
+
+
+
+
+
+[invoker register body]: ../api_invoker_management/invoker_register_body.json  "Invoker Register Body"
+[invoker onboarding body]: ../api_invoker_management/invoker_details_post_example.json  "API Invoker Request"
+[invoker getauth body]: ../api_invoker_management/invoker_getauth_example.json    "Get Auth Example"
+
+[provider register body]: ../api_provider_management/provider_register_body.json  "Provider Register Body"
+[provider request body]: ../api_provider_management/provider_details_post_example.json  "API Provider Enrolment Request"
+[provider getauth body]: ../api_provider_management/provider_getauth_example.json    "Get Auth Example"
+
+
+
+
+
+[Return To All Test Plans]: ../README.md
diff --git a/docs/testing_with_curl/README.md b/docs/testing_with_curl/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..d8c3982ab8166055ca8d3c6b0c32cab8bff1bf0b
--- /dev/null
+++ b/docs/testing_with_curl/README.md
@@ -0,0 +1,369 @@
+[**[Return To Main]**]
+# Testing Using Curl
+
+- [Testing Using Curl](#testing-using-curl)
+  - [cURL scripts (TLS supported)](#curl-scripts-tls-supported)
+  - [cURL manual execution](#curl-manual-execution)
+    - [Authentication](#authentication)
+      - [Invoker](#invoker)
+      - [Provider](#provider)
+    - [JWT Authentication APIs](#jwt-authentication-apis)
+      - [Register an entity](#register-an-entity)
+      - [Get access token for an existing entity](#get-access-token-for-an-existing-entity)
+      - [Retrieve and store CA certificate](#retrieve-and-store-ca-certificate)
+      - [Sign provider certificate](#sign-provider-certificate)
+    - [Invoker Management APIs](#invoker-management-apis)
+      - [Onboard an Invoker](#onboard-an-invoker)
+      - [Update Invoker Details](#update-invoker-details)
+      - [Offboard an Invoker](#offboard-an-invoker)
+    - [Publish APIs](#publish-apis)
+      - [Publish a new API.](#publish-a-new-api)
+      - [Update a published service API.](#update-a-published-service-api)
+      - [Unpublish a published service API.](#unpublish-a-published-service-api)
+      - [Retrieve all published APIs](#retrieve-all-published-apis)
+      - [Retrieve a published service API.](#retrieve-a-published-service-api)
+    - [Discover API](#discover-api)
+      - [Discover published service APIs and retrieve a collection of APIs according to certain filter criteria.](#discover-published-service-apis-and-retrieve-a-collection-of-apis-according-to-certain-filter-criteria)
+
+## cURL scripts (TLS supported)
+Also you can follow the instructions and run the commands of the bash scripts:
+* [provider](./capif_tls_curls_exposer.sh) to test CAPIF as provider with TLS support.
+* [invoker](./capif_tls_curls_invoker.sh) to test CAPIF as invoker with TLS support.
+
+## cURL manual execution
+
+### Authentication
+This version will use TLS communication, for that purpose we have 2 different scenarios, according to role:
+* Invoker
+* Provider
+
+#### Invoker
+To authenticate an invoker user, we must perform next steps:
+- Retrieve CA certificate from platform. [Retrieve and store CA certificate](#retrieve-and-store-ca-certificate)
+- Register on the CAPIF with invoker role. [Register an entity](#register-an-entity)
+- Get a Json Web Token (JWT) in order to request onboarding [Get access token for an existing entity](#get-access-token-for-an-existing-entity)
+- Request onboarding adding public key to request. [Onboard an Invoker](#onboard-an-invoker)
+- Store certificate signed by CAPIF platform to allow TLS onwards.
+
+**Flow:**
+
+![Flow](../images/flows/04%20-%20Invoker%20Register.png)
+![Flow](../images/flows/05%20-%20Invoker%20Onboarding.png)
+
+#### Provider
+To authenticate an provider user, we must perform next steps:
+- Retrieve CA certificate from platform. [Retrieve and store CA certificate](#retrieve-and-store-ca-certificate)
+- Register on the CAPIF with provider role. [Register an entity](#register-an-entity)
+- Request sign the public key to CAPIF including beared with JWT. [Sign provider certificate](#sign-provider-certificate)
+- Store certificate signed by CAPIF platform to allow TLS onwards.
+
+**Flow:**
+
+![Flow](../images/flows/01%20-%20Register%20del%20AEF.png)
+![Flow](../images/flows/02%20-%20AEF%20API%20Provider%20registration.png)
+![Flow](../images/flows/03%20-%20AEF%20Publish.png)
+
+### JWT Authentication APIs
+These APIs are triggered by an entity (Invoker or Provider for release 1.0) to:
+- register on the CAPIF Framework
+- get a Json Web Token (JWT) in order to be authorized to call CAPIF APIs
+
+#### Register an entity
+Request
+```shell
+curl --request POST 'http://<CAPIF_HOSTNAME>:<CAPIF_HTTP_PORT>/register' --header 'Content-Type: application/json' --data '{
+    "username":"...",
+    "password":"...",
+    "role":"...",
+    "description":"...",
+    "cn":"..."
+}'
+```
+
+* Role: invoker or publisher
+* cn: common name
+
+Response body
+```json
+{
+  "id": "Entity ID",
+  "message": "Informative message"
+}
+```
+
+#### Get access token for an existing entity
+Request
+```shell
+curl --request POST 'http://<CAPIF_HOSTNAME>:<CAPIF_HTTP_PORT>/gettoken' --header 'Content-Type: application/json' --data '{
+    "username":"...",
+    "password":"...",
+    "role":"..."
+}'
+```
+
+Response body
+```json
+{
+  "access_token": "JSON Web Token for CAPIF APIs", 
+  "message": "Informative message"
+}
+```
+
+#### Retrieve and store CA certificate
+```shell
+curl --request GET 'http://<CAPIF_HOSTNAME>:<CAPIF_HTTP_PORT>/ca-root' 2>/dev/null | jq -r '.certificate' -j > <CA Certificate file>
+```
+
+#### Sign provider certificate
+```shell
+curl --request POST 'http://<CAPIF_HOSTNAME>/sign-csr' --header 'Authorization: Bearer <JWT access token>' --header 'Content-Type: application/json' --data-raw '{
+  "csr":  "RAW PUBLIC KEY CREATED BY PUBLISHER",
+  "mode":  "client",
+  "filename": provider
+}'
+```
+Response
+``` json
+{
+  "certificate": "PUBLISHER CERTIFICATE"
+}
+```
+PUBLISHER CERTIFICATE value must be stored by Provider entity to next request to CAPIF (provider.crt for example)
+
+### Invoker Management APIs
+
+These APIs are triggered by a NetApp (i.e. Invoker)
+
+#### Onboard an Invoker
+
+```shell
+curl --cacert <CA Certificate file> --request POST 'https://<CAPIF_HOSTNAME>/api-invoker-management/v1/onboardedInvokers' --header 'Authorization: Bearer <Invoker JWT access token>' --header 'Content-Type: application/json' --data-raw '{
+  "notificationDestination" : "http://X:Y/netapp_callback",
+  "supportedFeatures" : "fffffff",
+  "apiInvokerInformation" : <Invoker CommonName>,
+  "websockNotifConfig" : {
+    "requestWebsocketUri" : true,
+    "websocketUri" : "websocketUri"
+  },
+  "onboardingInformation" : {
+    "apiInvokerPublicKey" : <RAW PUBLIC KEY CREATED BY INVOKER>
+  },
+  "requestTestNotification" : true
+}'
+```
+
+Response Body
+
+``` json
+{
+  "apiInvokerId": "7da0a8d4172d7d86c536c0fbc9c372",
+  "onboardingInformation": {
+    "apiInvokerPublicKey": "RAW PUBLIC KEY CREATED BY INVOKER", 
+    "apiInvokerCertificate": "INVOKER CERTIFICATE", 
+    "onboardingSecret": "onboardingSecret"
+    }, 
+    "notificationDestination": "http://host.docker.internal:8086/netapp_callback", 
+    "requestTestNotification": true, 
+    ...
+}
+```
+
+INVOKER CERTIFICATE value must be stored by Invoker entity to next request to CAPIF (invoker.crt for example)
+
+#### Update Invoker Details
+
+```shell
+curl --location --request PUT 'https://<CAPIF_HOSTNAME>/api-invoker-management/v1/onboardedInvokers/<API Invoker ID>' --cert <Invoker Signed Certificate file> --key <Invoker Private Key> --cacert <CA Certificate file> --header 'Content-Type: application/json' --data '{
+  "notificationDestination" : "http://X:Y/netapp_callback2",
+  "supportedFeatures" : "fffffff",
+  "apiInvokerInformation" : <Invoker CommonName>,
+  "websockNotifConfig" : {
+    "requestWebsocketUri" : true,
+    "websocketUri" : "websocketUri2"
+  },
+  "onboardingInformation" : {
+    "apiInvokerPublicKey" : <RAW PUBLIC KEY CREATED BY INVOKER>
+  },
+  "requestTestNotification" : true
+}'
+```
+
+#### Offboard an Invoker
+
+```shell
+curl --cert <Invoker Signed Certificate file> --key <Invoker Private Key> --cacert <CA Certificate file> --request DELETE 'https://<CAPIF_HOSTNAME>/api-invoker-management/v1/onboardedInvokers/<API Invoker ID>' 
+```
+
+### Publish APIs
+
+These APIs are triggered by the API Publishing Function (APF) of an Provider
+
+#### Publish a new API.
+```shell
+curl --cert <Provider Signed Certificate file> --key <Provider Private Key> --cacert <CA Certificate file> --request POST 'https://<CAPIF_HOSTNAME>/published-apis/v1/<Provider Id>/service-apis'  --header 'Content-Type: application/json' --data '{
+  "apiName": "3gpp-monitoring-event",
+  "aefProfiles": [
+    {
+      "aefId": "string",
+      "versions": [
+        {
+          "apiVersion": "v1",
+          "expiry": "2021-11-30T10:32:02.004Z",
+          "resources": [
+            {
+              "resourceName": "string",
+              "commType": "REQUEST_RESPONSE",
+              "uri": "string",
+              "custOpName": "string",
+              "operations": [
+                "GET"
+              ],
+              "description": "string"
+            }
+          ],
+          "custOperations": [
+            {
+              "commType": "REQUEST_RESPONSE",
+              "custOpName": "string",
+              "operations": [
+                "GET"
+              ],
+              "description": "string"
+            }
+          ]
+        }
+      ],
+      "protocol": "HTTP_1_1",
+      "dataFormat": "JSON",
+      "securityMethods": ["PSK"],
+      "interfaceDescriptions": [
+        {
+          "ipv4Addr": "string",
+          "port": 65535,
+          "securityMethods": ["PSK"]
+        },
+        {
+          "ipv4Addr": "string",
+          "port": 65535,
+          "securityMethods": ["PSK"]
+        }
+      ]
+    }
+  ],
+  "description": "string",
+  "supportedFeatures": "fffff",
+  "shareableInfo": {
+    "isShareable": true,
+    "capifProvDoms": [
+      "string"
+    ]
+  },
+  "serviceAPICategory": "string",
+  "apiSuppFeats": "fffff",
+  "pubApiPath": {
+    "ccfIds": [
+      "string"
+    ]
+  },
+  "ccfId": "string"
+}'
+```
+
+#### Update a published service API.
+```shell
+curl --cert <Provider Signed Certificate file> --key <Provider Private Key> --cacert <CA Certificate file> --request PUT 'https://<CAPIF_HOSTNAME>/published-apis/v1/<APIF Id>/service-apis/<Service API Id>' --header 'Content-Type: application/json' --data '{
+  "apiName": "3gpp-monitoring-event",
+  "aefProfiles": [
+    {
+      "aefId": "string1",
+      "versions": [
+        {
+          "apiVersion": "v1",
+          "expiry": "2021-11-30T10:32:02.004Z",
+          "resources": [
+            {
+              "resourceName": "string",
+              "commType": "REQUEST_RESPONSE",
+              "uri": "string",
+              "custOpName": "string",
+              "operations": [
+                "GET"
+              ],
+              "description": "string"
+            }
+          ],
+          "custOperations": [
+            {
+              "commType": "REQUEST_RESPONSE",
+              "custOpName": "string",
+              "operations": [
+                "GET"
+              ],
+              "description": "string"
+            }
+          ]
+        }
+      ],
+      "protocol": "HTTP_1_1",
+      "dataFormat": "JSON",
+      "securityMethods": ["PSK"],
+      "interfaceDescriptions": [
+        {
+          "ipv4Addr": "string",
+          "port": 65535,
+          "securityMethods": ["PSK"]
+        },
+        {
+          "ipv4Addr": "string",
+          "port": 65535,
+          "securityMethods": ["PSK"]
+        }
+      ]
+    }
+  ],
+  "description": "string",
+  "supportedFeatures": "fffff",
+  "shareableInfo": {
+    "isShareable": true,
+    "capifProvDoms": [
+      "string"
+    ]
+  },
+  "serviceAPICategory": "string",
+  "apiSuppFeats": "fffff",
+  "pubApiPath": {
+    "ccfIds": [
+      "string"
+    ]
+  },
+  "ccfId": "string"
+}'
+```
+
+#### Unpublish a published service API.
+```shell
+curl --cert <Provider Signed Certificate file> --key <Provider Private Key> --cacert <CA Certificate file> --request DELETE 'https://<CAPIF_HOSTNAME>/published-apis/v1/<APF Id>/service-apis/<Service API Id>'
+```
+
+#### Retrieve all published APIs
+```shell
+curl --cert <Provider Signed Certificate file> --key <Provider Private Key> --cacert <CA Certificate file> --request GET 'https://<CAPIF_HOSTNAME>/published-apis/v1/<APF Id>/service-apis'
+```
+
+#### Retrieve a published service API.
+```shell
+curl --cert <Provider Signed Certificate file> --key <Provider Private Key> --cacert <CA Certificate file> --request GET 'https://<CAPIF_HOSTNAME>/published-apis/v1/<APF Id>/service-apis/<Service API Id>'
+```
+
+### Discover API
+
+This API is triggered by a NetApp (or Invoker)
+
+#### Discover published service APIs and retrieve a collection of APIs according to certain filter criteria.
+```shell
+curl --cert <Invoker Signed Certificate file> --key <Invoker Private Key> --cacert <CA Certificate file> --request GET 'https://<CAPIF_HOSTNAME>/service-apis/v1/allServiceAPIs?api-invoker-id=<API Invoker Id>&api-name=<API Name>&api-version=<API version e.g. v1>&aef-id=<AEF Id>&api-cat=<Service API Category>&supported-features=<SuppFeat>&api-supported-features=<API Suppfeat>'
+```
+
+
+
+[Return To Main]: ../../README.md#using-curl
\ No newline at end of file
diff --git a/docs/testing_with_curl/capif_tls_curls_exposer.sh b/docs/testing_with_curl/capif_tls_curls_exposer.sh
new file mode 100755
index 0000000000000000000000000000000000000000..5b81712eeebf75965dc0fd6e4b38f1f6a89a1ef7
--- /dev/null
+++ b/docs/testing_with_curl/capif_tls_curls_exposer.sh
@@ -0,0 +1,205 @@
+##### Execute Exposer curls locally
+
+##### Configure machine 
+
+##### Add in /etc/hosts: 127.0.0.1	capifcore
+
+
+##### Set environment variables 
+capifhost="capifcore"
+capifhttpport="8080"
+
+exposerpk="-----BEGIN CERTIFICATE REQUEST-----\nMIIC0TCCAbkCAQAwgYsxEDAOBgNVBAMMB2V4cG9zZXIxFzAVBgNVBAoMDlRlbGVm\nb25pY2EgSStEMRMwEQYDVQQLDApJbm5vdmF0aW9uMQ8wDQYDVQQHDAZNYWRyaWQx\nDzANBgNVBAgMBk1hZHJpZDELMAkGA1UEBhMCRVMxGjAYBgkqhkiG9w0BCQEWC2lu\nbm9AdGlkLmVzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkpJ7FzAI\nkzFYxLKbW54lIsQBNIQz5zQIvRZDFcrO4QLR2jQUps9giBWEDih++47JiBJyM+z1\nWkEh7b+moZhQThj7L9PKgJHRhU1oeHpSE1x/r7479J5F+CFRqFo5v9dC+2zGfP4E\nsSrNfp3MK/KQHsHhMzSt881xAHs+p2/bcM+sd/BlXC4J6E1y6Hk3ogI7kq443fcY\noUHZx9ClUSboOvXa1ZSPVxdCV6xKRraUdAKfhMGn+pYtJDsNp8Gg/BN8NXmYUzl9\ntDhjeuIxr4N38LgW3gRHLNIa8acO9eBctWw9AD20JWzFAXvvmsboBPc2wsOVcsml\ncCbisMRKX4JyKQIDAQABoAAwDQYJKoZIhvcNAQELBQADggEBAIxZ1Sec9ATbqjhi\nRz4rvhX8+myXhyfEw2MQ62jz5tpH4qIVZFtn+cZvU/ULySY10WHaBijGgx8fTaMh\nvjQbc+p3PXmgtnmt1QmoOGjDTFa6vghqpxPLSUjjCUe8yj5y24gkOImY6Cv5rzzQ\nlnTMkNvnGgpDgUeiqWcQNbwwge3zkzp9bVRgogTT+EDxiFnjTTF6iUG80sRtXMGr\nD6sygLsF2zijGGfWoKRo/7aZTQxuCiCixceVFXegMfr+eACkOjV25Kso7hYBoEdP\nkgUf5PNpl5uK3/rmPIrl/TeE0SnGGfCYP7QajE9ELRsBVmVDZJb7ZxUl1A4YydFY\ni0QOM3Y=\n-----END CERTIFICATE REQUEST-----\n"
+
+
+##### Retrieve and store CA certificate 
+
+curl --request GET "http://$capifhost:$capifhttpport/ca-root" 2>/dev/null | jq -r '.certificate' -j > ca.crt
+
+
+##### Register an entity 
+
+exposerid=$(curl --request POST "http://$capifhost:$capifhttpport/register" --header 'Content-Type: application/json' --data '{
+    "username":"exposer",
+    "password":"exposer",
+    "role":"exposer",
+    "description":"Exposer",
+    "cn":"exposer"
+}' 2>/dev/null | jq -r '.id' -j)
+
+
+##### Get access token
+
+exposertoken=$(curl --request POST "http://$capifhost:$capifhttpport/gettoken" --header 'Content-Type: application/json' --data '{
+    "username":"exposer",
+    "password":"exposer",
+    "role":"exposer"
+}' 2>/dev/null | jq -r '.access_token' -j)
+
+
+##### Sign exposer certificate
+
+curl --request POST "http://$capifhost:$capifhttpport/sign-csr" --header "Authorization: Bearer $exposertoken" --header 'Content-Type: application/json' --data-raw "{
+  \"csr\":  \"$exposerpk\",
+  \"mode\":  \"client\",
+  \"filename\": \"exposer\"
+}" 2>/dev/null | jq -r '.certificate' -j > exposer.crt
+
+
+##### Publish service
+curl --cert exposer.crt --key exposer.key --cacert ca.crt --request POST "https://$capifhost/published-apis/v1/$exposerid/service-apis"  --header 'Content-Type: application/json' --data '{
+  "apiName": "3gpp-monitoring-event",
+  "aefProfiles": [
+    {
+      "aefId": "string",
+      "versions": [
+        {
+          "apiVersion": "v1",
+          "expiry": "2021-11-30T10:32:02.004Z",
+          "resources": [
+            {
+              "resourceName": "string",
+              "commType": "REQUEST_RESPONSE",
+              "uri": "string",
+              "custOpName": "string",
+              "operations": [
+                "GET"
+              ],
+              "description": "string"
+            }
+          ],
+          "custOperations": [
+            {
+              "commType": "REQUEST_RESPONSE",
+              "custOpName": "string",
+              "operations": [
+                "GET"
+              ],
+              "description": "string"
+            }
+          ]
+        }
+      ],
+      "protocol": "HTTP_1_1",
+      "dataFormat": "JSON",
+      "securityMethods": ["PSK"],
+      "interfaceDescriptions": [
+        {
+          "ipv4Addr": "string",
+          "port": 65535,
+          "securityMethods": ["PSK"]
+        },
+        {
+          "ipv4Addr": "string",
+          "port": 65535,
+          "securityMethods": ["PSK"]
+        }
+      ]
+    }
+  ],
+  "description": "string",
+  "supportedFeatures": "fffff",
+  "shareableInfo": {
+    "isShareable": true,
+    "capifProvDoms": [
+      "string"
+    ]
+  },
+  "serviceAPICategory": "string",
+  "apiSuppFeats": "fffff",
+  "pubApiPath": {
+    "ccfIds": [
+      "string"
+    ]
+  },
+  "ccfId": "string"
+}' > response.json
+
+apiserviceid=$(cat response.json | jq -r '.apiId' -j)
+
+
+##### Update a published service API
+curl --cert exposer.crt --key exposer.key --cacert ca.crt --request PUT "https://$capifhost/published-apis/v1/$exposerid/service-apis/$apiserviceid" --header 'Content-Type: application/json' --data '{
+  "apiName": "3gpp-monitoring-event",
+  "aefProfiles": [
+    {
+      "aefId": "string1",
+      "versions": [
+        {
+          "apiVersion": "v1",
+          "expiry": "2021-11-30T10:32:02.004Z",
+          "resources": [
+            {
+              "resourceName": "string",
+              "commType": "REQUEST_RESPONSE",
+              "uri": "string",
+              "custOpName": "string",
+              "operations": [
+                "GET"
+              ],
+              "description": "string"
+            }
+          ],
+          "custOperations": [
+            {
+              "commType": "REQUEST_RESPONSE",
+              "custOpName": "string",
+              "operations": [
+                "GET"
+              ],
+              "description": "string"
+            }
+          ]
+        }
+      ],
+      "protocol": "HTTP_1_1",
+      "dataFormat": "JSON",
+      "securityMethods": ["PSK"],
+      "interfaceDescriptions": [
+        {
+          "ipv4Addr": "string",
+          "port": 65535,
+          "securityMethods": ["PSK"]
+        },
+        {
+          "ipv4Addr": "string",
+          "port": 65535,
+          "securityMethods": ["PSK"]
+        }
+      ]
+    }
+  ],
+  "description": "string",
+  "supportedFeatures": "fffff",
+  "shareableInfo": {
+    "isShareable": true,
+    "capifProvDoms": [
+      "string"
+    ]
+  },
+  "serviceAPICategory": "string",
+  "apiSuppFeats": "fffff",
+  "pubApiPath": {
+    "ccfIds": [
+      "string"
+    ]
+  },
+  "ccfId": "string"
+}'
+
+
+##### Retrieve all published APIs
+
+curl --cert exposer.crt --key exposer.key --cacert ca.crt --request GET "https://$capifhost/published-apis/v1/$exposerid/service-apis"
+
+
+##### Retrieve a published service API
+
+curl --cert exposer.crt --key exposer.key --cacert ca.crt --request GET "https://$capifhost/published-apis/v1/$exposerid/service-apis/$apiserviceid"
+
+
+##### Unpublish a published service API
+
+curl --cert exposer.crt --key exposer.key --cacert ca.crt --request DELETE "https://$capifhost/published-apis/v1/$exposerid/service-apis/$apiserviceid"
+
+
diff --git a/docs/testing_with_curl/capif_tls_curls_invoker.sh b/docs/testing_with_curl/capif_tls_curls_invoker.sh
new file mode 100755
index 0000000000000000000000000000000000000000..d6c287a91ee27891cf652c65e6d5b25f8ca84a63
--- /dev/null
+++ b/docs/testing_with_curl/capif_tls_curls_invoker.sh
@@ -0,0 +1,86 @@
+##### Execute Invoker curls locally
+
+##### Configure machine 
+
+##### Add in /etc/hosts: 127.0.0.1	capifcore
+
+
+##### Set environment variables
+
+capifhost="capifcore"
+capifhttpport="8080"
+
+invokerpk="-----BEGIN CERTIFICATE REQUEST-----\nMIIC0TCCAbkCAQAwgYsxEDAOBgNVBAMMB2ludm9rZXIxFzAVBgNVBAoMDlRlbGVm\nb25pY2EgSStEMRMwEQYDVQQLDApJbm5vdmF0aW9uMQ8wDQYDVQQHDAZNYWRyaWQx\nDzANBgNVBAgMBk1hZHJpZDELMAkGA1UEBhMCRVMxGjAYBgkqhkiG9w0BCQEWC2lu\nbm9AdGlkLmVzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArfITEb3/\nJ5KDt7ia2WsQrd8iSrlH8kh6D9YNPEF+KaIGQ9w8QhmOW416uvIAASzOaCKMNqgb\nCI0NqsbVF9lfaiBgB71vcwX0yKatjACn3Nl3Lnubi+tH4Jb5zGQQXOuxpMHMmgyn\nNTsSc/MeMzX3iUWqLmmhnTC31Mu1ESUPTBa+CitQAj2wYMvBS970WICKrDlxWkR8\nZZBkRBZaxMfqY21VWmREtR+Kl6GCMBtUCUBH6uWjFiOpxYbCxdygxxrA4a3IzmiO\ntXOyLs7iuOP/CLSYfk71MHX2qKlpAyjdRK2W0w0GioV90Hk4uT/YUYy9zjWWN+mm\nrQ9GBy8iRZm7YwIDAQABoAAwDQYJKoZIhvcNAQELBQADggEBAI0btA7KDMvkY4Ib\n0eMteeeT40bm11Yw8/6V48IaIPi9EpZMI+jWyCebw8PBFUs3l3ImWeO8Gma96gyf\np0WB/64MRkUSdOxUWOWGMPIMEF+BH3eiHthx+EbAETtJ0D4KzmH6raxl14qvwLS5\nwxtxPGxu/R5ue5RVJpAzzJ6OX36p05GYSzL+pTotVPpowSdoeNsV+xPgPA0diV8a\nB7Zn/ujwMpsh7IjQPKpOEkhQdxc478Si8dmRbzXkVar1Oa8/QSJ8ZAaFI4VGowjR\nmtxps7AvS5OG9iMPtFQHpqxHVO50CJU5cbsXsYdu9EipGhgIKJDKewBX7tCKk0Ot\nBLU03CY=\n-----END CERTIFICATE REQUEST-----\n"
+
+
+##### Retrieve and store CA certificate
+
+curl --request GET "http://$capifhost:$capifhttpport/ca-root" 2>/dev/null | jq -r '.certificate' -j > ca.crt
+
+
+##### Register an entity 
+
+invokerid=$(curl --request POST "http://$capifhost:$capifhttpport/register" --header 'Content-Type: application/json' --data '{
+    "username":"invoker",
+    "password":"invoker",
+    "role":"invoker",
+    "description":"Invoker",
+    "cn":"invoker"
+}' 2>/dev/null | jq -r '.id' -j)
+
+
+##### Get access token 
+
+invokertoken=$(curl --request POST "http://$capifhost:$capifhttpport/gettoken" --header 'Content-Type: application/json' --data '{
+    "username":"invoker",
+    "password":"invoker",
+    "role":"invoker"
+}' 2>/dev/null | jq -r '.access_token' -j)
+
+
+##### Onboard an Invoker 
+
+curl --cacert ca.crt --request POST "https://$capifhost/api-invoker-management/v1/onboardedInvokers" --header "Authorization: Bearer $invokertoken" --header 'Content-Type: application/json' --data-raw "{
+  \"notificationDestination\" : \"http://X:Y/netapp_callback\",
+  \"supportedFeatures\" : \"fffffff\",
+  \"apiInvokerInformation\" : \"invoker\",
+  \"websockNotifConfig\" : {
+    \"requestWebsocketUri\" : true,
+    \"websocketUri\" : \"websocketUri\"
+  },
+  \"onboardingInformation\" : {
+    \"apiInvokerPublicKey\" : \"$invokerpk\"
+  },
+  \"requestTestNotification\" : true
+}" > response.json
+
+cat response.json | jq -r '.onboardingInformation.apiInvokerCertificate' -j > invoker.crt
+apiinvokerid=$(cat response.json | jq -r '.apiInvokerId' -j)
+
+
+##### Update Invoker Details 
+
+curl --location --request PUT "https://$capifhost/api-invoker-management/v1/onboardedInvokers/$apiinvokerid" --cert invoker.crt --key invoker.key --cacert ca.crt --header 'Content-Type: application/json' --data "{
+  \"notificationDestination\" : \"http://X:Y/netapp_callback2\",
+  \"supportedFeatures\" : \"fffffff\",
+  \"apiInvokerInformation\" : \"test\",
+  \"websockNotifConfig\" : {
+    \"requestWebsocketUri\" : true,
+    \"websocketUri\" : \"websocketUri2\"
+  },
+  \"onboardingInformation\" : {
+    \"apiInvokerPublicKey\" : \"$invokerpk\"
+  },
+  \"requestTestNotification\" : true
+}"
+
+
+##### Discover API 
+
+curl --cert invoker.crt --key invoker.key --cacert ca.crt --request GET "https://$capifhost/service-apis/v1/allServiceAPIs?api-invoker-id=$apiinvokerid"
+
+
+##### Offboard an Invoker 
+
+curl --cert invoker.crt --key invoker.key --cacert ca.crt --request DELETE "https://$capifhost/api-invoker-management/v1/onboardedInvokers/$apiinvokerid"
+
diff --git a/docs/testing_with_curl/exposer.key b/docs/testing_with_curl/exposer.key
new file mode 100644
index 0000000000000000000000000000000000000000..e84c8c4c2796860f0a3a1b0937d5b444a68692e2
--- /dev/null
+++ b/docs/testing_with_curl/exposer.key
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCSknsXMAiTMVjE
+sptbniUixAE0hDPnNAi9FkMVys7hAtHaNBSmz2CIFYQOKH77jsmIEnIz7PVaQSHt
+v6ahmFBOGPsv08qAkdGFTWh4elITXH+vvjv0nkX4IVGoWjm/10L7bMZ8/gSxKs1+
+ncwr8pAeweEzNK3zzXEAez6nb9twz6x38GVcLgnoTXLoeTeiAjuSrjjd9xihQdnH
+0KVRJug69drVlI9XF0JXrEpGtpR0Ap+Ewaf6li0kOw2nwaD8E3w1eZhTOX20OGN6
+4jGvg3fwuBbeBEcs0hrxpw714Fy1bD0APbQlbMUBe++axugE9zbCw5VyyaVwJuKw
+xEpfgnIpAgMBAAECggEACs11TqlcIG5qd/N1Ts8ni9noACpe4ZiXV578lRkW8++E
+xEZtX+P4iIm+wK+3DYGhvyp430naGsD30rF62FMaVr8xmCijC/nIoutTGqS38t8G
+Ns+C/2Lrjj+fvemJyGasSaKOjdIc9L/OWG7MiE/+05LU2bTKvfrIwXvT4NGg2ei1
+NDO8vS5fRHYZ1LyCyrCDetP2aYrTlPao20hmU4IDyh4N17wLuPgijC+AuqR2Xic0
+Mk4ofZ/6Y3oN0rrov2yG7IXjMJQI469IQ6TJLlyFc8tQIF5Y3CMMCMuVMq5m33bq
+/6bow4/VYFG8mPzy7lQLQ8YeEPsgDKL0pB4zqDr7ZwKBgQDJRJoG2PSaEOt6DIKV
+84to73oD9x9lOSrmaH2/NzL3mwLXP2Is4nmLzEDQvA0UhTZe9c0n6OoE3uRZ1gAu
+JIe3zXTJSK4/ysmePUZL1js5bKtuHBrcSCOupWRuJXbaXK5uqISDHUgHiRw3bq8y
+g8SZY/JOBPyJhVlKhmhNCYMi9wKBgQC6bjJ//tLpH6EG4ux0O2StzUoHrvV2cyUj
+RRxGvAt92sdsZaVKmIW/SlLy8tv5HJqblfn6m7aY/vUYbN3AfMJ4teLZz5Y//CH3
+jPchHyk/uhh7gxufiD65i5bfVyRt54tDbyVDc2/1prUyD5W4q4UNOmvhXym5saIc
+U5WNCnSr3wKBgQCs8MaM5bVgAPPlfoRixs9ejo/AgoK2nqWvL9AFEzA3NDn/rJX2
+TW/1YL+83Ck9Ha33cKwlA+y53LBIRSsIexknJWKZZltbsysFTk9t8JoZILg5N+sY
+puAKPFGMl6KFxSeZLDIY23s+BmF5fCEMfc7botbclUpN/IgaEl3i/C5zRwKBgHsx
+lKdmEaNBZlwxmgTYtpfvH2tiXwwN3M2ovp2zZ3icGMn1hTt8/GzCxXuLpnbAQx5r
+BcxoF0qUuAuS7RpklvHDZ4t9FJFloGCAQ1Ic0FovNDxyD8/k7WYY6vLdF9KUfj9q
+c9pVrvdKWVQiXlKw7PQn1eAQzXbK/g/v39Raw2xLAoGBAILTLY3sGBNkFCVhJlyZ
+DaIwkbtnpCBT2T7DUupw51aLhh4rnuJ5wA3uGdRqoKVYSc9DuOwB/yNFGuQDElxQ
+jfKlX0X5xItaxZ5FR4EvGCnqBJl6JM3QekzhXtq5VdY5zIf/HHqFYebcMFrkEicZ
+uuAZd4wa+jn9SR9mUYtS+Lq+
+-----END PRIVATE KEY-----
diff --git a/docs/testing_with_curl/invoker.key b/docs/testing_with_curl/invoker.key
new file mode 100644
index 0000000000000000000000000000000000000000..15b96bbd0d00ef4ee73a5557e79b42c4b6d6598f
--- /dev/null
+++ b/docs/testing_with_curl/invoker.key
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCt8hMRvf8nkoO3
+uJrZaxCt3yJKuUfySHoP1g08QX4pogZD3DxCGY5bjXq68gABLM5oIow2qBsIjQ2q
+xtUX2V9qIGAHvW9zBfTIpq2MAKfc2Xcue5uL60fglvnMZBBc67GkwcyaDKc1OxJz
+8x4zNfeJRaouaaGdMLfUy7URJQ9MFr4KK1ACPbBgy8FL3vRYgIqsOXFaRHxlkGRE
+FlrEx+pjbVVaZES1H4qXoYIwG1QJQEfq5aMWI6nFhsLF3KDHGsDhrcjOaI61c7Iu
+zuK44/8ItJh+TvUwdfaoqWkDKN1ErZbTDQaKhX3QeTi5P9hRjL3ONZY36aatD0YH
+LyJFmbtjAgMBAAECggEAAyR5OxdJ1W5jnSD9kBCvO6jDMIUuIcU+SAZUfGaxYybn
+EeNCtBiPGV8tWWLHJJ0bL6iKpAv+gOKeSpKOmwU7XkHZEWVlRAfpiNfen2bcTCiw
+fg3D4bgRMmDwwyMH368QFlJ56UFMCuqb0x+oCeMRIdNjwfbcPVCpZDYNGwTDBzoy
+72Aj5TssEu+Ft5VVGwhsvq0v6bd6OWmW34PI9SHzXzRlRw4b4ZtZekW8o/QpO1gO
+F+ARbCGE2qjqHWRU/vzINMmAucqhDM6/f7Un5XXr+Zm+8u4PGa5eLWkebJHhfwKX
+Ag0WToD/FmDPRqlnjZdzraJlhuXLGdhRAlzdnIQNRQKBgQDvhiVewu7CTzgB66dA
+cdrJkXVJPZUGvUYmXkwPaSju7hjDc87pNz+szH2QP+Qm+pD1mV9OswIim4Oi7C1l
+lEe423QGjtsn5txzcRk+ZzyX/Z2ltcnXi8N/MNeOZ2qFAgP/IIOTcgowKftuUT6w
+2A1DQFj6xxu6vrzxOqIL6tXy7wKBgQC56SM80udTqyb9+wk/KuDSgym3bSaZ8i5q
+dNVV5wOxCotLGG9Any61TVOIP/SUjar4f4+FznLZjJYXIZvpbS32PUOtlnKtOmp6
+OBKIpEXq2zq0u/o/i8EyOb6laNqehfffRYqqYU9mJXVjiTUNcOVqfLljeeui1r1P
+txSRBlTuzQKBgQDUgB/hbXHjw+J9mbM9soUXtUvn2ZHAc+Wrnpc+SN6+80/W/4R/
+VbvRM27mrjhc+InoytRKfvgS+gOUZJJ1/1KOR2wtcUovoVrNtHZf7blNYv0dCiXz
+bBTaX9uthER1km83RoJVKqStTGG74qqKvHMvygPnIQSR7iy0m38usX500wKBgGeM
+koLzWcOBhhNa+tiDMnwucFLpaeG/QdkrwBO7u5OlstYeAwF0aFi1fDxcmwcPLVaB
+/lfiGJhRtNunbacDl+EaWJLcRH12Fw6CItiW3xakCzvVo9o3JmGqRiTtlS9MoTZs
+DoM99jKH1K2fI7yb0DySwdPFedjWUNWQvNTWOQJVAoGAYr9Kuo7s83Qe9CaHQW/Y
+PPL0dYBA63guuw2mNQjBL5LuqMZPz6vVB0hIVlYb5Xgw48OWUThHksJ0qltJK7kR
+OPRyOxiWpJVo5rZPVzS0Ofbmau9z1VYr358RqR2N2EqG5KDr5QZT9nQq7k8EJvrF
+NM/zMhxmgtNYez417Q/3U+M=
+-----END PRIVATE KEY-----
diff --git a/docs/testing_with_postman/CAPIF.postman_collection.json b/docs/testing_with_postman/CAPIF.postman_collection.json
new file mode 100644
index 0000000000000000000000000000000000000000..e65c826994c986b46367eeb223d65444a38cebf9
--- /dev/null
+++ b/docs/testing_with_postman/CAPIF.postman_collection.json
@@ -0,0 +1,982 @@
+{
+	"info": {
+		"_postman_id": "5cfdf0d7-3b3c-4961-9cb9-84c2bf85056c",
+		"name": "CAPIF",
+		"schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json",
+		"_exporter_id": "31608242",
+		"_collection_link": "https://red-comet-993867.postman.co/workspace/Team-Workspace~bfc7c442-a60c-4bb1-8730-fdabc2df89b9/collection/31608242-5cfdf0d7-3b3c-4961-9cb9-84c2bf85056c?action=share&source=collection_link&creator=31608242"
+	},
+	"item": [
+		{
+			"name": "01-register_user_provider",
+			"event": [
+				{
+					"listen": "test",
+					"script": {
+						"exec": [
+							"var res = JSON.parse(responseBody);",
+							"pm.environment.set('ONBOARDING_URL', res.ccf_api_onboarding_url);",
+							"pm.environment.set('PUBLISH_URL', res.ccf_publish_url);",
+							"pm.environment.set('USER_ID', res.id);",
+							""
+						],
+						"type": "text/javascript"
+					}
+				}
+			],
+			"request": {
+				"method": "POST",
+				"header": [],
+				"body": {
+					"mode": "raw",
+					"raw": "{\n\"password\": \"{{PASSWORD}}\",\n\"username\": \"{{USERNAME}}\",\n\"description\": \"provider\",\n\"role\": \"provider\",\n\"cn\": \"provider\"\n}",
+					"options": {
+						"raw": {
+							"language": "json"
+						}
+					}
+				},
+				"url": {
+					"raw": "https://{{REGISTER_HOSTNAME}}:{{REGISTER_PORT}}/register",
+					"protocol": "https",
+					"host": [
+						"{{REGISTER_HOSTNAME}}"
+					],
+					"port": "{{REGISTER_PORT}}",
+					"path": [
+						"register"
+					]
+				}
+			},
+			"response": []
+		},
+		{
+			"name": "02-getauth_provider",
+			"event": [
+				{
+					"listen": "test",
+					"script": {
+						"exec": [
+							"var res = JSON.parse(responseBody);",
+							"",
+							"pm.environment.set('CA_ROOT', res.ca_root);",
+							"pm.environment.set('ACCESS_TOKEN', res.access_token);",
+							"",
+							"setTimeout(() => {",
+							"                pm.sendRequest({",
+							"                    url: 'http://localhost:3000/write_ca',",
+							"                    method: 'POST',",
+							"                    header: 'Content-Type:application/json',",
+							"                    encoding: 'binary',",
+							"                    body: {",
+							"                        mode: 'raw',",
+							"                        raw: res",
+							"                    }",
+							"                }, function (err, res) {",
+							"                    console.log(res);",
+							"                });",
+							"            }, 5000);"
+						],
+						"type": "text/javascript"
+					}
+				}
+			],
+			"request": {
+				"method": "POST",
+				"header": [],
+				"body": {
+					"mode": "raw",
+					"raw": "{\n\"password\": \"{{PASSWORD}}\",\n\"username\": \"{{USERNAME}}\"\n}",
+					"options": {
+						"raw": {
+							"language": "json"
+						}
+					}
+				},
+				"url": {
+					"raw": "https://{{REGISTER_HOSTNAME}}:{{REGISTER_PORT}}/getauth",
+					"protocol": "https",
+					"host": [
+						"{{REGISTER_HOSTNAME}}"
+					],
+					"port": "{{REGISTER_PORT}}",
+					"path": [
+						"getauth"
+					]
+				}
+			},
+			"response": []
+		},
+		{
+			"name": "03-onboard_provider",
+			"event": [
+				{
+					"listen": "test",
+					"script": {
+						"exec": [
+							"var res = JSON.parse(responseBody);",
+							"if (pm.response.code == 201){",
+							"    ",
+							"    pm.environment.set('PROVIDER_ID', res.apiProvDomId);",
+							"",
+							"    const roleVariableMapping = {",
+							"    \"AEF\": { id: 'AEF_ID', cert: 'AEF_CERT' },",
+							"    \"APF\": { id: 'APF_ID', cert: 'APF_CERT' },",
+							"    \"AMF\": { id: 'AMF_ID', cert: 'AMF_CERT' }",
+							"    };",
+							"",
+							"    res.apiProvFuncs.forEach(function(elemento) {",
+							"        const role = elemento.apiProvFuncRole;",
+							"        if (roleVariableMapping.hasOwnProperty(role)) {",
+							"            const variables = roleVariableMapping[role];",
+							"            pm.environment.set(variables.id, elemento.apiProvFuncId);",
+							"            pm.environment.set(variables.cert, elemento.regInfo.apiProvCert);",
+							"",
+							"        }",
+							"    });",
+							"",
+							"}",
+							"",
+							"",
+							""
+						],
+						"type": "text/javascript"
+					}
+				},
+				{
+					"listen": "prerequest",
+					"script": {
+						"exec": [
+							"",
+							"var res = JSON.parse(pm.request.body.raw);",
+							"",
+							"res.apiProvFuncs.forEach(function(elemento) {",
+							"",
+							"    setTimeout(() => {",
+							"                pm.sendRequest({",
+							"                    url: 'http://localhost:3000/generate_csr',",
+							"                    method: 'POST',",
+							"                    header: 'Content-Type:application/json',",
+							"                    encoding: 'binary',",
+							"                    body: {",
+							"                        mode: 'raw',",
+							"                        raw: elemento",
+							"                    }",
+							"                }, function (err, response) {",
+							"                    j_file = JSON.parse(response.text());",
+							"                    elemento.regInfo.apiProvPubKey = j_file.csr;",
+							"                    pm.environment.set(elemento.apiProvFuncRole+'_KEY', j_file.key);",
+							"                });",
+							"            }, 5000);",
+							"",
+							"});",
+							"",
+							"pm.request.body.raw = res;"
+						],
+						"type": "text/javascript"
+					}
+				}
+			],
+			"request": {
+				"auth": {
+					"type": "bearer",
+					"bearer": [
+						{
+							"key": "token",
+							"value": "{{ACCESS_TOKEN}}",
+							"type": "string"
+						}
+					]
+				},
+				"method": "POST",
+				"header": [
+					{
+						"key": "",
+						"value": "",
+						"type": "text",
+						"disabled": true
+					}
+				],
+				"body": {
+					"mode": "raw",
+					"raw": "{\n\"apiProvFuncs\": [\n    {\n    \"regInfo\": {\n        \"apiProvPubKey\": \"\"\n    },\n    \"apiProvFuncRole\": \"AEF\",\n    \"apiProvFuncInfo\": \"dummy_aef\"\n    },\n    {\n    \"regInfo\": {\n        \"apiProvPubKey\": \"\"\n    },\n    \"apiProvFuncRole\": \"APF\",\n    \"apiProvFuncInfo\": \"dummy_apf\"\n    },\n    {\n    \"regInfo\": {\n        \"apiProvPubKey\": \"\"\n    },\n    \"apiProvFuncRole\": \"AMF\",\n    \"apiProvFuncInfo\": \"dummy_amf\"\n    }\n],\n\"apiProvDomInfo\": \"This is provider\",\n\"suppFeat\": \"fff\",\n\"failReason\": \"string\",\n\"regSec\": \"{{ACCESS_TOKEN}}\"\n}",
+					"options": {
+						"raw": {
+							"language": "json"
+						}
+					}
+				},
+				"url": {
+					"raw": "https://{{CAPIF_HOSTNAME}}/{{ONBOARDING_URL}}",
+					"protocol": "https",
+					"host": [
+						"{{CAPIF_HOSTNAME}}"
+					],
+					"path": [
+						"{{ONBOARDING_URL}}"
+					]
+				}
+			},
+			"response": []
+		},
+		{
+			"name": "04-publish_api",
+			"event": [
+				{
+					"listen": "prerequest",
+					"script": {
+						"exec": [
+							"setTimeout(() => {",
+							"                pm.sendRequest({",
+							"                    url: 'http://localhost:3000/write_cert',",
+							"                    method: 'POST',",
+							"                    header: 'Content-Type:application/json',",
+							"                    encoding: 'binary',",
+							"                    body: {",
+							"                        mode: 'raw',",
+							"                        raw: {cert: pm.environment.get('APF_CERT'), key:pm.environment.get('APF_KEY')}",
+							"                    }",
+							"                }, function (err, response) {",
+							"                    console.log(response)",
+							"                });",
+							"            }, 5000);",
+							"",
+							"",
+							""
+						],
+						"type": "text/javascript"
+					}
+				},
+				{
+					"listen": "test",
+					"script": {
+						"exec": [
+							""
+						],
+						"type": "text/javascript"
+					}
+				}
+			],
+			"protocolProfileBehavior": {
+				"strictSSL": true
+			},
+			"request": {
+				"auth": {
+					"type": "noauth"
+				},
+				"method": "POST",
+				"header": [
+					{
+						"key": "",
+						"value": "",
+						"type": "text",
+						"disabled": true
+					}
+				],
+				"body": {
+					"mode": "raw",
+					"raw": "\n{\n    \"apiName\": \"hello_api_demo_v2\",\n    \"aefProfiles\": [\n      {\n        \"aefId\": \"{{AEF_ID}}\",\n        \"versions\": [\n          {\n            \"apiVersion\": \"v1\",\n            \"expiry\": \"2021-11-30T10:32:02.004Z\",\n            \"resources\": [\n              {\n                \"resourceName\": \"hello-endpoint\",\n                \"commType\": \"REQUEST_RESPONSE\",\n                \"uri\": \"/hello\",\n                \"custOpName\": \"string\",\n                \"operations\": [\n                  \"POST\"\n                ],\n                \"description\": \"Endpoint to receive a welcome message\"\n              }\n            ],\n            \"custOperations\": [\n              {\n                \"commType\": \"REQUEST_RESPONSE\",\n                \"custOpName\": \"string\",\n                \"operations\": [\n                  \"POST\"\n                ],\n                \"description\": \"string\"\n              }\n            ]\n          }\n        ],\n        \"protocol\": \"HTTP_1_1\",\n        \"dataFormat\": \"JSON\",\n        \"securityMethods\": [\"Oauth\"],\n        \"interfaceDescriptions\": [\n          {\n            \"ipv4Addr\": \"localhost\",\n            \"port\": 8088,\n            \"securityMethods\": [\"Oauth\"]\n          }\n        ]\n      }\n    ],\n    \"description\": \"Hello api services\",\n    \"supportedFeatures\": \"fffff\",\n    \"shareableInfo\": {\n      \"isShareable\": true,\n      \"capifProvDoms\": [\n        \"string\"\n      ]\n    },\n    \"serviceAPICategory\": \"string\",\n    \"apiSuppFeats\": \"fffff\",\n    \"pubApiPath\": {\n      \"ccfIds\": [\n        \"string\"\n      ]\n    },\n    \"ccfId\": \"string\"\n  }",
+					"options": {
+						"raw": {
+							"language": "json"
+						}
+					}
+				},
+				"url": {
+					"raw": "https://{{CAPIF_HOSTNAME}}/published-apis/v1/{{APF_ID}}/service-apis",
+					"protocol": "https",
+					"host": [
+						"{{CAPIF_HOSTNAME}}"
+					],
+					"path": [
+						"published-apis",
+						"v1",
+						"{{APF_ID}}",
+						"service-apis"
+					]
+				}
+			},
+			"response": []
+		},
+		{
+			"name": "05-register_user_invoker",
+			"event": [
+				{
+					"listen": "test",
+					"script": {
+						"exec": [
+							"var res = JSON.parse(responseBody);",
+							"pm.environment.set('ONBOARDING_URL_INVOKER', res.ccf_onboarding_url);",
+							"pm.environment.set('DISCOVER_URL', res.ccf_discover_url);",
+							"pm.environment.set('USER_INVOKER_ID', res.id);",
+							""
+						],
+						"type": "text/javascript"
+					}
+				}
+			],
+			"request": {
+				"method": "POST",
+				"header": [],
+				"body": {
+					"mode": "raw",
+					"raw": "{\n\"password\": \"{{PASSWORD}}\",\n\"username\": \"{{USERNAME_INVOKER}}\",\n\"description\": \"invoker\",\n\"role\": \"invoker\",\n\"cn\": \"invoker\"\n}",
+					"options": {
+						"raw": {
+							"language": "json"
+						}
+					}
+				},
+				"url": {
+					"raw": "https://{{REGISTER_HOSTNAME}}:{{REGISTER_PORT}}/register",
+					"protocol": "https",
+					"host": [
+						"{{REGISTER_HOSTNAME}}"
+					],
+					"port": "{{REGISTER_PORT}}",
+					"path": [
+						"register"
+					]
+				}
+			},
+			"response": []
+		},
+		{
+			"name": "06-getauth_invoker",
+			"event": [
+				{
+					"listen": "test",
+					"script": {
+						"exec": [
+							"var res = JSON.parse(responseBody);",
+							"",
+							"pm.environment.set('CA_ROOT', res.ca_root);",
+							"pm.environment.set('ACCESS_TOKEN_INVOKER', res.access_token);",
+							"",
+							"setTimeout(() => {",
+							"                pm.sendRequest({",
+							"                    url: 'http://localhost:3000/write_ca',",
+							"                    method: 'POST',",
+							"                    header: 'Content-Type:application/json',",
+							"                    encoding: 'binary',",
+							"                    body: {",
+							"                        mode: 'raw',",
+							"                        raw: res",
+							"                    }",
+							"                }, function (err, res) {",
+							"                    console.log(res);",
+							"                });",
+							"            }, 5000);"
+						],
+						"type": "text/javascript"
+					}
+				}
+			],
+			"request": {
+				"method": "POST",
+				"header": [],
+				"body": {
+					"mode": "raw",
+					"raw": "{\n\"password\": \"{{PASSWORD}}\",\n\"username\": \"{{USERNAME_INVOKER}}\"\n}",
+					"options": {
+						"raw": {
+							"language": "json"
+						}
+					}
+				},
+				"url": {
+					"raw": "https://{{REGISTER_HOSTNAME}}:{{REGISTER_PORT}}/getauth",
+					"protocol": "https",
+					"host": [
+						"{{REGISTER_HOSTNAME}}"
+					],
+					"port": "{{REGISTER_PORT}}",
+					"path": [
+						"getauth"
+					]
+				}
+			},
+			"response": []
+		},
+		{
+			"name": "07-onboard_invoker",
+			"event": [
+				{
+					"listen": "test",
+					"script": {
+						"exec": [
+							"var res = JSON.parse(responseBody);",
+							"if (pm.response.code == 201){",
+							"    ",
+							"    pm.environment.set('INVOKER_ID', res.apiInvokerId);",
+							"    pm.environment.set('INVOKER_CERT', res.onboardingInformation.apiInvokerCertificate);",
+							"}",
+							"",
+							"",
+							""
+						],
+						"type": "text/javascript"
+					}
+				},
+				{
+					"listen": "prerequest",
+					"script": {
+						"exec": [
+							"",
+							"var res = JSON.parse(pm.request.body.raw);",
+							"",
+							"",
+							"setTimeout(() => {",
+							"            pm.sendRequest({",
+							"                url: 'http://localhost:3000/generate_csr_invoker',",
+							"                method: 'POST',",
+							"                header: 'Content-Type:application/json',",
+							"                encoding: 'binary',",
+							"                body: {",
+							"                    mode: 'raw',",
+							"                    raw: {}",
+							"                }",
+							"            }, function (err, response) {",
+							"                j_file = JSON.parse(response.text());",
+							"                res.onboardingInformation.apiInvokerPublicKey = j_file.csr;",
+							"                pm.environment.set('INVOKER_KEY', j_file.key);",
+							"            });",
+							"        }, 5000);",
+							"",
+							"",
+							"pm.request.body.raw = res;"
+						],
+						"type": "text/javascript"
+					}
+				}
+			],
+			"request": {
+				"auth": {
+					"type": "bearer",
+					"bearer": [
+						{
+							"key": "token",
+							"value": "{{ACCESS_TOKEN_INVOKER}}",
+							"type": "string"
+						}
+					]
+				},
+				"method": "POST",
+				"header": [
+					{
+						"key": "",
+						"value": "",
+						"type": "text",
+						"disabled": true
+					}
+				],
+				"body": {
+					"mode": "raw",
+					"raw": "{\n  \"notificationDestination\" : \"http://host.docker.internal:8086/netapp_callback\",\n  \"supportedFeatures\" : \"fffffff\",\n  \"apiInvokerInformation\" : \"dummy\",\n  \"websockNotifConfig\" : {\n    \"requestWebsocketUri\" : true,\n    \"websocketUri\" : \"websocketUri\"\n  },\n  \"onboardingInformation\" : {\n    \"apiInvokerPublicKey\" : \"\"\n  },\n  \"requestTestNotification\" : true\n}",
+					"options": {
+						"raw": {
+							"language": "json"
+						}
+					}
+				},
+				"url": {
+					"raw": "https://{{CAPIF_HOSTNAME}}/{{ONBOARDING_URL_INVOKER}}",
+					"protocol": "https",
+					"host": [
+						"{{CAPIF_HOSTNAME}}"
+					],
+					"path": [
+						"{{ONBOARDING_URL_INVOKER}}"
+					]
+				}
+			},
+			"response": []
+		},
+		{
+			"name": "08-discover",
+			"event": [
+				{
+					"listen": "prerequest",
+					"script": {
+						"exec": [
+							"setTimeout(() => {",
+							"                pm.sendRequest({",
+							"                    url: 'http://localhost:3000/write_cert',",
+							"                    method: 'POST',",
+							"                    header: 'Content-Type:application/json',",
+							"                    encoding: 'binary',",
+							"                    body: {",
+							"                        mode: 'raw',",
+							"                        raw: {cert: pm.environment.get('INVOKER_CERT'), key:pm.environment.get('INVOKER_KEY')}",
+							"                    }",
+							"                }, function (err, response) {",
+							"                    console.log(response)",
+							"                });",
+							"            }, 5000);",
+							"",
+							"",
+							""
+						],
+						"type": "text/javascript"
+					}
+				},
+				{
+					"listen": "test",
+					"script": {
+						"exec": [
+							"var res = JSON.parse(responseBody);",
+							"if (pm.response.code == 200){",
+							"",
+							"    res.serviceAPIDescriptions.forEach(function(api) {",
+							"        pm.environment.set('API_SERVICE_ID', api.apiId);",
+							"        pm.environment.set('API_NAME', api.apiName);",
+							"        pm.environment.set('API_AEF_ID', api.aefProfiles[0].aefId);",
+							"        pm.environment.set('IPV4ADDR', api.aefProfiles[0].interfaceDescriptions[0].ipv4Addr);",
+							"        pm.environment.set('PORT', api.aefProfiles[0].interfaceDescriptions[0].port);",
+							"        pm.environment.set('URI', api.aefProfiles[0].versions[0].resources[0].uri);",
+							"    });",
+							"}"
+						],
+						"type": "text/javascript"
+					}
+				}
+			],
+			"protocolProfileBehavior": {
+				"disableBodyPruning": true,
+				"strictSSL": true
+			},
+			"request": {
+				"auth": {
+					"type": "noauth"
+				},
+				"method": "GET",
+				"header": [
+					{
+						"key": "",
+						"value": "",
+						"type": "text",
+						"disabled": true
+					}
+				],
+				"body": {
+					"mode": "raw",
+					"raw": "",
+					"options": {
+						"raw": {
+							"language": "json"
+						}
+					}
+				},
+				"url": {
+					"raw": "https://{{CAPIF_HOSTNAME}}/{{DISCOVER_URL}}{{INVOKER_ID}}",
+					"protocol": "https",
+					"host": [
+						"{{CAPIF_HOSTNAME}}"
+					],
+					"path": [
+						"{{DISCOVER_URL}}{{INVOKER_ID}}"
+					]
+				}
+			},
+			"response": []
+		},
+		{
+			"name": "09-security_context",
+			"event": [
+				{
+					"listen": "prerequest",
+					"script": {
+						"exec": [
+							"setTimeout(() => {",
+							"                pm.sendRequest({",
+							"                    url: 'http://localhost:3000/write_cert',",
+							"                    method: 'POST',",
+							"                    header: 'Content-Type:application/json',",
+							"                    encoding: 'binary',",
+							"                    body: {",
+							"                        mode: 'raw',",
+							"                        raw: {cert: pm.environment.get('INVOKER_CERT'), key:pm.environment.get('INVOKER_KEY')}",
+							"                    }",
+							"                }, function (err, response) {",
+							"                    console.log(response)",
+							"                });",
+							"            }, 5000);",
+							"",
+							"",
+							""
+						],
+						"type": "text/javascript"
+					}
+				},
+				{
+					"listen": "test",
+					"script": {
+						"exec": [
+							""
+						],
+						"type": "text/javascript"
+					}
+				}
+			],
+			"protocolProfileBehavior": {
+				"strictSSL": true
+			},
+			"request": {
+				"auth": {
+					"type": "noauth"
+				},
+				"method": "PUT",
+				"header": [
+					{
+						"key": "",
+						"value": "",
+						"type": "text",
+						"disabled": true
+					}
+				],
+				"body": {
+					"mode": "raw",
+					"raw": "{\n  \"securityInfo\": [\n    {\n      \"prefSecurityMethods\": [\n        \"Oauth\"\n      ],\n      \"authenticationInfo\": \"string\",\n      \"authorizationInfo\": \"string\",\n      \"aefId\": \"{{API_AEF_ID}}\",\n      \"apiId\": \"{{API_SERVICE_ID}}\"\n    }\n  ],\n  \"notificationDestination\": \"https://mynotificationdest.com\",\n  \"requestTestNotification\": true,\n  \"websockNotifConfig\": {\n    \"websocketUri\": \"string\",\n    \"requestWebsocketUri\": true\n  },\n  \"supportedFeatures\": \"fff\"\n}",
+					"options": {
+						"raw": {
+							"language": "json"
+						}
+					}
+				},
+				"url": {
+					"raw": "https://{{CAPIF_HOSTNAME}}/capif-security/v1/trustedInvokers/{{INVOKER_ID}}",
+					"protocol": "https",
+					"host": [
+						"{{CAPIF_HOSTNAME}}"
+					],
+					"path": [
+						"capif-security",
+						"v1",
+						"trustedInvokers",
+						"{{INVOKER_ID}}"
+					]
+				}
+			},
+			"response": []
+		},
+		{
+			"name": "10-get_token",
+			"event": [
+				{
+					"listen": "prerequest",
+					"script": {
+						"exec": [
+							"setTimeout(() => {",
+							"                pm.sendRequest({",
+							"                    url: 'http://localhost:3000/write_cert',",
+							"                    method: 'POST',",
+							"                    header: 'Content-Type:application/json',",
+							"                    encoding: 'binary',",
+							"                    body: {",
+							"                        mode: 'raw',",
+							"                        raw: {cert: pm.environment.get('INVOKER_CERT'), key:pm.environment.get('INVOKER_KEY')}",
+							"                    }",
+							"                }, function (err, response) {",
+							"                    console.log(response)",
+							"                });",
+							"            }, 5000);",
+							"",
+							"",
+							""
+						],
+						"type": "text/javascript"
+					}
+				},
+				{
+					"listen": "test",
+					"script": {
+						"exec": [
+							"var res = JSON.parse(responseBody);",
+							"if (pm.response.code == 200){",
+							"    pm.environment.set('NETAPP_SERVICE_TOKEN', res.access_token);",
+							"}"
+						],
+						"type": "text/javascript"
+					}
+				}
+			],
+			"protocolProfileBehavior": {
+				"strictSSL": true,
+				"disabledSystemHeaders": {}
+			},
+			"request": {
+				"auth": {
+					"type": "noauth"
+				},
+				"method": "POST",
+				"header": [
+					{
+						"key": "",
+						"value": "",
+						"type": "text",
+						"disabled": true
+					}
+				],
+				"body": {
+					"mode": "urlencoded",
+					"urlencoded": [
+						{
+							"key": "client_id",
+							"value": "{{INVOKER_ID}}",
+							"type": "text"
+						},
+						{
+							"key": "grant_type",
+							"value": "client_credentials",
+							"type": "text"
+						},
+						{
+							"key": "client_secret",
+							"value": "string",
+							"type": "text"
+						},
+						{
+							"key": "scope",
+							"value": "3gpp#{{API_AEF_ID}}:{{API_NAME}}",
+							"type": "text"
+						}
+					]
+				},
+				"url": {
+					"raw": "https://{{CAPIF_HOSTNAME}}/capif-security/v1/securities/{{INVOKER_ID}}/token",
+					"protocol": "https",
+					"host": [
+						"{{CAPIF_HOSTNAME}}"
+					],
+					"path": [
+						"capif-security",
+						"v1",
+						"securities",
+						"{{INVOKER_ID}}",
+						"token"
+					]
+				}
+			},
+			"response": []
+		},
+		{
+			"name": "11-call_service",
+			"event": [
+				{
+					"listen": "prerequest",
+					"script": {
+						"exec": [
+							""
+						],
+						"type": "text/javascript"
+					}
+				},
+				{
+					"listen": "test",
+					"script": {
+						"exec": [
+							""
+						],
+						"type": "text/javascript"
+					}
+				}
+			],
+			"protocolProfileBehavior": {
+				"strictSSL": false
+			},
+			"request": {
+				"auth": {
+					"type": "bearer",
+					"bearer": [
+						{
+							"key": "token",
+							"value": "{{NETAPP_SERVICE_TOKEN}}",
+							"type": "string"
+						}
+					]
+				},
+				"method": "POST",
+				"header": [
+					{
+						"key": "",
+						"value": "",
+						"type": "text",
+						"disabled": true
+					}
+				],
+				"body": {
+					"mode": "raw",
+					"raw": "{\n\"name\": {{USERNAME_INVOKER}}\n}",
+					"options": {
+						"raw": {
+							"language": "json"
+						}
+					}
+				},
+				"url": {
+					"raw": "http://{{IPV4ADDR}}:{{PORT}}{{URI}}",
+					"protocol": "http",
+					"host": [
+						"{{IPV4ADDR}}"
+					],
+					"port": "{{PORT}}{{URI}}"
+				}
+			},
+			"response": []
+		},
+		{
+			"name": "offboard_provider",
+			"event": [
+				{
+					"listen": "prerequest",
+					"script": {
+						"exec": [
+							"setTimeout(() => {",
+							"                pm.sendRequest({",
+							"                    url: 'http://localhost:3000/write_cert',",
+							"                    method: 'POST',",
+							"                    header: 'Content-Type:application/json',",
+							"                    encoding: 'binary',",
+							"                    body: {",
+							"                        mode: 'raw',",
+							"                        raw: {cert: pm.environment.get('AMF_CERT'), key:pm.environment.get('AMF_KEY')}",
+							"                    }",
+							"                }, function (err, response) {",
+							"                    console.log(response)",
+							"                });",
+							"            }, 5000);"
+						],
+						"type": "text/javascript"
+					}
+				}
+			],
+			"protocolProfileBehavior": {
+				"strictSSL": true
+			},
+			"request": {
+				"auth": {
+					"type": "noauth"
+				},
+				"method": "DELETE",
+				"header": [],
+				"url": {
+					"raw": "https://{{CAPIF_HOSTNAME}}/{{ONBOARDING_URL}}/{{PROVIDER_ID}}",
+					"protocol": "https",
+					"host": [
+						"{{CAPIF_HOSTNAME}}"
+					],
+					"path": [
+						"{{ONBOARDING_URL}}",
+						"{{PROVIDER_ID}}"
+					]
+				}
+			},
+			"response": []
+		},
+		{
+			"name": "offboard_invoker",
+			"event": [
+				{
+					"listen": "prerequest",
+					"script": {
+						"exec": [
+							"setTimeout(() => {",
+							"                pm.sendRequest({",
+							"                    url: 'http://localhost:3000/write_cert',",
+							"                    method: 'POST',",
+							"                    header: 'Content-Type:application/json',",
+							"                    encoding: 'binary',",
+							"                    body: {",
+							"                        mode: 'raw',",
+							"                        raw: {cert: pm.environment.get('INVOKER_CERT'), key:pm.environment.get('INVOKER_KEY')}",
+							"                    }",
+							"                }, function (err, response) {",
+							"                    console.log(response)",
+							"                });",
+							"            }, 5000);"
+						],
+						"type": "text/javascript"
+					}
+				}
+			],
+			"protocolProfileBehavior": {
+				"strictSSL": true
+			},
+			"request": {
+				"auth": {
+					"type": "noauth"
+				},
+				"method": "DELETE",
+				"header": [],
+				"url": {
+					"raw": "https://{{CAPIF_HOSTNAME}}/{{ONBOARDING_URL_INVOKER}}/{{INVOKER_ID}}",
+					"protocol": "https",
+					"host": [
+						"{{CAPIF_HOSTNAME}}"
+					],
+					"path": [
+						"{{ONBOARDING_URL_INVOKER}}",
+						"{{INVOKER_ID}}"
+					]
+				}
+			},
+			"response": []
+		},
+		{
+			"name": "remove_user_invoker",
+			"request": {
+				"method": "DELETE",
+				"header": [],
+				"body": {
+					"mode": "raw",
+					"raw": "{\n\"password\": \"{{PASSWORD}}\",\n\"username\": \"{{USERNAME_INVOKER}}\"\n}",
+					"options": {
+						"raw": {
+							"language": "json"
+						}
+					}
+				},
+				"url": {
+					"raw": "https://{{REGISTER_HOSTNAME}}:{{REGISTER_PORT}}/remove",
+					"protocol": "https",
+					"host": [
+						"{{REGISTER_HOSTNAME}}"
+					],
+					"port": "{{REGISTER_PORT}}",
+					"path": [
+						"remove"
+					]
+				}
+			},
+			"response": []
+		},
+		{
+			"name": "remove_user_provider",
+			"request": {
+				"method": "DELETE",
+				"header": [],
+				"body": {
+					"mode": "raw",
+					"raw": "{\n\"password\": \"{{PASSWORD}}\",\n\"username\": \"{{USERNAME}}\"\n}",
+					"options": {
+						"raw": {
+							"language": "json"
+						}
+					}
+				},
+				"url": {
+					"raw": "https://{{REGISTER_HOSTNAME}}:{{REGISTER_PORT}}/remove",
+					"protocol": "https",
+					"host": [
+						"{{REGISTER_HOSTNAME}}"
+					],
+					"port": "{{REGISTER_PORT}}",
+					"path": [
+						"remove"
+					]
+				}
+			},
+			"response": []
+		}
+	]
+}
\ No newline at end of file
diff --git a/docs/testing_with_postman/CAPIF.postman_environment.json b/docs/testing_with_postman/CAPIF.postman_environment.json
new file mode 100644
index 0000000000000000000000000000000000000000..ab3839e9e78b498312a14db675316a76455747b0
--- /dev/null
+++ b/docs/testing_with_postman/CAPIF.postman_environment.json
@@ -0,0 +1,237 @@
+{
+	"id": "f2daf431-63c4-4275-8755-4cc5de2e566d",
+	"name": "CAPIF",
+	"values": [
+		{
+			"key": "CAPIF_HOSTNAME",
+			"value": "capifcore",
+			"type": "default",
+			"enabled": true
+		},
+		{
+			"key": "CAPIF_PORT",
+			"value": "8080",
+			"type": "default",
+			"enabled": true
+		},
+		{
+			"key": "REGISTER_HOSTNAME",
+			"value": "localhost",
+			"type": "default",
+			"enabled": true
+		},
+		{
+			"key": "REGISTER_PORT",
+			"value": "8084",
+			"type": "default",
+			"enabled": true
+		},
+		{
+			"key": "USERNAME",
+			"value": "ProviderONE",
+			"type": "default",
+			"enabled": true
+		},
+		{
+			"key": "PASSWORD",
+			"value": "pass",
+			"type": "default",
+			"enabled": true
+		},
+		{
+			"key": "CALLBACK_IP",
+			"value": "host.docker.internal",
+			"type": "default",
+			"enabled": true
+		},
+		{
+			"key": "CALLBACK_PORT",
+			"value": "8087",
+			"type": "default",
+			"enabled": true
+		},
+		{
+			"key": "ONBOARDING_URL",
+			"value": "",
+			"type": "any",
+			"enabled": true
+		},
+		{
+			"key": "PUBLISH_URL",
+			"value": "",
+			"type": "any",
+			"enabled": true
+		},
+		{
+			"key": "USER_ID",
+			"value": "",
+			"type": "any",
+			"enabled": true
+		},
+		{
+			"key": "CA_ROOT",
+			"value": "",
+			"type": "any",
+			"enabled": true
+		},
+		{
+			"key": "ACCESS_TOKEN",
+			"value": "",
+			"type": "any",
+			"enabled": true
+		},
+		{
+			"key": "APF_KEY",
+			"value": "",
+			"type": "any",
+			"enabled": true
+		},
+		{
+			"key": "AMF_KEY",
+			"value": "",
+			"type": "any",
+			"enabled": true
+		},
+		{
+			"key": "AEF_KEY",
+			"value": "",
+			"type": "any",
+			"enabled": true
+		},
+		{
+			"key": "PROVIDER_ID",
+			"value": "",
+			"type": "any",
+			"enabled": true
+		},
+		{
+			"key": "AEF_ID",
+			"value": "",
+			"type": "any",
+			"enabled": true
+		},
+		{
+			"key": "AEF_CERT",
+			"value": "",
+			"type": "any",
+			"enabled": true
+		},
+		{
+			"key": "APF_ID",
+			"value": "",
+			"type": "any",
+			"enabled": true
+		},
+		{
+			"key": "APF_CERT",
+			"value": "",
+			"type": "any",
+			"enabled": true
+		},
+		{
+			"key": "AMF_ID",
+			"value": "",
+			"type": "any",
+			"enabled": true
+		},
+		{
+			"key": "AMF_CERT",
+			"value": "",
+			"type": "any",
+			"enabled": true
+		},
+		{
+			"key": "ONBOARDING_URL_INVOKER",
+			"value": "",
+			"type": "any",
+			"enabled": true
+		},
+		{
+			"key": "DISCOVER_URL",
+			"value": "",
+			"type": "any",
+			"enabled": true
+		},
+		{
+			"key": "USER_INVOKER_ID",
+			"value": "",
+			"type": "any",
+			"enabled": true
+		},
+		{
+			"key": "ACCESS_TOKEN_INVOKER",
+			"value": "",
+			"type": "any",
+			"enabled": true
+		},
+		{
+			"key": "INVOKER_KEY",
+			"value": "",
+			"type": "any",
+			"enabled": true
+		},
+		{
+			"key": "INVOKER_ID",
+			"value": "",
+			"type": "any",
+			"enabled": true
+		},
+		{
+			"key": "INVOKER_CERT",
+			"value": "",
+			"type": "any",
+			"enabled": true
+		},
+		{
+			"key": "API_ID",
+			"value": "",
+			"type": "any",
+			"enabled": true
+		},
+		{
+			"key": "API_NAME",
+			"value": "",
+			"type": "any",
+			"enabled": true
+		},
+		{
+			"key": "IPV4ADDR",
+			"value": "",
+			"type": "any",
+			"enabled": true
+		},
+		{
+			"key": "PORT",
+			"value": "",
+			"type": "any",
+			"enabled": true
+		},
+		{
+			"key": "URI",
+			"value": "",
+			"type": "any",
+			"enabled": true
+		},
+		{
+			"key": "API_SERVICE_ID",
+			"value": "",
+			"type": "any",
+			"enabled": true
+		},
+		{
+			"key": "API_AEF_ID",
+			"value": "",
+			"type": "any",
+			"enabled": true
+		},
+		{
+			"key": "NETAPP_SERVICE_TOKEN",
+			"value": "",
+			"type": "any",
+			"enabled": true
+		}
+	],
+	"_postman_variable_scope": "environment",
+	"_postman_exported_at": "2023-12-20T10:47:32.128Z",
+	"_postman_exported_using": "Postman/10.21.4"
+}
\ No newline at end of file
diff --git a/docs/testing_with_postman/README.md b/docs/testing_with_postman/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..6d36b3216bd894637462c7034f21179f3dcae7d4
--- /dev/null
+++ b/docs/testing_with_postman/README.md
@@ -0,0 +1,108 @@
+[**[Return To Main]**]
+
+# CAPIF in Postman
+In this section we can use Postman to publish an API as a provider and use it as an invoker.
+
+## Requisites
+
+- We will need to have Node.js installed since we will use a small script to create the CSRs of the certificates.
+- An instance of CAPIF (If it is not local, certain variables would have to be modified both in the Node.js script and in the Postman environment variables).
+
+## First steps
+
+1. Install the Node dependencies to run the script with:
+
+```
+npm i
+```
+
+2. Run the script.js with the following command:
+
+```
+node script.js
+```
+
+3. Import Postman collection and environment variables (CAPIF.postman_collection.json and CAPIF.postman_environment.json)
+
+## Not Local CAPIF
+
+If the CAPIF is not local, the host and port of both the CAPIF and the register would have to be specified in the variables, and the CAPIF_HOSTNAME in the script, necessary to obtain the server certificate.
+
+**Enviroments in Postman**
+```
+CAPIF_HOSTNAME     capifcore
+CAPIF_PORT         8080
+REGISTER_HOSTNAME  register
+REGISTER_PORT      8084
+```
+
+**Const in script.js**
+```
+CAPIF_HOSTNAME    capifcore
+```
+
+## CAPIF Flow
+Once the first steps have been taken, we can now use Postman requests. These requests are numbered in the order that must be followed to obtain everything necessary from CAPIF.
+
+### Publication of an API
+
+- **01-register_user_provider**
+- **02-getauth_provider**
+- **03-onboard_provider**
+
+At this point we move on to using certificate authentication in CAPIF. In Postman it is necessary to add the certificates manually and using more than one certificate for the same host as we do in CAPIF complicates things. For this reason, we use the script to overwrite a certificate and a key when it is necessary to have a specific one.
+
+To configure go to **settings** in Postman and open the **certificates** section. 
+
+- Here, activate the **CA certificates** option and add the **ca_cert.pem** file found in the **Responses** folder.
+- Adds a client certificate specifying the CAPIF host being used and the files **client_cert.crt** and **client_key.key** in the **Responses** folder.
+
+
+Once this is done, the node script will be in charge of changing the certificate that is necessary in each request.
+
+- **04-publish_api** 
+
+Once the api is published, we can start it. In this case we have a test one created in python that can be executed with the following command:
+
+```
+python3 hello_api.py
+```
+
+The API publication interface is set to localhost with port 8088, so the service must be set up locally. If you wanted to build it on another site, you would have to change the interface description in the body of publish_api.
+
+With this the provider part would be finished.
+
+### Calling the API
+
+- **05-register_user_invoker**
+- **06-getauth_invoker**
+- **07-onboard_invoker**
+
+At this point we move on to using certificate authentication in CAPIF. **If you did not configure the provider's certificates, you would have to do it now**.
+
+- **08-discover**
+- **09-security_context**
+- **10-get_token**
+- **11-call_service**
+
+With this, we would have made the API call and finished the flow.
+
+### Other requests
+
+Other requests that we have added are the following:
+
+- **offboard_provider**      Performs offboarding of the provider, thereby eliminating the published APIs.
+- **offboard_invoker**       Offboards the invoker, also eliminating access to the APIs of that invoker.
+- **remove_user_invoker**    Delete the user created for the invoker.
+- **remove_user_provider**   Delete the user created for the provider.
+
+## Notes
+
+- This process is designed to teach how requests are made in Postman and the flow that should be followed to publish and use an API.
+- It is possible that if external CAPIFs are used (Public CAPIF) the test data may already be used or the API already registered.
+- It is necessary to have the Node service running to make the certificate change for the requests, otherwise it will not work.
+- We are working on adding more requests to the Postman collection.
+- This collection is a testing guide and is recommended for testing purposes only.
+
+[Return To Main]: ../../README.md#using-postman
+
diff --git a/docs/testing_with_postman/hello_api.py b/docs/testing_with_postman/hello_api.py
new file mode 100644
index 0000000000000000000000000000000000000000..0b2a35989ecfaa144489d1b6012f61453c91bd68
--- /dev/null
+++ b/docs/testing_with_postman/hello_api.py
@@ -0,0 +1,38 @@
+from flask import Flask, jsonify, request
+from flask_jwt_extended import jwt_required, JWTManager, get_jwt_identity, get_jwt
+import ssl
+from werkzeug import serving
+import socket, ssl
+import OpenSSL
+from OpenSSL import crypto
+import jwt
+import pyone
+
+app = Flask(__name__)
+
+jwt_flask = JWTManager(app)
+
+
+with open("Responses/cert_server.pem", "rb") as cert_file:
+            cert= cert_file.read()
+
+crtObj = crypto.load_certificate(crypto.FILETYPE_PEM, cert)
+pubKeyObject = crtObj.get_pubkey()
+pubKeyString = crypto.dump_publickey(crypto.FILETYPE_PEM,pubKeyObject)
+
+app.config['JWT_ALGORITHM'] = 'RS256'
+app.config['JWT_PUBLIC_KEY'] = pubKeyString
+
+
+@app.route("/hello", methods=["POST"])
+@jwt_required()
+def hello():
+
+    request_data = request.get_json()
+
+    user_name = request_data['name']
+
+    return jsonify(f"Hello: {user_name}, welcome to CAPIF.")
+
+if __name__ == '__main__':
+    serving.run_simple("0.0.0.0", 8088, app)
diff --git a/docs/testing_with_postman/package.json b/docs/testing_with_postman/package.json
new file mode 100644
index 0000000000000000000000000000000000000000..6d612a702d5a9fa9a112f1a2f47c44f75725fa00
--- /dev/null
+++ b/docs/testing_with_postman/package.json
@@ -0,0 +1,16 @@
+{
+    "name": "node-server",
+    "version": "1.0.0",
+    "description": "",
+    "main": "index.js",
+    "scripts": {
+      "test": "echo \"Error: no test specified\" && exit 1"
+    },
+    "author": "",
+    "license": "ISC",
+    "dependencies": {
+      "body-parser": "^1.18.3",
+      "express": "^4.16.3",
+      "shelljs": "^0.8.2"
+    }
+  }
\ No newline at end of file
diff --git a/docs/testing_with_postman/script.js b/docs/testing_with_postman/script.js
new file mode 100644
index 0000000000000000000000000000000000000000..980f81f33b4bda4f48f55dcd13d8f436dface9a5
--- /dev/null
+++ b/docs/testing_with_postman/script.js
@@ -0,0 +1,199 @@
+// Change this variable if another host is used for CAPIF
+const CAPIF_HOSTNAME = 'capifcore';
+
+const express = require('express'),
+  app = express(),
+  fs = require('fs'),
+  shell = require('shelljs'),
+
+
+  folderPath = './Responses/',
+  bodyParser = require('body-parser'),
+  path = require('path');
+
+const { exec } = require('child_process');
+
+// Create the folder path in case it doesn't exist
+shell.mkdir('-p', folderPath);
+
+ // Change the limits according to your response size
+app.use(bodyParser.json({limit: '50mb', extended: true}));
+app.use(bodyParser.urlencoded({ limit: '50mb', extended: true })); 
+var opensslCommand = ''
+
+if (CAPIF_HOSTNAME.includes(':')){
+  opensslCommand = `openssl s_client -connect ${CAPIF_HOSTNAME} | openssl x509 -text > ./Responses/cert_server.pem`;
+}
+else{
+  opensslCommand = `openssl s_client -connect ${CAPIF_HOSTNAME}:443 | openssl x509 -text > ./Responses/cert_server.pem`;
+}
+
+exec(opensslCommand, (error, stdout, stderr) => {
+  if (error) {
+    console.error(`Error generating CSR: ${stderr}`);
+  }
+});
+
+fs.writeFileSync('./Responses/client_cert.crt', '');
+fs.writeFileSync('./Responses/client_key.key', '');
+
+app.get('/', (req, res) => res.send('Hello, I write data to file. Send them requests!'));
+
+app.post('/generate_csr', (req, res) => {
+
+  console.log(req.body);
+  const csrFilePath = 'Responses/'+req.body.apiProvFuncRole+'_csr.pem';
+  const privateKeyFilePath = 'Responses/'+req.body.apiProvFuncRole+'_key.key';
+
+  const subjectInfo = {
+    country: 'ES',
+    state: 'Madrid',
+    locality: 'Madrid',
+    organization: 'Telefonica I+D',
+    organizationalUnit: 'IT Department',
+    emailAddress: 'admin@example.com',
+  };
+
+  const opensslCommand = `openssl req -newkey rsa:2048 -nodes -keyout ${privateKeyFilePath} -out ${csrFilePath} -subj "/C=${subjectInfo.country}/ST=${subjectInfo.state}/L=${subjectInfo.locality}/O=${subjectInfo.organization}/OU=${subjectInfo.organizationalUnit}/emailAddress=${subjectInfo.emailAddress}"`;
+
+  exec(opensslCommand, (error, stdout, stderr) => {
+    if (error) {
+      console.error(`Error generating CSR: ${stderr}`);
+    } else {
+      console.log('CSR generated successfully:');
+      fs.readFile(csrFilePath, 'utf8', (readError, csrContent) => {
+        if (readError) {
+          console.error(`Error reading CSR: ${readError}`);
+          res.status(500).send('Error reading CSR');
+        } else {
+          console.log('CSR read successfully:');
+          // Send the CSR content in the response
+          fs.readFile(privateKeyFilePath, 'utf8', (readError, keyContent) => {
+            if (readError) {
+              console.error(`Error reading KEY: ${readError}`);
+              res.status(500).send('Error reading KEY');
+            } else {
+              console.log('KEY read successfully:');
+              // Send the CSR content in the response
+              fs.unlink(csrFilePath, (err) => {
+                if (err) {
+                  console.error(`Error deleting file: ${err.message}`);
+                } 
+              });
+              fs.unlink(privateKeyFilePath, (err) => {
+                if (err) {
+                  console.error(`Error deleting file: ${err.message}`);
+                } 
+              });
+              res.send({csr: csrContent, key: keyContent});
+            }
+          });
+        }
+      });
+    }
+  });
+});
+
+app.post('/generate_csr_invoker', (req, res) => {
+
+  console.log(req.body);
+  const csrFilePath = 'Responses/invoker_csr.pem';
+  const privateKeyFilePath = 'Responses/invoker_key.key';
+
+  const subjectInfo = {
+    country: 'ES',
+    state: 'Madrid',
+    locality: 'Madrid',
+    organization: 'Telefonica I+D',
+    organizationalUnit: 'IT Department',
+    emailAddress: 'admin@example.com',
+  };
+
+  const opensslCommand = `openssl req -newkey rsa:2048 -nodes -keyout ${privateKeyFilePath} -out ${csrFilePath} -subj "/C=${subjectInfo.country}/ST=${subjectInfo.state}/L=${subjectInfo.locality}/O=${subjectInfo.organization}/OU=${subjectInfo.organizationalUnit}/emailAddress=${subjectInfo.emailAddress}"`;
+
+  exec(opensslCommand, (error, stdout, stderr) => {
+    if (error) {
+      console.error(`Error generating CSR: ${stderr}`);
+    } else {
+      console.log('CSR generated successfully:');
+      fs.readFile(csrFilePath, 'utf8', (readError, csrContent) => {
+        if (readError) {
+          console.error(`Error reading CSR: ${readError}`);
+          res.status(500).send('Error reading CSR');
+        } else {
+          console.log('CSR read successfuly:');
+          // Send the CSR content in the response
+          fs.readFile(privateKeyFilePath, 'utf8', (readError, keyContent) => {
+            if (readError) {
+              console.error(`Error reading KEY: ${readError}`);
+              res.status(500).send('Error reading KEY');
+            } else {
+              console.log('KEY read successfully:');
+              // Send the CSR content in the response
+              fs.unlink(csrFilePath, (err) => {
+                if (err) {
+                  console.error(`Error deleting file: ${err.message}`);
+                } 
+              });
+              fs.unlink(privateKeyFilePath, (err) => {
+                if (err) {
+                  console.error(`Error deleting file: ${err.message}`);
+                } 
+              });
+              res.send({csr: csrContent, key: keyContent});
+            }
+          });
+        }
+      });
+    }
+  });
+});
+
+
+app.post('/write_cert', (req, res) => {
+  let extension = 'crt',
+    fsMode = 'writeFile',
+    filename = "client_cert",
+    filePath = `${path.join(folderPath, filename)}.${extension}`,
+    options = {encoding: 'binary'};
+  fs[fsMode](filePath, req.body.cert, options, (err) => {
+    if (err) {
+      console.log(err);
+      res.send('Error');
+    }
+  });
+  extension = 'key';
+  filename = "client_key";
+  filePath = `${path.join(folderPath, filename)}.${extension}`;
+  fs[fsMode](filePath, req.body.key, options, (err) => {
+    if (err) {
+      console.log(err);
+      res.send('Error');
+    }
+    else {
+      res.send('Success');
+    }
+  });
+});
+
+app.post('/write_ca', (req, res) => {
+  let extension = 'pem',
+    fsMode = 'writeFile',
+    filename = "ca_cert",
+    filePath = `${path.join(folderPath, filename)}.${extension}`,
+    options = {encoding: 'binary'};
+  fs[fsMode](filePath, req.body.ca_root, options, (err) => {
+    if (err) {
+      console.log(err);
+      res.send('Error');
+    }
+    else {
+      res.send('Success');
+    }
+  });
+});
+
+app.listen(3000, () => {
+  console.log('ResponsesToFile App is listening now! Send them requests my way!');
+  console.log(`Data is being stored at location: ${path.join(process.cwd(), folderPath)}`);
+});
\ No newline at end of file
diff --git a/docs/testing_with_robot/README.md b/docs/testing_with_robot/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..71504c1fc5ab76377c54bf868516f33a5617f731
--- /dev/null
+++ b/docs/testing_with_robot/README.md
@@ -0,0 +1,74 @@
+[**[Return To Main]**]
+# Testing With Robot Framework
+
+- [Testing With Robot Framework](#testing-with-robot-framework)
+  - [Steps to Test](#steps-to-test)
+  - [Script Test Execution](#script-test-execution)
+  - [Manual Build And Test Execution](#manual-build-and-test-execution)
+  - [Test result review](#test-result-review)
+
+## Steps to Test
+
+To run any test locally you will need *docker* and *docker-compose* installed in order run services and execute test plan. Steps will be:
+* **Run All Services**: See section [Run All CAPIF Services](../../README.md#run-all-capif-services-locally-with-docker-images)
+* **Run desired tests**: At this point we have 2 options:
+  * **Using helper script**: [Script Test Execution](#script-test-execution)
+  * **Build robot docker image and execute manually robot docker**: [Manual Build And Test Execution](#manual-build-and-test-execution)
+
+
+## Script Test Execution
+This script will build robot docker image if it's need and execute tests selected by "include" option. Just go to service folder, execute and follow steps.
+```
+./runCapifTests.sh --include <TAG>
+```
+Results will be stored at <REPOSITORY_FOLDER>/results
+
+Please check parameters (include) under *Test Execution* at [Manual Build And Test Execution](#manual-build-and-test-execution).
+
+## Manual Build And Test Execution
+
+* **Build Robot docker image**:
+```
+cd tools/robot
+docker build . -t 5gnow-robot-test:latest
+```
+
+* **Tests Execution**:
+  
+Execute all tests locally:
+```
+<PATH_TO_REPOSITORY>=path in local machine to repository cloned.
+<PATH_RESULT_FOLDER>=path to a folder on local machine to store results of Robot Framework execution.
+<CAPIF_HOSTNAME>=Is the hostname set when run.sh is executed, by default it will be capifcore.
+<CAPIF_HTTP_PORT>=This is the port to reach when robot framework want to reach CAPIF deployment using http, this should be set to port without TLS set on Nginx, 8080 by default.
+
+To execute all tests run :
+docker run -ti --rm --network="host" -v <PATH_TO_REPOSITORY>/tests:/opt/robot-tests/tests -v <PATH_RESULT_FOLDER>:/opt/robot-tests/results 5gnow-robot-test:latest --variable CAPIF_HOSTNAME:capifcore --variable CAPIF_HTTP_PORT:8080 --include all
+```
+
+Execute specific tests locally:
+```
+To run more specific tests, for example, only one functionality:
+<TAG>=Select one from list:
+  "capif_api_discover_service",
+  "capif_api_invoker_management",
+  "capif_api_publish_service",
+  "capif_api_events",
+  "capif_security_api
+
+And Run:
+docker run -ti --rm --network="host" -v <PATH_TO_REPOSITORY>/tests:/opt/robot-tests/tests -v <PATH_RESULT_FOLDER>:/opt/robot-tests/results 5gnow-robot-test:latest --variable CAPIF_HOSTNAME:capifcore --variable CAPIF_HTTP_PORT:8080 --include <TAG>
+```
+
+## Test result review
+
+In order to Review results after tests, you can check general report at <PATH_RESULT_FOLDER>/report.html or if you need more detailed information <PATH_RESULT_FOLDER>/log.html, example:
+* Report:
+![Report](../images/robot_report_example.png)
+* Detailed information:
+![Log](../images/robot_log_example.png)
+
+**NOTE: If you need more detail at Robot Framework Logs you can set log level option just adding to command --loglevel DEBUG**
+
+
+[Return To Main]: ../../README.md#robot-framework
\ No newline at end of file
diff --git a/helm/README-vault.md b/helm/README-vault.md
new file mode 100644
index 0000000000000000000000000000000000000000..0fab95888fe99817695f93e6126f211d8412d365
--- /dev/null
+++ b/helm/README-vault.md
@@ -0,0 +1,52 @@
+# Install vault
+```
+$ helm repo add hashicorp https://helm.releases.hashicorp.com
+$ helm upgrade --install vault hashicorp/vault -n mon --set server.standalone.enabled=true --create-namespace
+
+# if you are using ingress controller, please use:
+$ helm upgrade --install vault hashicorp/vault -n mon --set server.ingress.enabled=true --set server.ingress.hosts[0].host="vault.mon.int" --set server.ingress.ingressClassName=nginx --set server.standalone.enabled=true --create-namespace
+
+# verify pods are running
+$ kubectl -n mon get pods
+
+```
+NOTA: If using ingressRoute. Please, create a file with:
+
+```
+---
+
+apiVersion: traefik.containo.us/v1alpha1 
+kind: IngressRoute
+metadata:
+  name: vault-ingress-route 
+  namespace: mon
+spec:
+  entryPoints: [web] 
+  routes:
+    - kind: Rule
+      match: Host(`vault.mon.int`)
+      services:
+        - kind: Service
+          name: vault-internal 
+          port: 8200
+          scheme: http
+
+```
+```
+# deploy ingress route
+
+$ kubectl apply -f ingress-route.yaml
+```
+# Creating vault PKI and certificates
+
+## Considerations:
+  - If you change values by default in the `capi/values.yaml`. Please, consider have a look of some topics:
+    - You will need to create PKI and certificates, therefore. The `VAULT_TOKEN` provided must have sufficient permissions in Vault to create it
+    - Modify:
+      - `namespace` in `vault-job/vault-job.yaml`. The namespace should be changed in the entire file. By default is `mon` (same namespace when capif is deployed)
+      - `export VAULT_ADDR` using the service deployed to vault. By default is `http://vault-internal:8200`
+      - `export VAULT_TOKEN` using the token created to vault. By default is `dev-only-token`
+      - `DOMAIN1` - variable used for generate certificate (CSR) to capif `(ex: DOMAIN1=capif.mobile.cloud)`.
+```
+$ kubectl apply -f vault-job/
+```
\ No newline at end of file
diff --git a/helm/README.md b/helm/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..3fd0ff3192ae80d745c7e475ed47ca38a6ddd402
--- /dev/null
+++ b/helm/README.md
@@ -0,0 +1,47 @@
+# Install CAPIF in Kubernetes using HELM
+
+## Dependencies
+- Helm
+-  `Ingress` already in cluster (if configured in capif - `values.yaml`)
+  - ```
+    # OPTIONAL - if not exists Ingress in cluster, use this command to install it
+    $ helm upgrade --install ingress-nginx ingress-nginx --repo https://kubernetes.github.io/ingress-nginx --set rbac.create=true --set controller.service.type=NodePort
+
+    # OPTIONAL - if you need specify the nodePort in cluster use
+    $ helm upgrade --install ingress-nginx ingress-nginx --repo https://kubernetes.github.io/ingress-nginx --set rbac.create=true --set controller.service.type=NodePort --set controller.service.nodePorts.http=32080 --set controller.service.nodePorts.https=32443 --namespace ingress-nginx --create-namespace --set controller.extraArgs."enable-ssl-passthrough=true" --kubeconfig ../oneke-new.kubeconfig 
+
+    # Check if ssl-passthrough is enabled in nginx controller.
+    $ kubectl -n ingress-nginx get deploy -o yaml | grep passthrough
+    ```
+-  `PersistentVolumeClain` already in cluster (if configured in capif)
+
+## Considerations before to install/deploy:
+- **Prometheus**: 
+    - You can install prometheus but you will need permissions to deploy prometheus in the cluster. The helm creates a ClusterRole to access to all resources in the cluster. 
+    - If you don't have permission or there is already provided a Prometheus
+      in the cluster. in `capif/values.yaml` gives the field `monitoring.prometheus.enable: ""`
+        - Grafana will need the endpoint to prometheus. Please keep in mind setup the grafana's field in `capif/values.yaml`
+- **Vault**:
+    - You will need a instance of vault already deployed. If the cluster doesn't provide the vault instance. You can install it following the next [steps](https://github.com/Telefonica/CAPIF_Future_Network_Lab/blob/main/helm/README-vault.md)
+    - Once the vault is provided in the cluster. You need to create the PKI and certificates. Follow the vault-job [step](https://github.com/Telefonica/CAPIF_Future_Network_Lab/blob/main/helm/README-vault.md#creating-vault-pki-and-certificates) to create it
+        - Setup the `parametersVault.env.VaultHostname`: This is the endPoint to vault. This endpoint can be a service/ingress of kubernetes
+        - Setup `parametersVault.env.VaultPort`: This is the port listenting to vault instance
+        - Setup `parametersVault.env.vaultAccessToken`: This is the token used for capif to create the certificates in vault. If vault owns of you. Use the token created in [Vault readme](https://github.com/Telefonica/CAPIF_Future_Network_Lab/blob/main/helm/README-vault.md#creating-vault-pki-and-certificates) . Otherwise, the admin
+        of the cluster will provide you the token. This token will need sufficient permissions to create PKI and certificates.
+- **CAPIF**
+    - Please, have a look of [`values.yaml`](https://github.com/Telefonica/CAPIF_Future_Network_Lab/blob/main/helm/capif/values.yaml) file and setup according to the conditions
+ ```
+ # download dependencies 
+ $ helm dependency build capif/
+
+# check ingress_ip.oneke
+kubectl get svc -A | grep nginx
+
+# install capif
+$ helm upgrade --install -n mon monitoring-capif capif/ --set nginx.nginx.env.capifHostname=mon-capif.monitoring.int --set ingress_ip.oneke="10.17.173.127" --atomic --create-namespace
+ ```
+
+NOTA: The deployment can take until 8 minutes to be ready. Please, if it fails, re-install CAPIF
+
+## Troubleshooting
+- [`Mongo stuck`](https://www.ibm.com/docs/en/cloud-paks/cp-biz-automation/20.0.x?topic=troubleshooting-mongodb-pod-fails-start-container-exit-code-14-100)
\ No newline at end of file
diff --git a/helm/capif/.helmignore b/helm/capif/.helmignore
new file mode 100644
index 0000000000000000000000000000000000000000..0e8a0eb36f4ca2c939201c0d54b5d82a1ea34778
--- /dev/null
+++ b/helm/capif/.helmignore
@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
diff --git a/helm/capif/Chart.yaml b/helm/capif/Chart.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..625f95844b7f45365ff19a5df4e2da0b8492cd3f
--- /dev/null
+++ b/helm/capif/Chart.yaml
@@ -0,0 +1,26 @@
+apiVersion: v2
+name: capif
+description: A Helm chart to CAPIF in Kubernetes
+# A chart can be either an 'application' or a 'library' chart.
+#
+# Application charts are a collection of templates that can be packaged into versioned archives
+# to be deployed.
+#
+# Library charts provide useful utilities or functions for the chart developer. They're included as
+# a dependency of application charts to inject those utilities and functions into the rendering
+# pipeline. Library charts do not define any templates and therefore cannot be deployed.
+type: application
+# This is the chart version. This version number should be incremented each time you make changes
+# to the chart and its templates, including the app version.
+# Versions are expected to follow Semantic Versioning (https://semver.org/)
+version: v3.1.4
+# This is the version number of the application being deployed. This version number should be
+# incremented each time you make changes to the application. Versions are not expected to
+# follow Semantic Versioning. They should reflect the version the application is using.
+# It is recommended to use it with quotes.
+appVersion: "v3.1.4"
+dependencies:
+  - name: "tempo"
+    condition: tempo.enabled
+    repository: "https://grafana.github.io/helm-charts"
+    version: "^1.3.1"
diff --git a/helm/capif/README.md b/helm/capif/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..a78b060c3aff3b0fbc789d06e70b886c0f230208
--- /dev/null
+++ b/helm/capif/README.md
@@ -0,0 +1,304 @@
+# Helm of CAPIF
+
+![Version: v1.0.0](https://img.shields.io/badge/Version-v1.0.0-informational?style=for-the-badge)
+![Type: application](https://img.shields.io/badge/Type-application-informational?style=for-the-badge)
+![AppVersion: v1.0.0](https://img.shields.io/badge/AppVersion-v1.0.0-informational?style=for-the-badge)
+
+## Description
+
+A Helm chart to CAPIF in Kubernetes
+
+## Usage
+
+## Values
+
+| Key | Type | Default | Description |
+|-----|------|---------|-------------|
+| CapifClient.enable | string | `"true"` | If enable capif client. |
+| CapifClient.image.imagePullPolicy | string | `"Always"` | Image pull policy: Always, IfNotPresent |
+| CapifClient.image.repository | string | `"public.ecr.aws/o2v4a8t6/opencapif/client"` | The docker image repository to use |
+| CapifClient.image.tag | string | `""` | The docker image tag to use @default Chart version |
+| CapifClient.ports[0].name | string | `"8080"` |  |
+| CapifClient.ports[0].port | int | `8080` |  |
+| CapifClient.ports[0].targetPort | int | `8080` |  |
+| CapifClient.replicas | int | `1` |  |
+| CapifClient.resources.limits.cpu | string | `"100m"` |  |
+| CapifClient.resources.limits.memory | string | `"128Mi"` |  |
+| CapifClient.resources.requests.cpu | string | `"100m"` |  |
+| CapifClient.resources.requests.memory | string | `"128Mi"` |  |
+| CapifClient.type | string | `"ClusterIP"` |  |
+| accessControlPolicy.env | object | `{"monitoring":"true"}` | If env.monitoring: true. Setup monitoring.enable: true |
+| accessControlPolicy.image.imagePullPolicy | string | `"Always"` | Image pull policy: Always, IfNotPresent |
+| accessControlPolicy.image.repository | string | `"public.ecr.aws/o2v4a8t6/opencapif/access-control-policy"` | The docker image repository to use |
+| accessControlPolicy.image.tag | string | `""` | The docker image tag to use @default Chart version |
+| accessControlPolicy.ports[0].name | string | `"8080"` |  |
+| accessControlPolicy.ports[0].port | int | `8080` |  |
+| accessControlPolicy.ports[0].targetPort | int | `8080` |  |
+| accessControlPolicy.replicas | int | `1` |  |
+| accessControlPolicy.resources.limits.cpu | string | `"100m"` |  |
+| accessControlPolicy.resources.limits.memory | string | `"128Mi"` |  |
+| accessControlPolicy.resources.requests.cpu | string | `"100m"` |  |
+| accessControlPolicy.resources.requests.memory | string | `"128Mi"` |  |
+| accessControlPolicy.type | string | `"ClusterIP"` |  |
+| apiInvocationLogs.apiInvocationLogs.env | object | `{"monitoring":"true"}` | If env.monitoring: true. Setup monitoring.enable: true |
+| apiInvocationLogs.apiInvocationLogs.image.imagePullPolicy | string | `"Always"` | Image pull policy: Always, IfNotPresent |
+| apiInvocationLogs.apiInvocationLogs.image.repository | string | `"public.ecr.aws/o2v4a8t6/opencapif/api-invocation-logs-api"` | The docker image repository to use |
+| apiInvocationLogs.apiInvocationLogs.image.tag | string | `""` | The docker image tag to use @default Chart version |
+| apiInvocationLogs.apiInvocationLogs.resources.limits.cpu | string | `"100m"` |  |
+| apiInvocationLogs.apiInvocationLogs.resources.limits.memory | string | `"128Mi"` |  |
+| apiInvocationLogs.apiInvocationLogs.resources.requests.cpu | string | `"100m"` |  |
+| apiInvocationLogs.apiInvocationLogs.resources.requests.memory | string | `"128Mi"` |  |
+| apiInvocationLogs.ports[0].name | string | `"8080"` |  |
+| apiInvocationLogs.ports[0].port | int | `8080` |  |
+| apiInvocationLogs.ports[0].targetPort | int | `8080` |  |
+| apiInvocationLogs.replicas | int | `1` |  |
+| apiInvocationLogs.type | string | `"ClusterIP"` |  |
+| apiInvokerManagement.apiInvokerManagement.env | object | `{"monitoring":"true"}` | If env.monitoring: true. Setup monitoring.enable: true |
+| apiInvokerManagement.apiInvokerManagement.image.imagePullPolicy | string | `"Always"` | Image pull policy: Always, IfNotPresent |
+| apiInvokerManagement.apiInvokerManagement.image.repository | string | `"public.ecr.aws/o2v4a8t6/opencapif/api-invoker-management-api"` | The docker image repository to use |
+| apiInvokerManagement.apiInvokerManagement.image.tag | string | `""` | The docker image tag to use @default Chart version |
+| apiInvokerManagement.apiInvokerManagement.resources.limits.cpu | string | `"100m"` |  |
+| apiInvokerManagement.apiInvokerManagement.resources.limits.memory | string | `"128Mi"` |  |
+| apiInvokerManagement.apiInvokerManagement.resources.requests.cpu | string | `"100m"` |  |
+| apiInvokerManagement.apiInvokerManagement.resources.requests.memory | string | `"128Mi"` |  |
+| apiInvokerManagement.ports[0].name | string | `"8080"` |  |
+| apiInvokerManagement.ports[0].port | int | `8080` |  |
+| apiInvokerManagement.ports[0].targetPort | int | `8080` |  |
+| apiInvokerManagement.replicas | int | `1` |  |
+| apiInvokerManagement.type | string | `"ClusterIP"` |  |
+| apiProviderManagement.apiProviderManagement.env | object | `{"monitoring":"true"}` | If env.monitoring: true. Setup monitoring.enable: true |
+| apiProviderManagement.apiProviderManagement.image.imagePullPolicy | string | `"Always"` | Image pull policy: Always, IfNotPresent |
+| apiProviderManagement.apiProviderManagement.image.repository | string | `"public.ecr.aws/o2v4a8t6/opencapif/api-provider-management-api"` | The docker image repository to use |
+| apiProviderManagement.apiProviderManagement.image.tag | string | `""` | The docker image tag to use @default Chart version |
+| apiProviderManagement.apiProviderManagement.resources.limits.cpu | string | `"100m"` |  |
+| apiProviderManagement.apiProviderManagement.resources.limits.memory | string | `"128Mi"` |  |
+| apiProviderManagement.apiProviderManagement.resources.requests.cpu | string | `"100m"` |  |
+| apiProviderManagement.apiProviderManagement.resources.requests.memory | string | `"128Mi"` |  |
+| apiProviderManagement.ports[0].name | string | `"8080"` |  |
+| apiProviderManagement.ports[0].port | int | `8080` |  |
+| apiProviderManagement.ports[0].targetPort | int | `8080` |  |
+| apiProviderManagement.replicas | int | `1` |  |
+| apiProviderManagement.type | string | `"ClusterIP"` |  |
+| capifEvents.capifEvents.env | object | `{"monitoring":"true"}` | If env.monitoring: true. Setup monitoring.enable: true |
+| capifEvents.capifEvents.image.imagePullPolicy | string | `"Always"` | Image pull policy: Always, IfNotPresent |
+| capifEvents.capifEvents.image.repository | string | `"public.ecr.aws/o2v4a8t6/opencapif/events-api"` | The docker image repository to use |
+| capifEvents.capifEvents.image.tag | string | `""` | The docker image tag to use @default Chart version |
+| capifEvents.capifEvents.resources.limits.cpu | string | `"100m"` |  |
+| capifEvents.capifEvents.resources.limits.memory | string | `"128Mi"` |  |
+| capifEvents.capifEvents.resources.requests.cpu | string | `"100m"` |  |
+| capifEvents.capifEvents.resources.requests.memory | string | `"128Mi"` |  |
+| capifEvents.ports[0].name | string | `"8080"` |  |
+| capifEvents.ports[0].port | int | `8080` |  |
+| capifEvents.ports[0].targetPort | int | `8080` |  |
+| capifEvents.replicas | int | `1` |  |
+| capifEvents.type | string | `"ClusterIP"` |  |
+| capifRoutingInfo.capifRoutingInfo.env | object | `{"monitoring":"true"}` | If env.monitoring: true. Setup monitoring.enable: true |
+| capifRoutingInfo.capifRoutingInfo.image.imagePullPolicy | string | `"Always"` | Image pull policy: Always, IfNotPresent |
+| capifRoutingInfo.capifRoutingInfo.image.repository | string | `"public.ecr.aws/o2v4a8t6/opencapif/routing-info-api"` | The docker image repository to use |
+| capifRoutingInfo.capifRoutingInfo.image.tag | string | `""` | The docker image tag to use @default Chart version |
+| capifRoutingInfo.capifRoutingInfo.resources.limits.cpu | string | `"100m"` |  |
+| capifRoutingInfo.capifRoutingInfo.resources.limits.memory | string | `"128Mi"` |  |
+| capifRoutingInfo.capifRoutingInfo.resources.requests.cpu | string | `"100m"` |  |
+| capifRoutingInfo.capifRoutingInfo.resources.requests.memory | string | `"128Mi"` |  |
+| capifRoutingInfo.ports[0].name | string | `"8080"` |  |
+| capifRoutingInfo.ports[0].port | int | `8080` |  |
+| capifRoutingInfo.ports[0].targetPort | int | `8080` |  |
+| capifRoutingInfo.replicas | int | `1` |  |
+| capifRoutingInfo.type | string | `"ClusterIP"` |  |
+| capifSecurity.capifSecurity.env | object | `{"monitoring":"true"}` | If env.monitoring: true. Setup monitoring.enable: true |
+| capifSecurity.capifSecurity.image.imagePullPolicy | string | `"Always"` | Image pull policy: Always, IfNotPresent |
+| capifSecurity.capifSecurity.image.repository | string | `"public.ecr.aws/o2v4a8t6/opencapif/security-api"` | The docker image repository to use |
+| capifSecurity.capifSecurity.image.tag | string | `""` | The docker image tag to use @default Chart version |
+| capifSecurity.capifSecurity.resources.limits.cpu | string | `"100m"` |  |
+| capifSecurity.capifSecurity.resources.limits.memory | string | `"128Mi"` |  |
+| capifSecurity.capifSecurity.resources.requests.cpu | string | `"100m"` |  |
+| capifSecurity.capifSecurity.resources.requests.memory | string | `"128Mi"` |  |
+| capifSecurity.ports[0].name | string | `"8080"` |  |
+| capifSecurity.ports[0].port | int | `8080` |  |
+| capifSecurity.ports[0].targetPort | int | `8080` |  |
+| capifSecurity.replicas | int | `1` |  |
+| capifSecurity.type | string | `"ClusterIP"` |  |
+| env | string | `""` | The Environment variable. Use openshift if you are deploying in Openshift cluster. anotherwise use the field empty |
+| ingress.ip | string | `"10.17.173.127"` |  |
+| kubernetesClusterDomain | string | `"cluster.local"` |  |
+| logs.enable | string | `"true"` | If register enabled. enable: true, enable: "" = not enabled |
+| logs.logs.env | object | `{"monitoring":"true"}` | If env.monitoring: true. Setup monitoring.enable: true |
+| logs.logs.image.imagePullPolicy | string | `"Always"` | Image pull policy: Always, IfNotPresent |
+| logs.logs.image.repository | string | `"public.ecr.aws/o2v4a8t6/opencapif/auditing-api"` | The docker image repository to use |
+| logs.logs.image.tag | string | `""` | The docker image tag to use @default Chart version |
+| logs.logs.resources.limits.cpu | string | `"100m"` |  |
+| logs.logs.resources.limits.memory | string | `"128Mi"` |  |
+| logs.logs.resources.requests.cpu | string | `"100m"` |  |
+| logs.logs.resources.requests.memory | string | `"128Mi"` |  |
+| logs.ports[0].name | string | `"8080"` |  |
+| logs.ports[0].port | int | `8080` |  |
+| logs.ports[0].targetPort | int | `8080` |  |
+| logs.replicas | int | `1` |  |
+| logs.type | string | `"ClusterIP"` |  |
+| mongo.mongo.env.mongoInitdbRootPassword | string | `"example"` |  |
+| mongo.mongo.env.mongoInitdbRootUsername | string | `"root"` |  |
+| mongo.mongo.image.imagePullPolicy | string | `"Always"` | Image pull policy: Always, IfNotPresent |
+| mongo.mongo.image.repository | string | `"mongo"` | The docker image repository to use |
+| mongo.mongo.image.tag | string | `"6.0.2"` | The docker image tag to use @default Chart version |
+| mongo.mongo.resources | object | `{}` |  |
+| mongo.persistence | object | `{"enable":"true","storage":"8Gi"}` | If mongo.persistence enabled. enable: true, enable: "" = not enabled |
+| mongo.ports[0].name | string | `"27017"` |  |
+| mongo.ports[0].port | int | `27017` |  |
+| mongo.ports[0].targetPort | int | `27017` |  |
+| mongo.replicas | int | `1` |  |
+| mongo.type | string | `"ClusterIP"` |  |
+| mongoExpress.mongoExpress.env.meConfigMongodbAdminpassword | string | `"example"` |  |
+| mongoExpress.mongoExpress.env.meConfigMongodbAdminusername | string | `"root"` |  |
+| mongoExpress.mongoExpress.env.meConfigMongodbUrl | string | `"mongodb://root:example@mongo:27017/"` |  |
+| mongoExpress.mongoExpress.image.imagePullPolicy | string | `"Always"` | Image pull policy: Always, IfNotPresent |
+| mongoExpress.mongoExpress.image.repository | string | `"mongo-express"` | The docker image repository to use |
+| mongoExpress.mongoExpress.image.tag | string | `"1.0.0-alpha.4"` | The docker image tag to use @default Chart version |
+| mongoExpress.mongoExpress.resources.limits.cpu | string | `"100m"` |  |
+| mongoExpress.mongoExpress.resources.limits.memory | string | `"128Mi"` |  |
+| mongoExpress.mongoExpress.resources.requests.cpu | string | `"100m"` |  |
+| mongoExpress.mongoExpress.resources.requests.memory | string | `"128Mi"` |  |
+| mongoExpress.ports[0].name | string | `"8082"` |  |
+| mongoExpress.ports[0].port | int | `8082` |  |
+| mongoExpress.ports[0].targetPort | int | `8081` |  |
+| mongoExpress.replicas | int | `1` |  |
+| mongoExpress.type | string | `"ClusterIP"` |  |
+| mongoRegister.mongo.env.mongoInitdbRootPassword | string | `"example"` |  |
+| mongoRegister.mongo.env.mongoInitdbRootUsername | string | `"root"` |  |
+| mongoRegister.mongo.image.imagePullPolicy | string | `"Always"` | Image pull policy: Always, IfNotPresent |
+| mongoRegister.mongo.image.repository | string | `"mongo"` | The docker image repository to use |
+| mongoRegister.mongo.image.tag | string | `"6.0.2"` | The docker image tag to use @default Chart version |
+| mongoRegister.mongo.resources | object | `{}` |  |
+| mongoRegister.ports[0].name | string | `"27017"` |  |
+| mongoRegister.ports[0].port | int | `27017` |  |
+| mongoRegister.ports[0].targetPort | int | `27017` |  |
+| mongoRegister.replicas | int | `1` |  |
+| mongoRegister.type | string | `"ClusterIP"` |  |
+| monitoring.enable | string | `"true"` |  |
+| monitoring.enable | string | `"true"` | If monitoring enabled. enable: true, enable: "" = not enabled |
+| monitoring.fluentBit.env.lokiUrl | string | `"http://loki:3100/loki/api/v1/push"` |  |
+| monitoring.fluentBit.image.repository | string | `"grafana/fluent-bit-plugin-loki"` | The docker image repository to use |
+| monitoring.fluentBit.image.tag | string | `"latest"` | The docker image tag to use @default Chart version |
+| monitoring.fluentBit.resources | object | `{}` |  |
+| monitoring.grafana.env.gfAuthAnonymousEnable | bool | `true` |  |
+| monitoring.grafana.env.gfAuthAnonymousOrgRole | string | `"Admin"` |  |
+| monitoring.grafana.env.gfSecurityAdminPassword | string | `"secure_pass"` |  |
+| monitoring.grafana.env.gfSecurityAllowEmbedding | bool | `true` |  |
+| monitoring.grafana.env.lokiUrl | string | `"http://loki:3100"` |  |
+| monitoring.grafana.env.prometheusUrl | string | `"http://prometheus.mon.svc.cluster.local:9090"` |  |
+| monitoring.grafana.env.tempoUrl | string | `"http://monitoring-capif-tempo:3100"` |  |
+| monitoring.grafana.image.repository | string | `"grafana/grafana"` | The docker image repository to use |
+| monitoring.grafana.image.tag | string | `"latest"` | The docker image tag to use @default Chart version |
+| monitoring.grafana.ingress | object | `{"annotations":null,"enabled":true,"hosts":[{"host":"grafana.5gnacar.int","paths":[{"path":"/","pathType":"Prefix"}]}],"ingressClassName":"nginx","tls":[]}` | If ingress enabled=true, use monitoring.grafana.ingressRoute.enable="" |
+| monitoring.grafana.ingressRoute | object | `{"enable":"","host":"grafana.5gnacar.int"}` | If ingressRoute enable=true, use monitoring.grafana.ingress.enabled="" |
+| monitoring.grafana.persistence | object | `{"enable":"true","storage":"100Mi"}` | If grafana.persistence enabled. enable: true, enable: "" = not enabled |
+| monitoring.grafana.resources | object | `{}` |  |
+| monitoring.grafana.service.port | int | `3000` |  |
+| monitoring.grafana.service.type | string | `"ClusterIP"` |  |
+| monitoring.loki.image.repository | string | `"grafana/loki"` | The docker image repository to use |
+| monitoring.loki.image.tag | string | `"2.8.0"` | The docker image tag to use @default Chart version |
+| monitoring.loki.persistence | object | `{"enable":"true","storage":"100Mi"}` | If grafana.persistence enabled. enable: true, enable: "" = not enabled |
+| monitoring.loki.resources | object | `{}` |  |
+| monitoring.otel.configMap.tempoEndpoint | string | `"monitoring-capif-tempo:4317"` |  |
+| monitoring.otel.image.repository | string | `"otel/opentelemetry-collector"` | The docker image repository to use |
+| monitoring.otel.image.tag | string | `"0.81.0"` | The docker image tag to use @default Chart version |
+| monitoring.otel.resources | object | `{}` |  |
+| monitoring.prometheus.enable | string | `"true"` | It will deploy prometheus |
+| monitoring.prometheus.image.repository | string | `"prom/prometheus"` | The docker image repository to use |
+| monitoring.prometheus.image.tag | string | `"latest"` | The docker image tag to use @default Chart version |
+| monitoring.prometheus.ingress.annotations | string | `nil` |  |
+| monitoring.prometheus.ingress.enabled | bool | `true` |  |
+| monitoring.prometheus.ingress.hosts[0].host | string | `"prometheus.5gnacar.int"` |  |
+| monitoring.prometheus.ingress.hosts[0].paths[0].path | string | `"/"` |  |
+| monitoring.prometheus.ingress.hosts[0].paths[0].pathType | string | `"Prefix"` |  |
+| monitoring.prometheus.ingress.ingressClassName | string | `"nginx"` |  |
+| monitoring.prometheus.ingress.tls | list | `[]` |  |
+| monitoring.prometheus.ingressRoute | object | `{"enable":"","host":"prometheus.5gnacar.int"}` | If ingressRoute enable=true, use monitoring.prometheus.ingress.enabled="" |
+| monitoring.prometheus.persistence.enable | string | `"true"` |  |
+| monitoring.prometheus.persistence.storage | string | `"8Gi"` |  |
+| monitoring.prometheus.resources | object | `{}` |  |
+| monitoring.prometheus.service.port | int | `9090` |  |
+| monitoring.prometheus.service.type | string | `"ClusterIP"` |  |
+| monitoring.renderer.env.enableMetrics | string | `"true"` |  |
+| monitoring.renderer.image.repository | string | `"grafana/grafana-image-renderer"` | The docker image repository to use |
+| monitoring.renderer.image.tag | string | `"latest"` | The docker image tag to use @default Chart version |
+| monitoring.renderer.resources | object | `{}` |  |
+| nginx.annotations."nginx.ingress.kubernetes.io/backend-protocol" | string | `"HTTPS"` |  |
+| nginx.annotations."nginx.ingress.kubernetes.io/ssl-passthrough" | string | `"true"` |  |
+| nginx.annotations."nginx.ingress.kubernetes.io/ssl-redirect" | string | `"true"` |  |
+| nginx.ingressClassName | string | `"nginx"` |  |
+| nginx.ingressType | string | `"Ingress"` | if nginx.ingressType: "Ingress". set up monitoring.prometheus.ingress: true and monitoring.grafana.ingress: true Use IngressRoute if you want to use Gateway API. ex traefix |
+| nginx.nginx.env.capifHostname | string | `"my-capif.apps.ocp-epg.hi.inet"` | Ingress's host to Capif |
+| nginx.nginx.image.imagePullPolicy | string | `"Always"` | Image pull policy: Always, IfNotPresent |
+| nginx.nginx.image.repository | string | `"public.ecr.aws/o2v4a8t6/opencapif/nginx"` | The docker image repository to use |
+| nginx.nginx.image.tag | string | `""` | The docker image tag to use @default Chart version |
+| nginx.nginx.resources.limits.cpu | string | `"100m"` |  |
+| nginx.nginx.resources.limits.memory | string | `"128Mi"` |  |
+| nginx.nginx.resources.requests.cpu | string | `"100m"` |  |
+| nginx.nginx.resources.requests.memory | string | `"128Mi"` |  |
+| nginx.ports[0].name | string | `"8080"` |  |
+| nginx.ports[0].port | int | `8080` |  |
+| nginx.ports[0].targetPort | int | `8080` |  |
+| nginx.ports[1].name | string | `"443"` |  |
+| nginx.ports[1].port | int | `443` |  |
+| nginx.ports[1].targetPort | int | `443` |  |
+| nginx.replicas | int | `1` |  |
+| nginx.type | string | `"ClusterIP"` |  |
+| parametersVault.env.vaultAccessToken | string | `"dev-only-token"` |  |
+| parametersVault.env.vaultHostname | string | `"vault-internal.mon.svc.cluster.local"` |  |
+| parametersVault.env.vaultPort | int | `8200` |  |
+| publishedApis.ports[0].name | string | `"8080"` |  |
+| publishedApis.ports[0].port | int | `8080` |  |
+| publishedApis.ports[0].targetPort | int | `8080` |  |
+| publishedApis.publishedApis.env | object | `{"monitoring":"true"}` | If env.monitoring: true. Setup monitoring.enable: true |
+| publishedApis.publishedApis.image.imagePullPolicy | string | `"Always"` | Image pull policy: Always, IfNotPresent |
+| publishedApis.publishedApis.image.repository | string | `"public.ecr.aws/o2v4a8t6/opencapif/publish-service-api"` | The docker image repository to use |
+| publishedApis.publishedApis.image.tag | string | `""` | The docker image tag to use @default Chart version |
+| publishedApis.publishedApis.resources.limits.cpu | string | `"100m"` |  |
+| publishedApis.publishedApis.resources.limits.memory | string | `"128Mi"` |  |
+| publishedApis.publishedApis.resources.requests.cpu | string | `"100m"` |  |
+| publishedApis.publishedApis.resources.requests.memory | string | `"128Mi"` |  |
+| publishedApis.replicas | int | `1` |  |
+| publishedApis.type | string | `"ClusterIP"` |  |
+| redis.ports[0].name | string | `"6379"` |  |
+| redis.ports[0].port | int | `6379` |  |
+| redis.ports[0].targetPort | int | `6379` |  |
+| redis.redis.env.redisReplicationMode | string | `"master"` |  |
+| redis.redis.image.imagePullPolicy | string | `"Always"` | Image pull policy: Always, IfNotPresent |
+| redis.redis.image.repository | string | `"redis"` | The docker image repository to use |
+| redis.redis.image.tag | string | `"alpine"` | The docker image tag to use @default Chart version |
+| redis.redis.resources.limits.cpu | string | `"100m"` |  |
+| redis.redis.resources.limits.memory | string | `"128Mi"` |  |
+| redis.redis.resources.requests.cpu | string | `"100m"` |  |
+| redis.redis.resources.requests.memory | string | `"128Mi"` |  |
+| redis.replicas | int | `1` |  |
+| redis.type | string | `"ClusterIP"` |  |
+| register.enable | string | `"true"` | If register enabled. enable: true, enable: "" = not enabled |
+| register.ports[0].name | string | `"8080"` |  |
+| register.ports[0].port | int | `8084` |  |
+| register.ports[0].targetPort | int | `8080` |  |
+| register.register.env.mongoHost | string | `"mongo-register"` |  |
+| register.register.env.mongoPort | int | `27017` |  |
+| register.register.image.imagePullPolicy | string | `"Always"` | Image pull policy: Always, IfNotPresent |
+| register.register.image.repository | string | `"public.ecr.aws/o2v4a8t6/opencapif/jwtauth"` | The docker image repository to use |
+| register.register.image.tag | string | `""` | The docker image tag to use @default Chart version |
+| register.register.resources.limits.cpu | string | `"100m"` |  |
+| register.register.resources.limits.memory | string | `"128Mi"` |  |
+| register.register.resources.requests.cpu | string | `"100m"` |  |
+| register.register.resources.requests.memory | string | `"128Mi"` |  |
+| register.replicas | int | `1` |  |
+| register.type | string | `"ClusterIP"` |  |
+| serviceApis.ports[0].name | string | `"8080"` |  |
+| serviceApis.ports[0].port | int | `8080` |  |
+| serviceApis.ports[0].targetPort | int | `8080` |  |
+| serviceApis.replicas | int | `1` |  |
+| serviceApis.serviceApis.env | object | `{"monitoring":"true"}` | If env.monitoring: true. Setup monitoring.enable: true |
+| serviceApis.serviceApis.image.imagePullPolicy | string | `"Always"` | Image pull policy: Always, IfNotPresent |
+| serviceApis.serviceApis.image.repository | string | `"public.ecr.aws/o2v4a8t6/opencapif/discover-service-api"` | The docker image repository to use |
+| serviceApis.serviceApis.image.tag | string | `""` | The docker image tag to use @default Chart version |
+| serviceApis.serviceApis.resources.limits.cpu | string | `"100m"` |  |
+| serviceApis.serviceApis.resources.limits.memory | string | `"128Mi"` |  |
+| serviceApis.serviceApis.resources.requests.cpu | string | `"100m"` |  |
+| serviceApis.serviceApis.resources.requests.memory | string | `"128Mi"` |  |
+| serviceApis.type | string | `"ClusterIP"` |  |
+| tempo | object | `{"enabled":true,"persistence":{"enabled":true,"size":"3Gi"},"tempo":{"metricsGenerator":{"enabled":true,"remoteWriteUrl":"http://prometheus.mon.svc.cluster.local:9090/api/v1/write"}}}` | If monitoring.enable: "true". Also enable tempo.enabled: true |
+
diff --git a/helm/capif/docker-monitoring.json b/helm/capif/docker-monitoring.json
new file mode 100644
index 0000000000000000000000000000000000000000..8a3102a055ed6fad82439f8bc99397f419f277ef
--- /dev/null
+++ b/helm/capif/docker-monitoring.json
@@ -0,0 +1,690 @@
+{
+    "annotations": {
+      "list": [
+        {
+          "builtIn": 1,
+          "datasource": {
+            "type": "grafana",
+            "uid": "-- Grafana --"
+          },
+          "enable": true,
+          "hide": true,
+          "iconColor": "rgba(0, 211, 255, 1)",
+          "name": "Annotations & Alerts",
+          "type": "dashboard"
+        }
+      ]
+    },
+    "description": "Docker monitoring with Prometheus and cAdvisor",
+    "editable": true,
+    "fiscalYearStartMonth": 0,
+    "gnetId": 193,
+    "graphTooltip": 1,
+    "id": 1,
+    "links": [],
+    "liveNow": false,
+    "panels": [
+      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "af6b44aa-0703-4979-825c-c1afba946534"
+        },
+        "fieldConfig": {
+          "defaults": {
+            "color": {
+              "mode": "thresholds"
+            },
+            "mappings": [
+              {
+                "options": {
+                  "match": "null",
+                  "result": {
+                    "text": "N/A"
+                  }
+                },
+                "type": "special"
+              }
+            ],
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "green",
+                  "value": null
+                },
+                {
+                  "color": "red",
+                  "value": 80
+                }
+              ]
+            },
+            "unit": "none"
+          },
+          "overrides": []
+        },
+        "gridPos": {
+          "h": 3,
+          "w": 8,
+          "x": 0,
+          "y": 0
+        },
+        "id": 7,
+        "links": [],
+        "maxDataPoints": 100,
+        "options": {
+          "colorMode": "none",
+          "graphMode": "none",
+          "justifyMode": "auto",
+          "orientation": "horizontal",
+          "reduceOptions": {
+            "calcs": [
+              "mean"
+            ],
+            "fields": "",
+            "values": false
+          },
+          "textMode": "auto"
+        },
+        "pluginVersion": "9.5.2",
+        "targets": [
+          {
+            "datasource": {
+              "type": "prometheus",
+              "uid": "af6b44aa-0703-4979-825c-c1afba946534"
+            },
+            "expr": "count(container_last_seen{image!=\"\"})",
+            "intervalFactor": 2,
+            "legendFormat": "",
+            "metric": "container_last_seen",
+            "refId": "A",
+            "step": 240
+          }
+        ],
+        "title": "Running containers",
+        "transparent": true,
+        "type": "stat"
+      },
+      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "af6b44aa-0703-4979-825c-c1afba946534"
+        },
+        "fieldConfig": {
+          "defaults": {
+            "color": {
+              "mode": "thresholds"
+            },
+            "mappings": [
+              {
+                "options": {
+                  "match": "null",
+                  "result": {
+                    "text": "N/A"
+                  }
+                },
+                "type": "special"
+              }
+            ],
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "green",
+                  "value": null
+                },
+                {
+                  "color": "red",
+                  "value": 80
+                }
+              ]
+            },
+            "unit": "mbytes"
+          },
+          "overrides": []
+        },
+        "gridPos": {
+          "h": 3,
+          "w": 8,
+          "x": 8,
+          "y": 0
+        },
+        "id": 5,
+        "links": [],
+        "maxDataPoints": 100,
+        "options": {
+          "colorMode": "none",
+          "graphMode": "none",
+          "justifyMode": "auto",
+          "orientation": "horizontal",
+          "reduceOptions": {
+            "calcs": [
+              "lastNotNull"
+            ],
+            "fields": "",
+            "values": false
+          },
+          "textMode": "auto"
+        },
+        "pluginVersion": "9.5.2",
+        "targets": [
+          {
+            "datasource": {
+              "type": "prometheus",
+              "uid": "af6b44aa-0703-4979-825c-c1afba946534"
+            },
+            "expr": "sum(container_memory_usage_bytes{image!=\"\"})/1024/1024",
+            "intervalFactor": 2,
+            "legendFormat": "",
+            "metric": "container_memory_usage_bytes",
+            "refId": "A",
+            "step": 240
+          }
+        ],
+        "title": "Total Memory Usage",
+        "transparent": true,
+        "type": "stat"
+      },
+      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "af6b44aa-0703-4979-825c-c1afba946534"
+        },
+        "fieldConfig": {
+          "defaults": {
+            "color": {
+              "mode": "thresholds"
+            },
+            "mappings": [
+              {
+                "options": {
+                  "match": "null",
+                  "result": {
+                    "text": "N/A"
+                  }
+                },
+                "type": "special"
+              }
+            ],
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "green",
+                  "value": null
+                },
+                {
+                  "color": "red",
+                  "value": 80
+                }
+              ]
+            },
+            "unit": "percent"
+          },
+          "overrides": []
+        },
+        "gridPos": {
+          "h": 3,
+          "w": 8,
+          "x": 16,
+          "y": 0
+        },
+        "id": 6,
+        "links": [],
+        "maxDataPoints": 100,
+        "options": {
+          "colorMode": "none",
+          "graphMode": "none",
+          "justifyMode": "auto",
+          "orientation": "horizontal",
+          "reduceOptions": {
+            "calcs": [
+              "lastNotNull"
+            ],
+            "fields": "",
+            "values": false
+          },
+          "textMode": "auto"
+        },
+        "pluginVersion": "9.5.2",
+        "targets": [
+          {
+            "datasource": {
+              "type": "prometheus",
+              "uid": "af6b44aa-0703-4979-825c-c1afba946534"
+            },
+            "expr": "sum(rate(container_cpu_user_seconds_total{image!=\"\"}[5m]) * 100)",
+            "intervalFactor": 2,
+            "legendFormat": "",
+            "metric": "container_memory_usage_bytes",
+            "refId": "A",
+            "step": 240
+          }
+        ],
+        "title": "Total CPU Usage",
+        "transparent": true,
+        "type": "stat"
+      },
+      {
+        "aliasColors": {},
+        "bars": false,
+        "dashLength": 10,
+        "dashes": false,
+        "datasource": {
+          "type": "prometheus",
+          "uid": "af6b44aa-0703-4979-825c-c1afba946534"
+        },
+        "decimals": 2,
+        "editable": true,
+        "error": false,
+        "fill": 1,
+        "fillGradient": 0,
+        "grid": {},
+        "gridPos": {
+          "h": 7,
+          "w": 24,
+          "x": 0,
+          "y": 3
+        },
+        "hiddenSeries": false,
+        "id": 2,
+        "isNew": true,
+        "legend": {
+          "alignAsTable": true,
+          "avg": true,
+          "current": true,
+          "max": false,
+          "min": false,
+          "rightSide": true,
+          "show": true,
+          "total": false,
+          "values": true
+        },
+        "lines": true,
+        "linewidth": 2,
+        "links": [],
+        "nullPointMode": "connected",
+        "options": {
+          "alertThreshold": true
+        },
+        "percentage": false,
+        "pluginVersion": "9.5.2",
+        "pointradius": 5,
+        "points": false,
+        "renderer": "flot",
+        "seriesOverrides": [],
+        "spaceLength": 10,
+        "stack": false,
+        "steppedLine": false,
+        "targets": [
+          {
+            "datasource": {
+              "type": "prometheus",
+              "uid": "af6b44aa-0703-4979-825c-c1afba946534"
+            },
+            "expr": "rate(container_cpu_user_seconds_total{image!=\"\"}[5m]) * 100",
+            "intervalFactor": 2,
+            "legendFormat": "{{name}}",
+            "metric": "cpu",
+            "refId": "A",
+            "step": 10
+          }
+        ],
+        "thresholds": [],
+        "timeRegions": [],
+        "title": "CPU Usage",
+        "tooltip": {
+          "msResolution": false,
+          "shared": true,
+          "sort": 0,
+          "value_type": "cumulative"
+        },
+        "type": "graph",
+        "xaxis": {
+          "mode": "time",
+          "show": true,
+          "values": []
+        },
+        "yaxes": [
+          {
+            "format": "percent",
+            "logBase": 1,
+            "show": true
+          },
+          {
+            "format": "short",
+            "logBase": 1,
+            "show": true
+          }
+        ],
+        "yaxis": {
+          "align": false
+        }
+      },
+      {
+        "aliasColors": {},
+        "bars": false,
+        "dashLength": 10,
+        "dashes": false,
+        "datasource": {
+          "type": "prometheus",
+          "uid": "af6b44aa-0703-4979-825c-c1afba946534"
+        },
+        "decimals": 2,
+        "editable": true,
+        "error": false,
+        "fill": 1,
+        "fillGradient": 0,
+        "grid": {},
+        "gridPos": {
+          "h": 7,
+          "w": 24,
+          "x": 0,
+          "y": 10
+        },
+        "hiddenSeries": false,
+        "id": 1,
+        "isNew": true,
+        "legend": {
+          "alignAsTable": true,
+          "avg": true,
+          "current": true,
+          "max": false,
+          "min": false,
+          "rightSide": true,
+          "show": true,
+          "total": false,
+          "values": true
+        },
+        "lines": true,
+        "linewidth": 2,
+        "links": [],
+        "nullPointMode": "connected",
+        "options": {
+          "alertThreshold": true
+        },
+        "percentage": false,
+        "pluginVersion": "9.5.2",
+        "pointradius": 5,
+        "points": false,
+        "renderer": "flot",
+        "seriesOverrides": [],
+        "spaceLength": 10,
+        "stack": false,
+        "steppedLine": false,
+        "targets": [
+          {
+            "datasource": {
+              "type": "prometheus",
+              "uid": "af6b44aa-0703-4979-825c-c1afba946534"
+            },
+            "expr": "container_memory_usage_bytes{image!=\"\"}",
+            "hide": false,
+            "intervalFactor": 2,
+            "legendFormat": "{{name}}",
+            "metric": "container_memory_usage_bytes",
+            "refId": "A",
+            "step": 10
+          }
+        ],
+        "thresholds": [],
+        "timeRegions": [],
+        "title": "Memory Usage",
+        "tooltip": {
+          "msResolution": false,
+          "shared": true,
+          "sort": 0,
+          "value_type": "cumulative"
+        },
+        "type": "graph",
+        "xaxis": {
+          "mode": "time",
+          "show": true,
+          "values": []
+        },
+        "yaxes": [
+          {
+            "format": "bytes",
+            "label": "",
+            "logBase": 1,
+            "show": true
+          },
+          {
+            "format": "short",
+            "logBase": 1,
+            "show": false
+          }
+        ],
+        "yaxis": {
+          "align": false
+        }
+      },
+      {
+        "aliasColors": {},
+        "bars": false,
+        "dashLength": 10,
+        "dashes": false,
+        "datasource": {
+          "type": "prometheus",
+          "uid": "af6b44aa-0703-4979-825c-c1afba946534"
+        },
+        "editable": true,
+        "error": false,
+        "fill": 1,
+        "fillGradient": 0,
+        "grid": {},
+        "gridPos": {
+          "h": 7,
+          "w": 12,
+          "x": 0,
+          "y": 17
+        },
+        "hiddenSeries": false,
+        "id": 3,
+        "isNew": true,
+        "legend": {
+          "avg": false,
+          "current": false,
+          "max": false,
+          "min": false,
+          "show": true,
+          "total": false,
+          "values": false
+        },
+        "lines": true,
+        "linewidth": 2,
+        "links": [],
+        "nullPointMode": "connected",
+        "options": {
+          "alertThreshold": true
+        },
+        "percentage": false,
+        "pluginVersion": "9.5.2",
+        "pointradius": 5,
+        "points": false,
+        "renderer": "flot",
+        "seriesOverrides": [],
+        "spaceLength": 10,
+        "stack": false,
+        "steppedLine": false,
+        "targets": [
+          {
+            "datasource": {
+              "type": "prometheus",
+              "uid": "af6b44aa-0703-4979-825c-c1afba946534"
+            },
+            "expr": "irate(container_network_receive_bytes_total{image!=\"\"}[5m])",
+            "intervalFactor": 2,
+            "legendFormat": "{{name}}",
+            "metric": "container_network_receive_bytes_total",
+            "refId": "A",
+            "step": 20
+          }
+        ],
+        "thresholds": [],
+        "timeRegions": [],
+        "title": "Network Rx",
+        "tooltip": {
+          "msResolution": false,
+          "shared": true,
+          "sort": 0,
+          "value_type": "cumulative"
+        },
+        "type": "graph",
+        "xaxis": {
+          "mode": "time",
+          "show": true,
+          "values": []
+        },
+        "yaxes": [
+          {
+            "format": "Bps",
+            "logBase": 1,
+            "show": true
+          },
+          {
+            "format": "short",
+            "logBase": 1,
+            "show": true
+          }
+        ],
+        "yaxis": {
+          "align": false
+        }
+      },
+      {
+        "aliasColors": {},
+        "bars": false,
+        "dashLength": 10,
+        "dashes": false,
+        "datasource": {
+          "type": "prometheus",
+          "uid": "af6b44aa-0703-4979-825c-c1afba946534"
+        },
+        "editable": true,
+        "error": false,
+        "fill": 1,
+        "fillGradient": 0,
+        "grid": {},
+        "gridPos": {
+          "h": 7,
+          "w": 12,
+          "x": 12,
+          "y": 17
+        },
+        "hiddenSeries": false,
+        "id": 4,
+        "isNew": true,
+        "legend": {
+          "avg": false,
+          "current": false,
+          "max": false,
+          "min": false,
+          "show": true,
+          "total": false,
+          "values": false
+        },
+        "lines": true,
+        "linewidth": 2,
+        "links": [],
+        "nullPointMode": "connected",
+        "options": {
+          "alertThreshold": true
+        },
+        "percentage": false,
+        "pluginVersion": "9.5.2",
+        "pointradius": 5,
+        "points": false,
+        "renderer": "flot",
+        "seriesOverrides": [],
+        "spaceLength": 10,
+        "stack": false,
+        "steppedLine": false,
+        "targets": [
+          {
+            "datasource": {
+              "type": "prometheus",
+              "uid": "af6b44aa-0703-4979-825c-c1afba946534"
+            },
+            "expr": "irate(container_network_transmit_bytes_total{image!=\"\"}[5m])",
+            "intervalFactor": 2,
+            "legendFormat": "{{name}}",
+            "refId": "A",
+            "step": 20
+          }
+        ],
+        "thresholds": [],
+        "timeRegions": [],
+        "title": "Network Tx",
+        "tooltip": {
+          "msResolution": false,
+          "shared": true,
+          "sort": 0,
+          "value_type": "cumulative"
+        },
+        "type": "graph",
+        "xaxis": {
+          "mode": "time",
+          "show": true,
+          "values": []
+        },
+        "yaxes": [
+          {
+            "format": "Bps",
+            "logBase": 1,
+            "show": true
+          },
+          {
+            "format": "short",
+            "logBase": 1,
+            "show": true
+          }
+        ],
+        "yaxis": {
+          "align": false
+        }
+      }
+    ],
+    "refresh": "10s",
+    "schemaVersion": 38,
+    "style": "dark",
+    "tags": [
+      "docker"
+    ],
+    "templating": {
+      "list": []
+    },
+    "time": {
+      "from": "now-3h",
+      "to": "now"
+    },
+    "timepicker": {
+      "refresh_intervals": [
+        "5s",
+        "10s",
+        "30s",
+        "1m",
+        "5m",
+        "15m",
+        "30m",
+        "1h",
+        "2h",
+        "1d"
+      ],
+      "time_options": [
+        "5m",
+        "15m",
+        "1h",
+        "6h",
+        "12h",
+        "24h",
+        "2d",
+        "7d",
+        "30d"
+      ]
+    },
+    "timezone": "browser",
+    "title": "Docker monitoring",
+    "uid": "f66dea48-ca2f-46fb-a6f0-50bf50502d74",
+    "version": 2,
+    "weekStart": ""
+}
\ No newline at end of file
diff --git a/helm/capif/kubernetes-dashboard.json b/helm/capif/kubernetes-dashboard.json
new file mode 100644
index 0000000000000000000000000000000000000000..ac97f80ebd0139f383c3f82920b9b9aec7b8c1e9
--- /dev/null
+++ b/helm/capif/kubernetes-dashboard.json
@@ -0,0 +1,2629 @@
+{
+    "annotations": {
+      "list": [
+        {
+          "$$hashKey": "object:103",
+          "builtIn": 1,
+          "datasource": {
+            "type": "datasource",
+            "uid": "grafana"
+          },
+          "enable": true,
+          "hide": true,
+          "iconColor": "rgba(0, 211, 255, 1)",
+          "name": "Annotations & Alerts",
+          "type": "dashboard"
+        }
+      ]
+    },
+    "description": "Monitors Kubernetes cluster using Prometheus. Shows overall cluster CPU / Memory / Filesystem usage as well as individual pod, containers, systemd services statistics. Uses cAdvisor metrics only.",
+    "editable": true,
+    "fiscalYearStartMonth": 0,
+    "gnetId": 12740,
+    "graphTooltip": 0,
+    "id": 7,
+    "links": [],
+    "liveNow": false,
+    "panels": [
+      {
+        "collapsed": false,
+        "datasource": {
+          "type": "datasource",
+          "uid": "grafana"
+        },
+        "gridPos": {
+          "h": 1,
+          "w": 24,
+          "x": 0,
+          "y": 0
+        },
+        "id": 33,
+        "panels": [],
+        "targets": [
+          {
+            "datasource": {
+              "type": "datasource",
+              "uid": "grafana"
+            },
+            "refId": "A"
+          }
+        ],
+        "title": "Network I/O pressure",
+        "type": "row"
+      },
+      {
+        "aliasColors": {},
+        "bars": false,
+        "dashLength": 10,
+        "dashes": false,
+        "datasource": {
+          "type": "prometheus",
+          "uid": "af6b44aa-0703-4979-825c-c1afba946534"
+        },
+        "decimals": 2,
+        "editable": true,
+        "error": false,
+        "fieldConfig": {
+          "defaults": {
+            "links": []
+          },
+          "overrides": []
+        },
+        "fill": 1,
+        "fillGradient": 0,
+        "grid": {},
+        "gridPos": {
+          "h": 6,
+          "w": 24,
+          "x": 0,
+          "y": 1
+        },
+        "height": "200px",
+        "hiddenSeries": false,
+        "id": 32,
+        "legend": {
+          "alignAsTable": false,
+          "avg": true,
+          "current": true,
+          "max": false,
+          "min": false,
+          "rightSide": false,
+          "show": false,
+          "sideWidth": 200,
+          "sort": "current",
+          "sortDesc": true,
+          "total": false,
+          "values": true
+        },
+        "lines": true,
+        "linewidth": 2,
+        "links": [],
+        "nullPointMode": "connected",
+        "options": {
+          "alertThreshold": true
+        },
+        "percentage": false,
+        "pluginVersion": "10.0.2",
+        "pointradius": 5,
+        "points": false,
+        "renderer": "flot",
+        "seriesOverrides": [],
+        "spaceLength": 10,
+        "stack": false,
+        "steppedLine": false,
+        "targets": [
+          {
+            "datasource": {
+              "type": "prometheus",
+              "uid": "af6b44aa-0703-4979-825c-c1afba946534"
+            },
+            "expr": "sum (rate (container_network_receive_bytes_total{kubernetes_io_hostname=~\"^$Node$\"}[1m]))",
+            "interval": "10s",
+            "intervalFactor": 1,
+            "legendFormat": "Received",
+            "metric": "network",
+            "refId": "A",
+            "step": 10
+          },
+          {
+            "datasource": {
+              "type": "prometheus",
+              "uid": "af6b44aa-0703-4979-825c-c1afba946534"
+            },
+            "expr": "- sum (rate (container_network_transmit_bytes_total{kubernetes_io_hostname=~\"^$Node$\"}[1m]))",
+            "interval": "10s",
+            "intervalFactor": 1,
+            "legendFormat": "Sent",
+            "metric": "network",
+            "refId": "B",
+            "step": 10
+          }
+        ],
+        "thresholds": [],
+        "timeRegions": [],
+        "title": "Network I/O pressure",
+        "tooltip": {
+          "msResolution": false,
+          "shared": true,
+          "sort": 0,
+          "value_type": "cumulative"
+        },
+        "type": "graph",
+        "xaxis": {
+          "mode": "time",
+          "show": true,
+          "values": []
+        },
+        "yaxes": [
+          {
+            "format": "Bps",
+            "logBase": 1,
+            "show": true
+          },
+          {
+            "format": "Bps",
+            "logBase": 1,
+            "show": false
+          }
+        ],
+        "yaxis": {
+          "align": false
+        }
+      },
+      {
+        "collapsed": false,
+        "datasource": {
+          "type": "datasource",
+          "uid": "grafana"
+        },
+        "gridPos": {
+          "h": 1,
+          "w": 24,
+          "x": 0,
+          "y": 7
+        },
+        "id": 34,
+        "panels": [],
+        "targets": [
+          {
+            "datasource": {
+              "type": "datasource",
+              "uid": "grafana"
+            },
+            "refId": "A"
+          }
+        ],
+        "title": "Total usage",
+        "type": "row"
+      },
+      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "af6b44aa-0703-4979-825c-c1afba946534"
+        },
+        "fieldConfig": {
+          "defaults": {
+            "color": {
+              "mode": "thresholds"
+            },
+            "mappings": [
+              {
+                "options": {
+                  "match": "null",
+                  "result": {
+                    "text": "N/A"
+                  }
+                },
+                "type": "special"
+              }
+            ],
+            "max": 100,
+            "min": 0,
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "rgba(50, 172, 45, 0.97)",
+                  "value": null
+                },
+                {
+                  "color": "rgba(237, 129, 40, 0.89)",
+                  "value": 65
+                },
+                {
+                  "color": "rgba(245, 54, 54, 0.9)",
+                  "value": 90
+                }
+              ]
+            },
+            "unit": "percent"
+          },
+          "overrides": []
+        },
+        "gridPos": {
+          "h": 5,
+          "w": 8,
+          "x": 0,
+          "y": 8
+        },
+        "id": 4,
+        "links": [],
+        "maxDataPoints": 100,
+        "options": {
+          "orientation": "horizontal",
+          "reduceOptions": {
+            "calcs": [
+              "lastNotNull"
+            ],
+            "fields": "",
+            "values": false
+          },
+          "showThresholdLabels": false,
+          "showThresholdMarkers": true
+        },
+        "pluginVersion": "10.0.2",
+        "targets": [
+          {
+            "datasource": {
+              "type": "prometheus",
+              "uid": "af6b44aa-0703-4979-825c-c1afba946534"
+            },
+            "expr": "sum (container_memory_working_set_bytes{id=\"/\",kubernetes_io_hostname=~\"^$Node$\"}) / sum (machine_memory_bytes{kubernetes_io_hostname=~\"^$Node$\"}) * 100",
+            "interval": "10s",
+            "intervalFactor": 1,
+            "refId": "A",
+            "step": 10
+          }
+        ],
+        "title": "Cluster memory usage",
+        "type": "gauge"
+      },
+      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "af6b44aa-0703-4979-825c-c1afba946534"
+        },
+        "fieldConfig": {
+          "defaults": {
+            "color": {
+              "mode": "thresholds"
+            },
+            "decimals": 2,
+            "mappings": [
+              {
+                "options": {
+                  "match": "null",
+                  "result": {
+                    "text": "N/A"
+                  }
+                },
+                "type": "special"
+              }
+            ],
+            "max": 100,
+            "min": 0,
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "rgba(50, 172, 45, 0.97)",
+                  "value": null
+                },
+                {
+                  "color": "rgba(237, 129, 40, 0.89)",
+                  "value": 65
+                },
+                {
+                  "color": "rgba(245, 54, 54, 0.9)",
+                  "value": 90
+                }
+              ]
+            },
+            "unit": "percent"
+          },
+          "overrides": []
+        },
+        "gridPos": {
+          "h": 5,
+          "w": 8,
+          "x": 8,
+          "y": 8
+        },
+        "id": 6,
+        "links": [],
+        "maxDataPoints": 100,
+        "options": {
+          "orientation": "horizontal",
+          "reduceOptions": {
+            "calcs": [
+              "lastNotNull"
+            ],
+            "fields": "",
+            "values": false
+          },
+          "showThresholdLabels": false,
+          "showThresholdMarkers": true
+        },
+        "pluginVersion": "10.0.2",
+        "targets": [
+          {
+            "datasource": {
+              "type": "prometheus",
+              "uid": "af6b44aa-0703-4979-825c-c1afba946534"
+            },
+            "expr": "sum (rate (container_cpu_usage_seconds_total{id=\"/\",kubernetes_io_hostname=~\"^$Node$\"}[1m])) / sum (machine_cpu_cores{kubernetes_io_hostname=~\"^$Node$\"}) * 100",
+            "interval": "10s",
+            "intervalFactor": 1,
+            "refId": "A",
+            "step": 10
+          }
+        ],
+        "title": "Cluster CPU usage (1m avg)",
+        "type": "gauge"
+      },
+      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "af6b44aa-0703-4979-825c-c1afba946534"
+        },
+        "fieldConfig": {
+          "defaults": {
+            "color": {
+              "mode": "thresholds"
+            },
+            "decimals": 2,
+            "mappings": [
+              {
+                "options": {
+                  "match": "null",
+                  "result": {
+                    "text": "N/A"
+                  }
+                },
+                "type": "special"
+              }
+            ],
+            "max": 100,
+            "min": 0,
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "rgba(50, 172, 45, 0.97)",
+                  "value": null
+                },
+                {
+                  "color": "rgba(237, 129, 40, 0.89)",
+                  "value": 65
+                },
+                {
+                  "color": "rgba(245, 54, 54, 0.9)",
+                  "value": 90
+                }
+              ]
+            },
+            "unit": "percent"
+          },
+          "overrides": []
+        },
+        "gridPos": {
+          "h": 5,
+          "w": 8,
+          "x": 16,
+          "y": 8
+        },
+        "id": 7,
+        "links": [],
+        "maxDataPoints": 100,
+        "options": {
+          "orientation": "horizontal",
+          "reduceOptions": {
+            "calcs": [
+              "lastNotNull"
+            ],
+            "fields": "",
+            "values": false
+          },
+          "showThresholdLabels": false,
+          "showThresholdMarkers": true
+        },
+        "pluginVersion": "10.0.2",
+        "targets": [
+          {
+            "datasource": {
+              "type": "prometheus",
+              "uid": "af6b44aa-0703-4979-825c-c1afba946534"
+            },
+            "expr": "sum (container_fs_usage_bytes{device=~\"^/dev/[sv]d[a-z][1-9]$\",id=\"/\",kubernetes_io_hostname=~\"^$Node$\"}) / sum (container_fs_limit_bytes{device=~\"^/dev/[sv]d[a-z][1-9]$\",id=\"/\",kubernetes_io_hostname=~\"^$Node$\"}) * 100",
+            "interval": "10s",
+            "intervalFactor": 1,
+            "legendFormat": "",
+            "metric": "",
+            "refId": "A",
+            "step": 10
+          }
+        ],
+        "title": "Cluster filesystem usage",
+        "type": "gauge"
+      },
+      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "af6b44aa-0703-4979-825c-c1afba946534"
+        },
+        "fieldConfig": {
+          "defaults": {
+            "color": {
+              "mode": "thresholds"
+            },
+            "decimals": 2,
+            "mappings": [
+              {
+                "options": {
+                  "match": "null",
+                  "result": {
+                    "text": "N/A"
+                  }
+                },
+                "type": "special"
+              }
+            ],
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "green",
+                  "value": null
+                },
+                {
+                  "color": "red",
+                  "value": 80
+                }
+              ]
+            },
+            "unit": "bytes"
+          },
+          "overrides": []
+        },
+        "gridPos": {
+          "h": 3,
+          "w": 4,
+          "x": 0,
+          "y": 13
+        },
+        "id": 9,
+        "links": [],
+        "maxDataPoints": 100,
+        "options": {
+          "colorMode": "none",
+          "graphMode": "none",
+          "justifyMode": "auto",
+          "orientation": "horizontal",
+          "reduceOptions": {
+            "calcs": [
+              "lastNotNull"
+            ],
+            "fields": "",
+            "values": false
+          },
+          "textMode": "auto"
+        },
+        "pluginVersion": "10.0.2",
+        "targets": [
+          {
+            "datasource": {
+              "type": "prometheus",
+              "uid": "af6b44aa-0703-4979-825c-c1afba946534"
+            },
+            "expr": "sum (container_memory_working_set_bytes{id=\"/\",kubernetes_io_hostname=~\"^$Node$\"})",
+            "interval": "10s",
+            "intervalFactor": 1,
+            "refId": "A",
+            "step": 10
+          }
+        ],
+        "title": "Used",
+        "type": "stat"
+      },
+      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "af6b44aa-0703-4979-825c-c1afba946534"
+        },
+        "fieldConfig": {
+          "defaults": {
+            "color": {
+              "mode": "thresholds"
+            },
+            "decimals": 2,
+            "mappings": [
+              {
+                "options": {
+                  "match": "null",
+                  "result": {
+                    "text": "N/A"
+                  }
+                },
+                "type": "special"
+              }
+            ],
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "green",
+                  "value": null
+                },
+                {
+                  "color": "red",
+                  "value": 80
+                }
+              ]
+            },
+            "unit": "bytes"
+          },
+          "overrides": []
+        },
+        "gridPos": {
+          "h": 3,
+          "w": 4,
+          "x": 4,
+          "y": 13
+        },
+        "id": 10,
+        "links": [],
+        "maxDataPoints": 100,
+        "options": {
+          "colorMode": "none",
+          "graphMode": "none",
+          "justifyMode": "auto",
+          "orientation": "horizontal",
+          "reduceOptions": {
+            "calcs": [
+              "lastNotNull"
+            ],
+            "fields": "",
+            "values": false
+          },
+          "textMode": "auto"
+        },
+        "pluginVersion": "10.0.2",
+        "targets": [
+          {
+            "datasource": {
+              "type": "prometheus",
+              "uid": "af6b44aa-0703-4979-825c-c1afba946534"
+            },
+            "expr": "sum (machine_memory_bytes{kubernetes_io_hostname=~\"^$Node$\"})",
+            "interval": "10s",
+            "intervalFactor": 1,
+            "refId": "A",
+            "step": 10
+          }
+        ],
+        "title": "Total",
+        "type": "stat"
+      },
+      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "af6b44aa-0703-4979-825c-c1afba946534"
+        },
+        "fieldConfig": {
+          "defaults": {
+            "color": {
+              "mode": "thresholds"
+            },
+            "decimals": 2,
+            "mappings": [
+              {
+                "options": {
+                  "match": "null",
+                  "result": {
+                    "text": "N/A"
+                  }
+                },
+                "type": "special"
+              }
+            ],
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "green",
+                  "value": null
+                },
+                {
+                  "color": "red",
+                  "value": 80
+                }
+              ]
+            },
+            "unit": "none"
+          },
+          "overrides": []
+        },
+        "gridPos": {
+          "h": 3,
+          "w": 4,
+          "x": 8,
+          "y": 13
+        },
+        "id": 11,
+        "links": [],
+        "maxDataPoints": 100,
+        "options": {
+          "colorMode": "none",
+          "graphMode": "none",
+          "justifyMode": "auto",
+          "orientation": "horizontal",
+          "reduceOptions": {
+            "calcs": [
+              "lastNotNull"
+            ],
+            "fields": "",
+            "values": false
+          },
+          "textMode": "auto"
+        },
+        "pluginVersion": "10.0.2",
+        "targets": [
+          {
+            "datasource": {
+              "type": "prometheus",
+              "uid": "af6b44aa-0703-4979-825c-c1afba946534"
+            },
+            "expr": "sum (rate (container_cpu_usage_seconds_total{id=\"/\",kubernetes_io_hostname=~\"^$Node$\"}[1m]))",
+            "interval": "10s",
+            "intervalFactor": 1,
+            "refId": "A",
+            "step": 10
+          }
+        ],
+        "title": "Used",
+        "type": "stat"
+      },
+      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "af6b44aa-0703-4979-825c-c1afba946534"
+        },
+        "fieldConfig": {
+          "defaults": {
+            "color": {
+              "mode": "thresholds"
+            },
+            "decimals": 2,
+            "mappings": [
+              {
+                "options": {
+                  "match": "null",
+                  "result": {
+                    "text": "N/A"
+                  }
+                },
+                "type": "special"
+              }
+            ],
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "green",
+                  "value": null
+                },
+                {
+                  "color": "red",
+                  "value": 80
+                }
+              ]
+            },
+            "unit": "none"
+          },
+          "overrides": []
+        },
+        "gridPos": {
+          "h": 3,
+          "w": 4,
+          "x": 12,
+          "y": 13
+        },
+        "id": 12,
+        "links": [],
+        "maxDataPoints": 100,
+        "options": {
+          "colorMode": "none",
+          "graphMode": "none",
+          "justifyMode": "auto",
+          "orientation": "horizontal",
+          "reduceOptions": {
+            "calcs": [
+              "lastNotNull"
+            ],
+            "fields": "",
+            "values": false
+          },
+          "textMode": "auto"
+        },
+        "pluginVersion": "10.0.2",
+        "targets": [
+          {
+            "datasource": {
+              "type": "prometheus",
+              "uid": "af6b44aa-0703-4979-825c-c1afba946534"
+            },
+            "expr": "sum (machine_cpu_cores{kubernetes_io_hostname=~\"^$Node$\"})",
+            "interval": "10s",
+            "intervalFactor": 1,
+            "refId": "A",
+            "step": 10
+          }
+        ],
+        "title": "Total",
+        "type": "stat"
+      },
+      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "af6b44aa-0703-4979-825c-c1afba946534"
+        },
+        "fieldConfig": {
+          "defaults": {
+            "color": {
+              "mode": "thresholds"
+            },
+            "decimals": 2,
+            "mappings": [
+              {
+                "options": {
+                  "match": "null",
+                  "result": {
+                    "text": "N/A"
+                  }
+                },
+                "type": "special"
+              }
+            ],
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "green",
+                  "value": null
+                },
+                {
+                  "color": "red",
+                  "value": 80
+                }
+              ]
+            },
+            "unit": "bytes"
+          },
+          "overrides": []
+        },
+        "gridPos": {
+          "h": 3,
+          "w": 4,
+          "x": 16,
+          "y": 13
+        },
+        "id": 13,
+        "links": [],
+        "maxDataPoints": 100,
+        "options": {
+          "colorMode": "none",
+          "graphMode": "none",
+          "justifyMode": "auto",
+          "orientation": "horizontal",
+          "reduceOptions": {
+            "calcs": [
+              "lastNotNull"
+            ],
+            "fields": "",
+            "values": false
+          },
+          "textMode": "auto"
+        },
+        "pluginVersion": "10.0.2",
+        "targets": [
+          {
+            "datasource": {
+              "type": "prometheus",
+              "uid": "af6b44aa-0703-4979-825c-c1afba946534"
+            },
+            "expr": "sum (container_fs_usage_bytes{device=~\"^/dev/[sv]d[a-z][1-9]$\",id=\"/\",kubernetes_io_hostname=~\"^$Node$\"})",
+            "interval": "10s",
+            "intervalFactor": 1,
+            "refId": "A",
+            "step": 10
+          }
+        ],
+        "title": "Used",
+        "type": "stat"
+      },
+      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "af6b44aa-0703-4979-825c-c1afba946534"
+        },
+        "fieldConfig": {
+          "defaults": {
+            "color": {
+              "mode": "thresholds"
+            },
+            "decimals": 2,
+            "mappings": [
+              {
+                "options": {
+                  "match": "null",
+                  "result": {
+                    "text": "N/A"
+                  }
+                },
+                "type": "special"
+              }
+            ],
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "green",
+                  "value": null
+                },
+                {
+                  "color": "red",
+                  "value": 80
+                }
+              ]
+            },
+            "unit": "bytes"
+          },
+          "overrides": []
+        },
+        "gridPos": {
+          "h": 3,
+          "w": 4,
+          "x": 20,
+          "y": 13
+        },
+        "id": 14,
+        "links": [],
+        "maxDataPoints": 100,
+        "options": {
+          "colorMode": "none",
+          "graphMode": "none",
+          "justifyMode": "auto",
+          "orientation": "horizontal",
+          "reduceOptions": {
+            "calcs": [
+              "lastNotNull"
+            ],
+            "fields": "",
+            "values": false
+          },
+          "textMode": "auto"
+        },
+        "pluginVersion": "10.0.2",
+        "targets": [
+          {
+            "datasource": {
+              "type": "prometheus",
+              "uid": "af6b44aa-0703-4979-825c-c1afba946534"
+            },
+            "expr": "sum (container_fs_limit_bytes{device=~\"^/dev/[sv]d[a-z][1-9]$\",id=\"/\",kubernetes_io_hostname=~\"^$Node$\"})",
+            "interval": "10s",
+            "intervalFactor": 1,
+            "refId": "A",
+            "step": 10
+          }
+        ],
+        "title": "Total",
+        "type": "stat"
+      },
+      {
+        "collapsed": false,
+        "datasource": {
+          "type": "datasource",
+          "uid": "grafana"
+        },
+        "gridPos": {
+          "h": 1,
+          "w": 24,
+          "x": 0,
+          "y": 16
+        },
+        "id": 35,
+        "panels": [],
+        "targets": [
+          {
+            "datasource": {
+              "type": "datasource",
+              "uid": "grafana"
+            },
+            "refId": "A"
+          }
+        ],
+        "title": "Pods CPU usage",
+        "type": "row"
+      },
+      {
+        "aliasColors": {},
+        "bars": false,
+        "dashLength": 10,
+        "dashes": false,
+        "datasource": {
+          "type": "prometheus",
+          "uid": "af6b44aa-0703-4979-825c-c1afba946534"
+        },
+        "decimals": 3,
+        "editable": true,
+        "error": false,
+        "fieldConfig": {
+          "defaults": {
+            "links": []
+          },
+          "overrides": []
+        },
+        "fill": 0,
+        "fillGradient": 0,
+        "grid": {},
+        "gridPos": {
+          "h": 7,
+          "w": 24,
+          "x": 0,
+          "y": 17
+        },
+        "height": "",
+        "hiddenSeries": false,
+        "id": 17,
+        "legend": {
+          "alignAsTable": true,
+          "avg": true,
+          "current": true,
+          "max": false,
+          "min": false,
+          "rightSide": true,
+          "show": true,
+          "sort": "current",
+          "sortDesc": true,
+          "total": false,
+          "values": true
+        },
+        "lines": true,
+        "linewidth": 2,
+        "links": [],
+        "nullPointMode": "connected",
+        "options": {
+          "alertThreshold": true
+        },
+        "percentage": false,
+        "pluginVersion": "10.0.2",
+        "pointradius": 5,
+        "points": false,
+        "renderer": "flot",
+        "seriesOverrides": [],
+        "spaceLength": 10,
+        "stack": false,
+        "steppedLine": false,
+        "targets": [
+          {
+            "datasource": {
+              "type": "prometheus",
+              "uid": "af6b44aa-0703-4979-825c-c1afba946534"
+            },
+            "editorMode": "code",
+            "expr": "sum (rate (container_cpu_usage_seconds_total{image!=\"\",kubernetes_io_hostname=~\"^$Node$\",namespace=~\"^$namespace$\"}[1m])) by (pod)",
+            "interval": "10s",
+            "intervalFactor": 1,
+            "legendFormat": "{{ pod }}",
+            "metric": "container_cpu",
+            "range": true,
+            "refId": "A",
+            "step": 10
+          }
+        ],
+        "thresholds": [],
+        "timeRegions": [],
+        "title": "Pods CPU usage (1m avg)",
+        "tooltip": {
+          "msResolution": true,
+          "shared": true,
+          "sort": 2,
+          "value_type": "cumulative"
+        },
+        "type": "graph",
+        "xaxis": {
+          "mode": "time",
+          "show": true,
+          "values": []
+        },
+        "yaxes": [
+          {
+            "$$hashKey": "object:112",
+            "format": "none",
+            "label": "cores",
+            "logBase": 1,
+            "show": true
+          },
+          {
+            "$$hashKey": "object:113",
+            "format": "short",
+            "logBase": 1,
+            "show": false
+          }
+        ],
+        "yaxis": {
+          "align": false
+        }
+      },
+      {
+        "collapsed": false,
+        "datasource": {
+          "type": "datasource",
+          "uid": "grafana"
+        },
+        "gridPos": {
+          "h": 1,
+          "w": 24,
+          "x": 0,
+          "y": 24
+        },
+        "id": 39,
+        "panels": [],
+        "targets": [
+          {
+            "datasource": {
+              "type": "datasource",
+              "uid": "grafana"
+            },
+            "refId": "A"
+          }
+        ],
+        "title": "Pods memory usage",
+        "type": "row"
+      },
+      {
+        "aliasColors": {},
+        "bars": false,
+        "dashLength": 10,
+        "dashes": false,
+        "datasource": {
+          "type": "prometheus",
+          "uid": "af6b44aa-0703-4979-825c-c1afba946534"
+        },
+        "decimals": 2,
+        "editable": true,
+        "error": false,
+        "fieldConfig": {
+          "defaults": {
+            "links": []
+          },
+          "overrides": []
+        },
+        "fill": 0,
+        "fillGradient": 0,
+        "grid": {},
+        "gridPos": {
+          "h": 7,
+          "w": 24,
+          "x": 0,
+          "y": 25
+        },
+        "hiddenSeries": false,
+        "id": 25,
+        "legend": {
+          "alignAsTable": true,
+          "avg": true,
+          "current": true,
+          "max": false,
+          "min": false,
+          "rightSide": true,
+          "show": true,
+          "sideWidth": 200,
+          "sort": "current",
+          "sortDesc": true,
+          "total": false,
+          "values": true
+        },
+        "lines": true,
+        "linewidth": 2,
+        "links": [],
+        "nullPointMode": "connected",
+        "options": {
+          "alertThreshold": true
+        },
+        "percentage": false,
+        "pluginVersion": "10.0.2",
+        "pointradius": 5,
+        "points": false,
+        "renderer": "flot",
+        "seriesOverrides": [],
+        "spaceLength": 10,
+        "stack": false,
+        "steppedLine": false,
+        "targets": [
+          {
+            "datasource": {
+              "type": "prometheus",
+              "uid": "af6b44aa-0703-4979-825c-c1afba946534"
+            },
+            "editorMode": "code",
+            "expr": "sum (container_memory_working_set_bytes{image!=\"\",kubernetes_io_hostname=~\"^$Node$\",namespace=~\"^$namespace$\"}) by (pod)",
+            "interval": "10s",
+            "intervalFactor": 1,
+            "legendFormat": "{{ pod }}",
+            "metric": "container_memory_usage:sort_desc",
+            "range": true,
+            "refId": "A",
+            "step": 10
+          }
+        ],
+        "thresholds": [],
+        "timeRegions": [],
+        "title": "Pods memory usage",
+        "tooltip": {
+          "msResolution": false,
+          "shared": true,
+          "sort": 2,
+          "value_type": "cumulative"
+        },
+        "type": "graph",
+        "xaxis": {
+          "mode": "time",
+          "show": true,
+          "values": []
+        },
+        "yaxes": [
+          {
+            "$$hashKey": "object:181",
+            "format": "bytes",
+            "logBase": 1,
+            "show": true
+          },
+          {
+            "$$hashKey": "object:182",
+            "format": "short",
+            "logBase": 1,
+            "show": false
+          }
+        ],
+        "yaxis": {
+          "align": false
+        }
+      },
+      {
+        "collapsed": false,
+        "datasource": {
+          "type": "datasource",
+          "uid": "grafana"
+        },
+        "gridPos": {
+          "h": 1,
+          "w": 24,
+          "x": 0,
+          "y": 32
+        },
+        "id": 43,
+        "panels": [],
+        "targets": [
+          {
+            "datasource": {
+              "type": "datasource",
+              "uid": "grafana"
+            },
+            "refId": "A"
+          }
+        ],
+        "title": "Pods network I/O",
+        "type": "row"
+      },
+      {
+        "aliasColors": {},
+        "bars": false,
+        "dashLength": 10,
+        "dashes": false,
+        "datasource": {
+          "type": "prometheus",
+          "uid": "af6b44aa-0703-4979-825c-c1afba946534"
+        },
+        "decimals": 2,
+        "editable": true,
+        "error": false,
+        "fieldConfig": {
+          "defaults": {
+            "links": []
+          },
+          "overrides": []
+        },
+        "fill": 1,
+        "fillGradient": 0,
+        "grid": {},
+        "gridPos": {
+          "h": 7,
+          "w": 24,
+          "x": 0,
+          "y": 33
+        },
+        "hiddenSeries": false,
+        "id": 16,
+        "legend": {
+          "alignAsTable": true,
+          "avg": true,
+          "current": true,
+          "max": false,
+          "min": false,
+          "rightSide": true,
+          "show": true,
+          "sideWidth": 200,
+          "sort": "current",
+          "sortDesc": true,
+          "total": false,
+          "values": true
+        },
+        "lines": true,
+        "linewidth": 2,
+        "links": [],
+        "nullPointMode": "connected",
+        "options": {
+          "alertThreshold": true
+        },
+        "percentage": false,
+        "pluginVersion": "10.0.2",
+        "pointradius": 5,
+        "points": false,
+        "renderer": "flot",
+        "seriesOverrides": [],
+        "spaceLength": 10,
+        "stack": false,
+        "steppedLine": false,
+        "targets": [
+          {
+            "datasource": {
+              "type": "prometheus",
+              "uid": "af6b44aa-0703-4979-825c-c1afba946534"
+            },
+            "editorMode": "code",
+            "expr": "sum (rate (container_network_receive_bytes_total{image!=\"\",kubernetes_io_hostname=~\"^$Node$\",namespace=~\"^$namespace$\"}[1m])) by (pod)",
+            "interval": "10s",
+            "intervalFactor": 1,
+            "legendFormat": "-> {{ pod }}",
+            "metric": "network",
+            "range": true,
+            "refId": "A",
+            "step": 10
+          },
+          {
+            "datasource": {
+              "type": "prometheus",
+              "uid": "af6b44aa-0703-4979-825c-c1afba946534"
+            },
+            "expr": "- sum (rate (container_network_transmit_bytes_total{image!=\"\",name=~\"^k8s_.*\",kubernetes_io_hostname=~\"^$Node$\",namespace=~\"^$namespace$\"}[1m])) by (pod)",
+            "hide": true,
+            "interval": "10s",
+            "intervalFactor": 1,
+            "legendFormat": "<- {{ pod }}",
+            "metric": "network",
+            "refId": "B",
+            "step": 10
+          }
+        ],
+        "thresholds": [],
+        "timeRegions": [],
+        "title": "Pods network I/O (1m avg)",
+        "tooltip": {
+          "msResolution": false,
+          "shared": true,
+          "sort": 2,
+          "value_type": "cumulative"
+        },
+        "type": "graph",
+        "xaxis": {
+          "mode": "time",
+          "show": true,
+          "values": []
+        },
+        "yaxes": [
+          {
+            "format": "Bps",
+            "logBase": 1,
+            "show": true
+          },
+          {
+            "format": "short",
+            "logBase": 1,
+            "show": false
+          }
+        ],
+        "yaxis": {
+          "align": false
+        }
+      },
+      {
+        "collapsed": true,
+        "datasource": {
+          "type": "datasource",
+          "uid": "grafana"
+        },
+        "gridPos": {
+          "h": 1,
+          "w": 24,
+          "x": 0,
+          "y": 40
+        },
+        "id": 37,
+        "panels": [
+          {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": {
+              "type": "prometheus",
+              "uid": "af6b44aa-0703-4979-825c-c1afba946534"
+            },
+            "decimals": 3,
+            "editable": true,
+            "error": false,
+            "fieldConfig": {
+              "defaults": {
+                "links": []
+              },
+              "overrides": []
+            },
+            "fill": 0,
+            "fillGradient": 0,
+            "grid": {},
+            "gridPos": {
+              "h": 7,
+              "w": 24,
+              "x": 0,
+              "y": 41
+            },
+            "height": "",
+            "hiddenSeries": false,
+            "id": 24,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "hideEmpty": false,
+              "hideZero": false,
+              "max": false,
+              "min": false,
+              "rightSide": true,
+              "show": true,
+              "sort": "current",
+              "sortDesc": true,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 2,
+            "links": [],
+            "nullPointMode": "connected",
+            "options": {
+              "alertThreshold": true
+            },
+            "percentage": false,
+            "pluginVersion": "10.0.2",
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "datasource": {
+                  "type": "prometheus",
+                  "uid": "af6b44aa-0703-4979-825c-c1afba946534"
+                },
+                "expr": "sum (rate (container_cpu_usage_seconds_total{image!=\"\",name=~\"^k8s_.*\",container!=\"POD\",kubernetes_io_hostname=~\"^$Node$\",namespace=~\"^$namespace$\"}[1m])) by (container, pod)",
+                "hide": false,
+                "interval": "10s",
+                "intervalFactor": 1,
+                "legendFormat": "pod: {{ pod }}| {{ container }}",
+                "metric": "container_cpu",
+                "refId": "A",
+                "step": 10
+              },
+              {
+                "datasource": {
+                  "type": "prometheus",
+                  "uid": "af6b44aa-0703-4979-825c-c1afba946534"
+                },
+                "expr": "sum (rate (container_cpu_usage_seconds_total{image!=\"\",name!~\"^k8s_.*\",kubernetes_io_hostname=~\"^$Node$\",namespace=~\"^$namespace$\"}[1m])) by (kubernetes_io_hostname, name, image)",
+                "hide": false,
+                "interval": "10s",
+                "intervalFactor": 1,
+                "legendFormat": "docker: {{ kubernetes_io_hostname }} | {{ image }} ({{ name }})",
+                "metric": "container_cpu",
+                "refId": "B",
+                "step": 10
+              },
+              {
+                "datasource": {
+                  "type": "prometheus",
+                  "uid": "af6b44aa-0703-4979-825c-c1afba946534"
+                },
+                "expr": "sum (rate (container_cpu_usage_seconds_total{rkt_container_name!=\"\",kubernetes_io_hostname=~\"^$Node$\",namespace=~\"^$namespace$\"}[1m])) by (kubernetes_io_hostname, rkt_container_name)",
+                "interval": "10s",
+                "intervalFactor": 1,
+                "legendFormat": "rkt: {{ kubernetes_io_hostname }} | {{ rkt_container_name }}",
+                "metric": "container_cpu",
+                "refId": "C",
+                "step": 10
+              }
+            ],
+            "thresholds": [],
+            "timeRegions": [],
+            "title": "Containers CPU usage (1m avg)",
+            "tooltip": {
+              "msResolution": true,
+              "shared": true,
+              "sort": 2,
+              "value_type": "cumulative"
+            },
+            "type": "graph",
+            "xaxis": {
+              "mode": "time",
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "$$hashKey": "object:337",
+                "format": "none",
+                "label": "cores",
+                "logBase": 1,
+                "show": true
+              },
+              {
+                "$$hashKey": "object:338",
+                "format": "short",
+                "logBase": 1,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false
+            }
+          }
+        ],
+        "targets": [
+          {
+            "datasource": {
+              "type": "datasource",
+              "uid": "grafana"
+            },
+            "refId": "A"
+          }
+        ],
+        "title": "Containers CPU usage",
+        "type": "row"
+      },
+      {
+        "collapsed": true,
+        "datasource": {
+          "type": "datasource",
+          "uid": "grafana"
+        },
+        "gridPos": {
+          "h": 1,
+          "w": 24,
+          "x": 0,
+          "y": 41
+        },
+        "id": 41,
+        "panels": [
+          {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": {
+              "type": "prometheus",
+              "uid": "af6b44aa-0703-4979-825c-c1afba946534"
+            },
+            "decimals": 2,
+            "editable": true,
+            "error": false,
+            "fieldConfig": {
+              "defaults": {
+                "links": []
+              },
+              "overrides": []
+            },
+            "fill": 0,
+            "fillGradient": 0,
+            "grid": {},
+            "gridPos": {
+              "h": 7,
+              "w": 24,
+              "x": 0,
+              "y": 42
+            },
+            "hiddenSeries": false,
+            "id": 27,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "max": false,
+              "min": false,
+              "rightSide": true,
+              "show": true,
+              "sideWidth": 200,
+              "sort": "current",
+              "sortDesc": true,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 2,
+            "links": [],
+            "nullPointMode": "connected",
+            "options": {
+              "alertThreshold": true
+            },
+            "percentage": false,
+            "pluginVersion": "10.0.2",
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "datasource": {
+                  "type": "prometheus",
+                  "uid": "af6b44aa-0703-4979-825c-c1afba946534"
+                },
+                "expr": "sum (container_memory_working_set_bytes{image!=\"\",name=~\"^k8s_.*\",container!=\"POD\",kubernetes_io_hostname=~\"^$Node$\",namespace=~\"^$namespace$\"}) by (container, pod)",
+                "interval": "10s",
+                "intervalFactor": 1,
+                "legendFormat": "pod: {{ pod }} | {{ container }}",
+                "metric": "container_memory_usage:sort_desc",
+                "refId": "A",
+                "step": 10
+              },
+              {
+                "datasource": {
+                  "type": "prometheus",
+                  "uid": "af6b44aa-0703-4979-825c-c1afba946534"
+                },
+                "expr": "sum (container_memory_working_set_bytes{image!=\"\",name!~\"^k8s_.*\",kubernetes_io_hostname=~\"^$Node$\",namespace=~\"^$namespace$\"}) by (kubernetes_io_hostname, name, image)",
+                "interval": "10s",
+                "intervalFactor": 1,
+                "legendFormat": "docker: {{ kubernetes_io_hostname }} | {{ image }} ({{ name }})",
+                "metric": "container_memory_usage:sort_desc",
+                "refId": "B",
+                "step": 10
+              },
+              {
+                "datasource": {
+                  "type": "prometheus",
+                  "uid": "af6b44aa-0703-4979-825c-c1afba946534"
+                },
+                "expr": "sum (container_memory_working_set_bytes{rkt_container_name!=\"\",kubernetes_io_hostname=~\"^$Node$\",namespace=~\"^$namespace$\"}) by (kubernetes_io_hostname, rkt_container_name)",
+                "interval": "10s",
+                "intervalFactor": 1,
+                "legendFormat": "rkt: {{ kubernetes_io_hostname }} | {{ rkt_container_name }}",
+                "metric": "container_memory_usage:sort_desc",
+                "refId": "C",
+                "step": 10
+              }
+            ],
+            "thresholds": [],
+            "timeRegions": [],
+            "title": "Containers memory usage",
+            "tooltip": {
+              "msResolution": false,
+              "shared": true,
+              "sort": 2,
+              "value_type": "cumulative"
+            },
+            "type": "graph",
+            "xaxis": {
+              "mode": "time",
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "$$hashKey": "object:406",
+                "format": "bytes",
+                "logBase": 1,
+                "show": true
+              },
+              {
+                "$$hashKey": "object:407",
+                "format": "short",
+                "logBase": 1,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false
+            }
+          }
+        ],
+        "targets": [
+          {
+            "datasource": {
+              "type": "datasource",
+              "uid": "grafana"
+            },
+            "refId": "A"
+          }
+        ],
+        "title": "Containers memory usage",
+        "type": "row"
+      },
+      {
+        "collapsed": true,
+        "datasource": {
+          "type": "datasource",
+          "uid": "grafana"
+        },
+        "gridPos": {
+          "h": 1,
+          "w": 24,
+          "x": 0,
+          "y": 42
+        },
+        "id": 44,
+        "panels": [
+          {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": {
+              "type": "prometheus",
+              "uid": "af6b44aa-0703-4979-825c-c1afba946534"
+            },
+            "decimals": 2,
+            "editable": true,
+            "error": false,
+            "fieldConfig": {
+              "defaults": {
+                "links": []
+              },
+              "overrides": []
+            },
+            "fill": 1,
+            "fillGradient": 0,
+            "grid": {},
+            "gridPos": {
+              "h": 7,
+              "w": 24,
+              "x": 0,
+              "y": 43
+            },
+            "hiddenSeries": false,
+            "id": 30,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "max": false,
+              "min": false,
+              "rightSide": true,
+              "show": true,
+              "sideWidth": 200,
+              "sort": "current",
+              "sortDesc": true,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 2,
+            "links": [],
+            "nullPointMode": "connected",
+            "options": {
+              "alertThreshold": true
+            },
+            "percentage": false,
+            "pluginVersion": "10.0.2",
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "datasource": {
+                  "type": "prometheus",
+                  "uid": "af6b44aa-0703-4979-825c-c1afba946534"
+                },
+                "expr": "sum (rate (container_network_receive_bytes_total{image!=\"\",name=~\"^k8s_.*\",kubernetes_io_hostname=~\"^$Node$\",namespace=~\"^$namespace$\"}[1m])) by (container, pod)",
+                "hide": false,
+                "interval": "10s",
+                "intervalFactor": 1,
+                "legendFormat": "-> pod: {{ pod }} | {{ container }}",
+                "metric": "network",
+                "refId": "B",
+                "step": 10
+              },
+              {
+                "datasource": {
+                  "type": "prometheus",
+                  "uid": "af6b44aa-0703-4979-825c-c1afba946534"
+                },
+                "expr": "- sum (rate (container_network_transmit_bytes_total{image!=\"\",name=~\"^k8s_.*\",kubernetes_io_hostname=~\"^$Node$\",namespace=~\"^$namespace$\"}[1m])) by (container, pod)",
+                "hide": false,
+                "interval": "10s",
+                "intervalFactor": 1,
+                "legendFormat": "<- pod: {{ pod }} | {{ container }}",
+                "metric": "network",
+                "refId": "D",
+                "step": 10
+              },
+              {
+                "datasource": {
+                  "type": "prometheus",
+                  "uid": "af6b44aa-0703-4979-825c-c1afba946534"
+                },
+                "expr": "sum (rate (container_network_receive_bytes_total{image!=\"\",name!~\"^k8s_.*\",kubernetes_io_hostname=~\"^$Node$\",namespace=~\"^$namespace$\"}[1m])) by (kubernetes_io_hostname, name, image)",
+                "hide": false,
+                "interval": "10s",
+                "intervalFactor": 1,
+                "legendFormat": "-> docker: {{ kubernetes_io_hostname }} | {{ image }} ({{ name }})",
+                "metric": "network",
+                "refId": "A",
+                "step": 10
+              },
+              {
+                "datasource": {
+                  "type": "prometheus",
+                  "uid": "af6b44aa-0703-4979-825c-c1afba946534"
+                },
+                "expr": "- sum (rate (container_network_transmit_bytes_total{image!=\"\",name!~\"^k8s_.*\",kubernetes_io_hostname=~\"^$Node$\",namespace=~\"^$namespace$\"}[1m])) by (kubernetes_io_hostname, name, image)",
+                "hide": false,
+                "interval": "10s",
+                "intervalFactor": 1,
+                "legendFormat": "<- docker: {{ kubernetes_io_hostname }} | {{ image }} ({{ name }})",
+                "metric": "network",
+                "refId": "C",
+                "step": 10
+              },
+              {
+                "datasource": {
+                  "type": "prometheus",
+                  "uid": "af6b44aa-0703-4979-825c-c1afba946534"
+                },
+                "expr": "sum (rate (container_network_transmit_bytes_total{rkt_container_name!=\"\",kubernetes_io_hostname=~\"^$Node$\",namespace=~\"^$namespace$\"}[1m])) by (kubernetes_io_hostname, rkt_container_name)",
+                "hide": false,
+                "interval": "10s",
+                "intervalFactor": 1,
+                "legendFormat": "-> rkt: {{ kubernetes_io_hostname }} | {{ rkt_container_name }}",
+                "metric": "network",
+                "refId": "E",
+                "step": 10
+              },
+              {
+                "datasource": {
+                  "type": "prometheus",
+                  "uid": "af6b44aa-0703-4979-825c-c1afba946534"
+                },
+                "expr": "- sum (rate (container_network_transmit_bytes_total{rkt_container_name!=\"\",kubernetes_io_hostname=~\"^$Node$\",namespace=~\"^$namespace$\"}[1m])) by (kubernetes_io_hostname, rkt_container_name)",
+                "hide": false,
+                "interval": "10s",
+                "intervalFactor": 1,
+                "legendFormat": "<- rkt: {{ kubernetes_io_hostname }} | {{ rkt_container_name }}",
+                "metric": "network",
+                "refId": "F",
+                "step": 10
+              }
+            ],
+            "thresholds": [],
+            "timeRegions": [],
+            "title": "Containers network I/O (1m avg)",
+            "tooltip": {
+              "msResolution": false,
+              "shared": true,
+              "sort": 2,
+              "value_type": "cumulative"
+            },
+            "type": "graph",
+            "xaxis": {
+              "mode": "time",
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "Bps",
+                "logBase": 1,
+                "show": true
+              },
+              {
+                "format": "short",
+                "logBase": 1,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false
+            }
+          }
+        ],
+        "targets": [
+          {
+            "datasource": {
+              "type": "datasource",
+              "uid": "grafana"
+            },
+            "refId": "A"
+          }
+        ],
+        "title": "Containers network I/O",
+        "type": "row"
+      },
+      {
+        "collapsed": false,
+        "datasource": {
+          "type": "datasource",
+          "uid": "grafana"
+        },
+        "gridPos": {
+          "h": 1,
+          "w": 24,
+          "x": 0,
+          "y": 43
+        },
+        "id": 36,
+        "panels": [],
+        "targets": [
+          {
+            "datasource": {
+              "type": "datasource",
+              "uid": "grafana"
+            },
+            "refId": "A"
+          }
+        ],
+        "title": "System services CPU usage",
+        "type": "row"
+      },
+      {
+        "aliasColors": {},
+        "bars": false,
+        "dashLength": 10,
+        "dashes": false,
+        "datasource": {
+          "type": "prometheus",
+          "uid": "af6b44aa-0703-4979-825c-c1afba946534"
+        },
+        "decimals": 3,
+        "editable": true,
+        "error": false,
+        "fieldConfig": {
+          "defaults": {
+            "links": []
+          },
+          "overrides": []
+        },
+        "fill": 0,
+        "fillGradient": 0,
+        "grid": {},
+        "gridPos": {
+          "h": 7,
+          "w": 24,
+          "x": 0,
+          "y": 44
+        },
+        "height": "",
+        "hiddenSeries": false,
+        "id": 23,
+        "legend": {
+          "alignAsTable": true,
+          "avg": true,
+          "current": true,
+          "max": false,
+          "min": false,
+          "rightSide": true,
+          "show": true,
+          "sort": "current",
+          "sortDesc": true,
+          "total": false,
+          "values": true
+        },
+        "lines": true,
+        "linewidth": 2,
+        "links": [],
+        "nullPointMode": "connected",
+        "options": {
+          "alertThreshold": true
+        },
+        "percentage": false,
+        "pluginVersion": "10.0.2",
+        "pointradius": 5,
+        "points": false,
+        "renderer": "flot",
+        "seriesOverrides": [],
+        "spaceLength": 10,
+        "stack": false,
+        "steppedLine": true,
+        "targets": [
+          {
+            "datasource": {
+              "type": "prometheus",
+              "uid": "af6b44aa-0703-4979-825c-c1afba946534"
+            },
+            "editorMode": "code",
+            "expr": "sum (rate (container_cpu_usage_seconds_total{systemd_service_name!=\"\",kubernetes_io_hostname=~\"^$Node$\"}[1m])) by (systemd_service_name)",
+            "hide": false,
+            "interval": "10s",
+            "intervalFactor": 1,
+            "legendFormat": "{{ systemd_service_name }}",
+            "metric": "container_cpu",
+            "range": true,
+            "refId": "A",
+            "step": 10
+          }
+        ],
+        "thresholds": [],
+        "timeRegions": [],
+        "title": "System services CPU usage (1m avg)",
+        "tooltip": {
+          "msResolution": true,
+          "shared": true,
+          "sort": 2,
+          "value_type": "cumulative"
+        },
+        "type": "graph",
+        "xaxis": {
+          "mode": "time",
+          "show": true,
+          "values": []
+        },
+        "yaxes": [
+          {
+            "format": "none",
+            "label": "cores",
+            "logBase": 1,
+            "show": true
+          },
+          {
+            "format": "short",
+            "logBase": 1,
+            "show": false
+          }
+        ],
+        "yaxis": {
+          "align": false
+        }
+      },
+      {
+        "collapsed": true,
+        "datasource": {
+          "type": "datasource",
+          "uid": "grafana"
+        },
+        "gridPos": {
+          "h": 1,
+          "w": 24,
+          "x": 0,
+          "y": 51
+        },
+        "id": 40,
+        "panels": [
+          {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": {
+              "type": "prometheus",
+              "uid": "af6b44aa-0703-4979-825c-c1afba946534"
+            },
+            "decimals": 2,
+            "editable": true,
+            "error": false,
+            "fill": 0,
+            "fillGradient": 0,
+            "grid": {},
+            "gridPos": {
+              "h": 7,
+              "w": 24,
+              "x": 0,
+              "y": 29
+            },
+            "hiddenSeries": false,
+            "id": 26,
+            "isNew": true,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "max": false,
+              "min": false,
+              "rightSide": true,
+              "show": true,
+              "sideWidth": 200,
+              "sort": "current",
+              "sortDesc": true,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 2,
+            "links": [],
+            "nullPointMode": "connected",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": true,
+            "targets": [
+              {
+                "datasource": {
+                  "type": "prometheus",
+                  "uid": "af6b44aa-0703-4979-825c-c1afba946534"
+                },
+                "expr": "sum (container_memory_working_set_bytes{systemd_service_name!=\"\",kubernetes_io_hostname=~\"^$Node$\"}) by (systemd_service_name)",
+                "interval": "10s",
+                "intervalFactor": 1,
+                "legendFormat": "{{ systemd_service_name }}",
+                "metric": "container_memory_usage:sort_desc",
+                "refId": "A",
+                "step": 10
+              }
+            ],
+            "thresholds": [],
+            "timeRegions": [],
+            "title": "System services memory usage",
+            "tooltip": {
+              "msResolution": false,
+              "shared": true,
+              "sort": 2,
+              "value_type": "cumulative"
+            },
+            "type": "graph",
+            "xaxis": {
+              "mode": "time",
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "bytes",
+                "logBase": 1,
+                "show": true
+              },
+              {
+                "format": "short",
+                "logBase": 1,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false
+            }
+          }
+        ],
+        "targets": [
+          {
+            "datasource": {
+              "type": "datasource",
+              "uid": "grafana"
+            },
+            "refId": "A"
+          }
+        ],
+        "title": "System services memory usage",
+        "type": "row"
+      },
+      {
+        "collapsed": true,
+        "datasource": {
+          "type": "datasource",
+          "uid": "grafana"
+        },
+        "gridPos": {
+          "h": 1,
+          "w": 24,
+          "x": 0,
+          "y": 52
+        },
+        "id": 38,
+        "panels": [
+          {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": {
+              "type": "prometheus",
+              "uid": "af6b44aa-0703-4979-825c-c1afba946534"
+            },
+            "decimals": 3,
+            "editable": true,
+            "error": false,
+            "fieldConfig": {
+              "defaults": {
+                "links": []
+              },
+              "overrides": []
+            },
+            "fill": 0,
+            "fillGradient": 0,
+            "grid": {},
+            "gridPos": {
+              "h": 14,
+              "w": 24,
+              "x": 0,
+              "y": 46
+            },
+            "hiddenSeries": false,
+            "id": 20,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "max": false,
+              "min": false,
+              "rightSide": false,
+              "show": true,
+              "sort": "current",
+              "sortDesc": true,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 2,
+            "links": [],
+            "nullPointMode": "connected",
+            "options": {
+              "alertThreshold": true
+            },
+            "percentage": false,
+            "pluginVersion": "10.0.2",
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "datasource": {
+                  "type": "prometheus",
+                  "uid": "af6b44aa-0703-4979-825c-c1afba946534"
+                },
+                "expr": "sum (rate (container_cpu_usage_seconds_total{id!=\"/\",kubernetes_io_hostname=~\"^$Node$\"}[1m])) by (id)",
+                "hide": false,
+                "interval": "10s",
+                "intervalFactor": 1,
+                "legendFormat": "{{ id }}",
+                "metric": "container_cpu",
+                "refId": "A",
+                "step": 10
+              }
+            ],
+            "thresholds": [],
+            "timeRegions": [],
+            "title": "All processes CPU usage (1m avg)",
+            "tooltip": {
+              "msResolution": true,
+              "shared": true,
+              "sort": 2,
+              "value_type": "cumulative"
+            },
+            "type": "graph",
+            "xaxis": {
+              "mode": "time",
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "$$hashKey": "object:254",
+                "format": "none",
+                "label": "cores",
+                "logBase": 1,
+                "show": true
+              },
+              {
+                "$$hashKey": "object:255",
+                "format": "short",
+                "logBase": 1,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false
+            }
+          }
+        ],
+        "targets": [
+          {
+            "datasource": {
+              "type": "datasource",
+              "uid": "grafana"
+            },
+            "refId": "A"
+          }
+        ],
+        "title": "All processes CPU usage",
+        "type": "row"
+      },
+      {
+        "collapsed": true,
+        "datasource": {
+          "type": "datasource",
+          "uid": "grafana"
+        },
+        "gridPos": {
+          "h": 1,
+          "w": 24,
+          "x": 0,
+          "y": 53
+        },
+        "id": 42,
+        "panels": [
+          {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": {
+              "type": "prometheus",
+              "uid": "af6b44aa-0703-4979-825c-c1afba946534"
+            },
+            "decimals": 2,
+            "editable": true,
+            "error": false,
+            "fill": 0,
+            "fillGradient": 0,
+            "grid": {},
+            "gridPos": {
+              "h": 14,
+              "w": 24,
+              "x": 0,
+              "y": 47
+            },
+            "hiddenSeries": false,
+            "id": 28,
+            "isNew": true,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "max": false,
+              "min": false,
+              "rightSide": false,
+              "show": true,
+              "sideWidth": 200,
+              "sort": "current",
+              "sortDesc": true,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 2,
+            "links": [],
+            "nullPointMode": "connected",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": true,
+            "targets": [
+              {
+                "datasource": {
+                  "type": "prometheus",
+                  "uid": "af6b44aa-0703-4979-825c-c1afba946534"
+                },
+                "expr": "sum (container_memory_working_set_bytes{id!=\"/\",kubernetes_io_hostname=~\"^$Node$\"}) by (id)",
+                "interval": "10s",
+                "intervalFactor": 1,
+                "legendFormat": "{{ id }}",
+                "metric": "container_memory_usage:sort_desc",
+                "refId": "A",
+                "step": 10
+              }
+            ],
+            "thresholds": [],
+            "timeRegions": [],
+            "title": "All processes memory usage",
+            "tooltip": {
+              "msResolution": false,
+              "shared": true,
+              "sort": 2,
+              "value_type": "cumulative"
+            },
+            "type": "graph",
+            "xaxis": {
+              "mode": "time",
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "bytes",
+                "logBase": 1,
+                "show": true
+              },
+              {
+                "format": "short",
+                "logBase": 1,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false
+            }
+          }
+        ],
+        "targets": [
+          {
+            "datasource": {
+              "type": "datasource",
+              "uid": "grafana"
+            },
+            "refId": "A"
+          }
+        ],
+        "title": "All processes memory usage",
+        "type": "row"
+      },
+      {
+        "collapsed": true,
+        "datasource": {
+          "type": "datasource",
+          "uid": "grafana"
+        },
+        "gridPos": {
+          "h": 1,
+          "w": 24,
+          "x": 0,
+          "y": 54
+        },
+        "id": 45,
+        "panels": [
+          {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": {
+              "type": "prometheus",
+              "uid": "af6b44aa-0703-4979-825c-c1afba946534"
+            },
+            "decimals": 2,
+            "editable": true,
+            "error": false,
+            "fill": 1,
+            "fillGradient": 0,
+            "grid": {},
+            "gridPos": {
+              "h": 14,
+              "w": 24,
+              "x": 0,
+              "y": 48
+            },
+            "hiddenSeries": false,
+            "id": 29,
+            "isNew": true,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "max": false,
+              "min": false,
+              "rightSide": false,
+              "show": true,
+              "sideWidth": 200,
+              "sort": "current",
+              "sortDesc": true,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 2,
+            "links": [],
+            "nullPointMode": "connected",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "datasource": {
+                  "type": "prometheus",
+                  "uid": "af6b44aa-0703-4979-825c-c1afba946534"
+                },
+                "expr": "sum (rate (container_network_receive_bytes_total{id!=\"/\",kubernetes_io_hostname=~\"^$Node$\"}[1m])) by (id)",
+                "interval": "10s",
+                "intervalFactor": 1,
+                "legendFormat": "-> {{ id }}",
+                "metric": "network",
+                "refId": "A",
+                "step": 10
+              },
+              {
+                "datasource": {
+                  "type": "prometheus",
+                  "uid": "af6b44aa-0703-4979-825c-c1afba946534"
+                },
+                "expr": "- sum (rate (container_network_transmit_bytes_total{id!=\"/\",kubernetes_io_hostname=~\"^$Node$\"}[1m])) by (id)",
+                "interval": "10s",
+                "intervalFactor": 1,
+                "legendFormat": "<- {{ id }}",
+                "metric": "network",
+                "refId": "B",
+                "step": 10
+              }
+            ],
+            "thresholds": [],
+            "timeRegions": [],
+            "title": "All processes network I/O (1m avg)",
+            "tooltip": {
+              "msResolution": false,
+              "shared": true,
+              "sort": 2,
+              "value_type": "cumulative"
+            },
+            "type": "graph",
+            "xaxis": {
+              "mode": "time",
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "Bps",
+                "logBase": 1,
+                "show": true
+              },
+              {
+                "format": "short",
+                "logBase": 1,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false
+            }
+          }
+        ],
+        "targets": [
+          {
+            "datasource": {
+              "type": "datasource",
+              "uid": "grafana"
+            },
+            "refId": "A"
+          }
+        ],
+        "title": "All processes network I/O",
+        "type": "row"
+      }
+    ],
+    "refresh": "10s",
+    "schemaVersion": 38,
+    "style": "dark",
+    "tags": [
+      "kubernetes"
+    ],
+    "templating": {
+      "list": [
+        {
+          "allValue": "",
+          "current": {
+            "selected": true,
+            "text": "monitoring",
+            "value": "monitoring"
+          },
+          "datasource": {
+            "type": "prometheus",
+            "uid": "af6b44aa-0703-4979-825c-c1afba946534"
+          },
+          "definition": "label_values(namespace)",
+          "hide": 0,
+          "includeAll": true,
+          "multi": false,
+          "name": "namespace",
+          "options": [],
+          "query": "label_values(namespace)",
+          "refresh": 1,
+          "regex": "",
+          "skipUrlSync": false,
+          "sort": 0,
+          "tagValuesQuery": "",
+          "tagsQuery": "",
+          "type": "query",
+          "useTags": false
+        },
+        {
+          "allValue": ".*",
+          "current": {
+            "selected": false,
+            "text": "All",
+            "value": "$__all"
+          },
+          "datasource": {
+            "type": "prometheus",
+            "uid": "af6b44aa-0703-4979-825c-c1afba946534"
+          },
+          "definition": "",
+          "hide": 0,
+          "includeAll": true,
+          "multi": false,
+          "name": "Node",
+          "options": [],
+          "query": "label_values(kubernetes_io_hostname)",
+          "refresh": 1,
+          "regex": "",
+          "skipUrlSync": false,
+          "sort": 0,
+          "tagValuesQuery": "",
+          "tagsQuery": "",
+          "type": "query",
+          "useTags": false
+        }
+      ]
+    },
+    "time": {
+      "from": "now-5m",
+      "to": "now"
+    },
+    "timepicker": {
+      "refresh_intervals": [
+        "5s",
+        "10s",
+        "30s",
+        "1m",
+        "5m",
+        "15m",
+        "30m",
+        "1h",
+        "2h",
+        "1d"
+      ],
+      "time_options": [
+        "5m",
+        "15m",
+        "1h",
+        "6h",
+        "12h",
+        "24h",
+        "2d",
+        "7d",
+        "30d"
+      ]
+    },
+    "timezone": "browser",
+    "title": "Kubernetes Monitoring Dashboard",
+    "uid": "msqzbWjWk",
+    "version": 2,
+    "weekStart": ""
+  }
\ No newline at end of file
diff --git a/helm/capif/loki-logs.json b/helm/capif/loki-logs.json
new file mode 100644
index 0000000000000000000000000000000000000000..e7e4d72162ad88ab094ee11d3c49e257664b3324
--- /dev/null
+++ b/helm/capif/loki-logs.json
@@ -0,0 +1,281 @@
+{
+    "annotations": {
+      "list": [
+        {
+          "builtIn": 1,
+          "datasource": {
+            "type": "datasource",
+            "uid": "grafana"
+          },
+          "enable": true,
+          "hide": true,
+          "iconColor": "rgba(0, 211, 255, 1)",
+          "name": "Annotations & Alerts",
+          "type": "dashboard"
+        }
+      ]
+    },
+    "description": "Simple Loki dashboard",
+    "editable": true,
+    "fiscalYearStartMonth": 0,
+    "gnetId": 13198,
+    "graphTooltip": 0,
+    "id": 9,
+    "links": [],
+    "liveNow": false,
+    "panels": [
+      {
+        "aliasColors": {},
+        "bars": false,
+        "dashLength": 10,
+        "dashes": false,
+        "datasource": {
+          "type": "loki",
+          "uid": "$datasource"
+        },
+        "fill": 0,
+        "fillGradient": 0,
+        "gridPos": {
+          "h": 8,
+          "w": 24,
+          "x": 0,
+          "y": 0
+        },
+        "hiddenSeries": false,
+        "id": 4,
+        "legend": {
+          "alignAsTable": true,
+          "avg": false,
+          "current": false,
+          "hideEmpty": true,
+          "hideZero": true,
+          "max": false,
+          "min": false,
+          "rightSide": true,
+          "show": true,
+          "total": false,
+          "values": false
+        },
+        "lines": true,
+        "linewidth": 1,
+        "nullPointMode": "null",
+        "options": {
+          "alertThreshold": true
+        },
+        "percentage": false,
+        "pluginVersion": "9.5.2",
+        "pointradius": 2,
+        "points": false,
+        "renderer": "flot",
+        "seriesOverrides": [],
+        "spaceLength": 10,
+        "stack": true,
+        "steppedLine": false,
+        "targets": [
+          {
+            "datasource": {
+              "uid": "$datasource"
+            },
+            "editorMode": "code",
+            "expr": "count_over_time({job=\"fluent-bit\"}[1m])",
+            "legendFormat": "{{ container_name }}",
+            "queryType": "range",
+            "refId": "A"
+          }
+        ],
+        "thresholds": [],
+        "timeRegions": [],
+        "title": "Metric Rate",
+        "tooltip": {
+          "shared": true,
+          "sort": 2,
+          "value_type": "individual"
+        },
+        "type": "graph",
+        "xaxis": {
+          "mode": "time",
+          "show": true,
+          "values": []
+        },
+        "yaxes": [
+          {
+            "format": "short",
+            "logBase": 1,
+            "show": true
+          },
+          {
+            "format": "short",
+            "logBase": 1,
+            "show": true
+          }
+        ],
+        "yaxis": {
+          "align": false
+        }
+      },
+      {
+        "datasource": {
+          "type": "loki",
+          "uid": "e4f43364-7019-45a7-aa7a-14ce2d4ddb0b"
+        },
+        "gridPos": {
+          "h": 14,
+          "w": 24,
+          "x": 0,
+          "y": 8
+        },
+        "id": 2,
+        "options": {
+          "dedupStrategy": "none",
+          "enableLogDetails": true,
+          "prettifyLogMessage": false,
+          "showCommonLabels": false,
+          "showLabels": false,
+          "showTime": true,
+          "sortOrder": "Descending",
+          "wrapLogMessage": true
+        },
+        "pluginVersion": "7.1.3",
+        "targets": [
+          {
+            "datasource": {
+              "type": "loki",
+              "uid": "e4f43364-7019-45a7-aa7a-14ce2d4ddb0b"
+            },
+            "editorMode": "code",
+            "expr": "{job=~\"fluent-bit\"} |~ \"$string\"",
+            "legendFormat": "",
+            "queryType": "range",
+            "refId": "A"
+          }
+        ],
+        "title": "Loki Search",
+        "type": "logs"
+      }
+    ],
+    "refresh": "1m",
+    "schemaVersion": 38,
+    "style": "dark",
+    "tags": [],
+    "templating": {
+      "list": [
+        {
+          "current": {
+            "selected": false,
+            "text": "Loki",
+            "value": "Loki"
+          },
+          "hide": 0,
+          "includeAll": false,
+          "multi": false,
+          "name": "datasource",
+          "options": [],
+          "query": "loki",
+          "queryValue": "",
+          "refresh": 1,
+          "regex": "",
+          "skipUrlSync": false,
+          "type": "datasource"
+        },
+        {
+          "allValue": ".*",
+          "current": {
+            "selected": false,
+            "text": "All",
+            "value": "$__all"
+          },
+          "datasource": {
+            "type": "loki",
+            "uid": "$datasource"
+          },
+          "definition": "label_values(container_name)",
+          "hide": 0,
+          "includeAll": true,
+          "label": "app",
+          "multi": false,
+          "name": "app",
+          "options": [],
+          "query": "label_values(container_name)",
+          "refresh": 2,
+          "regex": "(.*)-.*-.*-.*-.*-.*",
+          "skipUrlSync": false,
+          "sort": 0,
+          "tagValuesQuery": "",
+          "tagsQuery": "",
+          "type": "query",
+          "useTags": false
+        },
+        {
+          "allValue": ".*",
+          "current": {
+            "selected": false,
+            "text": "All",
+            "value": "$__all"
+          },
+          "datasource": {
+            "type": "loki",
+            "uid": "$datasource"
+          },
+          "definition": "label_values(container_name)",
+          "hide": 0,
+          "includeAll": true,
+          "label": "job",
+          "multi": false,
+          "name": "job",
+          "options": [],
+          "query": "label_values(container_name)",
+          "refresh": 2,
+          "regex": "$app-(.*)",
+          "skipUrlSync": false,
+          "sort": 0,
+          "tagValuesQuery": "",
+          "tagsQuery": "",
+          "type": "query",
+          "useTags": false
+        },
+        {
+          "current": {
+            "selected": false,
+            "text": "",
+            "value": ""
+          },
+          "hide": 0,
+          "label": "string",
+          "name": "string",
+          "options": [
+            {
+              "selected": true,
+              "text": "",
+              "value": ""
+            }
+          ],
+          "query": "",
+          "skipUrlSync": false,
+          "type": "textbox"
+        }
+      ]
+    },
+    "time": {
+      "from": "now-1h",
+      "to": "now"
+    },
+    "timepicker": {
+      "refresh_intervals": [
+        "5s",
+        "10s",
+        "30s",
+        "1m",
+        "5m",
+        "15m",
+        "30m",
+        "1h",
+        "2h",
+        "1d"
+      ]
+    },
+    "timezone": "",
+    "title": "Loki Logs",
+    "uid": "ffxEJdvGz",
+    "version": 6,
+    "weekStart": ""
+}
\ No newline at end of file
diff --git a/helm/capif/templates/_helpers.tpl b/helm/capif/templates/_helpers.tpl
new file mode 100644
index 0000000000000000000000000000000000000000..35ce1ecf5e45fa36fd2bd7c02633c7dc7a3457b4
--- /dev/null
+++ b/helm/capif/templates/_helpers.tpl
@@ -0,0 +1,62 @@
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "capif.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "capif.fullname" -}}
+{{- if .Values.fullnameOverride }}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- $name := default .Chart.Name .Values.nameOverride }}
+{{- if contains $name .Release.Name }}
+{{- .Release.Name | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
+{{- end }}
+{{- end }}
+{{- end }}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "capif.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Common labels
+*/}}
+{{- define "capif.labels" -}}
+helm.sh/chart: {{ include "capif.chart" . }}
+{{ include "capif.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "capif.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "capif.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "capif.serviceAccountName" -}}
+{{- if .Values.serviceAccount.create }}
+{{- default (include "capif.fullname" .) .Values.serviceAccount.name }}
+{{- else }}
+{{- default "default" .Values.serviceAccount.name }}
+{{- end }}
+{{- end }}
diff --git a/helm/capif/templates/access-control-policy.yaml b/helm/capif/templates/access-control-policy.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..8b2b198beddf3e97793b994c43c86ef1df644e5e
--- /dev/null
+++ b/helm/capif/templates/access-control-policy.yaml
@@ -0,0 +1,17 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: access-control-policy
+  labels:
+    io.kompose.service: access-control-policy
+  {{- include "capif.labels" . | nindent 4 }}
+  annotations:
+    kompose.cmd: kompose -f ../services/docker-compose.yml convert
+    kompose.version: 1.28.0 (c4137012e)
+spec:
+  type: {{ .Values.accessControlPolicy.type }}
+  selector:
+    io.kompose.service: access-control-policy
+  {{- include "capif.selectorLabels" . | nindent 4 }}
+  ports:
+	{{- .Values.accessControlPolicy.ports | toYaml | nindent 2 -}}
\ No newline at end of file
diff --git a/helm/capif/templates/api-invocation-logs.yaml b/helm/capif/templates/api-invocation-logs.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..a9b4d8fd63deb56395c11b225503ce60e7b248f9
--- /dev/null
+++ b/helm/capif/templates/api-invocation-logs.yaml
@@ -0,0 +1,17 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: api-invocation-logs
+  labels:
+    io.kompose.service: api-invocation-logs
+  {{- include "capif.labels" . | nindent 4 }}
+  annotations:
+    kompose.cmd: kompose -f ../services/docker-compose.yml convert
+    kompose.version: 1.28.0 (c4137012e)
+spec:
+  type: {{ .Values.apiInvocationLogs.type }}
+  selector:
+    io.kompose.service: api-invocation-logs
+  {{- include "capif.selectorLabels" . | nindent 4 }}
+  ports:
+	{{- .Values.apiInvocationLogs.ports | toYaml | nindent 2 -}}
\ No newline at end of file
diff --git a/helm/capif/templates/api-invoker-management.yaml b/helm/capif/templates/api-invoker-management.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..3eaeda40135ba0f97db68fe3acc00b96a05ead58
--- /dev/null
+++ b/helm/capif/templates/api-invoker-management.yaml
@@ -0,0 +1,17 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: api-invoker-management
+  labels:
+    io.kompose.service: api-invoker-management
+  {{- include "capif.labels" . | nindent 4 }}
+  annotations:
+    kompose.cmd: kompose -f ../services/docker-compose.yml convert
+    kompose.version: 1.28.0 (c4137012e)
+spec:
+  type: {{ .Values.apiInvokerManagement.type }}
+  selector:
+    io.kompose.service: api-invoker-management
+  {{- include "capif.selectorLabels" . | nindent 4 }}
+  ports:
+	{{- .Values.apiInvokerManagement.ports | toYaml | nindent 2 -}}
\ No newline at end of file
diff --git a/helm/capif/templates/api-provider-management.yaml b/helm/capif/templates/api-provider-management.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..42379862e425bf8b796cc7234262fcf3310faa4a
--- /dev/null
+++ b/helm/capif/templates/api-provider-management.yaml
@@ -0,0 +1,17 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: api-provider-management
+  labels:
+    io.kompose.service: api-provider-management
+  {{- include "capif.labels" . | nindent 4 }}
+  annotations:
+    kompose.cmd: kompose -f ../services/docker-compose.yml convert
+    kompose.version: 1.28.0 (c4137012e)
+spec:
+  type: {{ .Values.apiProviderManagement.type }}
+  selector:
+    io.kompose.service: api-provider-management
+  {{- include "capif.selectorLabels" . | nindent 4 }}
+  ports:
+	{{- .Values.apiProviderManagement.ports | toYaml | nindent 2 -}}
\ No newline at end of file
diff --git a/helm/capif/templates/capif-events-configmap.yaml b/helm/capif/templates/capif-events-configmap.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..ca31c23ec295806d0941623b19848a920ada61b9
--- /dev/null
+++ b/helm/capif/templates/capif-events-configmap.yaml
@@ -0,0 +1,28 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: capif-events-configmap
+data:
+  config.yaml: |
+    mongo: {
+      'user': '{{ .Values.mongo.mongo.env.mongoInitdbRootUsername }}',
+      'password': '{{ .Values.mongo.mongo.env.mongoInitdbRootPassword }}',
+      'db': 'capif',
+      'col': 'eventsdetails',
+      'certs_col': "certs",
+      'capif_invokers_col': 'invokerdetails',
+      'capif_providers_col': 'providerenrolmentdetails',
+      'host': 'mongo',
+      'port': "27017"
+    }   
+
+    monitoring: {
+      "fluent_bit_host": fluent-bit,
+      "fluent_bit_port": 24224,
+      "opentelemetry_url": "otel-collector",
+      "opentelemetry_port": "55680",
+      "opentelemetry_max_queue_size": 8192,
+      "opentelemetry_schedule_delay_millis": 20000,
+      "opentelemetry_max_export_batch_size": 2048,
+      "opentelemetry_export_timeout_millis": 60000
+    }
diff --git a/helm/capif/templates/capif-events.yaml b/helm/capif/templates/capif-events.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..40b3d7bdcf7a01aca3f6c78a108039ff1ba22ca3
--- /dev/null
+++ b/helm/capif/templates/capif-events.yaml
@@ -0,0 +1,17 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: capif-events
+  labels:
+    io.kompose.service: capif-events
+  {{- include "capif.labels" . | nindent 4 }}
+  annotations:
+    kompose.cmd: kompose -f ../services/docker-compose.yml convert
+    kompose.version: 1.28.0 (c4137012e)
+spec:
+  type: {{ .Values.capifEvents.type }}
+  selector:
+    io.kompose.service: capif-events
+  {{- include "capif.selectorLabels" . | nindent 4 }}
+  ports:
+	{{- .Values.capifEvents.ports | toYaml | nindent 2 -}}
\ No newline at end of file
diff --git a/helm/capif/templates/capif-invocation-configmap.yaml b/helm/capif/templates/capif-invocation-configmap.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..68fc1f1444f515a6802332096e140615fda3c69f
--- /dev/null
+++ b/helm/capif/templates/capif-invocation-configmap.yaml
@@ -0,0 +1,29 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: capif-invocation-configmap
+data:
+  config.yaml: |
+    mongo: {
+      'user': '{{ .Values.mongo.mongo.env.mongoInitdbRootUsername }}',
+      'password': '{{ .Values.mongo.mongo.env.mongoInitdbRootPassword }}',
+      'db': 'capif',
+      'logs_col': 'invocationlogs',
+      'invoker_col': 'invokerdetails',
+      'prov_col': 'providerenrolmentdetails',
+      'serv_col': 'serviceapidescriptions',
+      'capif_users_col': "user",
+      'host': 'mongo',
+      'port': "27017"
+    }
+
+    monitoring: {
+      "fluent_bit_host": fluent-bit,
+      "fluent_bit_port": 24224,
+      "opentelemetry_url": "otel-collector",
+      "opentelemetry_port": "55680",
+      "opentelemetry_max_queue_size": 8192,
+      "opentelemetry_schedule_delay_millis": 20000,
+      "opentelemetry_max_export_batch_size": 2048,
+      "opentelemetry_export_timeout_millis": 60000
+    }
diff --git a/helm/capif/templates/capif-invoker-configmap.yaml b/helm/capif/templates/capif-invoker-configmap.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..32bab3cbcafbc40d0e028f75c33c1da2b811c240
--- /dev/null
+++ b/helm/capif/templates/capif-invoker-configmap.yaml
@@ -0,0 +1,41 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: capif-invoker-configmap
+data:
+  config.yaml: |
+    mongo: {
+      'user': '{{ .Values.mongo.mongo.env.mongoInitdbRootUsername }}',
+      'password': '{{ .Values.mongo.mongo.env.mongoInitdbRootPassword }}',
+      'db': 'capif',
+      'col': 'invokerdetails',
+      'capif_users_col': "user",
+      'certs_col': "certs",
+      'service_col': 'serviceapidescriptions',
+      'host': 'mongo',
+      'port': "27017"
+    }
+    mongo_register: {
+      'user': '{{ .Values.mongoRegister.mongo.env.mongoInitdbRootUsername }}',
+      'password': '{{ .Values.mongoRegister.mongo.env.mongoInitdbRootPassword }}',
+      'db': 'capif_users',
+      'col': 'user',
+      'host': 'mongo-register',
+      'port': '27017'
+    }
+    ca_factory: {
+      "url": {{ quote .Values.parametersVault.env.vaultHostname }},
+      "port": {{ quote .Values.parametersVault.env.vaultPort }},
+      "token": {{ quote .Values.parametersVault.env.vaultAccessToken }}
+    }
+
+    monitoring: {
+      "fluent_bit_host": fluent-bit,
+      "fluent_bit_port": 24224,
+      "opentelemetry_url": "otel-collector",
+      "opentelemetry_port": "55680",
+      "opentelemetry_max_queue_size": 8192,
+      "opentelemetry_schedule_delay_millis": 20000,
+      "opentelemetry_max_export_batch_size": 2048,
+      "opentelemetry_export_timeout_millis": 60000
+    }
\ No newline at end of file
diff --git a/helm/capif/templates/capif-logs-configmap.yaml b/helm/capif/templates/capif-logs-configmap.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..53cae6ea3eaf65b017001ef504367eef67ce15d2
--- /dev/null
+++ b/helm/capif/templates/capif-logs-configmap.yaml
@@ -0,0 +1,27 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: capif-logs-configmap
+data:
+  config.yaml: |
+    mongo: {
+      'user': '{{ .Values.mongo.mongo.env.mongoInitdbRootUsername }}',
+      'password': '{{ .Values.mongo.mongo.env.mongoInitdbRootPassword }}',
+      'db': 'capif',
+      'logs_col': 'invocationlogs',
+      'capif_users_col': "user",
+      'host': 'mongo',
+      'port': "27017"
+    }
+
+    monitoring: {
+      "fluent_bit_host": fluent-bit,
+      "fluent_bit_port": 24224,
+      "opentelemetry_url": "otel-collector",
+      "opentelemetry_port": "55680",
+      "opentelemetry_max_queue_size": 8192,
+      "opentelemetry_schedule_delay_millis": 20000,
+      "opentelemetry_max_export_batch_size": 2048,
+      "opentelemetry_export_timeout_millis": 60000
+    }
+
diff --git a/helm/capif/templates/capif-provider-configmap.yaml b/helm/capif/templates/capif-provider-configmap.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..28e530fddd16402c9f7ec70734bf6f0d82220bed
--- /dev/null
+++ b/helm/capif/templates/capif-provider-configmap.yaml
@@ -0,0 +1,41 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: capif-provider-configmap
+data:
+  config.yaml: |
+    mongo: {
+      'user': '{{ .Values.mongo.mongo.env.mongoInitdbRootUsername }}',
+      'password': '{{ .Values.mongo.mongo.env.mongoInitdbRootPassword }}',
+      'db': 'capif',
+      'col': 'providerenrolmentdetails',
+      'certs_col': "certs",
+      'capif_users': 'user',
+      'host': 'mongo',
+      'port': "27017"
+    }
+    mongo_register: {
+      'user': '{{ .Values.mongoRegister.mongo.env.mongoInitdbRootUsername }}',
+      'password': '{{ .Values.mongoRegister.mongo.env.mongoInitdbRootPassword }}',
+      'db': 'capif_users',
+      'col': 'user',
+      'host': 'mongo-register',
+      'port': '27017'
+    }
+    ca_factory: {
+      "url": {{ quote .Values.parametersVault.env.vaultHostname }},
+      "port": {{ quote .Values.parametersVault.env.vaultPort }},
+      "token": {{ quote .Values.parametersVault.env.vaultAccessToken }}
+    }
+
+
+    monitoring: {
+      "fluent_bit_host": fluent-bit,
+      "fluent_bit_port": 24224,
+      "opentelemetry_url": "otel-collector",
+      "opentelemetry_port": "55680",
+      "opentelemetry_max_queue_size": 8192,
+      "opentelemetry_schedule_delay_millis": 20000,
+      "opentelemetry_max_export_batch_size": 2048,
+      "opentelemetry_export_timeout_millis": 60000
+    }
\ No newline at end of file
diff --git a/helm/capif/templates/capif-published-configmap.yaml b/helm/capif/templates/capif-published-configmap.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..507afd4a769e5598435bdf084fec5e866bad04d2
--- /dev/null
+++ b/helm/capif/templates/capif-published-configmap.yaml
@@ -0,0 +1,27 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: capif-published-configmap
+data:
+  config.yaml: |
+    mongo: {
+      'user': '{{ .Values.mongo.mongo.env.mongoInitdbRootUsername }}',
+      'password': '{{ .Values.mongo.mongo.env.mongoInitdbRootPassword }}',
+      'db': 'capif',
+      'col': 'serviceapidescriptions',
+      'certs_col': "certs",
+      'capif_provider_col': "providerenrolmentdetails",
+      'host': 'mongo',
+      'port': "27017"
+    }
+
+    monitoring: {
+      "fluent_bit_host": fluent-bit,
+      "fluent_bit_port": 24224,
+      "opentelemetry_url": "otel-collector",
+      "opentelemetry_port": "55680",
+      "opentelemetry_max_queue_size": 8192,
+      "opentelemetry_schedule_delay_millis": 20000,
+      "opentelemetry_max_export_batch_size": 2048,
+      "opentelemetry_export_timeout_millis": 60000
+    }
\ No newline at end of file
diff --git a/helm/capif/templates/capif-routing-info.yaml b/helm/capif/templates/capif-routing-info.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..6de48aa99149970097522dc28f0a1b4340debae3
--- /dev/null
+++ b/helm/capif/templates/capif-routing-info.yaml
@@ -0,0 +1,17 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: capif-routing-info
+  labels:
+    io.kompose.service: capif-routing-info
+  {{- include "capif.labels" . | nindent 4 }}
+  annotations:
+    kompose.cmd: kompose -f ../services/docker-compose.yml convert
+    kompose.version: 1.28.0 (c4137012e)
+spec:
+  type: {{ .Values.capifRoutingInfo.type }}
+  selector:
+    io.kompose.service: capif-routing-info
+  {{- include "capif.selectorLabels" . | nindent 4 }}
+  ports:
+	{{- .Values.capifRoutingInfo.ports | toYaml | nindent 2 -}}
\ No newline at end of file
diff --git a/helm/capif/templates/capif-security-configmap.yaml b/helm/capif/templates/capif-security-configmap.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..ade6a59257fe064ae1a27d36af23dc608e452ad4
--- /dev/null
+++ b/helm/capif/templates/capif-security-configmap.yaml
@@ -0,0 +1,28 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: capif-security-configmap
+data:
+  config.yaml: |
+    mongo: {
+      'user': '{{ .Values.mongo.mongo.env.mongoInitdbRootUsername }}',
+      'password': '{{ .Values.mongo.mongo.env.mongoInitdbRootPassword }}',
+      'db': 'capif',
+      'col': 'security',
+      'capif_service_col': 'serviceapidescriptions',
+      'certs_col': "certs",
+      'capif_invokers' : 'invokerdetails',
+      'host': 'mongo',
+      'port': "27017"
+    }
+
+    monitoring: {
+      "fluent_bit_host": fluent-bit,
+      "fluent_bit_port": 24224,
+      "opentelemetry_url": "otel-collector",
+      "opentelemetry_port": "55680",
+      "opentelemetry_max_queue_size": 8192,
+      "opentelemetry_schedule_delay_millis": 20000,
+      "opentelemetry_max_export_batch_size": 2048,
+      "opentelemetry_export_timeout_millis": 60000
+    }
\ No newline at end of file
diff --git a/helm/capif/templates/capif-security.yaml b/helm/capif/templates/capif-security.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..e0bf7d885643e717c9fa4b587fe0cadbb25d0fec
--- /dev/null
+++ b/helm/capif/templates/capif-security.yaml
@@ -0,0 +1,17 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: capif-security
+  labels:
+    io.kompose.service: capif-security
+  {{- include "capif.labels" . | nindent 4 }}
+  annotations:
+    kompose.cmd: kompose -f ../services/docker-compose.yml convert
+    kompose.version: 1.28.0 (c4137012e)
+spec:
+  type: {{ .Values.capifSecurity.type }}
+  selector:
+    io.kompose.service: capif-security
+  {{- include "capif.selectorLabels" . | nindent 4 }}
+  ports:
+	{{- .Values.capifSecurity.ports | toYaml | nindent 2 -}}
\ No newline at end of file
diff --git a/helm/capif/templates/capif-service-configmap.yaml b/helm/capif/templates/capif-service-configmap.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..1cd3d6610c9e3850ec0231f3680345fac8aad969
--- /dev/null
+++ b/helm/capif/templates/capif-service-configmap.yaml
@@ -0,0 +1,27 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: capif-service-configmap
+data:
+  config.yaml: |
+    mongo: {
+      'user': '{{ .Values.mongo.mongo.env.mongoInitdbRootUsername }}',
+      'password': '{{ .Values.mongo.mongo.env.mongoInitdbRootPassword }}',
+      'db': 'capif',
+      'col': 'serviceapidescriptions',
+      'invokers_col': 'invokerdetails',
+      'capif_users_col': "user",
+      'host': 'mongo',
+      'port': "27017"
+    }
+
+    monitoring: {
+      "fluent_bit_host": fluent-bit,
+      "fluent_bit_port": 24224,
+      "opentelemetry_url": "otel-collector",
+      "opentelemetry_port": "55680",
+      "opentelemetry_max_queue_size": 8192,
+      "opentelemetry_schedule_delay_millis": 20000,
+      "opentelemetry_max_export_batch_size": 2048,
+      "opentelemetry_export_timeout_millis": 60000
+    }
\ No newline at end of file
diff --git a/helm/capif/templates/deployment.yaml b/helm/capif/templates/deployment.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..4c2e0265d80a53931ac74bea856cd59a94b09ccb
--- /dev/null
+++ b/helm/capif/templates/deployment.yaml
@@ -0,0 +1,1001 @@
+{{- if eq .Values.CapifClient.enable "true" }}
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: capif-client
+  labels:
+    io.kompose.service: capif-client
+  {{- include "capif.labels" . | nindent 4 }}
+  annotations:
+    kompose.cmd: kompose -f ../services/docker-compose.yml convert
+spec:
+  replicas: {{ .Values.CapifClient.replicas }}
+  selector:
+    matchLabels:
+      io.kompose.service: capif-client
+    {{- include "capif.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      labels:
+        io.kompose.network/services-default: "true"
+        io.kompose.service: capif-client
+      {{- include "capif.selectorLabels" . | nindent 8 }}
+      annotations:
+        date: "{{  now | unixEpoch }}"
+    spec:
+      hostAliases:
+        - ip: "{{ .Values.ingress.ip }}"
+          hostnames:
+            - "{{ .Values.nginx.nginx.env.capifHostname }}"
+      containers:
+      - env:
+        - name: CAPIF_HOSTNAME
+          value: nginx.mon.svc.cluster.local
+        - name: VAULT_HOSTNAME
+          value: {{ quote .Values.parametersVault.env.vaultHostname }}
+        - name: VAULT_PORT
+          value: {{ quote .Values.parametersVault.env.vaultPort }}
+        - name: VAULT_ACCESS_TOKEN
+          value: {{ quote .Values.parametersVault.env.vaultAccessToken }}
+        image: {{ .Values.CapifClient.image.repository }}:{{ .Values.CapifClient.image.tag | default .Chart.AppVersion }}
+        imagePullPolicy: {{ .Values.CapifClient.image.imagePullPolicy }}
+        name: capif-client
+        resources:
+            {{- toYaml .Values.CapifClient.resources | nindent 12 }}
+      restartPolicy: Always
+{{- end }}
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: access-control-policy
+  labels:
+    io.kompose.service: access-control-policy
+  {{- include "capif.labels" . | nindent 4 }}
+  annotations:
+    kompose.cmd: kompose -f ../services/docker-compose.yml convert
+spec:
+  replicas: {{ .Values.accessControlPolicy.replicas }}
+  selector:
+    matchLabels:
+      io.kompose.service: access-control-policy
+    {{- include "capif.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      labels:
+        io.kompose.network/services-default: "true"
+        io.kompose.service: access-control-policy
+      {{- include "capif.selectorLabels" . | nindent 8 }}
+      annotations:
+        date: "{{  now | unixEpoch }}"
+    spec:
+      hostAliases:
+        - ip: "{{ .Values.ingress.ip }}"
+          hostnames:
+            - "{{ .Values.nginx.nginx.env.capifHostname }}"
+      containers:
+      - env:
+        - name: CAPIF_HOSTNAME
+          value: {{ quote .Values.nginx.nginx.env.capifHostname }}
+        - name: MONITORING
+          value: {{ quote .Values.accessControlPolicy.env.monitoring }}
+        image: {{ .Values.accessControlPolicy.image.repository }}:{{ .Values.accessControlPolicy.image.tag | default .Chart.AppVersion }}
+        imagePullPolicy: {{ .Values.accessControlPolicy.image.imagePullPolicy }}
+        name: access-control-policy
+        ports:
+        - containerPort: 8080
+        resources:
+            {{- toYaml .Values.accessControlPolicy.resources | nindent 12 }}
+        readinessProbe:
+          tcpSocket:
+            port: 8080
+          initialDelaySeconds: 10
+          periodSeconds: 5
+      restartPolicy: Always
+
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: api-invocation-logs
+  labels:
+    io.kompose.service: api-invocation-logs
+  {{- include "capif.labels" . | nindent 4 }}
+  annotations:
+    kompose.cmd: kompose -f ../services/docker-compose.yml convert
+spec:
+  replicas: {{ .Values.apiInvocationLogs.replicas }}
+  selector:
+    matchLabels:
+      io.kompose.service: api-invocation-logs
+    {{- include "capif.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      labels:
+        io.kompose.network/services-default: "true"
+        io.kompose.service: api-invocation-logs
+      {{- include "capif.selectorLabels" . | nindent 8 }}
+      annotations:
+        date: "{{  now | unixEpoch }}"
+        checksum/config: {{ include (print $.Template.BasePath "/capif-invocation-configmap.yaml") . | sha256sum }}
+    spec:
+      hostAliases:
+        - ip: "{{ .Values.ingress.ip }}"
+          hostnames:
+            - "{{ .Values.nginx.nginx.env.capifHostname }}"
+      containers:
+      - env:
+        - name: CAPIF_HOSTNAME
+          value: {{ quote .Values.nginx.nginx.env.capifHostname }}
+        - name: MONITORING
+          value: {{ quote .Values.apiInvocationLogs.apiInvocationLogs.env.monitoring }}
+        - name: VAULT_HOSTNAME
+          value: {{ quote .Values.parametersVault.env.vaultHostname }}
+        - name: VAULT_PORT
+          value: {{ quote .Values.parametersVault.env.vaultPort }}
+        - name: VAULT_ACCESS_TOKEN
+          value: {{ quote .Values.parametersVault.env.vaultAccessToken }}
+        - name: KUBERNETES_CLUSTER_DOMAIN
+          value: {{ quote .Values.kubernetesClusterDomain }}
+        image: {{ .Values.apiInvocationLogs.apiInvocationLogs.image.repository }}:{{ .Values.apiInvocationLogs.apiInvocationLogs.image.tag | default .Chart.AppVersion }}
+        imagePullPolicy: {{ .Values.apiInvocationLogs.apiInvocationLogs.image.imagePullPolicy }}
+        name: api-invocation-logs
+        ports:
+        - containerPort: 8080
+        volumeMounts:
+          - name: capif-invocation-config
+            mountPath: /usr/src/app/config.yaml
+            subPath: config.yaml
+        resources:
+            {{- toYaml .Values.apiInvocationLogs.apiInvocationLogs.resources | nindent 12 }}
+        readinessProbe:
+          tcpSocket:
+            port: 8080
+          initialDelaySeconds: 10
+          periodSeconds: 5
+      volumes:
+      - name: capif-invocation-config
+        configMap:
+          name: capif-invocation-configmap
+          items:
+          - key: "config.yaml"
+            path: "config.yaml"
+      restartPolicy: Always
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: api-invoker-management
+  labels:
+    io.kompose.service: api-invoker-management
+  {{- include "capif.labels" . | nindent 4 }}
+  annotations:
+    kompose.cmd: kompose -f ../services/docker-compose.yml convert
+spec:
+  replicas: {{ .Values.apiInvokerManagement.replicas }}
+  selector:
+    matchLabels:
+      io.kompose.service: api-invoker-management
+    {{- include "capif.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      labels:
+        io.kompose.network/services-default: "true"
+        io.kompose.service: api-invoker-management
+      {{- include "capif.selectorLabels" . | nindent 8 }}
+      annotations:
+        date: "{{  now | unixEpoch }}"
+        checksum/config: {{ include (print $.Template.BasePath "/capif-invoker-configmap.yaml") . | sha256sum }}
+    spec:
+      hostAliases:
+        - ip: "{{ .Values.ingress.ip }}"
+          hostnames:
+            - "{{ .Values.nginx.nginx.env.capifHostname }}"
+      containers:
+      - env:
+        - name: KUBERNETES_CLUSTER_DOMAIN
+          value: {{ quote .Values.kubernetesClusterDomain }}
+        - name: MONITORING
+          value: {{ quote .Values.apiInvokerManagement.apiInvokerManagement.env.monitoring }}
+        - name: VAULT_HOSTNAME
+          value: {{ quote .Values.parametersVault.env.vaultHostname }}
+        - name: VAULT_PORT
+          value: {{ quote .Values.parametersVault.env.vaultPort }}
+        - name: VAULT_ACCESS_TOKEN
+          value: {{ quote .Values.parametersVault.env.vaultAccessToken }}
+        image: {{ .Values.apiInvokerManagement.apiInvokerManagement.image.repository }}:{{
+          .Values.apiInvokerManagement.apiInvokerManagement.image.tag | default .Chart.AppVersion }}
+        imagePullPolicy: {{ .Values.apiInvokerManagement.apiInvokerManagement.image.imagePullPolicy }}
+        name: api-invoker-management
+        ports:
+        - containerPort: 8080
+        volumeMounts:
+          - name: capif-invoker-config
+            mountPath: /usr/src/app/config.yaml
+            subPath: config.yaml
+        resources:
+            {{- toYaml .Values.apiInvokerManagement.apiInvokerManagement.resources | nindent 12 }}
+      volumes:
+      - name: capif-invoker-config
+        configMap:
+          name: capif-invoker-configmap
+          items:
+          - key: "config.yaml"
+            path: "config.yaml"
+      restartPolicy: Always
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: api-provider-management
+  labels:
+    io.kompose.service: api-provider-management
+  {{- include "capif.labels" . | nindent 4 }}
+  annotations:
+    kompose.cmd: kompose -f ../services/docker-compose.yml convert
+spec:
+  replicas: {{ .Values.apiProviderManagement.replicas }}
+  selector:
+    matchLabels:
+      io.kompose.service: api-provider-management
+    {{- include "capif.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      labels:
+        io.kompose.network/services-default: "true"
+        io.kompose.service: api-provider-management
+      {{- include "capif.selectorLabels" . | nindent 8 }}
+      annotations:
+        date: "{{  now | unixEpoch }}"
+        checksum/config: {{ include (print $.Template.BasePath "/capif-provider-configmap.yaml") . | sha256sum }}
+    spec:
+      hostAliases:
+        - ip: "{{ .Values.ingress.ip }}"
+          hostnames:
+            - "{{ .Values.nginx.nginx.env.capifHostname }}"
+      containers:
+      - env:
+        - name: KUBERNETES_CLUSTER_DOMAIN
+          value: {{ quote .Values.kubernetesClusterDomain }}
+        - name: MONITORING
+          value: {{ quote .Values.apiProviderManagement.apiProviderManagement.env.monitoring }}
+        - name: VAULT_HOSTNAME
+          value: {{ quote .Values.parametersVault.env.vaultHostname }}
+        - name: VAULT_PORT
+          value: {{ quote .Values.parametersVault.env.vaultPort }}
+        - name: VAULT_ACCESS_TOKEN
+          value: {{ quote .Values.parametersVault.env.vaultAccessToken }}
+        image: {{ .Values.apiProviderManagement.apiProviderManagement.image.repository
+          }}:{{ .Values.apiProviderManagement.apiProviderManagement.image.tag | default .Chart.AppVersion }}
+        imagePullPolicy: {{ .Values.apiProviderManagement.apiProviderManagement.image.imagePullPolicy }}
+        name: api-provider-management
+        ports:
+        - containerPort: 8080
+        volumeMounts:
+          - name: capif-provider-config
+            mountPath: /usr/src/app/config.yaml
+            subPath: config.yaml
+        resources:
+            {{- toYaml .Values.apiProviderManagement.apiProviderManagement.resources | nindent 12 }}
+      volumes:
+      - name: capif-provider-config
+        configMap:
+          name: capif-provider-configmap
+          items:
+          - key: "config.yaml"
+            path: "config.yaml"
+      restartPolicy: Always
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: capif-events
+  labels:
+    io.kompose.service: capif-events
+  {{- include "capif.labels" . | nindent 4 }}
+  annotations:
+    kompose.cmd: kompose -f ../services/docker-compose.yml convert
+spec:
+  replicas: {{ .Values.capifEvents.replicas }}
+  selector:
+    matchLabels:
+      io.kompose.service: capif-events
+    {{- include "capif.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      labels:
+        io.kompose.network/services-default: "true"
+        io.kompose.service: capif-events
+      {{- include "capif.selectorLabels" . | nindent 8 }}
+      annotations:
+        date: "{{  now | unixEpoch }}"
+        checksum/config: {{ include (print $.Template.BasePath "/capif-events-configmap.yaml") . | sha256sum }}
+    spec:
+      hostAliases:
+        - ip: "{{ .Values.ingress.ip }}"
+          hostnames:
+            - "{{ .Values.nginx.nginx.env.capifHostname }}"
+      containers:
+      - env:
+        - name: KUBERNETES_CLUSTER_DOMAIN
+          value: {{ quote .Values.kubernetesClusterDomain }}
+        - name: MONITORING
+          value: {{ quote .Values.capifEvents.capifEvents.env.monitoring }}
+        image: {{ .Values.capifEvents.capifEvents.image.repository }}:{{ .Values.capifEvents.capifEvents.image.tag | default .Chart.AppVersion }}
+        imagePullPolicy: {{ .Values.capifEvents.capifEvents.image.imagePullPolicy }}
+        name: capif-events
+        ports:
+        - containerPort: 8080
+        volumeMounts:
+          - name: capif-events-config
+            mountPath: /usr/src/app/config.yaml
+            subPath: config.yaml
+        resources:
+            {{- toYaml .Values.capifEvents.capifEvents.resources | nindent 12 }}
+        readinessProbe:
+          tcpSocket:
+            port: 8080
+          initialDelaySeconds: 5
+          periodSeconds: 5
+      volumes:
+      - name: capif-events-config
+        configMap:
+          name: capif-events-configmap
+          items:
+          - key: "config.yaml"
+            path: "config.yaml"
+      restartPolicy: Always
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: capif-routing-info
+  labels:
+    io.kompose.service: capif-routing-info
+  {{- include "capif.labels" . | nindent 4 }}
+  annotations:
+    kompose.cmd: kompose -f ../services/docker-compose.yml convert
+spec:
+  replicas: {{ .Values.capifRoutingInfo.replicas }}
+  selector:
+    matchLabels:
+      io.kompose.service: capif-routing-info
+    {{- include "capif.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      labels:
+        io.kompose.network/services-default: "true"
+        io.kompose.service: capif-routing-info
+      {{- include "capif.selectorLabels" . | nindent 8 }}
+      annotations:
+        date: "{{  now | unixEpoch }}"
+    spec:
+      hostAliases:
+        - ip: "{{ .Values.ingress.ip }}"
+          hostnames:
+            - "{{ .Values.nginx.nginx.env.capifHostname }}"
+      containers:
+      - env:
+        - name: KUBERNETES_CLUSTER_DOMAIN
+          value: {{ quote .Values.kubernetesClusterDomain }}
+        - name: MONITORING
+          value: {{ quote .Values.capifRoutingInfo.capifRoutingInfo.env.monitoring }}
+        image: {{ .Values.capifRoutingInfo.capifRoutingInfo.image.repository }}:{{ .Values.capifRoutingInfo.capifRoutingInfo.image.tag | default .Chart.AppVersion }}
+        imagePullPolicy: {{ .Values.capifRoutingInfo.capifRoutingInfo.image.imagePullPolicy }}
+        name: capif-routing-info
+        ports:
+        - containerPort: 8080
+        resources:
+            {{- toYaml .Values.capifRoutingInfo.capifRoutingInfo.resources | nindent 12 }}
+        readinessProbe:
+          tcpSocket:
+            port: 8080
+          initialDelaySeconds: 5
+          periodSeconds: 5
+      restartPolicy: Always
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: capif-security
+  labels:
+    io.kompose.service: capif-security
+  {{- include "capif.labels" . | nindent 4 }}
+  annotations:
+    kompose.cmd: kompose -f ../services/docker-compose.yml convert
+spec:
+  replicas: {{ .Values.capifSecurity.replicas }}
+  selector:
+    matchLabels:
+      io.kompose.service: capif-security
+    {{- include "capif.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      labels:
+        io.kompose.network/services-default: "true"
+        io.kompose.service: capif-security
+      {{- include "capif.selectorLabels" . | nindent 8 }}
+      annotations:
+        date: "{{  now | unixEpoch }}"
+        checksum/config: {{ include (print $.Template.BasePath "/capif-security-configmap.yaml") . | sha256sum }}
+    spec:
+      hostAliases:
+        - ip: "{{ .Values.ingress.ip }}"
+          hostnames:
+            - "{{ .Values.nginx.nginx.env.capifHostname }}"
+      containers:
+      - env:
+        - name: CAPIF_HOSTNAME
+          value: {{ quote .Values.nginx.nginx.env.capifHostname }}
+        - name: MONITORING
+          value: {{ quote .Values.capifSecurity.capifSecurity.env.monitoring }}
+        - name: VAULT_HOSTNAME
+          value: {{ quote .Values.parametersVault.env.vaultHostname }}
+        - name: VAULT_PORT
+          value: {{ quote .Values.parametersVault.env.vaultPort }}
+        - name: VAULT_ACCESS_TOKEN
+          value: {{ quote .Values.parametersVault.env.vaultAccessToken }}
+        - name: KUBERNETES_CLUSTER_DOMAIN
+          value: {{ quote .Values.kubernetesClusterDomain }}
+        image: {{ .Values.capifSecurity.capifSecurity.image.repository }}:{{ .Values.capifSecurity.capifSecurity.image.tag | default .Chart.AppVersion }}
+        imagePullPolicy: {{ .Values.capifSecurity.capifSecurity.image.imagePullPolicy }}
+        name: capif-security
+        ports:
+        - containerPort: 8080
+        volumeMounts:
+          - name: capif-security-config
+            mountPath: /usr/src/app/config.yaml
+            subPath: config.yaml
+        resources:
+            {{- toYaml .Values.capifSecurity.capifSecurity.resources | nindent 12 }}
+      volumes:
+      - name: capif-security-config
+        configMap:
+          name: capif-security-configmap
+          items:
+          - key: "config.yaml"
+            path: "config.yaml"
+      restartPolicy: Always
+      restartPolicy: Always
+
+{{- if eq .Values.register.enable "true" }}
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: register
+  labels:
+    io.kompose.service: register
+  {{- include "capif.labels" . | nindent 4 }}
+  annotations:
+    kompose.cmd: kompose -f ../services/docker-compose.yml convert
+spec:
+  replicas: {{ .Values.register.replicas }}
+  selector:
+    matchLabels:
+      io.kompose.service: register
+    {{- include "capif.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      labels:
+        io.kompose.network/services-default: "true"
+        io.kompose.service: register
+      {{- include "capif.selectorLabels" . | nindent 8 }}
+      annotations:
+        date: "{{  now | unixEpoch }}"
+        checksum/config: {{ include (print $.Template.BasePath "/register-configmap.yaml") . | sha256sum }}
+    spec:
+      hostAliases:
+        - ip: "{{ .Values.ingress.ip }}"
+          hostnames:
+            - "{{ .Values.nginx.nginx.env.capifHostname }}"
+      containers:
+      - env:
+        - name: KUBERNETES_CLUSTER_DOMAIN
+          value: {{ quote .Values.kubernetesClusterDomain }}
+        - name: VAULT_HOSTNAME
+          value: {{ quote .Values.parametersVault.env.vaultHostname }}
+        - name: VAULT_PORT
+          value: {{ quote .Values.parametersVault.env.vaultPort }}
+        - name: VAULT_ACCESS_TOKEN
+          value: {{ quote .Values.parametersVault.env.vaultAccessToken }}
+        image: {{ .Values.register.register.image.repository }}:{{ .Values.register.register.image.tag | default .Chart.AppVersion }}
+        imagePullPolicy: {{ .Values.register.register.image.imagePullPolicy }}
+        name: register
+        ports:
+        - containerPort: 8080
+        resources:
+            {{- toYaml .Values.register.register.resources | nindent 12 }}
+        volumeMounts:
+          - name: register-configmap
+            mountPath: /usr/src/app/config.yaml
+            subPath: config.yaml
+      volumes:
+      - name:  register-configmap
+        configMap:
+          name: register-configmap
+          items:
+          - key: "config.yaml"
+            path: "config.yaml"
+      restartPolicy: Always
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: mongo-register
+  labels:
+    io.kompose.service: mongo-register
+  {{- include "capif.labels" . | nindent 4 }}
+  annotations:
+    kompose.cmd: kompose -f ../services/docker-compose.yml convert
+spec:
+  replicas: {{ .Values.mongoRegister.replicas }}
+  selector:
+    matchLabels:
+      io.kompose.service: mongo-register
+    {{- include "capif.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      labels:
+        io.kompose.network/services-default: "true"
+        io.kompose.service: mongo-register
+      {{- include "capif.selectorLabels" . | nindent 8 }}
+      annotations:
+        date: "{{  now | unixEpoch }}"
+    spec:
+      hostAliases:
+        - ip: "{{ .Values.ingress.ip }}"
+          hostnames:
+            - "{{ .Values.nginx.nginx.env.capifHostname }}"
+      containers:
+      - env:
+        - name: MONGO_INITDB_ROOT_PASSWORD
+          value: {{ quote .Values.mongoRegister.mongo.env.mongoInitdbRootPassword }}
+        - name: MONGO_INITDB_ROOT_USERNAME
+          value: {{ quote .Values.mongoRegister.mongo.env.mongoInitdbRootUsername }}
+        - name: KUBERNETES_CLUSTER_DOMAIN
+          value: {{ quote .Values.kubernetesClusterDomain }}
+        image: {{ .Values.mongoRegister.mongo.image.repository }}:{{ .Values.mongoRegister.mongo.image.tag | default .Chart.AppVersion }}
+        imagePullPolicy: {{ .Values.mongoRegister.mongo.image.imagePullPolicy }}
+        name: mongo-register
+        ports:
+        - containerPort: 27017
+        resources:
+            {{- toYaml .Values.mongoRegister.mongo.resources | nindent 12 }}
+        readinessProbe:
+          tcpSocket:
+            port: 27017
+#          initialDelaySeconds: 5
+          periodSeconds: 5
+      restartPolicy: Always
+{{- end }}
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: logs
+  labels:
+    io.kompose.service: logs
+  {{- include "capif.labels" . | nindent 4 }}
+  annotations:
+    kompose.cmd: kompose -f ../services/docker-compose.yml convert
+spec:
+  replicas: {{ .Values.logs.replicas }}
+  selector:
+    matchLabels:
+      io.kompose.service: logs
+    {{- include "capif.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      labels:
+        io.kompose.network/services-default: "true"
+        io.kompose.service: logs
+      {{- include "capif.selectorLabels" . | nindent 8 }}
+      annotations:
+        date: "{{  now | unixEpoch }}"
+        checksum/config: {{ include (print $.Template.BasePath "/capif-logs-configmap.yaml") . | sha256sum }}
+    spec:
+      hostAliases:
+        - ip: "{{ .Values.ingress.ip }}"
+          hostnames:
+            - "{{ .Values.nginx.nginx.env.capifHostname }}"
+      containers:
+      - env:
+        - name: KUBERNETES_CLUSTER_DOMAIN
+          value: {{ quote .Values.kubernetesClusterDomain }}
+        - name: MONITORING
+          value: {{ quote .Values.logs.logs.env.monitoring }}
+        image: {{ .Values.logs.logs.image.repository }}:{{ .Values.logs.logs.image.tag | default .Chart.AppVersion }}
+        imagePullPolicy: {{ .Values.logs.logs.image.imagePullPolicy }}
+        name: logs
+        ports:
+        - containerPort: 8080
+        volumeMounts:
+          - name: capif-logs-config
+            mountPath: /usr/src/app/config.yaml
+            subPath: config.yaml
+        resources:
+            {{- toYaml .Values.logs.logs.resources | nindent 12 }}
+        readinessProbe:
+          tcpSocket:
+            port: 8080
+          initialDelaySeconds: 5
+          periodSeconds: 5
+      volumes:
+      - name: capif-logs-config
+        configMap:
+          name: capif-logs-configmap
+          items:
+          - key: "config.yaml"
+            path: "config.yaml"
+      restartPolicy: Always
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: mongo
+  labels:
+    io.kompose.service: mongo
+  {{- include "capif.labels" . | nindent 4 }}
+  annotations:
+    kompose.cmd: kompose -f ../services/docker-compose.yml convert
+spec:
+  replicas: {{ .Values.mongo.replicas }}
+  strategy:
+    type: Recreate
+  selector:
+    matchLabels:
+      io.kompose.service: mongo
+    {{- include "capif.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      labels:
+        io.kompose.network/services-default: "true"
+        io.kompose.service: mongo
+      {{- include "capif.selectorLabels" . | nindent 8 }}
+      annotations:
+        date: "{{  now | unixEpoch }}"
+    spec:
+      hostAliases:
+        - ip: "{{ .Values.ingress.ip }}"
+          hostnames:
+            - "{{ .Values.nginx.nginx.env.capifHostname }}"
+      containers:
+      - env:
+        - name: MONGO_INITDB_ROOT_PASSWORD
+          value: {{ quote .Values.mongo.mongo.env.mongoInitdbRootPassword }}
+        - name: MONGO_INITDB_ROOT_USERNAME
+          value: {{ quote .Values.mongo.mongo.env.mongoInitdbRootUsername }}
+        - name: KUBERNETES_CLUSTER_DOMAIN
+          value: {{ quote .Values.kubernetesClusterDomain }}
+        image: {{ .Values.mongo.mongo.image.repository }}:{{ .Values.mongo.mongo.image.tag | default .Chart.AppVersion }}
+        imagePullPolicy: {{ .Values.mongo.mongo.image.imagePullPolicy }}
+        name: mongo
+        ports:
+        - containerPort: 27017
+        securityContext:
+            runAsUser: 0
+        {{- if eq .Values.mongo.persistence.enable "true" }}
+        volumeMounts:
+            - name: mongo-pvc
+              mountPath: /data/db
+        {{- end }}
+        resources:
+            {{- toYaml .Values.mongo.mongo.resources | nindent 12 }}
+        livenessProbe:
+          tcpSocket:
+            port: 27017
+          initialDelaySeconds: 20
+          periodSeconds: 5
+        readinessProbe:
+          tcpSocket:
+            port: 27017
+#          initialDelaySeconds: 5
+          periodSeconds: 5
+      - name: mongo-helper
+        image: busybox
+        command:
+          - sh
+          - -c
+          - while true ; do echo alive ; sleep 10 ; done
+        {{- if eq .Values.mongo.persistence.enable "true" }}
+        volumeMounts:
+        - mountPath: /mongodata
+          name: mongo-pvc
+        {{- end }}
+      {{- if eq .Values.mongo.persistence.enable "true" }}
+      volumes:
+      - name: mongo-pvc
+        persistentVolumeClaim:
+          claimName: mongo-pvc
+      {{- end }}
+      restartPolicy: Always
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: mongo-express
+  labels:
+    io.kompose.service: mongo-express
+  {{- include "capif.labels" . | nindent 4 }}
+  annotations:
+    kompose.cmd: kompose -f ../services/docker-compose.yml convert
+spec:
+  replicas: {{ .Values.mongoExpress.replicas }}
+  selector:
+    matchLabels:
+      io.kompose.service: mongo-express
+    {{- include "capif.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      labels:
+        io.kompose.network/services-default: "true"
+        io.kompose.service: mongo-express
+      {{- include "capif.selectorLabels" . | nindent 8 }}
+      annotations:
+        date: "{{  now | unixEpoch }}"
+    spec:
+      hostAliases:
+        - ip: "{{ .Values.ingress.ip }}"
+          hostnames:
+            - "{{ .Values.nginx.nginx.env.capifHostname }}"
+      containers:
+      - env:
+        - name: ME_CONFIG_MONGODB_ADMINPASSWORD
+          value: {{ quote .Values.mongoExpress.mongoExpress.env.meConfigMongodbAdminpassword
+            }}
+        - name: ME_CONFIG_MONGODB_ADMINUSERNAME
+          value: {{ quote .Values.mongoExpress.mongoExpress.env.meConfigMongodbAdminusername
+            }}
+        - name: ME_CONFIG_MONGODB_URL
+          value: {{ quote .Values.mongoExpress.mongoExpress.env.meConfigMongodbUrl }}
+        - name: KUBERNETES_CLUSTER_DOMAIN
+          value: {{ quote .Values.kubernetesClusterDomain }}
+        image: {{ .Values.mongoExpress.mongoExpress.image.repository }}:{{ .Values.mongoExpress.mongoExpress.image.tag | default .Chart.AppVersion }}
+        imagePullPolicy: {{ .Values.mongoExpress.mongoExpress.image.imagePullPolicy }}
+        name: mongo-express
+        ports:
+        - containerPort: 8081
+        resources:
+            {{- toYaml .Values.mongoExpress.mongoExpress.resources | nindent 12 }}
+        readinessProbe:
+          tcpSocket:
+            port: 8081
+#          initialDelaySeconds: 0
+          periodSeconds: 5     
+      restartPolicy: Always
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: nginx
+  labels:
+    io.kompose.service: nginx
+  {{- include "capif.labels" . | nindent 4 }}
+  annotations:
+    kompose.cmd: kompose -f ../services/docker-compose.yml convert
+spec:
+  replicas: {{ .Values.nginx.replicas }}
+  selector:
+    matchLabels:
+      io.kompose.service: nginx
+    {{- include "capif.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      labels:
+        io.kompose.network/services-default: "true"
+        io.kompose.service: nginx
+      {{- include "capif.selectorLabels" . | nindent 8 }}
+      annotations:
+        date: "{{  now | unixEpoch }}"
+    spec:
+      hostAliases:
+        - ip: "{{ .Values.ingress.ip }}"
+          hostnames:
+            - "{{ .Values.nginx.nginx.env.capifHostname }}"
+      containers:
+      - env:
+        - name: CAPIF_HOSTNAME
+          value: {{ quote .Values.nginx.nginx.env.capifHostname }}
+        - name: VAULT_HOSTNAME
+          value: {{ quote .Values.parametersVault.env.vaultHostname }}
+        - name: VAULT_PORT
+          value: {{ quote .Values.parametersVault.env.vaultPort }}
+        - name: VAULT_ACCESS_TOKEN
+          value: {{ quote .Values.parametersVault.env.vaultAccessToken }}
+        - name: KUBERNETES_CLUSTER_DOMAIN
+          value: {{ quote .Values.kubernetesClusterDomain }}
+        image: {{ .Values.nginx.nginx.image.repository }}:{{ .Values.nginx.nginx.image.tag | default .Chart.AppVersion }}
+        imagePullPolicy: {{ .Values.nginx.nginx.image.imagePullPolicy }}
+        name: nginx
+        ports:
+        - containerPort: 8080
+        - containerPort: 443
+        livenessProbe:
+          tcpSocket:
+            port: 8080
+          initialDelaySeconds: 20
+          periodSeconds: 5
+#        readinessProbe:
+#          tcpSocket:
+#            port: 8080
+#          initialDelaySeconds: 60
+#          periodSeconds: 5
+        resources:
+            {{- toYaml .Values.nginx.nginx.resources | nindent 12 }}
+      restartPolicy: Always
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: published-apis
+  labels:
+    io.kompose.service: published-apis
+  {{- include "capif.labels" . | nindent 4 }}
+  annotations:
+    kompose.cmd: kompose -f ../services/docker-compose.yml convert
+spec:
+  replicas: {{ .Values.publishedApis.replicas }}
+  selector:
+    matchLabels:
+      io.kompose.service: published-apis
+    {{- include "capif.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      labels:
+        io.kompose.network/services-default: "true"
+        io.kompose.service: published-apis
+      {{- include "capif.selectorLabels" . | nindent 8 }}
+      annotations:
+        date: "{{  now | unixEpoch }}"
+        checksum/config: {{ include (print $.Template.BasePath "/capif-published-configmap.yaml") . | sha256sum }}
+    spec:
+      hostAliases:
+        - ip: "{{ .Values.ingress.ip }}"
+          hostnames:
+            - "{{ .Values.nginx.nginx.env.capifHostname }}"
+      containers:
+      - env:
+        - name: KUBERNETES_CLUSTER_DOMAIN
+          value: {{ quote .Values.kubernetesClusterDomain }}
+        - name: MONITORING
+          value: {{ quote .Values.publishedApis.publishedApis.env.monitoring }}
+        image: {{ .Values.publishedApis.publishedApis.image.repository }}:{{ .Values.publishedApis.publishedApis.image.tag | default .Chart.AppVersion }}
+        imagePullPolicy: {{ .Values.publishedApis.publishedApis.image.imagePullPolicy }}
+        name: published-apis
+        ports:
+        - containerPort: 8080
+        volumeMounts:
+          - name: capif-published-config
+            mountPath: /usr/src/app/config.yaml
+            subPath: config.yaml
+        resources:
+            {{- toYaml .Values.publishedApis.publishedApis.resources | nindent 12 }}
+        readinessProbe:
+          tcpSocket:
+            port: 8080
+          initialDelaySeconds: 5
+          periodSeconds: 5
+      volumes:
+      - name: capif-published-config
+        configMap:
+          name: capif-published-configmap
+          items:
+          - key: "config.yaml"
+            path: "config.yaml"
+      restartPolicy: Always
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: redis
+  labels:
+    io.kompose.service: redis
+  {{- include "capif.labels" . | nindent 4 }}
+  annotations:
+    kompose.cmd: kompose -f ../services/docker-compose.yml convert
+spec:
+  replicas: {{ .Values.redis.replicas }}
+  selector:
+    matchLabels:
+      io.kompose.service: redis
+    {{- include "capif.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      labels:
+        io.kompose.network/services-default: "true"
+        io.kompose.service: redis
+      {{- include "capif.selectorLabels" . | nindent 8 }}
+      annotations:
+        date: "{{  now | unixEpoch }}"
+    spec:
+      hostAliases:
+        - ip: "{{ .Values.ingress.ip }}"
+          hostnames:
+            - "{{ .Values.nginx.nginx.env.capifHostname }}"
+      containers:
+      - args:
+        - redis-server
+        env:
+        - name: REDIS_REPLICATION_MODE
+          value: {{ quote .Values.redis.redis.env.redisReplicationMode }}
+        - name: KUBERNETES_CLUSTER_DOMAIN
+          value: {{ quote .Values.kubernetesClusterDomain }}
+        image: {{ .Values.redis.redis.image.repository }}:{{ .Values.redis.redis.image.tag | default .Chart.AppVersion }}
+        imagePullPolicy: {{ .Values.redis.redis.image.imagePullPolicy }}
+        name: redis
+        ports:
+        - containerPort: 6379
+        resources:
+            {{- toYaml .Values.redis.redis.resources | nindent 12 }}
+        readinessProbe:
+          tcpSocket:
+            port: 6379
+#          initialDelaySeconds: 5
+          periodSeconds: 5
+        livenessProbe:
+          tcpSocket:
+            port: 6379
+          initialDelaySeconds: 5
+          periodSeconds: 5
+      restartPolicy: Always
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: service-apis
+  labels:
+    io.kompose.service: service-apis
+  {{- include "capif.labels" . | nindent 4 }}
+  annotations:
+    kompose.cmd: kompose -f ../services/docker-compose.yml convert
+spec:
+  replicas: {{ .Values.serviceApis.replicas }}
+  selector:
+    matchLabels:
+      io.kompose.service: service-apis
+    {{- include "capif.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      labels:
+        io.kompose.network/services-default: "true"
+        io.kompose.service: service-apis
+      {{- include "capif.selectorLabels" . | nindent 8 }}
+      annotations:
+        date: "{{  now | unixEpoch }}"
+        checksum/config: {{ include (print $.Template.BasePath "/capif-service-configmap.yaml") . | sha256sum }}
+    spec:
+      hostAliases:
+        - ip: "{{ .Values.ingress.ip }}"
+          hostnames:
+            - "{{ .Values.nginx.nginx.env.capifHostname }}"
+      containers:
+      - env:
+        - name: KUBERNETES_CLUSTER_DOMAIN
+          value: {{ quote .Values.kubernetesClusterDomain }}
+        - name: MONITORING
+          value: {{ quote .Values.serviceApis.serviceApis.env.monitoring }}
+        image: {{ .Values.serviceApis.serviceApis.image.repository }}:{{ .Values.serviceApis.serviceApis.image.tag | default .Chart.AppVersion }}
+        imagePullPolicy: {{ .Values.serviceApis.serviceApis.image.imagePullPolicy }}
+        name: service-apis
+        ports:
+        - containerPort: 8080
+        volumeMounts:
+          - name: capif-service-config
+            mountPath: /usr/src/app/config.yaml
+            subPath: config.yaml
+        resources:
+            {{- toYaml .Values.serviceApis.serviceApis.resources | nindent 12 }}
+        readinessProbe:
+          tcpSocket:
+            port: 8080
+          initialDelaySeconds: 5
+          periodSeconds: 5
+      volumes:
+      - name: capif-service-config
+        configMap:
+          name: capif-service-configmap
+          items:
+          - key: "config.yaml"
+            path: "config.yaml"
+      restartPolicy: Always
\ No newline at end of file
diff --git a/helm/capif/templates/fluent-bit-service.yaml b/helm/capif/templates/fluent-bit-service.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..90653b3aabb306b61829bd4f5ae02cec5dbdd817
--- /dev/null
+++ b/helm/capif/templates/fluent-bit-service.yaml
@@ -0,0 +1,24 @@
+{{- if eq .Values.monitoring.enable "true" }}
+apiVersion: v1
+kind: Service
+metadata:
+  annotations:
+    kompose.cmd: kompose -f docker-compose.yml convert
+    kompose.version: 1.28.0 (c4137012e)
+  creationTimestamp: null
+  labels:
+    io.kompose.service: fluent-bit
+    {{- include "capif.labels" . | nindent 4 }}
+  name: fluent-bit
+spec:
+  ports:
+    - name: "24224-tcp"
+      port: 24224
+      targetPort: 24224
+    - name: 24224-udp
+      port: 24224
+      protocol: UDP
+      targetPort: 24224
+  selector:
+    io.kompose.service: fluent-bit
+{{- end }}
\ No newline at end of file
diff --git a/helm/capif/templates/fluentbit-configmap.yaml b/helm/capif/templates/fluentbit-configmap.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..20467b10a80d79431e308c6c87cd9cdc42fffcd6
--- /dev/null
+++ b/helm/capif/templates/fluentbit-configmap.yaml
@@ -0,0 +1,24 @@
+{{- if eq .Values.monitoring.enable "true" }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: fluent-bit-configmap
+data:
+  LOKI_URL: {{ quote .Values.monitoring.fluentBit.env.lokiUrl }}
+  fluent-bit.conf: |
+    [INPUT]
+        Name        forward
+        Listen      0.0.0.0
+        Port        24224
+    [Output]
+        Name grafana-loki
+        Match *
+        Url ${LOKI_URL}
+        RemoveKeys source
+        Labels {job="fluent-bit"}
+        LabelKeys container_name, traceID
+        BatchWait 1s
+        BatchSize 1001024
+        LineFormat json
+        LogLevel info
+{{- end }}
\ No newline at end of file
diff --git a/helm/capif/templates/fluentbit-deployment.yaml b/helm/capif/templates/fluentbit-deployment.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..925ec022bb6bd5a2763ffacac23bb4113ca7072d
--- /dev/null
+++ b/helm/capif/templates/fluentbit-deployment.yaml
@@ -0,0 +1,59 @@
+{{- if eq .Values.monitoring.enable "true" }}
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  annotations:
+    kompose.cmd: kompose -f docker-compose.yml convert
+    kompose.version: 1.28.0 (c4137012e)
+  labels:
+    io.kompose.service: fluent-bit
+    {{- include "capif.labels" . | nindent 4 }}
+  name: fluent-bit
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      io.kompose.service: fluent-bit
+      {{- include "capif.selectorLabels" . | nindent 6 }}
+  strategy:
+    type: Recreate
+  template:
+    metadata:
+      annotations:
+        kompose.cmd: kompose -f docker-compose.yml convert
+        kompose.version: 1.28.0 (c4137012e)
+        checksum/config: {{ include (print $.Template.BasePath "/fluentbit-configmap.yaml") . | sha256sum }}
+      creationTimestamp: null
+      labels:
+        io.kompose.network/monitoring-default: "true"
+        io.kompose.service: fluent-bit
+        {{- include "capif.selectorLabels" . | nindent 8 }}
+    spec:
+      containers:
+        - env:
+            - name: LOKI_URL
+              valueFrom:
+                configMapKeyRef:
+                  name: fluent-bit-configmap
+                  key: LOKI_URL
+          image: {{ .Values.monitoring.fluentBit.image.repository }}:{{ .Values.monitoring.fluentBit.image.tag }}
+          name: fluent-bit
+          ports:
+            - containerPort: 24224
+            - containerPort: 24224
+              protocol: UDP
+          resources:
+            {{- toYaml .Values.monitoring.fluentBit.resources | nindent 12 }}
+          volumeMounts:
+            - name: fluent-bit-conf
+              mountPath: /fluent-bit/etc/fluent-bit.conf
+              subPath: fluent-bit.conf
+      restartPolicy: Always
+      volumes:
+        - name: fluent-bit-conf
+          configMap:
+            name: fluent-bit-configmap
+            items:
+            - key: "fluent-bit.conf"
+              path: "fluent-bit.conf"
+{{- end }}
\ No newline at end of file
diff --git a/helm/capif/templates/grafana-configmap.yaml b/helm/capif/templates/grafana-configmap.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..654101f720e7c6d515aa17e5f14adedd532c44e9
--- /dev/null
+++ b/helm/capif/templates/grafana-configmap.yaml
@@ -0,0 +1,108 @@
+{{- if eq .Values.monitoring.enable "true" }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: datasources
+data:
+  datasources.yaml: |
+    apiVersion: 1 
+    datasources:
+      - name: Loki
+        type: loki
+        uid: e4f43364-7019-45a7-aa7a-14ce2d4ddb0b
+        typeName: Loki
+        typeLogoUrl: public/app/plugins/datasource/loki/img/loki_icon.svg
+        access: proxy
+        url: {{ .Values.monitoring.grafana.env.lokiUrl }}
+        user: ''
+        database: ''
+        basicAuth: false
+        isDefault: false
+        jsonData:
+          derivedFields:
+          - datasourceUid: fee7e008-f836-424a-b701-88cad583c715
+            matcherRegex: '"traceID":\s*"([a-fA-F0-9]+)"'
+            name: traceID
+            url: "$${__value.raw}"
+        readOnly: false 
+      - name: Prometheus
+        type: prometheus
+        typeName: Prometheus
+        typeLogoUrl: public/app/plugins/datasource/prometheus/img/prometheus_logo.svg
+        access: proxy
+        url: {{ .Values.monitoring.grafana.env.prometheusUrl }}
+        uid: af6b44aa-0703-4979-825c-c1afba946534
+        user: ''
+        database: ''
+        basicAuth: false
+        isDefault: false
+        jsonData:
+          httpMethod: POST
+          prometheusType: Prometheus
+          prometheusVersion: 2.40.1
+        readOnly: false 
+      - name: Tempo
+        type: tempo
+        typeName: Tempo
+        typeLogoUrl: public/app/plugins/datasource/tempo/img/tempo_logo.svg
+        uid: fee7e008-f836-424a-b701-88cad583c715
+        access: proxy
+        url: {{ .Values.monitoring.grafana.env.tempoUrl }} 
+        user: ''
+        database: ''
+        basicAuth: false
+        isDefault: false
+        jsonData:
+          lokiSearch:
+            datasourceUid: e4f43364-7019-45a7-aa7a-14ce2d4ddb0b
+        readOnly: false
+---
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: default
+data:
+  default.yaml: |
+    apiVersion: 1
+    providers:
+      - name: Default # A uniquely identifiable name for the provider
+        orgId: 1
+        folder: "" # The folder where to place the dashboards
+        folderUid: ""
+        type: file
+        disableDeletion: false
+        allowUiUpdates: true
+        options:
+          path: /var/lib/grafana/dashboards
+
+---
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: docker-monitoring
+data:
+  Docker-monitoring.json: |-
+{{ .Files.Get "docker-monitoring.json" | indent 4 }}
+
+---
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: kubernetes-dashboard
+data:
+  kubernetes-dashboard.json: |
+{{ .Files.Get "kubernetes-dashboard.json" | indent 4 }}
+
+---
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: loki-logs
+data:
+  loki-logs.json: |
+{{ .Files.Get "loki-logs.json" | indent 4 }}
+{{- end }}
diff --git a/helm/capif/templates/grafana-deployment.yaml b/helm/capif/templates/grafana-deployment.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..844f32ece2ce27cc1d40774377c5dce7c6e5eaed
--- /dev/null
+++ b/helm/capif/templates/grafana-deployment.yaml
@@ -0,0 +1,109 @@
+{{- if eq .Values.monitoring.enable "true" }}
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  annotations:
+    kompose.cmd: kompose -f docker-compose.yml convert
+    kompose.version: 1.28.0 (c4137012e)
+  labels:
+    io.kompose.service: grafana
+    {{- include "capif.labels" . | nindent 4 }}
+  name: grafana
+spec:
+  replicas: 1
+  strategy:
+    type: Recreate
+  selector:
+    matchLabels:
+      io.kompose.service: grafana
+      {{- include "capif.selectorLabels" . | nindent 6 }}
+  strategy:
+    type: Recreate
+  template:
+    metadata:
+      annotations:
+        kompose.cmd: kompose -f docker-compose.yml convert
+        kompose.version: 1.28.0 (c4137012e)
+        checksum/config: {{ include (print $.Template.BasePath "/grafana-configmap.yaml") . | sha256sum }}
+      labels:
+        io.kompose.network/monitoring-default: "true"
+        io.kompose.service: grafana
+        {{- include "capif.selectorLabels" . | nindent 8 }}
+    spec:
+      containers:
+        - env:
+            - name: GF_AUTH_ANONYMOUS_ENABLED
+              value: {{ quote .Values.monitoring.grafana.env.gfAuthAnonymousEnable }}
+            - name: GF_SECURITY_ALLOW_EMBEDDING
+              value: {{ quote .Values.monitoring.grafana.env.gfSecurityAllowEmbedding }}
+            - name: GF_PATHS_PROVISIONING
+              value: /etc/grafana/provisioning
+          image: {{ .Values.monitoring.grafana.image.repository }}:{{ .Values.monitoring.grafana.image.tag }}
+          name: grafana
+          envFrom:
+            - secretRef:
+                name: grafana-secrets
+          ports:
+            - containerPort: 3000
+          resources:
+            {{- toYaml .Values.monitoring.grafana.resources | nindent 12 }}
+          securityContext:
+            runAsUser: 0
+          volumeMounts:
+            - name: grafana-datasources
+              mountPath: /etc/grafana/provisioning/datasources/datasources.yaml
+              subPath: datasources.yaml
+            - name: grafana-default
+              mountPath: /etc/grafana/provisioning/dashboards/default.yaml
+              subPath: default.yaml
+            - name: grafana-docker
+              mountPath: /var/lib/grafana/dashboards/Docker-monitoring.json
+              subPath: Docker-monitoring.json
+            - name: kubernetes-dashboard
+              mountPath: /var/lib/grafana/dashboards/kubernetes-dashboard.json
+              subPath: kubernetes-dashboard.json
+            - name: grafana-loki
+              mountPath: /var/lib/grafana/dashboards/Loki-Logs.json
+              subPath: loki-logs.json
+            {{- if eq .Values.monitoring.grafana.persistence.enable "true" }}
+            - name: grafana-claim0
+              mountPath: /var/lib/grafana
+            {{- end }}
+      volumes:
+      - name: grafana-datasources
+        configMap:
+          name: datasources
+          items:
+          - key: "datasources.yaml"
+            path: "datasources.yaml"
+      - name: grafana-default
+        configMap:
+          name: default
+          items:
+          - key: "default.yaml"
+            path: "default.yaml"
+      - name: grafana-docker
+        configMap:
+          name: docker-monitoring
+          items:
+          - key: "Docker-monitoring.json"
+            path: "Docker-monitoring.json"
+      - name: kubernetes-dashboard
+        configMap:
+          name: kubernetes-dashboard
+          items:
+          - key: "kubernetes-dashboard.json"
+            path: "kubernetes-dashboard.json"
+      - name: grafana-loki
+        configMap:
+          name: loki-logs
+          items:
+          - key: "loki-logs.json"
+            path: "loki-logs.json"
+    {{- if eq .Values.monitoring.grafana.persistence.enable "true" }}
+      - name: grafana-claim0
+        persistentVolumeClaim:
+          claimName: grafana-claim0
+    {{- end }}
+      restartPolicy: Always
+{{- end }}
\ No newline at end of file
diff --git a/helm/capif/templates/grafana-ingress-route.yaml b/helm/capif/templates/grafana-ingress-route.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..2e2648bf5f4b7e52d5d1e1ca73037d4e2dc7a18b
--- /dev/null
+++ b/helm/capif/templates/grafana-ingress-route.yaml
@@ -0,0 +1,18 @@
+{{- if eq .Values.monitoring.enable "true" }}
+{{- if eq .Values.monitoring.grafana.ingressRoute.enable "true" }}
+apiVersion: traefik.containo.us/v1alpha1 
+kind: IngressRoute
+metadata:
+  name: grafana-ingress-route 
+spec:
+  entryPoints: [web] 
+  routes:
+    - kind: Rule
+      match: Host(`{{ .Values.monitoring.grafana.ingressRoute.host }}`)
+      services:
+        - kind: Service
+          name: grafana 
+          port: {{ .Values.monitoring.grafana.service.port }}
+          scheme: http
+{{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/helm/capif/templates/grafana-ingress.yaml b/helm/capif/templates/grafana-ingress.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..7d7d0cba2890fee678fc110be2f44592019be198
--- /dev/null
+++ b/helm/capif/templates/grafana-ingress.yaml
@@ -0,0 +1,34 @@
+{{- if eq .Values.monitoring.enable "true" }}
+{{- if .Values.monitoring.grafana.ingress.enabled -}}
+{{- $svcPort := .Values.monitoring.grafana.service.port -}}
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: grafana-ingress
+  labels:
+    {{- include "capif.labels" . | nindent 4 }}
+  {{- with .Values.monitoring.grafana.ingress.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+{{- if .Values.monitoring.grafana.ingress.ingressClassName }}
+  ingressClassName: {{ .Values.monitoring.grafana.ingress.ingressClassName }}
+{{- end }}
+  rules:
+    {{- range .Values.monitoring.grafana.ingress.hosts }}
+  - host: {{ .host | quote }}
+    http:
+      paths:
+        {{- range .paths }}
+        - path: {{ .path }}
+          pathType: {{ .pathType }}
+          backend:
+            service:
+              name: grafana
+              port:
+                number: {{ $svcPort }}
+        {{- end }}
+    {{- end }}
+{{- end }}
+{{- end }}
diff --git a/helm/capif/templates/grafana-pvc.yaml b/helm/capif/templates/grafana-pvc.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..b2c6672ec88770fbc2ef0ff3d67a826971be668f
--- /dev/null
+++ b/helm/capif/templates/grafana-pvc.yaml
@@ -0,0 +1,16 @@
+{{- if eq .Values.monitoring.enable "true" }}
+{{- if eq .Values.monitoring.grafana.persistence.enable "true" }}
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  labels:
+    io.kompose.service: grafana-claim0
+  name: grafana-claim0
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: {{ .Values.monitoring.grafana.persistence.storage }}
+{{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/helm/capif/templates/grafana-secrets.yaml b/helm/capif/templates/grafana-secrets.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..a6796d4a9de32cfdd2557ff68dfd1ec721414005
--- /dev/null
+++ b/helm/capif/templates/grafana-secrets.yaml
@@ -0,0 +1,10 @@
+{{- if eq .Values.monitoring.enable "true" }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: grafana-secrets
+type: Opaque
+data:
+  GF_AUTH_ANONYMOUS_ORG_ROLE: {{ .Values.monitoring.grafana.env.gfAuthAnonymousOrgRole | b64enc | quote }}
+  GF_SECURITY_ADMIN_PASSWORD: {{ .Values.monitoring.grafana.env.gfSecurityAdminPassword | b64enc | quote }}
+{{- end }}
\ No newline at end of file
diff --git a/helm/capif/templates/grafana-service.yaml b/helm/capif/templates/grafana-service.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..c6280438f7cd896ae2e05f41a2de6039593af55c
--- /dev/null
+++ b/helm/capif/templates/grafana-service.yaml
@@ -0,0 +1,17 @@
+{{- if eq .Values.monitoring.enable "true" }}
+apiVersion: v1
+kind: Service
+metadata:
+  name: grafana
+  labels:
+    {{- include "capif.labels" . | nindent 4 }}
+spec:
+  type: {{ .Values.monitoring.grafana.service.type }}
+  ports:
+    - port: {{ .Values.monitoring.grafana.service.port }}
+      targetPort: {{ .Values.monitoring.grafana.service.port }}
+      protocol: TCP
+      name: http-port
+  selector:
+    io.kompose.service: grafana
+{{- end }}
\ No newline at end of file
diff --git a/helm/capif/templates/logs.yaml b/helm/capif/templates/logs.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..7382eff22fd777be0631d70f913efdf947c8c4b5
--- /dev/null
+++ b/helm/capif/templates/logs.yaml
@@ -0,0 +1,17 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: logs
+  labels:
+    io.kompose.service: logs
+  {{- include "capif.labels" . | nindent 4 }}
+  annotations:
+    kompose.cmd: kompose -f ../services/docker-compose.yml convert
+    kompose.version: 1.28.0 (c4137012e)
+spec:
+  type: {{ .Values.logs.type }}
+  selector:
+    io.kompose.service: logs
+  {{- include "capif.selectorLabels" . | nindent 4 }}
+  ports:
+	{{- .Values.logs.ports | toYaml | nindent 2 -}}
\ No newline at end of file
diff --git a/helm/capif/templates/loki-deployment.yaml b/helm/capif/templates/loki-deployment.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..cadf37d067e88b18fb7c835a5af2f5c0bafea5f4
--- /dev/null
+++ b/helm/capif/templates/loki-deployment.yaml
@@ -0,0 +1,54 @@
+{{- if eq .Values.monitoring.enable "true" }}
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  annotations:
+    kompose.cmd: kompose -f docker-compose.yml convert
+    kompose.version: 1.28.0 (c4137012e)
+  labels:
+    io.kompose.service: loki
+    {{- include "capif.labels" . | nindent 4 }}
+  name: loki
+spec:
+  replicas: 1
+  strategy:
+    type: Recreate
+  selector:
+    matchLabels:
+      io.kompose.service: loki
+      {{- include "capif.selectorLabels" . | nindent 6 }}
+  strategy: {}
+  template:
+    metadata:
+      annotations:
+        kompose.cmd: kompose -f docker-compose.yml convert
+        kompose.version: 1.28.0 (c4137012e)
+      labels:
+        io.kompose.network/monitoring-default: "true"
+        io.kompose.service: loki
+        {{- include "capif.selectorLabels" . | nindent 8 }}
+    spec:
+      containers:
+        - args:
+            - -config.file=/etc/loki/local-config.yaml
+          image: {{ .Values.monitoring.loki.image.repository }}:{{ .Values.monitoring.loki.image.tag }}
+          name: loki
+          ports:
+            - containerPort: 3100
+          {{- if eq .Values.monitoring.loki.persistence.enable "true" }}
+          volumeMounts:
+            - name: loki-claim0
+              mountPath: /loki/wal
+          {{- end }}
+          resources:
+            {{- toYaml .Values.monitoring.loki.resources | nindent 12 }}
+          securityContext:
+            runAsUser: 0
+    {{- if eq .Values.monitoring.loki.persistence.enable "true" }}
+      volumes:
+      - name: loki-claim0
+        persistentVolumeClaim:
+          claimName: loki-claim0
+    {{- end }}
+      restartPolicy: Always
+{{- end }}
\ No newline at end of file
diff --git a/helm/capif/templates/loki-pvc.yaml b/helm/capif/templates/loki-pvc.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..7da7816938afdb1850f7d2f312f967811dafb69d
--- /dev/null
+++ b/helm/capif/templates/loki-pvc.yaml
@@ -0,0 +1,16 @@
+{{- if eq .Values.monitoring.enable "true" }}
+{{- if eq .Values.monitoring.loki.persistence.enable "true" }}
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  labels:
+    io.kompose.service: loki-claim0
+  name: loki-claim0
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: {{ .Values.monitoring.loki.persistence.storage }}
+{{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/helm/capif/templates/loki-service.yaml b/helm/capif/templates/loki-service.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..cf711a9d162ef071fd1601983f1f8e9f11814c96
--- /dev/null
+++ b/helm/capif/templates/loki-service.yaml
@@ -0,0 +1,19 @@
+{{- if eq .Values.monitoring.enable "true" }}
+apiVersion: v1
+kind: Service
+metadata:
+  annotations:
+    kompose.cmd: kompose -f docker-compose.yml convert
+    kompose.version: 1.28.0 (c4137012e)
+  labels:
+    io.kompose.service: loki
+    {{- include "capif.labels" . | nindent 4 }}
+  name: loki
+spec:
+  ports:
+    - name: "loki-port"
+      port: 3100
+      targetPort: 3100
+  selector:
+    io.kompose.service: loki
+{{- end }}
\ No newline at end of file
diff --git a/helm/capif/templates/mongo-express.yaml b/helm/capif/templates/mongo-express.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..28d553b2fa05594f414638d5122e3cc442889ec7
--- /dev/null
+++ b/helm/capif/templates/mongo-express.yaml
@@ -0,0 +1,17 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: mongo-express
+  labels:
+    io.kompose.service: mongo-express
+  {{- include "capif.labels" . | nindent 4 }}
+  annotations:
+    kompose.cmd: kompose -f ../services/docker-compose.yml convert
+    kompose.version: 1.28.0 (c4137012e)
+spec:
+  type: {{ .Values.mongoExpress.type }}
+  selector:
+    io.kompose.service: mongo-express
+  {{- include "capif.selectorLabels" . | nindent 4 }}
+  ports:
+	{{- .Values.mongoExpress.ports | toYaml | nindent 2 -}}
\ No newline at end of file
diff --git a/helm/capif/templates/mongo-pvc.yaml b/helm/capif/templates/mongo-pvc.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..2996d57e2c121fe12c2fd04d5ceaceee14320f4c
--- /dev/null
+++ b/helm/capif/templates/mongo-pvc.yaml
@@ -0,0 +1,16 @@
+{{- if eq .Values.monitoring.enable "true" }}
+{{- if eq .Values.mongo.persistence.enable "true" }}
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  labels:
+    io.kompose.service: mongo-pvc
+  name: mongo-pvc
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: {{ .Values.mongo.persistence.storage }}
+{{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/helm/capif/templates/mongo-register.yaml b/helm/capif/templates/mongo-register.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..82b307f5f2bae9e026b1efb78c15a09d319d7306
--- /dev/null
+++ b/helm/capif/templates/mongo-register.yaml
@@ -0,0 +1,17 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: mongo-register
+  labels:
+    io.kompose.service: mongo-register
+  {{- include "capif.labels" . | nindent 4 }}
+  annotations:
+    kompose.cmd: kompose -f ../services/docker-compose.yml convert
+    kompose.version: 1.28.0 (c4137012e)
+spec:
+  type: {{ .Values.mongoRegister.type }}
+  selector:
+    io.kompose.service: mongo-register
+  {{- include "capif.selectorLabels" . | nindent 4 }}
+  ports:
+	{{- .Values.mongoRegister.ports | toYaml | nindent 2 -}}
\ No newline at end of file
diff --git a/helm/capif/templates/mongo.yaml b/helm/capif/templates/mongo.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..864276480d68191f6363191ab080936d43484d17
--- /dev/null
+++ b/helm/capif/templates/mongo.yaml
@@ -0,0 +1,17 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: mongo
+  labels:
+    io.kompose.service: mongo
+  {{- include "capif.labels" . | nindent 4 }}
+  annotations:
+    kompose.cmd: kompose -f ../services/docker-compose.yml convert
+    kompose.version: 1.28.0 (c4137012e)
+spec:
+  type: {{ .Values.mongo.type }}
+  selector:
+    io.kompose.service: mongo
+  {{- include "capif.selectorLabels" . | nindent 4 }}
+  ports:
+	{{- .Values.mongo.ports | toYaml | nindent 2 -}}
\ No newline at end of file
diff --git a/helm/capif/templates/nginx-ingress-route.yaml b/helm/capif/templates/nginx-ingress-route.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..57ca0bed1a4c8de978e244a34f346edb8606b003
--- /dev/null
+++ b/helm/capif/templates/nginx-ingress-route.yaml
@@ -0,0 +1,17 @@
+{{- if eq .Values.nginx.ingressType "IngressRoute" }}
+---
+apiVersion: traefik.containo.us/v1alpha1 
+kind: IngressRoute
+metadata:
+  name: nginx-capif-ingress-route
+spec:
+  entryPoints: [web] 
+  routes:
+    - kind: Rule
+      match: Host(`{{ .Values.nginx.nginx.env.capifHostname }} && Path(`/ca-root`, `/sign-csr`, `/certdata`, `/register`, `/testdata`, `/getauth`, `/test`)`)
+      services:
+        - kind: Service
+          name: nginx 
+          port: 8080
+          scheme: http
+{{- end }}
\ No newline at end of file
diff --git a/helm/capif/templates/nginx-ssl-ingress-route.yaml b/helm/capif/templates/nginx-ssl-ingress-route.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..8c806b69a712ee995f4c97c8e406383acb507190
--- /dev/null
+++ b/helm/capif/templates/nginx-ssl-ingress-route.yaml
@@ -0,0 +1,18 @@
+{{- if eq .Values.nginx.ingressType "IngressRoute" }}
+---
+apiVersion: traefik.containo.us/v1alpha1 
+kind: IngressRoute
+metadata:
+  name: nginx-ssl-capif-ingress-route 
+spec:
+  entryPoints: [web] 
+  routes:
+    - kind: Rule
+      match: Host(`{{ .Values.nginx.nginx.env.capifHostname }}`)
+      services:
+        - kind: Service
+          name: nginx 
+          port: 443
+      tls:
+        passthrough: true
+{{- end }}
\ No newline at end of file
diff --git a/helm/capif/templates/nginx-ssl-route.yaml b/helm/capif/templates/nginx-ssl-route.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..3e24b72131a56915468f2dc40329fbf9c480f222
--- /dev/null
+++ b/helm/capif/templates/nginx-ssl-route.yaml
@@ -0,0 +1,22 @@
+{{- if eq .Values.env "openshift" }}
+apiVersion: route.openshift.io/v1
+kind: Route
+metadata:
+  labels:
+  name: nginx-ssl
+spec:
+  host: {{ .Values.nginx.nginx.env.capifHostname }}
+  port:
+    targetPort: "443"
+  tls:
+    termination: passthrough
+  to:
+    kind: Service
+    name: nginx
+    weight: 100
+status:
+  ingress:
+  - conditions:
+    host: {{ .Values.nginx.nginx.env.capifHostname }}
+    routerCanonicalHostname: router-default.apps.ocp-epg.hi.inet
+{{- end }}
\ No newline at end of file
diff --git a/helm/capif/templates/nginx-ssl.yaml b/helm/capif/templates/nginx-ssl.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..275e2c782095b810a385e95babaef5da223cb396
--- /dev/null
+++ b/helm/capif/templates/nginx-ssl.yaml
@@ -0,0 +1,32 @@
+{{- if eq .Values.nginx.ingressType "Ingress" }}
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: nginx-register
+  labels:
+  {{- include "capif.labels" . | nindent 4 }}
+  {{- with .Values.nginx.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+    cert-manager.io/issuer: letsencrypt-issuer
+  {{- end }}
+spec:
+{{- if .Values.nginx.ingressClassName }}
+  ingressClassName: {{ .Values.nginx.ingressClassName }}
+{{- end }}
+  rules:
+  - host: "register{{ .Values.nginx.nginx.env.capifHostname }}"
+    http:
+      paths:
+      - backend:
+          service:
+            name: 'register'
+            port:
+              number: 8084
+        path: /
+        pathType: Prefix
+  tls:
+  - hosts:
+    - "register{{ .Values.nginx.nginx.env.capifHostname }}"
+    secretName: letsencrypt-secret
+{{- end }}
\ No newline at end of file
diff --git a/helm/capif/templates/nginx.yaml b/helm/capif/templates/nginx.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..61856f56231201a76f82b2dce5b79c802a8e6953
--- /dev/null
+++ b/helm/capif/templates/nginx.yaml
@@ -0,0 +1,48 @@
+{{- if eq .Values.nginx.ingressType "Ingress" }}
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: nginx
+  labels:
+  {{- include "capif.labels" . | nindent 4 }}
+  {{- with .Values.nginx.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+    nginx.ingress.kubernetes.io/backend-protocol: "HTTPS"
+    nginx.ingress.kubernetes.io/ssl-passthrough: "true"
+    nginx.ingress.kubernetes.io/ssl-redirect: "true"
+  {{- end }}
+spec:
+{{- if .Values.nginx.ingressClassName }}
+  ingressClassName: {{ .Values.nginx.ingressClassName }}
+{{- end }}
+  rules:
+  - host: "{{ .Values.nginx.nginx.env.capifHostname }}"
+    http:
+      paths:
+      - backend:
+          service:
+            name: 'nginx'
+            port:
+              number: 443
+        path: /
+        pathType: Prefix
+{{- end }}
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: nginx
+  labels:
+    io.kompose.service: nginx
+  {{- include "capif.labels" . | nindent 4 }}
+  annotations:
+    kompose.cmd: kompose -f ../services/docker-compose.yml convert
+    kompose.version: 1.28.0 (c4137012e)
+spec:
+  type: {{ .Values.nginx.type }}
+  selector:
+    io.kompose.service: nginx
+  {{- include "capif.selectorLabels" . | nindent 4 }}
+  ports:
+	{{- .Values.nginx.ports | toYaml | nindent 2 -}}
\ No newline at end of file
diff --git a/helm/capif/templates/otel-collector-configmap.yaml b/helm/capif/templates/otel-collector-configmap.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..fed15350a9b18e02a7e0a09935526034dfd316d9
--- /dev/null
+++ b/helm/capif/templates/otel-collector-configmap.yaml
@@ -0,0 +1,37 @@
+{{- if eq .Values.monitoring.enable "true" }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: open-telemetry-configmap
+data:
+  otel-collector-config.yaml: |
+    receivers:
+      otlp:
+        protocols:
+          grpc:
+            endpoint: 0.0.0.0:55680
+          http:
+            endpoint: 0.0.0.0:4318
+
+    processors:
+      batch:
+
+
+    exporters:
+      logging:
+        loglevel: debug
+      otlp:
+        #timeout: 60s
+        endpoint: {{ .Values.monitoring.otel.configMap.tempoEndpoint }}
+        tls:
+          insecure: true
+
+
+    service:
+      pipelines:
+        traces:
+          receivers: [otlp]
+          processors: [batch]
+          # exporters: [otlp]
+          exporters: [otlp]
+{{- end }}
\ No newline at end of file
diff --git a/helm/capif/templates/otel-collector-deployment.yaml b/helm/capif/templates/otel-collector-deployment.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..8c83eca1ae2fe50c98b8ce73dde333c59f710579
--- /dev/null
+++ b/helm/capif/templates/otel-collector-deployment.yaml
@@ -0,0 +1,54 @@
+{{- if eq .Values.monitoring.enable "true" }}
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  annotations:
+    kompose.cmd: kompose -f docker-compose.yml convert
+    kompose.version: 1.28.0 (c4137012e)
+  labels:
+    io.kompose.service: otel-collector
+    {{- include "capif.labels" . | nindent 4 }}
+  name: otel-collector
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      io.kompose.service: otel-collector
+      {{- include "capif.selectorLabels" . | nindent 6 }}
+  strategy:
+    type: Recreate
+  template:
+    metadata:
+      annotations:
+        kompose.cmd: kompose -f docker-compose.yml convert
+        kompose.version: 1.28.0 (c4137012e)
+        checksum/config: {{ include (print $.Template.BasePath "/otel-collector-configmap.yaml") . | sha256sum }}
+      labels:
+        io.kompose.network/monitoring-default: "true"
+        io.kompose.service: otel-collector
+        {{- include "capif.selectorLabels" . | nindent 8 }}
+    spec:
+      containers:
+        - args:
+            - --config
+            - /etc/otel-collector-config.yaml
+          image: {{ .Values.monitoring.otel.image.repository }}:{{ .Values.monitoring.otel.image.tag }}
+          name: otel-collector
+          ports:
+            - containerPort: 55680
+            - containerPort: 4317
+          resources:
+            {{- toYaml .Values.monitoring.otel.resources | nindent 12 }}
+          volumeMounts:
+            - name: op-telemetry
+              mountPath: /etc/otel-collector-config.yaml
+              subPath: otel-collector-config.yaml
+      restartPolicy: Always
+      volumes:
+        - name: op-telemetry
+          configMap:
+            name: open-telemetry-configmap
+            items:
+            - key: "otel-collector-config.yaml"
+              path: "otel-collector-config.yaml"
+{{- end }}
\ No newline at end of file
diff --git a/helm/capif/templates/otel-collector-service.yaml b/helm/capif/templates/otel-collector-service.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..761b8ceb4a3d1d96bfe098d7485037b8a2b21c78
--- /dev/null
+++ b/helm/capif/templates/otel-collector-service.yaml
@@ -0,0 +1,22 @@
+{{- if eq .Values.monitoring.enable "true" }}
+apiVersion: v1
+kind: Service
+metadata:
+  annotations:
+    kompose.cmd: kompose -f docker-compose.yml convert
+    kompose.version: 1.28.0 (c4137012e)
+  labels:
+    io.kompose.service: otel-collector
+    {{- include "capif.labels" . | nindent 4 }}
+  name: otel-collector
+spec:
+  ports:
+    - name: "grpc-port"
+      port: 55680
+      targetPort: 55680
+    - name: "http-port"
+      port: 4318
+      targetPort: 4318
+  selector:
+    io.kompose.service: otel-collector
+{{- end }}
\ No newline at end of file
diff --git a/helm/capif/templates/prometheus-clusterrole.yaml b/helm/capif/templates/prometheus-clusterrole.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..3470ffd70714c68113df3ad009b36980cd1f147f
--- /dev/null
+++ b/helm/capif/templates/prometheus-clusterrole.yaml
@@ -0,0 +1,49 @@
+{{- if eq .Values.monitoring.enable "true" }}
+{{- if eq .Values.monitoring.prometheus.enable "true" }}
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: prometheus
+  labels:
+    app: prometheus
+rules:
+- apiGroups: [""]
+  resources:
+  - nodes
+  - nodes/proxy
+  - services
+  - endpoints
+  - pods
+  verbs: ["get", "list", "watch"]
+- apiGroups:
+  - extensions
+  resources:
+  - ingresses
+  verbs: ["get", "list", "watch"]
+- nonResourceURLs: ["/metrics"]
+  verbs: ["get"]
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: prometheus
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app: prometheus
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: prometheus
+  labels:
+    app: prometheus
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: prometheus
+subjects:
+- kind: ServiceAccount
+  name: prometheus
+  namespace: {{ .Release.Namespace }}
+{{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/helm/capif/templates/prometheus-configmap.yaml b/helm/capif/templates/prometheus-configmap.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..d2ab952e4ddb7013a0019f5c00586d5043db5cfe
--- /dev/null
+++ b/helm/capif/templates/prometheus-configmap.yaml
@@ -0,0 +1,141 @@
+{{- if eq .Values.monitoring.enable "true" }}
+{{- if eq .Values.monitoring.prometheus.enable "true" }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  labels:
+    app: prometheus
+  name: prometheus-config
+data:
+  prometheus.rules: |-
+    groups:
+    - name: devopscube alert
+      rules:
+      - alert: High Pod Memory
+        expr: sum(container_memory_usage_bytes) > 1
+        for: 1m
+        labels:
+          severity: slack
+        annotations:
+          summary: High Memory Usage
+  prometheus.yml: |-
+    global:
+      scrape_interval: 30s
+      scrape_timeout: 10s
+    scrape_configs:
+    #------------- configuration to collect pods metrics kubelet -------------------
+    - job_name: 'kubernetes-cadvisor'
+      scheme: https
+      tls_config:
+        ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
+      bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token
+      kubernetes_sd_configs:
+      - role: node
+      relabel_configs:
+      - action: labelmap
+        regex: __meta_kubernetes_node_label_(.+)
+      - target_label: __address__
+        replacement: kubernetes.default.svc:443
+      - source_labels: [__meta_kubernetes_node_name]
+        regex: (.+)
+        target_label: __metrics_path__
+        replacement: /api/v1/nodes/${1}/proxy/metrics/cadvisor
+    #------------- configuration to collect pods metrics -------------------
+    - job_name: 'kubernetes-pods'
+      honor_labels: true
+      kubernetes_sd_configs:
+      - role: pod
+      relabel_configs:
+      # select only those pods that has "prometheus.io/scrape: true" annotation
+      - source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_scrape]
+        action: keep
+        regex: true
+      # set metrics_path (default is /metrics) to the metrics path specified in "prometheus.io/path: <metric path>" annotation.
+      - source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_path]
+        action: replace
+        target_label: __metrics_path__
+        regex: (.+)
+      # set the scrapping port to the port specified in "prometheus.io/port: <port>" annotation and set address accordingly.
+      - source_labels: [__address__, __meta_kubernetes_pod_annotation_prometheus_io_port]
+        action: replace
+        regex: ([^:]+)(?::\d+)?;(\d+)
+        replacement: $1:$2
+        target_label: __address__
+      - action: labelmap
+        regex: __meta_kubernetes_pod_label_(.+)
+      - source_labels: [__meta_kubernetes_namespace]
+        action: replace
+        target_label: kubernetes_namespace
+      - source_labels: [__meta_kubernetes_pod_name]
+        action: replace
+        target_label: kubernetes_pod_name
+
+    #-------------- configuration to collect metrics from service endpoints -----------------------
+    - job_name: 'kubernetes-service-endpoints'
+      honor_labels: true
+      kubernetes_sd_configs:
+      - role: endpoints
+      relabel_configs:
+      # select only those endpoints whose service has "prometheus.io/scrape: true" annotation
+      - source_labels: [__meta_kubernetes_service_annotation_prometheus_io_scrape]
+        action: keep
+        regex: true
+      # set the metrics_path to the path specified in "prometheus.io/path: <metric path>" annotation.
+      - source_labels: [__meta_kubernetes_service_annotation_prometheus_io_path]
+        action: replace
+        target_label: __metrics_path__
+        regex: (.+)
+      # set the scrapping port to the port specified in "prometheus.io/port: <port>" annotation and set address accordingly.
+      - source_labels: [__address__, __meta_kubernetes_service_annotation_prometheus_io_port]
+        action: replace
+        target_label: __address__
+        regex: ([^:]+)(?::\d+)?;(\d+)
+        replacement: $1:$2
+      - action: labelmap
+        regex: __meta_kubernetes_service_label_(.+)
+      - source_labels: [__meta_kubernetes_namespace]
+        action: replace
+        target_label: kubernetes_namespace
+      - source_labels: [__meta_kubernetes_service_name]
+        action: replace
+        target_label: kubernetes_name
+
+    #---------------- configuration to collect metrics from kubernetes apiserver -------------------------
+    - job_name: 'kubernetes-apiservers'
+      honor_labels: true
+      kubernetes_sd_configs:
+      - role: endpoints
+      # kubernetes apiserver serve metrics on a TLS secure endpoints. so, we have to use "https" scheme
+      scheme: https
+      # we have to provide certificate to establish tls secure connection
+      tls_config:
+        ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
+      #  bearer_token_file is required for authorizating prometheus server to kubernetes apiserver
+      bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token
+
+      relabel_configs:
+      - source_labels: [__meta_kubernetes_namespace, __meta_kubernetes_service_name, __meta_kubernetes_endpoint_port_name]
+        action: keep
+        regex: default;kubernetes;https
+
+    #--------------- configuration to collect metrics from nodes -----------------------
+    - job_name: 'kubernetes-nodes'
+      honor_labels: true
+      scheme: https
+      tls_config:
+        ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
+      bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token
+
+      kubernetes_sd_configs:
+      - role: node
+      relabel_configs:
+      - action: labelmap
+        regex: __meta_kubernetes_node_label_(.+)
+      - target_label: __address__
+        replacement: kubernetes.default.svc:443
+      - source_labels: [__meta_kubernetes_node_name]
+        regex: (.+)
+        target_label: __metrics_path__
+        replacement: /api/v1/nodes/${1}/proxy/metrics
+{{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/helm/capif/templates/prometheus-deployment.yaml b/helm/capif/templates/prometheus-deployment.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..d70cf09ddd5b37061b73992076fccc318e0fb208
--- /dev/null
+++ b/helm/capif/templates/prometheus-deployment.yaml
@@ -0,0 +1,68 @@
+{{- if eq .Values.monitoring.enable "true" }}
+{{- if eq .Values.monitoring.prometheus.enable "true" }}
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: prometheus
+  labels:
+    app: prometheus
+    {{- include "capif.labels" . | nindent 4 }}
+spec:
+  replicas: 1
+  strategy:
+    type: Recreate
+  selector:
+    matchLabels:
+      app: prometheus
+      {{- include "capif.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      annotations:
+        checksum/config: {{ include (print $.Template.BasePath "/prometheus-configmap.yaml") . | sha256sum }}
+      labels:
+        app: prometheus
+        {{- include "capif.selectorLabels" . | nindent 8 }}
+    spec:
+      serviceAccountName: prometheus
+      containers:
+      - name: prometheus
+        image: {{ .Values.monitoring.prometheus.image.repository }}:{{ .Values.monitoring.prometheus.image.tag }}
+        args:
+        - "--config.file=/etc/prometheus/prometheus.yml"
+        - "--storage.tsdb.path=/prometheus/"
+        - "--storage.tsdb.retention.time={{.Values.monitoring.prometheus.retentionTime }}"
+        ports:
+        - containerPort: 9090
+        resources:
+          {{- toYaml .Values.monitoring.prometheus.resources | nindent 12 }}
+        securityContext:
+          runAsUser: 0
+        livenessProbe:
+          tcpSocket:
+            port: 9090
+          initialDelaySeconds: 20
+        volumeMounts:
+        - name: prometheus-config
+          mountPath: /etc/prometheus/
+        {{- if eq .Values.monitoring.prometheus.persistence.enable "true" }}
+        - name: prometheus-storage-volume
+          mountPath: /prometheus/
+        {{ else }}
+        - name: prometheus-storage
+          mountPath: /prometheus/
+        {{- end }}
+      volumes:
+      - name: prometheus-config
+        configMap:
+          defaultMode: 420
+          name: prometheus-config
+      {{- if eq .Values.monitoring.prometheus.persistence.enable "true" }}
+      - name: prometheus-storage-volume
+        persistentVolumeClaim:
+          claimName: prometheus-pvc
+      {{ else }}
+      - name: prometheus-storage
+        emptyDir: {}
+      {{- end }}
+{{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/helm/capif/templates/prometheus-ingress-route.yaml b/helm/capif/templates/prometheus-ingress-route.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..b7a0d2b0e02ebbb80c5e4a53aa9240066759f581
--- /dev/null
+++ b/helm/capif/templates/prometheus-ingress-route.yaml
@@ -0,0 +1,20 @@
+{{- if eq .Values.monitoring.enable "true" }}
+{{- if eq .Values.monitoring.prometheus.enable "true" }}
+{{- if eq .Values.monitoring.prometheus.ingressRoute.enable "true" }}
+apiVersion: traefik.containo.us/v1alpha1 
+kind: IngressRoute
+metadata:
+  name: prometheus-ingress-route 
+spec:
+  entryPoints: [web] 
+  routes:
+    - kind: Rule
+      match: Host(`{{ .Values.monitoring.prometheus.ingressRoute.host }}`)
+      services:
+        - kind: Service
+          name: prometheus 
+          port: {{ .Values.monitoring.prometheus.service.port }}
+          scheme: http
+{{- end }}
+{{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/helm/capif/templates/prometheus-ingress.yaml b/helm/capif/templates/prometheus-ingress.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..d08297327eac7192db7618a5937e2af6e5f05d1d
--- /dev/null
+++ b/helm/capif/templates/prometheus-ingress.yaml
@@ -0,0 +1,36 @@
+{{- if eq .Values.monitoring.enable "true" }}
+{{- if eq .Values.monitoring.prometheus.enable "true" }}
+{{- if .Values.monitoring.prometheus.ingress.enabled -}}
+{{- $svcPort := .Values.monitoring.prometheus.service.port -}}
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: prometheus-ingress
+  labels:
+    {{- include "capif.labels" . | nindent 4 }}
+  {{- with .Values.monitoring.prometheus.ingress.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+{{- if .Values.monitoring.prometheus.ingress.ingressClassName }}
+  ingressClassName: {{ .Values.monitoring.prometheus.ingress.ingressClassName }}
+{{- end }}
+  rules:
+    {{- range .Values.monitoring.prometheus.ingress.hosts }}
+  - host: {{ .host | quote }}
+    http:
+      paths:
+        {{- range .paths }}
+        - path: {{ .path }}
+          pathType: {{ .pathType }}
+          backend:
+            service:
+              name: prometheus
+              port:
+                number: {{ $svcPort }}
+        {{- end }}
+    {{- end }}
+{{- end }}
+{{- end }}
+{{- end }}
diff --git a/helm/capif/templates/prometheus-pvc.yaml b/helm/capif/templates/prometheus-pvc.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..0ba676f3e817a25928e79c024021f62663e05de5
--- /dev/null
+++ b/helm/capif/templates/prometheus-pvc.yaml
@@ -0,0 +1,19 @@
+{{- if eq .Values.monitoring.enable "true" }}
+{{- if eq .Values.monitoring.prometheus.enable "true" }}
+{{- if eq .Values.monitoring.prometheus.persistence.enable "true" }}
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: prometheus-pvc
+  labels:
+    app: prometheus
+    {{- include "capif.labels" . | nindent 4 }}
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: {{ .Values.monitoring.prometheus.persistence.storage }}
+{{- end }}
+{{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/helm/capif/templates/prometheus-service.yaml b/helm/capif/templates/prometheus-service.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..778dbd580e55f200bb735b5605f0e00ba4ef1d94
--- /dev/null
+++ b/helm/capif/templates/prometheus-service.yaml
@@ -0,0 +1,22 @@
+{{- if eq .Values.monitoring.enable "true" }}
+{{- if eq .Values.monitoring.prometheus.enable "true" }}
+apiVersion: v1
+kind: Service
+metadata:
+  annotations:
+    prometheus.io/path: /metrics
+    prometheus.io/port: {{ quote .Values.monitoring.prometheus.service.port }}
+    prometheus.io/scrape: "true"
+  name: prometheus
+  labels:
+    {{- include "capif.labels" . | nindent 4 }}
+spec:
+  type: {{ .Values.monitoring.prometheus.service.type }}
+  ports:
+  - port: {{ .Values.monitoring.prometheus.service.port }}
+    protocol: TCP
+    targetPort: {{ .Values.monitoring.prometheus.service.port }}
+  selector:
+    app: prometheus
+{{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/helm/capif/templates/published-apis.yaml b/helm/capif/templates/published-apis.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..a5444f1640bf02b113d3bfd967bcde78122efcf2
--- /dev/null
+++ b/helm/capif/templates/published-apis.yaml
@@ -0,0 +1,17 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: published-apis
+  labels:
+    io.kompose.service: published-apis
+  {{- include "capif.labels" . | nindent 4 }}
+  annotations:
+    kompose.cmd: kompose -f ../services/docker-compose.yml convert
+    kompose.version: 1.28.0 (c4137012e)
+spec:
+  type: {{ .Values.publishedApis.type }}
+  selector:
+    io.kompose.service: published-apis
+  {{- include "capif.selectorLabels" . | nindent 4 }}
+  ports:
+	{{- .Values.publishedApis.ports | toYaml | nindent 2 -}}
\ No newline at end of file
diff --git a/helm/capif/templates/redis.yaml b/helm/capif/templates/redis.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..3254a95f48f9b36be9de55d7f0c1d08df2ba5f73
--- /dev/null
+++ b/helm/capif/templates/redis.yaml
@@ -0,0 +1,17 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: redis
+  labels:
+    io.kompose.service: redis
+  {{- include "capif.labels" . | nindent 4 }}
+  annotations:
+    kompose.cmd: kompose -f ../services/docker-compose.yml convert
+    kompose.version: 1.28.0 (c4137012e)
+spec:
+  type: {{ .Values.redis.type }}
+  selector:
+    io.kompose.service: redis
+  {{- include "capif.selectorLabels" . | nindent 4 }}
+  ports:
+	{{- .Values.redis.ports | toYaml | nindent 2 -}}
\ No newline at end of file
diff --git a/helm/capif/templates/register-configmap.yaml b/helm/capif/templates/register-configmap.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..51293a5b7824d6688d9545d600c5571f9db4d55d
--- /dev/null
+++ b/helm/capif/templates/register-configmap.yaml
@@ -0,0 +1,21 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: register-configmap
+  labels:
+  {{- include "capif.labels" . | nindent 4 }}
+data:
+  config.yaml: |-
+    mongo: {
+      'user': 'root',
+      'password': 'example',
+      'db': 'capif_users',
+      'col': 'user',
+      'host': '{{ .Values.register.register.env.mongoHost }}',
+      'port': '{{ .Values.register.register.env.mongoPort }}'
+    }
+    ca_factory: {
+      "url": "{{ .Values.parametersVault.env.vaultHostname }}",
+      "port": "{{ .Values.parametersVault.env.vaultPort }}",
+      "token": "{{ .Values.parametersVault.env.vaultAccessToken }}"
+    }
\ No newline at end of file
diff --git a/helm/capif/templates/register.yaml b/helm/capif/templates/register.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..2de1d64248110745b5999c1e50e1b5801166b709
--- /dev/null
+++ b/helm/capif/templates/register.yaml
@@ -0,0 +1,19 @@
+{{- if eq .Values.register.enable "true" }}
+apiVersion: v1
+kind: Service
+metadata:
+  name: register
+  labels:
+    io.kompose.service: register
+  {{- include "capif.labels" . | nindent 4 }}
+  annotations:
+    kompose.cmd: kompose -f ../services/docker-compose.yml convert
+    kompose.version: 1.28.0 (c4137012e)
+spec:
+  type: {{ .Values.register.type }}
+  selector:
+    io.kompose.service: register
+  {{- include "capif.selectorLabels" . | nindent 4 }}
+  ports:
+	{{- .Values.register.ports | toYaml | nindent 2 -}}
+{{- end }}
\ No newline at end of file
diff --git a/helm/capif/templates/renderer-configmap.yaml b/helm/capif/templates/renderer-configmap.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..0159fcbc02450bc9a3eb9522e11e11c42656977e
--- /dev/null
+++ b/helm/capif/templates/renderer-configmap.yaml
@@ -0,0 +1,8 @@
+{{- if eq .Values.monitoring.enable "true" }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: renderer-configmap
+data:
+  ENABLE_METRICS: {{ quote .Values.monitoring.renderer.env.enableMetrics }}
+{{- end }}
\ No newline at end of file
diff --git a/helm/capif/templates/renderer-deployment.yaml b/helm/capif/templates/renderer-deployment.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..83a7ee2f73cb0c5254a3d75e1673a4e22d42dfab
--- /dev/null
+++ b/helm/capif/templates/renderer-deployment.yaml
@@ -0,0 +1,44 @@
+{{- if eq .Values.monitoring.enable "true" }}
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  annotations:
+    kompose.cmd: kompose -f docker-compose.yml convert
+    kompose.version: 1.28.0 (c4137012e)
+  labels:
+    io.kompose.service: renderer
+    {{- include "capif.labels" . | nindent 4 }}
+  name: renderer
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      io.kompose.service: renderer
+      {{- include "capif.selectorLabels" . | nindent 6 }}
+  strategy: {}
+  template:
+    metadata:
+      annotations:
+        kompose.cmd: kompose -f docker-compose.yml convert
+        kompose.version: 1.28.0 (c4137012e)
+        checksum/config: {{ include (print $.Template.BasePath "/renderer-configmap.yaml") . | sha256sum }}
+      labels:
+        io.kompose.network/monitoring-default: "true"
+        io.kompose.service: renderer
+        {{- include "capif.selectorLabels" . | nindent 8 }}
+    spec:
+      containers:
+        - env:
+            - name: ENABLE_METRICS
+              valueFrom:
+                configMapKeyRef:
+                  name: renderer-configmap
+                  key: ENABLE_METRICS
+          image: {{ .Values.monitoring.renderer.image.repository }}:{{ .Values.monitoring.renderer.image.tag }}
+          name: grafana-image-renderer
+          ports:
+            - containerPort: 8081
+          resources:
+            {{- toYaml .Values.monitoring.renderer.resources | nindent 12 }}
+      restartPolicy: Always
+{{- end }}
\ No newline at end of file
diff --git a/helm/capif/templates/renderer-service.yaml b/helm/capif/templates/renderer-service.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..471a51dca046b1d35fcf0afd68a500a48db62cdc
--- /dev/null
+++ b/helm/capif/templates/renderer-service.yaml
@@ -0,0 +1,18 @@
+{{- if eq .Values.monitoring.enable "true" }}
+apiVersion: v1
+kind: Service
+metadata:
+  annotations:
+    kompose.cmd: kompose -f docker-compose.yml convert
+    kompose.version: 1.28.0 (c4137012e)
+  labels:
+    io.kompose.service: renderer
+  name: renderer
+spec:
+  ports:
+    - name: "rendere-port"
+      port: 8081
+      targetPort: 8081
+  selector:
+    io.kompose.service: renderer
+{{- end }}
\ No newline at end of file
diff --git a/helm/capif/templates/service-apis.yaml b/helm/capif/templates/service-apis.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..bff1af594b5ceba6a7ba58a78103fb1b885b43ea
--- /dev/null
+++ b/helm/capif/templates/service-apis.yaml
@@ -0,0 +1,17 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: service-apis
+  labels:
+    io.kompose.service: service-apis
+  {{- include "capif.labels" . | nindent 4 }}
+  annotations:
+    kompose.cmd: kompose -f ../services/docker-compose.yml convert
+    kompose.version: 1.28.0 (c4137012e)
+spec:
+  type: {{ .Values.serviceApis.type }}
+  selector:
+    io.kompose.service: service-apis
+  {{- include "capif.selectorLabels" . | nindent 4 }}
+  ports:
+	{{- .Values.serviceApis.ports | toYaml | nindent 2 -}}
\ No newline at end of file
diff --git a/helm/capif/values.yaml b/helm/capif/values.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..a2aea33c43517bce909dad4d8133e6846fe94873
--- /dev/null
+++ b/helm/capif/values.yaml
@@ -0,0 +1,660 @@
+# -- The Environment variable. Use openshift if you are deploying in Openshift cluster. anotherwise use the field empty
+env: ""
+
+# Use the Ip address dude for the kubernetes to your Ingress Controller ej: kubectl -n NAMESPACE_CAPIF get ing 
+ingress: 
+    ip: "10.17.173.127"
+
+monitoring:
+  enable: "true"
+
+accessControlPolicy:
+  image:
+      # -- The docker image repository to use
+      repository: "public.ecr.aws/o2v4a8t6/opencapif/access-control-policy"
+      # -- The docker image tag to use
+      # @default Chart version
+      tag: ""
+      # -- Image pull policy: Always, IfNotPresent
+      imagePullPolicy: Always
+  # -- If env.monitoring: true. Setup monitoring.enable: true
+  env: 
+      monitoring: "true"
+  resources:
+    limits:
+      cpu: 100m
+      memory: 128Mi
+    requests:
+      cpu: 100m
+      memory: 128Mi
+  ports:
+  - name: "8080"
+    port: 8080
+    targetPort: 8080
+  replicas: 1
+  type: ClusterIP
+
+CapifClient:
+  # -- If enable capif client.
+  enable: "true"
+  image:
+      # -- The docker image repository to use
+      repository: "public.ecr.aws/o2v4a8t6/opencapif/client"
+      # -- The docker image tag to use
+      # @default Chart version
+      tag: ""
+      # -- Image pull policy: Always, IfNotPresent
+      imagePullPolicy: Always
+  resources:
+    limits:
+      cpu: 100m
+      memory: 128Mi
+    requests:
+      cpu: 100m
+      memory: 128Mi
+  ports:
+  - name: "8080"
+    port: 8080
+    targetPort: 8080
+  replicas: 1
+  type: ClusterIP
+
+apiInvocationLogs:
+  apiInvocationLogs:
+    image:
+      # -- The docker image repository to use
+      repository: "public.ecr.aws/o2v4a8t6/opencapif/api-invocation-logs-api"
+      # -- The docker image tag to use
+      # @default Chart version
+      tag: ""
+      # -- Image pull policy: Always, IfNotPresent
+      imagePullPolicy: Always
+    # -- If env.monitoring: true. Setup monitoring.enable: true
+    env: 
+      monitoring: "true"
+    resources:
+     limits:
+       cpu: 100m
+       memory: 128Mi
+     requests:
+       cpu: 100m
+       memory: 128Mi
+  ports:
+  - name: "8080"
+    port: 8080
+    targetPort: 8080
+  replicas: 1
+  type: ClusterIP
+apiInvokerManagement:
+  apiInvokerManagement:
+    image:
+      # -- The docker image repository to use
+      repository: "public.ecr.aws/o2v4a8t6/opencapif/api-invoker-management-api"
+      # -- The docker image tag to use
+      # @default Chart version
+      tag: ""
+      # -- Image pull policy: Always, IfNotPresent
+      imagePullPolicy: Always
+    # -- If env.monitoring: true. Setup monitoring.enable: true
+    env:
+      monitoring: "true"
+    resources:
+     limits:
+       cpu: 100m
+       memory: 128Mi
+     requests:
+       cpu: 100m
+       memory: 128Mi
+  ports:
+  - name: "8080"
+    port: 8080
+    targetPort: 8080
+  replicas: 1
+  type: ClusterIP
+apiProviderManagement:
+  apiProviderManagement:
+    image:
+      # -- The docker image repository to use
+      repository: "public.ecr.aws/o2v4a8t6/opencapif/api-provider-management-api"
+      # -- The docker image tag to use
+      # @default Chart version
+      tag: ""
+      # -- Image pull policy: Always, IfNotPresent
+      imagePullPolicy: Always
+    # -- If env.monitoring: true. Setup monitoring.enable: true
+    env:
+      monitoring: "true"
+    resources:
+     limits:
+       cpu: 100m
+       memory: 128Mi
+     requests:
+       cpu: 100m
+       memory: 128Mi
+  ports:
+  - name: "8080"
+    port: 8080
+    targetPort: 8080
+  replicas: 1
+  type: ClusterIP
+capifEvents:
+  capifEvents:
+    image:
+      # -- The docker image repository to use
+      repository: "public.ecr.aws/o2v4a8t6/opencapif/events-api"
+      # -- The docker image tag to use
+      # @default Chart version
+      tag: ""
+      # -- Image pull policy: Always, IfNotPresent
+      imagePullPolicy: Always
+    # -- If env.monitoring: true. Setup monitoring.enable: true
+    env:
+      monitoring: "true"
+    resources:
+     limits:
+       cpu: 100m
+       memory: 128Mi
+     requests:
+       cpu: 100m
+       memory: 128Mi
+  ports:
+  - name: "8080"
+    port: 8080
+    targetPort: 8080
+  replicas: 1
+  type: ClusterIP
+capifRoutingInfo:
+  capifRoutingInfo:
+    image:
+      # -- The docker image repository to use
+      repository: "public.ecr.aws/o2v4a8t6/opencapif/routing-info-api"
+      # -- The docker image tag to use
+      # @default Chart version
+      tag: ""
+      # -- Image pull policy: Always, IfNotPresent
+      imagePullPolicy: Always
+    # -- If env.monitoring: true. Setup monitoring.enable: true
+    env:
+      monitoring: "true"
+    resources:
+     limits:
+       cpu: 100m
+       memory: 128Mi
+     requests:
+       cpu: 100m
+       memory: 128Mi
+  ports:
+  - name: "8080"
+    port: 8080
+    targetPort: 8080
+  replicas: 1
+  type: ClusterIP
+capifSecurity:
+  capifSecurity:
+    image:
+      # -- The docker image repository to use
+      repository: "public.ecr.aws/o2v4a8t6/opencapif/security-api"
+      # -- The docker image tag to use
+      # @default Chart version
+      tag: ""
+      # -- Image pull policy: Always, IfNotPresent
+      imagePullPolicy: Always
+    # -- If env.monitoring: true. Setup monitoring.enable: true
+    env:
+      monitoring: "true"
+    resources:
+     limits:
+       cpu: 100m
+       memory: 128Mi
+     requests:
+       cpu: 100m
+       memory: 128Mi
+  ports:
+  - name: "8080"
+    port: 8080
+    targetPort: 8080
+  replicas: 1
+  type: ClusterIP
+register:
+  # -- If register enabled. enable: true, enable: "" = not enabled
+  enable: "true"
+  register:
+    image:
+      # -- The docker image repository to use
+      repository: "public.ecr.aws/o2v4a8t6/opencapif/register"
+      # -- The docker image tag to use
+      # @default Chart version
+      tag: ""
+      # -- Image pull policy: Always, IfNotPresent
+      imagePullPolicy: Always
+    env:
+      mongoHost: mongo-register
+      mongoPort: 27017
+    resources:
+     limits:
+       cpu: 100m
+       memory: 128Mi
+     requests:
+       cpu: 100m
+       memory: 128Mi
+  ports:
+  - name: "8080"
+    port: 8084
+    targetPort: 8080
+  replicas: 1
+  type: ClusterIP
+mongoRegister:
+  mongo:
+    env:
+      # User's password MongoDB
+      mongoInitdbRootPassword: example
+      # Name of User's mongodb
+      mongoInitdbRootUsername: root
+    image:
+      # -- The docker image repository to use
+      repository: "mongo"
+      # -- The docker image tag to use
+      # @default Chart version
+      tag: "6.0.2"
+      # -- Image pull policy: Always, IfNotPresent
+      imagePullPolicy: Always
+    resources: {}
+#     limits:
+#       cpu: 100m
+#       memory: 128Mi
+#     requests:
+#       cpu: 100m
+#       memory: 128Mi
+  ports:
+  - name: "27017"
+    port: 27017
+    targetPort: 27017
+  replicas: 1
+  type: ClusterIP
+
+kubernetesClusterDomain: cluster.local
+logs:
+  # -- If register enabled. enable: true, enable: "" = not enabled
+  enable: "true"
+  logs:
+    image:
+      # -- The docker image repository to use
+      repository: "public.ecr.aws/o2v4a8t6/opencapif/auditing-api"
+      # -- The docker image tag to use
+      # @default Chart version
+      tag: ""
+      # -- Image pull policy: Always, IfNotPresent
+      imagePullPolicy: Always
+    # -- If env.monitoring: true. Setup monitoring.enable: true
+    env:
+      monitoring: "true"
+    resources:
+     limits:
+       cpu: 100m
+       memory: 128Mi
+     requests:
+       cpu: 100m
+       memory: 128Mi
+  ports:
+  - name: "8080"
+    port: 8080
+    targetPort: 8080
+  replicas: 1
+  type: ClusterIP
+mongo:
+  mongo:
+    env:
+      # User's password MongoDB
+      mongoInitdbRootPassword: example
+      # Name of User's mongodb
+      mongoInitdbRootUsername: root
+    image:
+      # -- The docker image repository to use
+      repository: "mongo"
+      # -- The docker image tag to use
+      # @default Chart version
+      tag: "6.0.2"
+      # -- Image pull policy: Always, IfNotPresent
+      imagePullPolicy: Always
+    resources: {}
+#     limits:
+#       cpu: 100m
+#       memory: 128Mi
+#     requests:
+#       cpu: 100m
+#       memory: 128Mi
+  ports:
+  - name: "27017"
+    port: 27017
+    targetPort: 27017
+  replicas: 1
+  type: ClusterIP
+  # -- If mongo.persistence enabled. enable: true, enable: "" = not enabled
+  persistence:
+    enable: "true"
+    storage: 8Gi
+mongoExpress:
+  mongoExpress:
+    env:
+      # User's password MongoDB
+      meConfigMongodbAdminpassword: example
+      # Name of User's mongodb
+      meConfigMongodbAdminusername: root
+      # URI for connecting MongoDB
+      meConfigMongodbUrl: mongodb://root:example@mongo:27017/
+    image:
+      # -- The docker image repository to use
+      repository: "mongo-express"
+      # -- The docker image tag to use
+      # @default Chart version
+      tag: "1.0.0-alpha.4"
+      # -- Image pull policy: Always, IfNotPresent
+      imagePullPolicy: Always
+    resources:
+     limits:
+       cpu: 100m
+       memory: 128Mi
+     requests:
+       cpu: 100m
+       memory: 128Mi
+  ports:
+  - name: "8082"
+    port: 8082
+    targetPort: 8081
+  replicas: 1
+  type: ClusterIP
+nginx:
+  # -- if nginx.ingressType: "Ingress". set up monitoring.prometheus.ingress: true
+  # and monitoring.grafana.ingress: true
+  # Use IngressRoute if you want to use Gateway API. ex traefix
+  ingressType: "Ingress"
+  ingressClassName: nginx
+  annotations:
+    # kubernetes.io/ingress.class: nginx
+    # kubernetes.io/tls-acme: "true"
+    nginx.ingress.kubernetes.io/backend-protocol: "HTTPS"
+    nginx.ingress.kubernetes.io/ssl-passthrough: "true"
+    nginx.ingress.kubernetes.io/ssl-redirect: "true"
+  nginx:
+    env:
+      # -- Ingress's host to Capif
+      capifHostname: "my-capif.apps.ocp-epg.hi.inet"
+    image:
+      # -- The docker image repository to use
+      repository: "public.ecr.aws/o2v4a8t6/opencapif/nginx"
+      # -- The docker image tag to use
+      # @default Chart version
+      tag: ""
+      # -- Image pull policy: Always, IfNotPresent
+      imagePullPolicy: Always
+    resources:
+     limits:
+       cpu: 100m
+       memory: 128Mi
+     requests:
+       cpu: 100m
+       memory: 128Mi
+  ports:
+  - name: "8080"
+    port: 8080
+    targetPort: 8080
+  - name: "443"
+    port: 443
+    targetPort: 443
+  replicas: 1
+  type: ClusterIP
+publishedApis:
+  ports:
+  - name: "8080"
+    port: 8080
+    targetPort: 8080
+  publishedApis:
+    image:
+      # -- The docker image repository to use
+      repository: "public.ecr.aws/o2v4a8t6/opencapif/publish-service-api"
+      # -- The docker image tag to use
+      # @default Chart version
+      tag: ""
+      # -- Image pull policy: Always, IfNotPresent
+      imagePullPolicy: Always
+    # -- If env.monitoring: true. Setup monitoring.enable: true
+    env:
+      monitoring: "true"
+    resources:
+     limits:
+       cpu: 100m
+       memory: 128Mi
+     requests:
+       cpu: 100m
+       memory: 128Mi
+  replicas: 1
+  type: ClusterIP
+redis:
+  ports:
+  - name: "6379"
+    port: 6379
+    targetPort: 6379
+  redis:
+    env:
+      # Mode of replication
+      redisReplicationMode: master
+    image:
+      # -- The docker image repository to use
+      repository: "redis"
+      # -- The docker image tag to use
+      # @default Chart version
+      tag: "alpine"
+      # -- Image pull policy: Always, IfNotPresent
+      imagePullPolicy: Always
+    resources:
+     limits:
+       cpu: 100m
+       memory: 128Mi
+     requests:
+       cpu: 100m
+       memory: 128Mi
+  replicas: 1
+  type: ClusterIP
+serviceApis:
+  ports:
+  - name: "8080"
+    port: 8080
+    targetPort: 8080
+  replicas: 1
+  serviceApis:
+    image:
+      # -- The docker image repository to use
+      repository: "public.ecr.aws/o2v4a8t6/opencapif/discover-service-api"
+      # -- The docker image tag to use
+      # @default Chart version
+      tag: ""
+      # -- Image pull policy: Always, IfNotPresent
+      imagePullPolicy: Always
+    # -- If env.monitoring: true. Setup monitoring.enable: true
+    env:
+      monitoring: "true"
+    resources:
+     limits:
+       cpu: 100m
+       memory: 128Mi
+     requests:
+       cpu: 100m
+       memory: 128Mi
+  type: ClusterIP
+parametersVault:
+  env: 
+    vaultHostname: vault-internal.mon.svc.cluster.local
+    vaultPort: 8200
+    vaultAccessToken: dev-only-token
+# -- With tempo.enabled: false. It won't be deployed
+# -- If monitoring.enable: "true". Also enable tempo.enabled: true
+tempo:
+  enabled: true
+  tempo:
+    metricsGenerator:
+      enabled: true
+      remoteWriteUrl: "http://prometheus.mon.svc.cluster.local:9090/api/v1/write"
+  persistence:
+    enabled: true
+    size: 3Gi
+monitoring:
+  # -- If monitoring enabled. enable: true, enable: "" = not enabled
+  enable:  "true"
+  fluentBit:
+      image: 
+        # -- The docker image repository to use
+        repository: "grafana/fluent-bit-plugin-loki"
+        # -- The docker image tag to use
+        # @default Chart version
+        tag: "latest"
+      env:
+        lokiUrl: http://loki:3100/loki/api/v1/push
+      resources: {}
+        # limits:
+        #   cpu: 100m
+        #   memory: 128Mi
+        # requests:
+        #   cpu: 100m
+        #   memory: 128Mi
+  loki:
+      image: 
+        # -- The docker image repository to use
+        repository: "grafana/loki"
+        # -- The docker image tag to use
+        # @default Chart version
+        tag: "2.8.0"
+      resources: {}
+        # limits:
+        #   cpu: 100m
+        #   memory: 128Mi
+        # requests:
+        #   cpu: 100m
+        #   memory: 128Mi
+      # -- If grafana.persistence enabled. enable: true, enable: "" = not enabled
+      persistence:
+        enable: "true"
+        storage: 100Mi
+  otel:
+      image: 
+        # -- The docker image repository to use
+        repository: "otel/opentelemetry-collector"
+        # -- The docker image tag to use
+        # @default Chart version
+        tag: "0.81.0"
+      configMap:
+        tempoEndpoint: monitoring-capif-tempo:4317
+      resources: {}
+        # limits:
+        #   cpu: 100m
+        #   memory: 128Mi
+        # requests:
+        #   cpu: 100m
+        #   memory: 128Mi
+  renderer:
+      image: 
+        # -- The docker image repository to use
+        repository: "grafana/grafana-image-renderer"
+        # -- The docker image tag to use
+        # @default Chart version
+        tag: "latest"
+      env:
+        enableMetrics: "true"
+      resources: {}
+        # limits:
+        #   cpu: 100m
+        #   memory: 128Mi
+        # requests:
+        #   cpu: 100m
+        #   memory: 128Mi
+  prometheus:
+      # -- With prometheus.enabled: "". It won't be deployed. prometheus.enable: "true"
+      # -- It will deploy prometheus
+      enable: "true"
+      image: 
+        # -- The docker image repository to use
+        repository: "prom/prometheus"
+        # -- The docker image tag to use
+        # @default Chart version
+        tag: "latest"
+      retentionTime: 5d
+      resources: {}
+        # limits:
+        #   cpu: 100m
+        #   memory: 128Mi
+        # requests:
+        #   cpu: 100m
+        #   memory: 128Mi
+      persistence:
+        enable: "true"
+        storage: 8Gi
+      service:
+        type: ClusterIP
+        port: 9090
+      ingress:
+        enabled: true
+        ingressClassName: nginx
+        annotations:
+          # kubernetes.io/ingress.class: nginx
+          # kubernetes.io/tls-acme: "true"
+        hosts:
+          - host: prometheus.5gnacar.int
+            paths:
+              - path: /
+                pathType: Prefix
+        tls: []
+        #  - secretName: chart-example-tls
+        #    hosts:
+        #      - chart-example.local
+      # -- If ingressRoute enable=true, use monitoring.prometheus.ingress.enabled=""
+      ingressRoute:
+        enable: ""
+        host:  prometheus.5gnacar.int
+  grafana:
+      image: 
+        # -- The docker image repository to use
+        repository: "grafana/grafana"
+        # -- The docker image tag to use
+        # @default Chart version
+        tag: "latest"
+      env:
+        gfAuthAnonymousEnable: true
+        gfSecurityAllowEmbedding: true
+        gfAuthAnonymousOrgRole: Admin
+        gfSecurityAdminPassword:  secure_pass
+        lokiUrl: http://loki:3100
+        prometheusUrl: http://prometheus.mon.svc.cluster.local:9090
+        tempoUrl: http://monitoring-capif-tempo:3100
+      resources: {}
+        # limits:
+        #   cpu: 100m
+        #   memory: 128Mi
+        # requests:
+        #   cpu: 100m
+        #   memory: 128Mi
+      # -- If grafana.persistence enabled. enable: true, enable: "" = not enabled
+      persistence:
+        enable: "true"
+        storage: 100Mi
+      service:
+        type: ClusterIP
+        port: 3000
+      # -- If ingress enabled=true, use monitoring.grafana.ingressRoute.enable=""
+      ingress:
+        enabled: true
+        ingressClassName: nginx
+        annotations:
+          # kubernetes.io/ingress.class: nginx
+          # kubernetes.io/tls-acme: "true"
+        hosts:
+          - host: grafana.5gnacar.int
+            paths:
+              - path: /
+                pathType: Prefix
+        tls: []
+        #  - secretName: chart-example-tls
+        #    hosts:
+        #      - chart-example.local     
+      # -- If ingressRoute enable=true, use monitoring.grafana.ingress.enabled=""
+      ingressRoute:
+        enable: ""
+        host:  grafana.5gnacar.int
diff --git a/helm/helmfile-capif.yaml b/helm/helmfile-capif.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..610e64a4d19b92696fa23bc3ecf9dd698546a5b5
--- /dev/null
+++ b/helm/helmfile-capif.yaml
@@ -0,0 +1,19 @@
+# helm upgrade --install -n mon monitoring-capif capif/ --set nginx.nginx.env.capifHostname=mon-capif.monitoring.int \
+# --set ingress_ip.oneke="10.17.173.127" --set env=oneke --atomic
+helmDefaults:
+  createNamespace: true
+  timeout: 600
+releases:
+  - name: monitoring-capif
+    chart: ./capif/
+    namespace: monitoring
+#    atomic: true
+    wait: true
+    values:
+      - ./capif/values.yaml
+      - nginx:
+          nginx:
+            env:
+              capifHostname: monitoring-capif.monitoring.int
+      - ingress:
+          ip: "10.17.173.127"
\ No newline at end of file
diff --git a/helm/vault-job/vault-job.yaml b/helm/vault-job/vault-job.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..6e0e9ce696cfa6ab1d5ae023e405c87bddc5a836
--- /dev/null
+++ b/helm/vault-job/vault-job.yaml
@@ -0,0 +1,251 @@
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: vault-prepare-certs
+  namespace: mon
+  labels:
+    io.kompose.service: api-invocation-logs
+    app: capif
+    app.kubernetes.io/name: capif
+    app.kubernetes.io/instance: capif
+data:
+  vault-prepare-certs.sh: |-
+     #!/bin/sh
+    
+     echo "install dependencies"
+     apk add --no-cache jq openssl
+
+     # Establecer las variables de entorno de Vault
+
+     export VAULT_ADDR='http://vault-internal:8200'
+     
+     # In standalone's mode. Please use the root's token
+     # or the token with the sufficient permissions
+     # to execute the next commands in vault
+     # otherwise, if use the vault as dev's mode. Just
+     # type the token's dev.
+     export VAULT_TOKEN="dev-only-token"
+     export DOMAIN1=capif.mobilesandbox.cloud
+     
+     vault secrets enable pki
+     
+     echo "# Generar una CA en Vault #"
+     vault secrets tune -max-lease-ttl=87600h pki
+     
+     vault write -field=certificate pki/root/generate/internal \
+          common_name="capif" \
+          issuer_name="root-2023" \
+          ttl=87600h > root_2023_ca.crt
+    
+     echo "# check root_2023_ca.crt #"
+     cat root_2023_ca.crt
+     
+     vault write pki/config/urls \
+          issuing_certificates="$VAULT_ADDR/v1/pki/ca" \
+          crl_distribution_points="$VAULT_ADDR/v1/pki/crl"
+     
+     # # Generar una CA intermedia en Vault
+     vault secrets enable -path=pki_int pki
+     
+     vault secrets tune -max-lease-ttl=43800h pki_int
+     
+     vault write -format=json pki_int/intermediate/generate/internal \
+          common_name="capif Intermediate Authority" \
+          issuer_name="capif-intermediate" \
+         | jq -r '.data.csr' > pki_intermediate.csr
+     
+     echo "### content pki_intermediate.csr ###"
+     cat pki_intermediate.csr
+     
+     # Firmar la CA intermedia con la CA raíz
+     vault write -format=json pki/root/sign-intermediate \
+          issuer_ref="root-2023" \
+          csr=@pki_intermediate.csr \
+          format=pem_bundle ttl="43800h" \
+          | jq -r '.data.certificate' > capif_intermediate.cert.pem
+     
+     # Configurar la CA intermedia en Vault
+     vault write pki_int/intermediate/set-signed certificate=@capif_intermediate.cert.pem
+     
+     #Crear rol en Vault
+     vault write pki_int/roles/my-ca use_csr_common_name=true require_cn=false allowed_domains="*" allow_any_name=true allow_bare_domains=true allow_glob_domains=true allow_subdomains=true max_ttl=4300h ttl=4300h
+     
+     # Emitir un certificado firmado por la CA intermedia
+     # vault write -format=json pki_int/issue/my-ca \
+     #   common_name="nginx.mon.svc.cluster.local" \
+     #   format=pem_bundle ttl="438h" \
+     #   | jq -r '.data.certificate' > ccf_cert.crt.pem \
+     #   && jq -r '.data.issuing_ca' > root_ca.crt.pem \
+     #   && jq -r '.data.private_key' > private_key.pem
+     
+     #   vault write -format=json pki_int/issue/my-ca \
+     #   common_name="nginx.mon.svc.cluster.local" \
+     #   format=pem_bundle ttl="438h" \
+     #   | jq -r '.data.private_key as $private_key | .data.issuing_ca as $issuing_ca | .data.certificate as $certificate | [$private_key, $issuing_ca, $certificate]' > cert_data.json
+     
+     
+     #Create CSR
+     openssl genrsa -out ./server.key 2048
+     
+     cat > ./foo.cnf <<EOF
+     [ req ]
+     distinguished_name = req_distinguished_name
+     req_extensions = v3_req
+     
+     [ req_distinguished_name ]
+     countryName = \$ENV::COUNTRY
+     countryName_default = \$ENV::COUNTRY
+     stateOrProvinceName = \$ENV::STATE
+     stateOrProvinceName_default = \$ENV::STATE
+     localityName = \$ENV::LOCALITY
+     localityName_default = \$ENV::LOCALITY
+     organizationName = \$ENV::ORGNAME
+     organizationName_default = \$ENV::ORGNAME
+     organizationalUnitName  = \$ENV::ORGUNIT
+     organizationalUnitName_default  = \$ENV::ORGUNIT
+     commonName = capif
+     commonName_max  = 64
+     emailAddress = Email Address
+     emailAddress_max = 64
+     emailAddress_default = \$ENV::EMAIL
+     
+     [ v3_req ]
+     subjectAltName = @alt_names
+     
+     [alt_names]
+     DNS.1 = \$ENV::DOMAIN1
+     DNS.2 = \$ENV::DOMAIN2
+     DNS.3 = \$ENV::DOMAIN3
+     EOF
+
+     export DOMAIN2=nginx.mon.svc.cluster.local
+     export DOMAIN3=nginx.mon-staging.svc.cluster.local
+     export COUNTRY=ES                # 2 letter country-code
+     export STATE=Madrid            # state or province name
+     export LOCALITY=Madrid        # Locality Name (e.g. city)
+     export ORGNAME="Telefonica I+D" # Organization Name (eg, company)
+     export ORGUNIT=Innovation                  # Organizational Unit Name (eg. section)
+     export COMMONNAME="nginx.mon.svc.cluster.local"
+     export EMAIL=inno@tid.es    # certificate's email address
+     # optional extra details
+     CHALLENGE=""                # challenge password
+     COMPANY=""                  # company name
+     
+     # DAYS="-days 365"
+     
+     # create the certificate request
+     openssl req -new $DAYS -batch -key ./server.key -out ./server.csr -config ./foo.cnf -extensions v3_req
+     
+     echo "### verify the Subject Alternative Name (SAN) ###"
+     openssl req -text -noout -verify -in ./server.csr | grep 'DNS'
+
+
+     #cat <<__EOF__ | openssl req -new $DAYS -nodes -keyout client.key -out client.csr
+     #cat <<__EOF__ | openssl req -new $DAYS -key ./server.key -out ./server.csr
+     #$COUNTRY
+     #$STATE
+     #$LOCALITY
+     #$ORGNAME
+     #$ORGUNIT
+     #$COMMONNAME
+     #$EMAIL
+     #$CHALLENGE
+     #$COMPANY
+     #__EOF__
+     
+     # vault write -format=json pki_int/issue/my-ca \
+     #   csr=@server.csr \
+     #   format=pem_bundle ttl="438h" \
+     #   | jq -r '.data.private_key as $private_key | .data.issuing_ca as $issuing_ca | .data.certificate as $certificate | [$private_key, $issuing_ca, $certificate]' > cert_data.json
+     
+     vault write -format=json pki_int/sign/my-ca  format=pem_bundle ttl="43000h" csr=@server.csr | jq -r '.data.issuing_ca as $issuing_ca | .data.certificate as $certificate | [$issuing_ca, $certificate]' > cert_data.json
+     
+     jq -r '.[0]' cert_data.json > root_ca.crt.pem
+     echo "### content root_ca.crt.pem ###"
+     cat root_ca.crt.pem
+
+     echo "### content server_certificate.crt.pem ###"
+     jq -r '.[1]' cert_data.json > server_certificate.crt.pem
+     
+     openssl x509 -pubkey -noout -in server_certificate.crt.pem  > server_certificate_pub.pem
+     
+     #vault kv put secret/ca ca=@root_ca.crt.pem root_2023_ca.crt
+     
+     #cat root_2023_ca.crt root_2023_ca.crt > ca.crt
+     
+     cat > certificados_concatenados.crt << EOF
+     $(cat "root_2023_ca.crt")
+     $(cat "root_ca.crt.pem")
+     EOF
+     echo "### content of root_2023_ca.crt ###"
+     cat root_2023_ca.crt
+
+     echo "### content of root_ca.crt.pem ###"
+     cat root_ca.crt.pem
+
+     echo "### content of certificados_concatenados.crt ###"
+     cat certificados_concatenados.crt
+     
+     # vault kv put secret/ca ca=@root_2023_ca.crt
+
+     echo "### enable secrets kv ###"
+     vault secrets enable -path=secret -version=2 kv
+
+     vault kv put secret/ca ca=@certificados_concatenados.crt
+     
+     vault kv put secret/server_cert cert=@server_certificate.crt.pem
+     
+     vault kv put secret/server_cert/pub pub_key=@server_certificate_pub.pem
+     
+     vault kv put secret/server_cert/private key=@server.key
+     
+     #POLICY_NAME="my-policy"
+     #POLICY_FILE="my-policy.hcl"
+     #TOKEN_ID="read-ca-token"
+     
+     # Crear la política en Vault
+     #echo "path \"secret/data/ca\" {
+     #  capabilities = [\"read\"]
+     #}" > "$POLICY_FILE"
+     
+     #vault policy write "$POLICY_NAME" "$POLICY_FILE"
+     
+     # Generar un nuevo token y asignar la política
+     #TOKEN=$(vault token create -id="$TOKEN_ID" -policy="$POLICY_NAME" -format=json | jq -r '.auth.client_token')
+     
+     #echo "Token generado:"
+     #echo "$TOKEN"
+---
+
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: vault-pki
+  namespace: mon
+  labels:
+    io.kompose.service: vault-pki
+    app: capif
+    app.kubernetes.io/name: capif
+    app.kubernetes.io/instance: capif
+spec:
+  template:
+    spec:
+      containers:
+      - name: vault-pki
+        image: docker.io/hashicorp/vault:1.15.1
+        command: ["./vault-prepare-certs.sh"]
+        volumeMounts:
+          - name: vault-prepare-certs
+            mountPath: vault-prepare-certs.sh
+            subPath: vault-prepare-certs.sh
+      restartPolicy: Never
+      volumes:
+      - name:  vault-prepare-certs
+        configMap:
+          name: vault-prepare-certs
+          defaultMode: 0777
+          items:
+          - key: "vault-prepare-certs.sh"
+            path: "vault-prepare-certs.sh"
+  backoffLimit: 4
diff --git a/monitoring/docker-compose.yml b/monitoring/docker-compose.yml
new file mode 100644
index 0000000000000000000000000000000000000000..41f647f0fd0371f207903d72ff41b5fcac598592
--- /dev/null
+++ b/monitoring/docker-compose.yml
@@ -0,0 +1,110 @@
+version: '3'
+services:
+  prometheus:
+    image: prom/prometheus:latest
+    container_name: prometheus
+    user: "${DUID}:${DGID}"
+    volumes:
+      - ./prometheus/prometheus.yml:/etc/prometheus/prometheus.yml
+      - ./prometheus/prometheus_db:/var/lib/prometheus
+      - ./prometheus/prometheus_db:/prometheus
+      - ./prometheus/prometheus_db:/etc/prometheus
+      - ./prometheus/alert.rules:/etc/prometheus/alert.rules
+    command:
+      - '--config.file=/etc/prometheus/prometheus.yml'
+      - '--web.route-prefix=/'
+      - '--storage.tsdb.retention.time=200h'
+      - '--web.enable-lifecycle'
+    restart: unless-stopped
+    ports:
+      - '9090:9090'
+
+  # cadvisor collects metrics about running containers
+  cadvisor:
+    image: gcr.io/cadvisor/cadvisor:v0.47.2
+    container_name: cadvisor
+    ports:
+    - 8090:8080
+    volumes:
+    - /:/rootfs:ro
+    - /var/run:/var/run:rw
+    - /sys:/sys:ro
+    - /var/lib/docker/:/var/lib/docker:ro
+    - /var/run/docker.sock:/var/run/docker.sock:rw
+
+  grafana:
+    image: grafana/grafana
+    user: "${DUID}:${DGID}"
+    environment:
+      - GF_SECURITY_ADMIN_PASSWORD=secure_pass
+      - GF_PATHS_PROVISIONING=/etc/grafana/provisioning
+      - GF_AUTH_ANONYMOUS_ENABLED=true
+      - GF_AUTH_ANONYMOUS_ORG_ROLE=Admin
+    volumes:
+      - ./grafana/grafana_config/grafana.ini:/etc/grafana/grafana.ini
+      - ./grafana/grafana_db:/var/lib/grafana
+      - ./grafana/grafana_provisioning/grafana-datasources.yaml:/etc/grafana/provisioning/datasources/datasources.yaml
+      - ./grafana/grafana_provisioning/grafana-default-provisioning.yaml:/etc/grafana/provisioning/dashboards/default.yaml
+      - ./grafana/grafana_dashboards/Docker-monitoring.json:/var/lib/grafana/dashboards/Docker-monitoring.json
+      - ./grafana/grafana_dashboards/Loki-Logs.json:/var/lib/grafana/dashboards/Loki-Logs.json
+
+    depends_on:
+      - prometheus
+    ports:
+      - '3000:3000'
+
+  # loki save and analyze logs
+  loki:
+    image: grafana/loki:2.8.0
+    ports:
+      - "3100:3100"
+    command: -config.file=/etc/loki/local-config.yaml
+
+  # promtail send docker logs to loki
+  promtail:
+    image: grafana/promtail:2.8.0
+    volumes:
+      - /var/log:/var/log
+    command: -config.file=/etc/promtail/config.yml
+
+  # grafana image renderer
+  renderer:
+    image: grafana/grafana-image-renderer:latest
+    container_name: grafana-image-renderer
+    expose:
+      - "8081"
+    environment:
+      ENABLE_METRICS: "true"
+
+  # fluent-bit send logs to loki
+  fluent-bit:
+    image: grafana/fluent-bit-plugin-loki:latest
+    container_name: fluent-bit
+    environment:
+      - LOKI_URL=http://loki:3100/loki/api/v1/push
+    volumes:
+      - ./fluent_bit/fluent-bit.conf:/fluent-bit/etc/fluent-bit.conf
+    ports:
+      - "24224:24224"
+      - "24224:24224/udp"
+
+  # opentelemetry collector
+  otel-collector:
+    image: otel/opentelemetry-collector:latest
+    ports:
+      - 55680:55680
+      - 4317:4317
+    volumes:
+      - ./otlp_collector/otel-config.yaml:/etc/otel-collector-config.yaml
+    command: ["--config", "/etc/otel-collector-config.yaml"]
+
+  # tempo is a distributed tracing backend
+  tempo:
+    image: grafana/tempo:latest
+    command: [ "-config.file=/etc/tempo.yaml" ]
+    volumes:
+      - ./tempo/tempo.yaml:/etc/tempo.yaml
+      - ./tempo/tempo-data:/tmp/tempo
+    ports:
+      - 3102:3100
+
diff --git a/monitoring/fluent_bit/fluent-bit.conf b/monitoring/fluent_bit/fluent-bit.conf
new file mode 100644
index 0000000000000000000000000000000000000000..ab11a28efe9fa933c85b3ba8f47422219f3239e1
--- /dev/null
+++ b/monitoring/fluent_bit/fluent-bit.conf
@@ -0,0 +1,15 @@
+[INPUT]
+    Name        forward
+    Listen      0.0.0.0
+    Port        24224
+[Output]
+    Name grafana-loki
+    Match *
+    Url ${LOKI_URL}
+    RemoveKeys source
+    Labels {job="fluent-bit"}
+    LabelKeys container_name, traceID
+    BatchWait 1s
+    BatchSize 1001024
+    LineFormat json
+    LogLevel info
\ No newline at end of file
diff --git a/monitoring/grafana/grafana_config/grafana.ini b/monitoring/grafana/grafana_config/grafana.ini
new file mode 100644
index 0000000000000000000000000000000000000000..c69fa95ada4d314f8a95fcfda8b53143a19572ed
--- /dev/null
+++ b/monitoring/grafana/grafana_config/grafana.ini
@@ -0,0 +1,1894 @@
+##################### Grafana Configuration Example #####################
+#
+# Everything has defaults so you only need to uncomment things you want to
+# change
+
+# possible values : production, development
+;app_mode = production
+
+# instance name, defaults to HOSTNAME environment variable value or hostname if HOSTNAME var is empty
+;instance_name = ${HOSTNAME}
+
+# force migration will run migrations that might cause dataloss
+;force_migration = false
+
+#################################### Paths ####################################
+[paths]
+# Path to where grafana can store temp files, sessions, and the sqlite3 db (if that is used)
+;data = /var/lib/grafana/dashboards
+
+# Temporary files in `data` directory older than given duration will be removed
+;temp_data_lifetime = 24h
+
+# Directory where grafana can store logs
+;logs = /var/log/grafana
+
+# Directory where grafana will automatically scan and look for plugins
+;plugins = /var/lib/grafana/plugins
+
+# folder that contains provisioning config files that grafana will apply on startup and while running.
+;provisioning = conf/provisioning
+
+#################################### Server ####################################
+[server]
+# Protocol (http, https, h2, socket)
+;protocol = http
+
+# This is the minimum TLS version allowed. By default, this value is empty. Accepted values are: TLS1.2, TLS1.3. If nothing is set TLS1.2 would be taken
+;min_tls_version = ""
+
+# The ip address to bind to, empty will bind to all interfaces
+;http_addr =
+
+# The http port  to use
+;http_port = 3000
+
+# The public facing domain name used to access grafana from a browser
+;domain = localhost
+
+# Redirect to correct domain if host header does not match domain
+# Prevents DNS rebinding attacks
+;enforce_domain = false
+
+# The full public facing url you use in browser, used for redirects and emails
+# If you use reverse proxy and sub path specify full url (with sub path)
+;root_url = %(protocol)s://%(domain)s:%(http_port)s/
+
+# Serve Grafana from subpath specified in `root_url` setting. By default it is set to `false` for compatibility reasons.
+;serve_from_sub_path = false
+
+# Log web requests
+;router_logging = false
+
+# the path relative working path
+;static_root_path = public
+
+# enable gzip
+;enable_gzip = false
+
+# https certs & key file
+;cert_file =
+;cert_key =
+
+# Unix socket gid
+# Changing the gid of a file without privileges requires that the target group is in the group of the process and that the process is the file owner
+# It is recommended to set the gid as http server user gid
+# Not set when the value is -1
+;socket_gid =
+
+# Unix socket mode
+;socket_mode =
+
+# Unix socket path
+;socket =
+
+# CDN Url
+;cdn_url =
+
+# Sets the maximum time using a duration format (5s/5m/5ms) before timing out read of an incoming request and closing idle connections.
+# `0` means there is no timeout for reading the request.
+;read_timeout = 0
+
+# This setting enables you to specify additional headers that the server adds to HTTP(S) responses.
+[server.custom_response_headers]
+#exampleHeader1 = exampleValue1
+#exampleHeader2 = exampleValue2
+
+#################################### GRPC Server #########################
+;[grpc_server]
+;network = "tcp"
+;address = "127.0.0.1:10000"
+;use_tls = false
+;cert_file =
+;key_file =
+
+#################################### Database ####################################
+[database]
+# You can configure the database connection by specifying type, host, name, user and password
+# as separate properties or as on string using the url properties.
+
+# Either "mysql", "postgres" or "sqlite3", it's your choice
+;type = sqlite3
+;host = 127.0.0.1:3306
+;name = grafana
+;user = root
+# If the password contains # or ; you have to wrap it with triple quotes. Ex """#password;"""
+;password =
+
+# Use either URL or the previous fields to configure the database
+# Example: mysql://user:secret@host:port/database
+;url =
+
+# For "postgres", use either "disable", "require" or "verify-full"
+# For "mysql", use either "true", "false", or "skip-verify".
+;ssl_mode = disable
+
+# Database drivers may support different transaction isolation levels.
+# Currently, only "mysql" driver supports isolation levels.
+# If the value is empty - driver's default isolation level is applied.
+# For "mysql" use "READ-UNCOMMITTED", "READ-COMMITTED", "REPEATABLE-READ" or "SERIALIZABLE".
+;isolation_level =
+
+;ca_cert_path =
+;client_key_path =
+;client_cert_path =
+;server_cert_name =
+
+# For "sqlite3" only, path relative to data_path setting
+;path = grafana.db
+
+# Max idle conn setting default is 2
+;max_idle_conn = 2
+
+# Max conn setting default is 0 (mean not set)
+;max_open_conn =
+
+# Connection Max Lifetime default is 14400 (means 14400 seconds or 4 hours)
+;conn_max_lifetime = 14400
+
+# Set to true to log the sql calls and execution times.
+;log_queries =
+
+# For "sqlite3" only. cache mode setting used for connecting to the database. (private, shared)
+;cache_mode = private
+
+# For "sqlite3" only. Enable/disable Write-Ahead Logging, https://sqlite.org/wal.html. Default is false.
+;wal = false
+
+# For "mysql" only if migrationLocking feature toggle is set. How many seconds to wait before failing to lock the database for the migrations, default is 0.
+;locking_attempt_timeout_sec = 0
+
+# For "sqlite" only. How many times to retry query in case of database is locked failures. Default is 0 (disabled).
+;query_retries = 0
+
+# For "sqlite" only. How many times to retry transaction in case of database is locked failures. Default is 5.
+;transaction_retries = 5
+
+# Set to true to add metrics and tracing for database queries.
+;instrument_queries = false
+
+################################### Data sources #########################
+[datasources]
+# Upper limit of data sources that Grafana will return. This limit is a temporary configuration and it will be deprecated when pagination will be introduced on the list data sources API.
+;datasource_limit = 5000
+
+#################################### Cache server #############################
+[remote_cache]
+# Either "redis", "memcached" or "database" default is "database"
+;type = database
+
+# cache connectionstring options
+# database: will use Grafana primary database.
+# redis: config like redis server e.g. `addr=127.0.0.1:6379,pool_size=100,db=0,ssl=false`. Only addr is required. ssl may be 'true', 'false', or 'insecure'.
+# memcache: 127.0.0.1:11211
+;connstr =
+
+# prefix prepended to all the keys in the remote cache
+; prefix =
+
+# This enables encryption of values stored in the remote cache
+;encryption =
+
+#################################### Data proxy ###########################
+[dataproxy]
+
+# This enables data proxy logging, default is false
+;logging = false
+
+# How long the data proxy waits to read the headers of the response before timing out, default is 30 seconds.
+# This setting also applies to core backend HTTP data sources where query requests use an HTTP client with timeout set.
+;timeout = 30
+
+# How long the data proxy waits to establish a TCP connection before timing out, default is 10 seconds.
+;dialTimeout = 10
+
+# How many seconds the data proxy waits before sending a keepalive probe request.
+;keep_alive_seconds = 30
+
+# How many seconds the data proxy waits for a successful TLS Handshake before timing out.
+;tls_handshake_timeout_seconds = 10
+
+# How many seconds the data proxy will wait for a server's first response headers after
+# fully writing the request headers if the request has an "Expect: 100-continue"
+# header. A value of 0 will result in the body being sent immediately, without
+# waiting for the server to approve.
+;expect_continue_timeout_seconds = 1
+
+# Optionally limits the total number of connections per host, including connections in the dialing,
+# active, and idle states. On limit violation, dials will block.
+# A value of zero (0) means no limit.
+;max_conns_per_host = 0
+
+# The maximum number of idle connections that Grafana will keep alive.
+;max_idle_connections = 100
+
+# How many seconds the data proxy keeps an idle connection open before timing out.
+;idle_conn_timeout_seconds = 90
+
+# If enabled and user is not anonymous, data proxy will add X-Grafana-User header with username into the request, default is false.
+;send_user_header = false
+
+# Limit the amount of bytes that will be read/accepted from responses of outgoing HTTP requests.
+;response_limit = 0
+
+# Limits the number of rows that Grafana will process from SQL data sources.
+;row_limit = 1000000
+
+# Sets a custom value for the `User-Agent` header for outgoing data proxy requests. If empty, the default value is `Grafana/<BuildVersion>` (for example `Grafana/9.0.0`).
+;user_agent =
+
+#################################### Analytics ####################################
+[analytics]
+# Server reporting, sends usage counters to stats.grafana.org every 24 hours.
+# No ip addresses are being tracked, only simple counters to track
+# running instances, dashboard and error counts. It is very helpful to us.
+# Change this option to false to disable reporting.
+;reporting_enabled = true
+
+# The name of the distributor of the Grafana instance. Ex hosted-grafana, grafana-labs
+;reporting_distributor = grafana-labs
+
+# Set to false to disable all checks to https://grafana.com
+# for new versions of grafana. The check is used
+# in some UI views to notify that a grafana update exists.
+# This option does not cause any auto updates, nor send any information
+# only a GET request to https://raw.githubusercontent.com/grafana/grafana/main/latest.json to get the latest version.
+;check_for_updates = true
+
+# Set to false to disable all checks to https://grafana.com
+# for new versions of plugins. The check is used
+# in some UI views to notify that a plugin update exists.
+# This option does not cause any auto updates, nor send any information
+# only a GET request to https://grafana.com to get the latest versions.
+;check_for_plugin_updates = true
+
+# Google Analytics universal tracking code, only enabled if you specify an id here
+;google_analytics_ua_id =
+
+# Google Analytics 4 tracking code, only enabled if you specify an id here
+;google_analytics_4_id =
+
+# When Google Analytics 4 Enhanced event measurement is enabled, we will try to avoid sending duplicate events and let Google Analytics 4 detect navigation changes, etc.
+;google_analytics_4_send_manual_page_views = false
+
+# Google Tag Manager ID, only enabled if you specify an id here
+;google_tag_manager_id =
+
+# Rudderstack write key, enabled only if rudderstack_data_plane_url is also set
+;rudderstack_write_key =
+
+# Rudderstack data plane url, enabled only if rudderstack_write_key is also set
+;rudderstack_data_plane_url =
+
+# Rudderstack SDK url, optional, only valid if rudderstack_write_key and rudderstack_data_plane_url is also set
+;rudderstack_sdk_url =
+
+# Rudderstack Config url, optional, used by Rudderstack SDK to fetch source config
+;rudderstack_config_url =
+
+# Intercom secret, optional, used to hash user_id before passing to Intercom via Rudderstack
+;intercom_secret =
+
+# Controls if the UI contains any links to user feedback forms
+;feedback_links_enabled = true
+
+#################################### Security ####################################
+[security]
+# disable creation of admin user on first start of grafana
+;disable_initial_admin_creation = false
+
+# default admin user, created on startup
+;admin_user = admin
+
+# default admin password, can be changed before first start of grafana,  or in profile settings
+;admin_password = admin
+
+# default admin email, created on startup
+;admin_email = admin@localhost
+
+# used for signing
+;secret_key = SW2YcwTIb9zpOOhoPsMm
+
+# current key provider used for envelope encryption, default to static value specified by secret_key
+;encryption_provider = secretKey.v1
+
+# list of configured key providers, space separated (Enterprise only): e.g., awskms.v1 azurekv.v1
+;available_encryption_providers =
+
+# disable gravatar profile images
+;disable_gravatar = false
+
+# data source proxy whitelist (ip_or_domain:port separated by spaces)
+;data_source_proxy_whitelist =
+
+# disable protection against brute force login attempts
+;disable_brute_force_login_protection = false
+
+# set to true if you host Grafana behind HTTPS. default is false.
+;cookie_secure = false
+
+# set cookie SameSite attribute. defaults to `lax`. can be set to "lax", "strict", "none" and "disabled"
+;cookie_samesite = lax
+
+# set to true if you want to allow browsers to render Grafana in a <frame>, <iframe>, <embed> or <object>. default is false.
+allow_embedding = false
+
+# Set to true if you want to enable http strict transport security (HSTS) response header.
+# HSTS tells browsers that the site should only be accessed using HTTPS.
+;strict_transport_security = false
+
+# Sets how long a browser should cache HSTS. Only applied if strict_transport_security is enabled.
+;strict_transport_security_max_age_seconds = 86400
+
+# Set to true if to enable HSTS preloading option. Only applied if strict_transport_security is enabled.
+;strict_transport_security_preload = false
+
+# Set to true if to enable the HSTS includeSubDomains option. Only applied if strict_transport_security is enabled.
+;strict_transport_security_subdomains = false
+
+# Set to true to enable the X-Content-Type-Options response header.
+# The X-Content-Type-Options response HTTP header is a marker used by the server to indicate that the MIME types advertised
+# in the Content-Type headers should not be changed and be followed.
+;x_content_type_options = true
+
+# Set to true to enable the X-XSS-Protection header, which tells browsers to stop pages from loading
+# when they detect reflected cross-site scripting (XSS) attacks.
+;x_xss_protection = true
+
+# Enable adding the Content-Security-Policy header to your requests.
+# CSP allows to control resources the user agent is allowed to load and helps prevent XSS attacks.
+;content_security_policy = false
+
+# Set Content Security Policy template used when adding the Content-Security-Policy header to your requests.
+# $NONCE in the template includes a random nonce.
+# $ROOT_PATH is server.root_url without the protocol.
+;content_security_policy_template = """script-src 'self' 'unsafe-eval' 'unsafe-inline' 'strict-dynamic' $NONCE;object-src 'none';font-src 'self';style-src 'self' 'unsafe-inline' blob:;img-src * data:;base-uri 'self';connect-src 'self' grafana.com ws://$ROOT_PATH wss://$ROOT_PATH;manifest-src 'self';media-src 'none';form-action 'self';"""
+
+# Enable adding the Content-Security-Policy-Report-Only header to your requests.
+# Allows you to monitor the effects of a policy without enforcing it.
+;content_security_policy_report_only = false
+
+# Set Content Security Policy Report Only template used when adding the Content-Security-Policy-Report-Only header to your requests.
+# $NONCE in the template includes a random nonce.
+# $ROOT_PATH is server.root_url without the protocol.
+;content_security_policy_report_only_template = """script-src 'self' 'unsafe-eval' 'unsafe-inline' 'strict-dynamic' $NONCE;object-src 'none';font-src 'self';style-src 'self' 'unsafe-inline' blob:;img-src * data:;base-uri 'self';connect-src 'self' grafana.com ws://$ROOT_PATH wss://$ROOT_PATH;manifest-src 'self';media-src 'none';form-action 'self';"""
+# Controls if old angular plugins are supported or not. This will be disabled by default in future release
+;angular_support_enabled = true
+
+# List of additional allowed URLs to pass by the CSRF check, separated by spaces. Suggested when authentication comes from an IdP.
+;csrf_trusted_origins = example.com
+
+# List of allowed headers to be set by the user, separated by spaces. Suggested to use for if authentication lives behind reverse proxies.
+;csrf_additional_headers =
+
+# The CSRF check will be executed even if the request has no login cookie.
+;csrf_always_check = false
+
+# Comma-separated list of plugins ids that won't be loaded inside the frontend sandbox
+;disable_frontend_sandbox_for_plugins =
+
+[security.encryption]
+# Defines the time-to-live (TTL) for decrypted data encryption keys stored in memory (cache).
+# Please note that small values may cause performance issues due to a high frequency decryption operations.
+;data_keys_cache_ttl = 15m
+
+# Defines the frequency of data encryption keys cache cleanup interval.
+# On every interval, decrypted data encryption keys that reached the TTL are removed from the cache.
+;data_keys_cache_cleanup_interval = 1m
+
+#################################### Snapshots ###########################
+[snapshots]
+# set to false to remove snapshot functionality
+;enabled = true
+
+# snapshot sharing options
+;external_enabled = true
+;external_snapshot_url = https://snapshots.raintank.io
+;external_snapshot_name = Publish to snapshots.raintank.io
+
+# Set to true to enable this Grafana instance act as an external snapshot server and allow unauthenticated requests for
+# creating and deleting snapshots.
+;public_mode = false
+
+# remove expired snapshot
+;snapshot_remove_expired = true
+
+#################################### Dashboards History ##################
+[dashboards]
+# Number dashboard versions to keep (per dashboard). Default: 20, Minimum: 1
+;versions_to_keep = 20
+
+# Minimum dashboard refresh interval. When set, this will restrict users to set the refresh interval of a dashboard lower than given interval. Per default this is 5 seconds.
+# The interval string is a possibly signed sequence of decimal numbers, followed by a unit suffix (ms, s, m, h, d), e.g. 30s or 1m.
+;min_refresh_interval = 5s
+
+# Path to the default home dashboard. If this value is empty, then Grafana uses StaticRootPath + "dashboards/home.json"
+;default_home_dashboard_path =
+
+#################################### Users ###############################
+[users]
+# disable user signup / registration
+;allow_sign_up = true
+
+# Allow non admin users to create organizations
+;allow_org_create = true
+
+# Set to true to automatically assign new users to the default organization (id 1)
+;auto_assign_org = true
+
+# Set this value to automatically add new users to the provided organization (if auto_assign_org above is set to true)
+;auto_assign_org_id = 1
+
+# Default role new users will be automatically assigned
+;auto_assign_org_role = Viewer
+
+# Require email validation before sign up completes
+;verify_email_enabled = false
+
+# Background text for the user field on the login page
+;login_hint = email or username
+;password_hint = password
+
+# Default UI theme ("dark" or "light")
+;default_theme = dark
+
+# Default UI language (supported IETF language tag, such as en-US)
+;default_language = en-US
+
+# Path to a custom home page. Users are only redirected to this if the default home dashboard is used. It should match a frontend route and contain a leading slash.
+;home_page =
+
+# External user management, these options affect the organization users view
+;external_manage_link_url =
+;external_manage_link_name =
+;external_manage_info =
+
+# Viewers can edit/inspect dashboard settings in the browser. But not save the dashboard.
+;viewers_can_edit = false
+
+# Editors can administrate dashboard, folders and teams they create
+;editors_can_admin = false
+
+# The duration in time a user invitation remains valid before expiring. This setting should be expressed as a duration. Examples: 6h (hours), 2d (days), 1w (week). Default is 24h (24 hours). The minimum supported duration is 15m (15 minutes).
+;user_invite_max_lifetime_duration = 24h
+
+# Enter a comma-separated list of users login to hide them in the Grafana UI. These users are shown to Grafana admins and themselves.
+; hidden_users =
+
+[secretscan]
+# Enable secretscan feature
+;enabled = false
+
+# Interval to check for token leaks
+;interval = 5m
+
+# base URL of the grafana token leak check service
+;base_url = https://secret-scanning.grafana.net
+
+# URL to send outgoing webhooks to in case of detection
+;oncall_url =
+
+# Whether to revoke the token if a leak is detected or just send a notification
+;revoke = true
+
+[service_accounts]
+# Service account maximum expiration date in days.
+# When set, Grafana will not allow the creation of tokens with expiry greater than this setting.
+; token_expiration_day_limit =
+
+[auth]
+# Login cookie name
+;login_cookie_name = grafana_session
+
+# Disable usage of Grafana build-in login solution.
+;disable_login = false
+
+# The maximum lifetime (duration) an authenticated user can be inactive before being required to login at next visit. Default is 7 days (7d). This setting should be expressed as a duration, e.g. 5m (minutes), 6h (hours), 10d (days), 2w (weeks), 1M (month). The lifetime resets at each successful token rotation.
+;login_maximum_inactive_lifetime_duration =
+
+# The maximum lifetime (duration) an authenticated user can be logged in since login time before being required to login. Default is 30 days (30d). This setting should be expressed as a duration, e.g. 5m (minutes), 6h (hours), 10d (days), 2w (weeks), 1M (month).
+;login_maximum_lifetime_duration =
+
+# How often should auth tokens be rotated for authenticated users when being active. The default is each 10 minutes.
+;token_rotation_interval_minutes = 10
+
+# Set to true to disable (hide) the login form, useful if you use OAuth, defaults to false
+;disable_login_form = false
+
+# Set to true to disable the sign out link in the side menu. Useful if you use auth.proxy or auth.jwt, defaults to false
+;disable_signout_menu = false
+
+# URL to redirect the user to after sign out
+;signout_redirect_url =
+
+# Set to true to attempt login with OAuth automatically, skipping the login screen.
+# This setting is ignored if multiple OAuth providers are configured.
+# Deprecated, use auto_login option for specific provider instead.
+;oauth_auto_login = false
+
+# OAuth state max age cookie duration in seconds. Defaults to 600 seconds.
+;oauth_state_cookie_max_age = 600
+
+# Skip forced assignment of OrgID 1 or 'auto_assign_org_id' for social logins
+# Deprecated, use skip_org_role_sync option for specific provider instead.
+;oauth_skip_org_role_update_sync = false
+
+# limit of api_key seconds to live before expiration
+;api_key_max_seconds_to_live = -1
+
+# Set to true to enable SigV4 authentication option for HTTP-based datasources.
+;sigv4_auth_enabled = false
+
+# Set to true to enable verbose logging of SigV4 request signing
+;sigv4_verbose_logging = false
+
+# Set to true to enable Azure authentication option for HTTP-based datasources.
+;azure_auth_enabled = false
+
+# Set to skip the organization role from JWT login and use system's role assignment instead.
+; skip_org_role_sync = false
+
+# Use email lookup in addition to the unique ID provided by the IdP
+;oauth_allow_insecure_email_lookup = false
+
+#################################### Anonymous Auth ######################
+[auth.anonymous]
+# enable anonymous access
+;enabled = false
+
+# specify organization name that should be used for unauthenticated users
+;org_name = Main Org.
+
+# specify role for unauthenticated users
+;org_role = Viewer
+
+# mask the Grafana version number for unauthenticated users
+;hide_version = false
+
+#################################### GitHub Auth ##########################
+[auth.github]
+;name = GitHub
+;icon = github
+;enabled = false
+;allow_sign_up = true
+;auto_login = false
+;client_id = some_id
+;client_secret = some_secret
+;scopes = user:email,read:org
+;auth_url = https://github.com/login/oauth/authorize
+;token_url = https://github.com/login/oauth/access_token
+;api_url = https://api.github.com/user
+;allowed_domains =
+;team_ids =
+;allowed_organizations =
+;role_attribute_path =
+;role_attribute_strict = false
+;allow_assign_grafana_admin = false
+;skip_org_role_sync = false
+
+#################################### GitLab Auth #########################
+[auth.gitlab]
+;name = GitLab
+;icon = gitlab
+;enabled = false
+;allow_sign_up = true
+;auto_login = false
+;client_id = some_id
+;client_secret = some_secret
+;scopes = openid email profile
+;auth_url = https://gitlab.com/oauth/authorize
+;token_url = https://gitlab.com/oauth/token
+;api_url = https://gitlab.com/api/v4
+;allowed_domains =
+;allowed_groups =
+;role_attribute_path =
+;role_attribute_strict = false
+;allow_assign_grafana_admin = false
+;skip_org_role_sync = false
+;tls_skip_verify_insecure = false
+;tls_client_cert =
+;tls_client_key =
+;tls_client_ca =
+;use_pkce = true
+
+#################################### Google Auth ##########################
+[auth.google]
+;name = Google
+;icon = google
+;enabled = false
+;allow_sign_up = true
+;auto_login = false
+;client_id = some_client_id
+;client_secret = some_client_secret
+;scopes = openid email profile
+;auth_url = https://accounts.google.com/o/oauth2/v2/auth
+;token_url = https://oauth2.googleapis.com/token
+;api_url = https://openidconnect.googleapis.com/v1/userinfo
+;allowed_domains =
+;hosted_domain =
+;skip_org_role_sync = false
+;use_pkce = true
+
+#################################### Grafana.com Auth ####################
+[auth.grafana_com]
+;name = Grafana.com
+;icon = grafana
+;enabled = false
+;allow_sign_up = true
+;auto_login = false
+;client_id = some_id
+;client_secret = some_secret
+;scopes = user:email
+;allowed_organizations =
+;skip_org_role_sync = false
+
+#################################### Azure AD OAuth #######################
+[auth.azuread]
+;name = Microsoft
+;icon = microsoft
+;enabled = false
+;allow_sign_up = true
+;auto_login = false
+;client_id = some_client_id
+;client_secret = some_client_secret
+;scopes = openid email profile
+;auth_url = https://login.microsoftonline.com/<tenant-id>/oauth2/v2.0/authorize
+;token_url = https://login.microsoftonline.com/<tenant-id>/oauth2/v2.0/token
+;allowed_domains =
+;allowed_groups =
+;allowed_organizations =
+;role_attribute_strict = false
+;allow_assign_grafana_admin = false
+;use_pkce = true
+# prevent synchronizing users organization roles
+;skip_org_role_sync = false
+
+#################################### Okta OAuth #######################
+[auth.okta]
+;name = Okta
+;enabled = false
+;allow_sign_up = true
+;auto_login = false
+;client_id = some_id
+;client_secret = some_secret
+;scopes = openid profile email groups
+;auth_url = https://<tenant-id>.okta.com/oauth2/v1/authorize
+;token_url = https://<tenant-id>.okta.com/oauth2/v1/token
+;api_url = https://<tenant-id>.okta.com/oauth2/v1/userinfo
+;allowed_domains =
+;allowed_groups =
+;role_attribute_path =
+;role_attribute_strict = false
+;allow_assign_grafana_admin = false
+;skip_org_role_sync = false
+;use_pkce = true
+
+#################################### Generic OAuth ##########################
+[auth.generic_oauth]
+;enabled = false
+;name = OAuth
+;allow_sign_up = true
+;auto_login = false
+;client_id = some_id
+;client_secret = some_secret
+;scopes = user:email,read:org
+;empty_scopes = false
+;email_attribute_name = email:primary
+;email_attribute_path =
+;login_attribute_path =
+;name_attribute_path =
+;id_token_attribute_name =
+;auth_url = https://foo.bar/login/oauth/authorize
+;token_url = https://foo.bar/login/oauth/access_token
+;api_url = https://foo.bar/user
+;teams_url =
+;allowed_domains =
+;team_ids =
+;allowed_organizations =
+;role_attribute_path =
+;role_attribute_strict = false
+;groups_attribute_path =
+;team_ids_attribute_path =
+;tls_skip_verify_insecure = false
+;tls_client_cert =
+;tls_client_key =
+;tls_client_ca =
+;use_pkce = false
+;auth_style =
+;allow_assign_grafana_admin = false
+
+#################################### Basic Auth ##########################
+[auth.basic]
+;enabled = true
+
+#################################### Auth Proxy ##########################
+[auth.proxy]
+;enabled = false
+;header_name = X-WEBAUTH-USER
+;header_property = username
+;auto_sign_up = true
+;sync_ttl = 60
+;whitelist = 192.168.1.1, 192.168.2.1
+;headers = Email:X-User-Email, Name:X-User-Name
+# Non-ASCII strings in header values are encoded using quoted-printable encoding
+;headers_encoded = false
+# Read the auth proxy docs for details on what the setting below enables
+;enable_login_token = false
+
+#################################### Auth JWT ##########################
+[auth.jwt]
+;enabled = true
+;header_name = X-JWT-Assertion
+;email_claim = sub
+;username_claim = sub
+;jwk_set_url = https://foo.bar/.well-known/jwks.json
+;jwk_set_file = /path/to/jwks.json
+;cache_ttl = 60m
+;expect_claims = {"aud": ["foo", "bar"]}
+;key_file = /path/to/key/file
+;role_attribute_path =
+;role_attribute_strict = false
+;auto_sign_up = false
+;url_login = false
+;allow_assign_grafana_admin = false
+
+#################################### Auth LDAP ##########################
+[auth.ldap]
+;enabled = false
+;config_file = /etc/grafana/ldap.toml
+;allow_sign_up = true
+# prevent synchronizing ldap users organization roles
+;skip_org_role_sync = false
+
+# LDAP background sync (Enterprise only)
+# At 1 am every day
+;sync_cron = "0 1 * * *"
+;active_sync_enabled = true
+
+#################################### AWS ###########################
+[aws]
+# Enter a comma-separated list of allowed AWS authentication providers.
+# Options are: default (AWS SDK Default), keys (Access && secret key), credentials (Credentials field), ec2_iam_role (EC2 IAM Role)
+; allowed_auth_providers = default,keys,credentials
+
+# Allow AWS users to assume a role using temporary security credentials.
+# If true, assume role will be enabled for all AWS authentication providers that are specified in aws_auth_providers
+; assume_role_enabled = true
+
+# Specify max no of pages to be returned by the ListMetricPages API
+; list_metrics_page_limit = 500
+
+# Experimental, for use in Grafana Cloud only. Please do not set.
+; external_id =
+
+#################################### Azure ###############################
+[azure]
+# Azure cloud environment where Grafana is hosted
+# Possible values are AzureCloud, AzureChinaCloud, AzureUSGovernment and AzureGermanCloud
+# Default value is AzureCloud (i.e. public cloud)
+;cloud = AzureCloud
+
+# Specifies whether Grafana hosted in Azure service with Managed Identity configured (e.g. Azure Virtual Machines instance)
+# If enabled, the managed identity can be used for authentication of Grafana in Azure services
+# Disabled by default, needs to be explicitly enabled
+;managed_identity_enabled = false
+
+# Client ID to use for user-assigned managed identity
+# Should be set for user-assigned identity and should be empty for system-assigned identity
+;managed_identity_client_id =
+
+# Specifies whether Azure AD Workload Identity authentication should be enabled in datasources that support it
+# For more documentation on Azure AD Workload Identity, review this documentation:
+# https://azure.github.io/azure-workload-identity/docs/
+# Disabled by default, needs to be explicitly enabled
+;workload_identity_enabled = false
+
+# Tenant ID of the Azure AD Workload Identity
+# Allows to override default tenant ID of the Azure AD identity associated with the Kubernetes service account
+;workload_identity_tenant_id =
+
+# Client ID of the Azure AD Workload Identity
+# Allows to override default client ID of the Azure AD identity associated with the Kubernetes service account
+;workload_identity_client_id =
+
+# Custom path to token file for the Azure AD Workload Identity
+# Allows to set a custom path to the projected service account token file
+;workload_identity_token_file =
+
+# Specifies whether user identity authentication (on behalf of currently signed-in user) should be enabled in datasources
+# that support it (requires AAD authentication)
+# Disabled by default, needs to be explicitly enabled
+;user_identity_enabled = false
+
+# Override token URL for Azure Active Directory
+# By default is the same as token URL configured for AAD authentication settings
+;user_identity_token_url =
+
+# Override ADD application ID which would be used to exchange users token to an access token for the datasource
+# By default is the same as used in AAD authentication or can be set to another application (for OBO flow)
+;user_identity_client_id =
+
+# Override the AAD application client secret
+# By default is the same as used in AAD authentication or can be set to another application (for OBO flow)
+;user_identity_client_secret =
+
+#################################### Role-based Access Control ###########
+[rbac]
+;permission_cache = true
+
+# Reset basic roles permissions on boot
+# Warning left to true, basic roles permissions will be reset on every boot
+#reset_basic_roles = false
+
+#################################### SMTP / Emailing ##########################
+[smtp]
+;enabled = false
+;host = localhost:25
+;user =
+# If the password contains # or ; you have to wrap it with triple quotes. Ex """#password;"""
+;password =
+;cert_file =
+;key_file =
+;skip_verify = false
+;from_address = admin@grafana.localhost
+;from_name = Grafana
+# EHLO identity in SMTP dialog (defaults to instance_name)
+;ehlo_identity = dashboard.example.com
+# SMTP startTLS policy (defaults to 'OpportunisticStartTLS')
+;startTLS_policy = NoStartTLS
+
+[emails]
+;welcome_email_on_sign_up = false
+;templates_pattern = emails/*.html, emails/*.txt
+;content_types = text/html
+
+#################################### Logging ##########################
+[log]
+# Either "console", "file", "syslog". Default is console and  file
+# Use space to separate multiple modes, e.g. "console file"
+;mode = console file
+
+# Either "debug", "info", "warn", "error", "critical", default is "info"
+;level = info
+
+# optional settings to set different levels for specific loggers. Ex filters = sqlstore:debug
+;filters =
+
+# Set the default error message shown to users. This message is displayed instead of sensitive backend errors which should be obfuscated. Default is the same as the sample value.
+;user_facing_default_error = "please inspect Grafana server log for details"
+
+# For "console" mode only
+[log.console]
+;level =
+
+# log line format, valid options are text, console and json
+;format = console
+
+# For "file" mode only
+[log.file]
+;level =
+
+# log line format, valid options are text, console and json
+;format = text
+
+# This enables automated log rotate(switch of following options), default is true
+;log_rotate = true
+
+# Max line number of single file, default is 1000000
+;max_lines = 1000000
+
+# Max size shift of single file, default is 28 means 1 << 28, 256MB
+;max_size_shift = 28
+
+# Segment log daily, default is true
+;daily_rotate = true
+
+# Expired days of log file(delete after max days), default is 7
+;max_days = 7
+
+[log.syslog]
+;level =
+
+# log line format, valid options are text, console and json
+;format = text
+
+# Syslog network type and address. This can be udp, tcp, or unix. If left blank, the default unix endpoints will be used.
+;network =
+;address =
+
+# Syslog facility. user, daemon and local0 through local7 are valid.
+;facility =
+
+# Syslog tag. By default, the process' argv[0] is used.
+;tag =
+
+[log.frontend]
+# Should Faro javascript agent be initialized
+;enabled = false
+
+# Custom HTTP endpoint to send events to. Default will log the events to stdout.
+;custom_endpoint = /log-grafana-javascript-agent
+
+# Requests per second limit enforced an extended period, for Grafana backend log ingestion endpoint (/log).
+;log_endpoint_requests_per_second_limit = 3
+
+# Max requests accepted per short interval of time for Grafana backend log ingestion endpoint (/log).
+;log_endpoint_burst_limit = 15
+
+# Should error instrumentation be enabled, only affects Grafana Javascript Agent
+;instrumentations_errors_enabled = true
+
+# Should console instrumentation be enabled, only affects Grafana Javascript Agent
+;instrumentations_console_enabled = false
+
+# Should webvitals instrumentation be enabled, only affects Grafana Javascript Agent
+;instrumentations_webvitals_enabled = false
+
+# Api Key, only applies to Grafana Javascript Agent provider
+;api_key = testApiKey
+
+#################################### Usage Quotas ########################
+[quota]
+; enabled = false
+
+#### set quotas to -1 to make unlimited. ####
+# limit number of users per Org.
+; org_user = 10
+
+# limit number of dashboards per Org.
+; org_dashboard = 100
+
+# limit number of data_sources per Org.
+; org_data_source = 10
+
+# limit number of api_keys per Org.
+; org_api_key = 10
+
+# limit number of alerts per Org.
+;org_alert_rule = 100
+
+# limit number of orgs a user can create.
+; user_org = 10
+
+# Global limit of users.
+; global_user = -1
+
+# global limit of orgs.
+; global_org = -1
+
+# global limit of dashboards
+; global_dashboard = -1
+
+# global limit of api_keys
+; global_api_key = -1
+
+# global limit on number of logged in users.
+; global_session = -1
+
+# global limit of alerts
+;global_alert_rule = -1
+
+# global limit of correlations
+; global_correlations = -1
+
+#################################### Unified Alerting ####################
+[unified_alerting]
+#Enable the Unified Alerting sub-system and interface. When enabled we'll migrate all of your alert rules and notification channels to the new system. New alert rules will be created and your notification channels will be converted into an Alertmanager configuration. Previous data is preserved to enable backwards compatibility but new data is removed.```
+;enabled = true
+
+# Comma-separated list of organization IDs for which to disable unified alerting. Only supported if unified alerting is enabled.
+;disabled_orgs =
+
+# Specify the frequency of polling for admin config changes.
+# The interval string is a possibly signed sequence of decimal numbers, followed by a unit suffix (ms, s, m, h, d), e.g. 30s or 1m.
+;admin_config_poll_interval = 60s
+
+# Specify the frequency of polling for Alertmanager config changes.
+# The interval string is a possibly signed sequence of decimal numbers, followed by a unit suffix (ms, s, m, h, d), e.g. 30s or 1m.
+;alertmanager_config_poll_interval = 60s
+
+# The redis server address that should be connected to.
+;ha_redis_address =
+
+# The username that should be used to authenticate with the redis server.
+;ha_redis_username =
+
+# The password that should be used to authenticate with the redis server.
+;ha_redis_password =
+
+# The redis database, by default it's 0.
+;ha_redis_db =
+
+# A prefix that is used for every key or channel that is created on the redis server
+# as part of HA for alerting.
+;ha_redis_prefix =
+
+# The name of the cluster peer that will be used as identifier. If none is
+# provided, a random one will be generated.
+;ha_redis_peer_name =
+
+# Listen address/hostname and port to receive unified alerting messages for other Grafana instances. The port is used for both TCP and UDP. It is assumed other Grafana instances are also running on the same port. The default value is `0.0.0.0:9094`.
+;ha_listen_address = "0.0.0.0:9094"
+
+# Listen address/hostname and port to receive unified alerting messages for other Grafana instances. The port is used for both TCP and UDP. It is assumed other Grafana instances are also running on the same port. The default value is `0.0.0.0:9094`.
+;ha_advertise_address = ""
+
+# Comma-separated list of initial instances (in a format of host:port) that will form the HA cluster. Configuring this setting will enable High Availability mode for alerting.
+;ha_peers = ""
+
+# Time to wait for an instance to send a notification via the Alertmanager. In HA, each Grafana instance will
+# be assigned a position (e.g. 0, 1). We then multiply this position with the timeout to indicate how long should
+# each instance wait before sending the notification to take into account replication lag.
+# The interval string is a possibly signed sequence of decimal numbers, followed by a unit suffix (ms, s, m, h, d), e.g. 30s or 1m.
+;ha_peer_timeout = "15s"
+
+# The label is an optional string to include on each packet and stream.
+# It uniquely identifies the cluster and prevents cross-communication
+# issues when sending gossip messages in an enviromenet with multiple clusters.
+;ha_label =
+
+# The interval between sending gossip messages. By lowering this value (more frequent) gossip messages are propagated
+# across cluster more quickly at the expense of increased bandwidth usage.
+# The interval string is a possibly signed sequence of decimal numbers, followed by a unit suffix (ms, s, m, h, d), e.g. 30s or 1m.
+;ha_gossip_interval = "200ms"
+
+# The interval between gossip full state syncs. Setting this interval lower (more frequent) will increase convergence speeds
+# across larger clusters at the expense of increased bandwidth usage.
+# The interval string is a possibly signed sequence of decimal numbers, followed by a unit suffix (ms, s, m, h, d), e.g. 30s or 1m.
+;ha_push_pull_interval = "60s"
+
+# Enable or disable alerting rule execution. The alerting UI remains visible. This option has a legacy version in the `[alerting]` section that takes precedence.
+;execute_alerts = true
+
+# Alert evaluation timeout when fetching data from the datasource. This option has a legacy version in the `[alerting]` section that takes precedence.
+# The timeout string is a possibly signed sequence of decimal numbers, followed by a unit suffix (ms, s, m, h, d), e.g. 30s or 1m.
+;evaluation_timeout = 30s
+
+# Number of times we'll attempt to evaluate an alert rule before giving up on that evaluation. This option has a legacy version in the `[alerting]` section that takes precedence.
+;max_attempts = 3
+
+# Minimum interval to enforce between rule evaluations. Rules will be adjusted if they are less than this value  or if they are not multiple of the scheduler interval (10s). Higher values can help with resource management as we'll schedule fewer evaluations over time. This option has a legacy version in the `[alerting]` section that takes precedence.
+# The interval string is a possibly signed sequence of decimal numbers, followed by a unit suffix (ms, s, m, h, d), e.g. 30s or 1m.
+;min_interval = 10s
+
+[unified_alerting.reserved_labels]
+# Comma-separated list of reserved labels added by the Grafana Alerting engine that should be disabled.
+# For example: `disabled_labels=grafana_folder`
+;disabled_labels =
+
+[unified_alerting.state_history]
+# Enable the state history functionality in Unified Alerting. The previous states of alert rules will be visible in panels and in the UI.
+; enabled = true
+
+# Select which pluggable state history backend to use. Either "annotations", "loki", or "multiple"
+# "loki" writes state history to an external Loki instance. "multiple" allows history to be written to multiple backends at once.
+# Defaults to "annotations".
+; backend = "multiple"
+
+# For "multiple" only.
+# Indicates the main backend used to serve state history queries.
+# Either "annotations" or "loki"
+; primary = "loki"
+
+# For "multiple" only.
+# Comma-separated list of additional backends to write state history data to.
+; secondaries = "annotations"
+
+# For "loki" only.
+# URL of the external Loki instance.
+# Either "loki_remote_url", or both of "loki_remote_read_url" and "loki_remote_write_url" is required for the "loki" backend.
+; loki_remote_url = "http://loki:3100"
+
+# For "loki" only.
+# URL of the external Loki's read path. To be used in configurations where Loki has separated read and write URLs.
+# Either "loki_remote_url", or both of "loki_remote_read_url" and "loki_remote_write_url" is required for the "loki" backend.
+; loki_remote_read_url = "http://loki-querier:3100"
+
+# For "loki" only.
+# URL of the external Loki's write path. To be used in configurations where Loki has separated read and write URLs.
+# Either "loki_remote_url", or both of "loki_remote_read_url" and "loki_remote_write_url" is required for the "loki" backend.
+; loki_remote_write_url = "http://loki-distributor:3100"
+
+# For "loki" only.
+# Optional tenant ID to attach to requests sent to Loki.
+; loki_tenant_id = 123
+
+# For "loki" only.
+# Optional username for basic authentication on requests sent to Loki. Can be left blank to disable basic auth.
+; loki_basic_auth_username = "myuser"
+
+# For "loki" only.
+# Optional password for basic authentication on requests sent to Loki. Can be left blank.
+; loki_basic_auth_password = "mypass"
+
+[unified_alerting.state_history.external_labels]
+# Optional extra labels to attach to outbound state history records or log streams.
+# Any number of label key-value-pairs can be provided.
+; mylabelkey = mylabelvalue
+
+#################################### Alerting ############################
+[alerting]
+# Disable legacy alerting engine & UI features
+;enabled = false
+
+# Makes it possible to turn off alert execution but alerting UI is visible
+;execute_alerts = true
+
+# Default setting for new alert rules. Defaults to categorize error and timeouts as alerting. (alerting, keep_state)
+;error_or_timeout = alerting
+
+# Default setting for how Grafana handles nodata or null values in alerting. (alerting, no_data, keep_state, ok)
+;nodata_or_nullvalues = no_data
+
+# Alert notifications can include images, but rendering many images at the same time can overload the server
+# This limit will protect the server from render overloading and make sure notifications are sent out quickly
+;concurrent_render_limit = 5
+
+# Default setting for alert calculation timeout. Default value is 30
+;evaluation_timeout_seconds = 30
+
+# Default setting for alert notification timeout. Default value is 30
+;notification_timeout_seconds = 30
+
+# Default setting for max attempts to sending alert notifications. Default value is 3
+;max_attempts = 3
+
+# Makes it possible to enforce a minimal interval between evaluations, to reduce load on the backend
+;min_interval_seconds = 1
+
+# Configures for how long alert annotations are stored. Default is 0, which keeps them forever.
+# This setting should be expressed as a duration. Examples: 6h (hours), 10d (days), 2w (weeks), 1M (month).
+;max_annotation_age =
+
+# Configures max number of alert annotations that Grafana stores. Default value is 0, which keeps all alert annotations.
+;max_annotations_to_keep =
+
+#################################### Annotations #########################
+[annotations]
+# Configures the batch size for the annotation clean-up job. This setting is used for dashboard, API, and alert annotations.
+;cleanupjob_batchsize = 100
+
+# Enforces the maximum allowed length of the tags for any newly introduced annotations. It can be between 500 and 4096 inclusive (which is the respective's column length). Default value is 500.
+# Setting it to a higher value would impact performance therefore is not recommended.
+;tags_length = 500
+
+[annotations.dashboard]
+# Dashboard annotations means that annotations are associated with the dashboard they are created on.
+
+# Configures how long dashboard annotations are stored. Default is 0, which keeps them forever.
+# This setting should be expressed as a duration. Examples: 6h (hours), 10d (days), 2w (weeks), 1M (month).
+;max_age =
+
+# Configures max number of dashboard annotations that Grafana stores. Default value is 0, which keeps all dashboard annotations.
+;max_annotations_to_keep =
+
+[annotations.api]
+# API annotations means that the annotations have been created using the API without any
+# association with a dashboard.
+
+# Configures how long Grafana stores API annotations. Default is 0, which keeps them forever.
+# This setting should be expressed as a duration. Examples: 6h (hours), 10d (days), 2w (weeks), 1M (month).
+;max_age =
+
+# Configures max number of API annotations that Grafana keeps. Default value is 0, which keeps all API annotations.
+;max_annotations_to_keep =
+
+#################################### Explore #############################
+[explore]
+# Enable the Explore section
+;enabled = true
+
+#################################### Help #############################
+[help]
+# Enable the Help section
+;enabled = true
+
+#################################### Profile #############################
+[profile]
+# Enable the Profile section
+;enabled = true
+
+#################################### News #############################
+[news]
+# Enable the news feed section
+; news_feed_enabled = true
+
+#################################### Query #############################
+[query]
+# Set the number of data source queries that can be executed concurrently in mixed queries. Default is the number of CPUs.
+;concurrent_query_limit =
+
+#################################### Query History #############################
+[query_history]
+# Enable the Query history
+;enabled = true
+
+#################################### Internal Grafana Metrics ##########################
+# Metrics available at HTTP URL /metrics and /metrics/plugins/:pluginId
+[metrics]
+# Disable / Enable internal metrics
+;enabled           = true
+# Graphite Publish interval
+;interval_seconds  = 10
+# Disable total stats (stat_totals_*) metrics to be generated
+;disable_total_stats = false
+# The interval at which the total stats collector will update the stats. Default is 1800 seconds.
+;total_stats_collector_interval_seconds = 1800
+
+#If both are set, basic auth will be required for the metrics endpoints.
+; basic_auth_username =
+; basic_auth_password =
+
+# Metrics environment info adds dimensions to the `grafana_environment_info` metric, which
+# can expose more information about the Grafana instance.
+[metrics.environment_info]
+#exampleLabel1 = exampleValue1
+#exampleLabel2 = exampleValue2
+
+# Send internal metrics to Graphite
+[metrics.graphite]
+# Enable by setting the address setting (ex localhost:2003)
+;address =
+;prefix = prod.grafana.%(instance_name)s.
+
+#################################### Grafana.com integration  ##########################
+# Url used to import dashboards directly from Grafana.com
+[grafana_com]
+;url = https://grafana.com
+;api_url = https://grafana.com/api
+
+#################################### Distributed tracing ############
+# Opentracing is deprecated use opentelemetry instead
+[tracing.jaeger]
+# Enable by setting the address sending traces to jaeger (ex localhost:6831)
+;address = localhost:6831
+# Tag that will always be included in when creating new spans. ex (tag1:value1,tag2:value2)
+;always_included_tag = tag1:value1
+# Type specifies the type of the sampler: const, probabilistic, rateLimiting, or remote
+;sampler_type = const
+# jaeger samplerconfig param
+# for "const" sampler, 0 or 1 for always false/true respectively
+# for "probabilistic" sampler, a probability between 0 and 1
+# for "rateLimiting" sampler, the number of spans per second
+# for "remote" sampler, param is the same as for "probabilistic"
+# and indicates the initial sampling rate before the actual one
+# is received from the mothership
+;sampler_param = 1
+# sampling_server_url is the URL of a sampling manager providing a sampling strategy.
+;sampling_server_url =
+# Whether or not to use Zipkin propagation (x-b3- HTTP headers).
+;zipkin_propagation = false
+# Setting this to true disables shared RPC spans.
+# Not disabling is the most common setting when using Zipkin elsewhere in your infrastructure.
+;disable_shared_zipkin_spans = false
+
+[tracing.opentelemetry]
+# attributes that will always be included in when creating new spans. ex (key1:value1,key2:value2)
+;custom_attributes = key1:value1,key2:value2
+
+[tracing.opentelemetry.jaeger]
+# jaeger destination (ex http://localhost:14268/api/traces)
+; address = http://localhost:14268/api/traces
+# Propagation specifies the text map propagation format: w3c, jaeger
+; propagation = jaeger
+
+# This is a configuration for OTLP exporter with GRPC protocol
+[tracing.opentelemetry.otlp]
+# otlp destination (ex localhost:4317)
+; address = localhost:4317
+# Propagation specifies the text map propagation format: w3c, jaeger
+; propagation = w3c
+
+#################################### External image storage ##########################
+[external_image_storage]
+# Used for uploading images to public servers so they can be included in slack/email messages.
+# you can choose between (s3, webdav, gcs, azure_blob, local)
+;provider =
+
+[external_image_storage.s3]
+;endpoint =
+;path_style_access =
+;bucket =
+;region =
+;path =
+;access_key =
+;secret_key =
+
+[external_image_storage.webdav]
+;url =
+;public_url =
+;username =
+;password =
+
+[external_image_storage.gcs]
+;key_file =
+;bucket =
+;path =
+
+[external_image_storage.azure_blob]
+;account_name =
+;account_key =
+;container_name =
+;sas_token_expiration_days =
+
+[external_image_storage.local]
+# does not require any configuration
+
+[rendering]
+# Options to configure a remote HTTP image rendering service, e.g. using https://github.com/grafana/grafana-image-renderer.
+# URL to a remote HTTP image renderer service, e.g. http://localhost:8081/render, will enable Grafana to render panels and dashboards to PNG-images using HTTP requests to an external service.
+;server_url =
+# If the remote HTTP image renderer service runs on a different server than the Grafana server you may have to configure this to a URL where Grafana is reachable, e.g. http://grafana.domain/.
+;callback_url =
+# An auth token that will be sent to and verified by the renderer. The renderer will deny any request without an auth token matching the one configured on the renderer side.
+;renderer_token = -
+# Concurrent render request limit affects when the /render HTTP endpoint is used. Rendering many images at the same time can overload the server,
+# which this setting can help protect against by only allowing a certain amount of concurrent requests.
+;concurrent_render_request_limit = 30
+# Determines the lifetime of the render key used by the image renderer to access and render Grafana.
+# This setting should be expressed as a duration. Examples: 10s (seconds), 5m (minutes), 2h (hours).
+# Default is 5m. This should be more than enough for most deployments.
+# Change the value only if image rendering is failing and you see `Failed to get the render key from cache` in Grafana logs.
+;render_key_lifetime = 5m
+
+[panels]
+# If set to true Grafana will allow script tags in text panels. Not recommended as it enable XSS vulnerabilities.
+;disable_sanitize_html = false
+
+[plugins]
+;enable_alpha = false
+;app_tls_skip_verify_insecure = false
+# Enter a comma-separated list of plugin identifiers to identify plugins to load even if they are unsigned. Plugins with modified signatures are never loaded.
+;allow_loading_unsigned_plugins =
+# Enable or disable installing / uninstalling / updating plugins directly from within Grafana.
+;plugin_admin_enabled = false
+;plugin_admin_external_manage_enabled = false
+;plugin_catalog_url = https://grafana.com/grafana/plugins/
+# Enter a comma-separated list of plugin identifiers to hide in the plugin catalog.
+;plugin_catalog_hidden_plugins =
+# Log all backend requests for core and external plugins.
+;log_backend_requests = false
+# Disable download of the public key for verifying plugin signature.
+; public_key_retrieval_disabled = false
+# Force download of the public key for verifying plugin signature on startup. If disabled, the public key will be retrieved every 10 days.
+# Requires public_key_retrieval_disabled to be false to have any effect.
+; public_key_retrieval_on_startup = false
+
+#################################### Grafana Live ##########################################
+[live]
+# max_connections to Grafana Live WebSocket endpoint per Grafana server instance. See Grafana Live docs
+# if you are planning to make it higher than default 100 since this can require some OS and infrastructure
+# tuning. 0 disables Live, -1 means unlimited connections.
+;max_connections = 100
+
+# allowed_origins is a comma-separated list of origins that can establish connection with Grafana Live.
+# If not set then origin will be matched over root_url. Supports wildcard symbol "*".
+;allowed_origins =
+
+# engine defines an HA (high availability) engine to use for Grafana Live. By default no engine used - in
+# this case Live features work only on a single Grafana server. Available options: "redis".
+# Setting ha_engine is an EXPERIMENTAL feature.
+;ha_engine =
+
+# ha_engine_address sets a connection address for Live HA engine. Depending on engine type address format can differ.
+# For now we only support Redis connection address in "host:port" format.
+# This option is EXPERIMENTAL.
+;ha_engine_address = "127.0.0.1:6379"
+
+#################################### Grafana Image Renderer Plugin ##########################
+[plugin.grafana-image-renderer]
+# Instruct headless browser instance to use a default timezone when not provided by Grafana, e.g. when rendering panel image of alert.
+# See ICU’s metaZones.txt (https://cs.chromium.org/chromium/src/third_party/icu/source/data/misc/metaZones.txt) for a list of supported
+# timezone IDs. Fallbacks to TZ environment variable if not set.
+;rendering_timezone =
+
+# Instruct headless browser instance to use a default language when not provided by Grafana, e.g. when rendering panel image of alert.
+# Please refer to the HTTP header Accept-Language to understand how to format this value, e.g. 'fr-CH, fr;q=0.9, en;q=0.8, de;q=0.7, *;q=0.5'.
+;rendering_language =
+
+# Instruct headless browser instance to use a default device scale factor when not provided by Grafana, e.g. when rendering panel image of alert.
+# Default is 1. Using a higher value will produce more detailed images (higher DPI), but will require more disk space to store an image.
+;rendering_viewport_device_scale_factor =
+
+# Instruct headless browser instance whether to ignore HTTPS errors during navigation. Per default HTTPS errors are not ignored. Due to
+# the security risk it's not recommended to ignore HTTPS errors.
+;rendering_ignore_https_errors =
+
+# Instruct headless browser instance whether to capture and log verbose information when rendering an image. Default is false and will
+# only capture and log error messages. When enabled, debug messages are captured and logged as well.
+# For the verbose information to be included in the Grafana server log you have to adjust the rendering log level to debug, configure
+# [log].filter = rendering:debug.
+;rendering_verbose_logging =
+
+# Instruct headless browser instance whether to output its debug and error messages into running process of remote rendering service.
+# Default is false. This can be useful to enable (true) when troubleshooting.
+;rendering_dumpio =
+
+# Additional arguments to pass to the headless browser instance. Default is --no-sandbox. The list of Chromium flags can be found
+# here (https://peter.sh/experiments/chromium-command-line-switches/). Multiple arguments is separated with comma-character.
+;rendering_args =
+
+# You can configure the plugin to use a different browser binary instead of the pre-packaged version of Chromium.
+# Please note that this is not recommended, since you may encounter problems if the installed version of Chrome/Chromium is not
+# compatible with the plugin.
+;rendering_chrome_bin =
+
+# Instruct how headless browser instances are created. Default is 'default' and will create a new browser instance on each request.
+# Mode 'clustered' will make sure that only a maximum of browsers/incognito pages can execute concurrently.
+# Mode 'reusable' will have one browser instance and will create a new incognito page on each request.
+;rendering_mode =
+
+# When rendering_mode = clustered, you can instruct how many browsers or incognito pages can execute concurrently. Default is 'browser'
+# and will cluster using browser instances.
+# Mode 'context' will cluster using incognito pages.
+;rendering_clustering_mode =
+# When rendering_mode = clustered, you can define the maximum number of browser instances/incognito pages that can execute concurrently. Default is '5'.
+;rendering_clustering_max_concurrency =
+# When rendering_mode = clustered, you can specify the duration a rendering request can take before it will time out. Default is `30` seconds.
+;rendering_clustering_timeout =
+
+# Limit the maximum viewport width, height and device scale factor that can be requested.
+;rendering_viewport_max_width =
+;rendering_viewport_max_height =
+;rendering_viewport_max_device_scale_factor =
+
+# Change the listening host and port of the gRPC server. Default host is 127.0.0.1 and default port is 0 and will automatically assign
+# a port not in use.
+;grpc_host =
+;grpc_port =
+
+[support_bundles]
+# Enable support bundle creation (default: true)
+#enabled = true
+# Only server admins can generate and view support bundles (default: true)
+#server_admin_only = true
+# If set, bundles will be encrypted with the provided public keys separated by whitespace
+#public_keys = ""
+
+[enterprise]
+# Path to a valid Grafana Enterprise license.jwt file
+;license_path =
+
+[feature_toggles]
+# there are currently two ways to enable feature toggles in the `grafana.ini`.
+# you can either pass an array of feature you want to enable to the `enable` field or
+# configure each toggle by setting the name of the toggle to true/false. Toggles set to true/false
+# will take presidence over toggles in the `enable` list.
+
+;enable = feature1,feature2
+
+;feature1 = true
+;feature2 = false
+
+[date_formats]
+# For information on what formatting patterns that are supported https://momentjs.com/docs/#/displaying/
+
+# Default system date format used in time range picker and other places where full time is displayed
+;full_date = YYYY-MM-DD HH:mm:ss
+
+# Used by graph and other places where we only show small intervals
+;interval_second = HH:mm:ss
+;interval_minute = HH:mm
+;interval_hour = MM/DD HH:mm
+;interval_day = MM/DD
+;interval_month = YYYY-MM
+;interval_year = YYYY
+
+# Experimental feature
+;use_browser_locale = false
+
+# Default timezone for user preferences. Options are 'browser' for the browser local timezone or a timezone name from IANA Time Zone database, e.g. 'UTC' or 'Europe/Amsterdam' etc.
+;default_timezone = browser
+
+[expressions]
+# Enable or disable the expressions functionality.
+;enabled = true
+
+[geomap]
+# Set the JSON configuration for the default basemap
+;default_baselayer_config = `{
+;  "type": "xyz",
+;  "config": {
+;    "attribution": "Open street map",
+;    "url": "https://tile.openstreetmap.org/{z}/{x}/{y}.png"
+;  }
+;}`
+
+# Enable or disable loading other base map layers
+;enable_custom_baselayers = true
+
+# Move an app plugin referenced by its id (including all its pages) to a specific navigation section
+[navigation.app_sections]
+# The following will move an app plugin with the id of `my-app-id` under the `cfg` section
+# my-app-id = cfg
+
+# Move a specific app plugin page (referenced by its `path` field) to a specific navigation section
+[navigation.app_standalone_pages]
+# The following will move the page with the path "/a/my-app-id/my-page" from `my-app-id` to the `cfg` section
+# /a/my-app-id/my-page = cfg
+
+#################################### Secure Socks5 Datasource Proxy #####################################
+[secure_socks_datasource_proxy]
+; enabled = false
+; root_ca_cert =
+; client_key =
+; client_cert =
+; server_name =
+# The address of the socks5 proxy datasources should connect to
+; proxy_address =
+; show_ui = true
+
+################################## Feature Management ##############################################
+[feature_management]
+hidden_toggles =
+read_only_toggles =
+# Enterprise only
+[white_labeling]
+# Set to your company name to override application title
+;app_title =
+
+# Set to main title on the login page
+;login_title =
+
+# Set to login subtitle
+;login_subtitle =
+
+# Set to complete url to override login logo
+;login_logo =
+
+# Set to complete css background expression to override login background
+# example: login_background = url(http://www.bhmpics.com/wallpapers/starfield-1920x1080.jpg)
+;login_background =
+
+# Set to complete css background expression to override login box background
+;login_box_background =
+
+# Set to complete url to override menu logo
+;menu_logo =
+
+# Set to complete url to override fav icon (icon shown in browser tab)
+;fav_icon =
+
+# Set to complete url to override apple/ios icon
+;apple_touch_icon =
+
+# Set to complete url to override loading logo
+;loading_logo =
+
+# Set to `true` to remove the Grafana edition from appearing in the footer
+;hide_edition =
+
+# Below is an example for how to replace the default footer & help links with 2 custom links
+;footer_links = support guides
+;footer_links_support_text = Support
+;footer_links_support_url = http://your.support.site
+;footer_links_guides_text = Guides
+;footer_links_guides_url = http://your.guides.site
+
+[white_labeling.public_dashboards]
+# Hides the footer for the public dashboards if set to "true"
+# example: footer_hide = true
+;footer_hide =
+# Set to text shown in the footer
+;footer_text =
+# Set to complete url to override public dashboard footer logo
+;footer_logo =
+# Set to link for the footer
+;footer_link =
+
+[usage_insights.export]
+# Enable the usage insights export feature
+; enabled = false
+# Storage type
+; storage = loki
+
+[usage_insights.export.storage.loki]
+# Set the communication protocol to use with Loki (can be grpc or http)
+; type = grpc
+# Set the address for writing logs to Loki (format must be host:port)
+; url = localhost:9095
+# Defaults to true. If true, it establishes a secure connection to Loki
+; tls = true
+# Set the tenant id for Loki communications. Disabled by default.
+# Mandatory to interact with Loki running in multi-tenant mode.
+tenant_id =
+
+[reporting]
+# Enable/disable the reporting feature. If disabled, no reports will be generated
+;enabled = true
+# Set timeout for each panel rendering request
+;rendering_timeout = 10s
+# Set maximum number of concurrent calls to the rendering service
+;concurrent_render_limit = 4
+# Set the scale factor for rendering images. 2 is enough for monitor resolutions
+# 4 would be better for printed material. Setting a higher value affects performance and memory
+;image_scale_factor = 2
+# Set the maximum file size in megabytes for the CSV attachments
+; max_attachment_size_mb = 10
+# Path to the directory containing fonts
+;fonts_path =
+# Name of the TrueType font file with Regular style
+;font_regular = DejaVuSansCondensed.ttf
+# Name of the TrueType font file with Bold style
+;font_bold = DejaVuSansCondensed-Bold.ttf
+# Name of the TrueType font file with Italic style
+;font_italic = DejaVuSansCondensed-Oblique.ttf
+
+[analytics]
+# Enable the analytics feature
+;enabled = true
+
+[analytics.summaries]
+# Set interval for writing dashboard usage stats buffer to database
+;buffer_write_interval = 30s
+# Set timeout for writing dashboard usage stats buffer to database
+;buffer_write_timeout = 3s
+# Set interval for trying to rollup per dashboard usage summary
+# only rolled up at most once per day
+;rollup_interval = 4h
+# Set timeout for trying to rollup per dashboard usage summary
+;rollup_timeout = 60s
+
+[analytics.views]
+# Set age for recent active users
+;recent_users_age = 10m
+
+[auditing]
+# Enable the auditing feature
+; enabled = false
+# List of enabled loggers
+;loggers = file
+# Keep dashboard content in the logs (request or response fields); this can significantly increase the size of your logs.
+;log_dashboard_content = false
+# Keep requests and responses body; this can significantly increase the size of your logs.
+;verbose = false
+# Write an audit log for every status code.
+# By default it only logs the following ones: 2XX, 3XX, 401, 403 and 500.
+;log_all_status_codes = false
+# Maximum response body (in bytes) to be audited; 500KiB by default.
+# May help reducing the memory footprint caused by auditing.
+;max_response_size_bytes = 512000
+
+[auditing.logs.file]
+# Path to logs folder
+;path = data/log
+# Maximum log files to keep
+;max_files = 5
+# Max size in megabytes per log file
+;max_file_size_mb = 256
+
+[auditing.logs.loki]
+# Set the communication protocol to use with Loki (can be grpc or http)
+;type = grpc
+# Set the address for writing logs to Loki (format must be host:port)
+;url = localhost:9095
+# Defaults to true. If true, it establishes a secure connection to Loki
+;tls = true
+# Set the tenant id for Loki communications. Disabled by default.
+# Mandatory to interact with Loki running in multi-tenant mode.
+;tenant_id =
+
+#################################### SAML Auth ###########################
+[auth.saml]
+# Defaults to false. If true, the feature is enabled.
+;enabled = false
+# Enable SAML single logout
+;single_logout = false
+# Defaults to true. Allow new Grafana users to be created through SAML login.
+;allow_sign_up = true
+# Set to true to attempt login with SAML automatically, skipping the login screen.
+# This setting is ignored if multiple auth providers are configured to use auto login.
+;auto_login = false
+# Base64-encoded public X.509 certificate. Used to sign requests to the IdP
+;certificate =
+# Path to the public X.509 certificate. Used to sign requests to the IdP
+;certificate_path =
+# Base64-encoded private key. Used to decrypt assertions from the IdP
+;private_key =
+;# Path to the private key. Used to decrypt assertions from the IdP
+;private_key_path =
+# Signature algorithm using for signing requests to the IdP. Supported values are rsa-sha1, rsa-sha256, rsa-sha512.
+# If non-empty, authentication requests will be signed. Default is empty (requests not signed).
+;signature_algorithm =
+# Base64-encoded IdP SAML metadata XML. Used to verify and obtain binding locations from the IdP
+;idp_metadata =
+# Path to the SAML metadata XML. Used to verify and obtain binding locations from the IdP
+;idp_metadata_path =
+# URL to fetch SAML IdP metadata. Used to verify and obtain binding locations from the IdP
+;idp_metadata_url =
+# Duration, since the IdP issued a response and the SP is allowed to process it. Defaults to 90 seconds.
+;max_issue_delay = 90s
+# Duration, for how long the SP's metadata should be valid. Defaults to 48 hours.
+;metadata_valid_duration = 48h
+# Allow IdP-initiated SSO
+;allow_idp_initiated = false
+# Relay state for IdP-initiated SSO. Should match relay state configured in IdP
+;relay_state =
+# Friendly name or name of the attribute within the SAML assertion to use as the user's name
+;assertion_attribute_name = displayName
+# Friendly name or name of the attribute within the SAML assertion to use as the user's login handle
+;assertion_attribute_login = mail
+# Friendly name or name of the attribute within the SAML assertion to use as the user's email
+;assertion_attribute_email = mail
+# Friendly name or name of the attribute within the SAML assertion to use as the user's groups
+;assertion_attribute_groups = group
+# Friendly name or name of the attribute within the SAML assertion to use as the user's roles
+;assertion_attribute_role = role
+# Friendly name or name of the attribute within the SAML assertion to use as the user's organization Id
+;assertion_attribute_org = organizatio
+# List of comma- or space-separated organizations. User should be a member of at least one organization to log in.
+;allowed_organizations = Engineering, Sales
+# List of comma- or space-separated Organization:OrgId:Role mappings. Organization can be `*` meaning "All users". Role is optional and can have the following values: `Viewer`, `Editor` or `Admin`.
+;org_mapping = Engineering:2, Sales:3
+# List of comma- or space-separated roles which will be mapped into the Editor role
+;role_values_editor = editor, developer
+# List of comma- or space-separated roles which will be mapped into the Admin role
+;role_values_admin = admin
+# List of comma- or space-separated roles which will be mapped into the Grafana Admin (Super Admin) role
+;role_values_grafana_admin = superadmin
+# Name identifier format to use with the IdP
+;name_id_format = urn:oasis:names:tc:SAML:2.0:nameid-format:transient
+
+[keystore.vault]
+# Location of the Vault server
+;url =
+# Vault's namespace if using Vault with multi-tenancy
+;namespace =
+# Method for authenticating towards Vault. Vault is inactive if this option is not set
+# Possible values: token
+;auth_method =
+# Secret token to connect to Vault when auth_method is token
+;token =
+# Time between checking if there are any secrets which needs to be renewed.
+;lease_renewal_interval = 5m
+# Time until expiration for tokens which are renewed. Should have a value higher the lease_renewal_interval
+;lease_renewal_expires_within = 15m
+# New duration for renewed tokens. Vault may be configured to ignore this value and impose a stricter limit.
+;lease_renewal_increment = 1h
+
+[auth.security]
+# Protected roles defines a set of user roles for which Grafana will not try to map users that have previously logged in
+# with one solution with another. Configuration values are separated by space,
+# possible values are = all editors viewers org_admins server_admins
+;protected_roles =
+
+[security.egress]
+# Allow and deny lists can be used to control what hosts can be accessed based on what a user can configure through the ui.
+# This includes:
+# - datasource requests
+# - alerting channels
+# a list of hostnames or IP adresses separated by spaces for which outgoing requests will be blocked
+;host_deny_list =
+# a list of hostnames or IP adresses separated by spaces for which requests will be allowed, all other requests will be blocked
+;host_allow_list =
+
+# a list of headers that will be stripped from outgoing datasource and alerting requests
+;header_drop_list =
+# a list of cookies that will be stripped from outgoing datasource requests
+;cookie_drop_list =
+
+[security.encryption]
+# Encryption algorithm used to encrypt secrets stored into the database and cookies,
+# possible values are aes-cfb and aes-gcm.
+;algorithm = aes-cfb
+
+# Example of AWS Key Management Service provider setup
+[security.encryption.awskms.v1]
+# Reference to KMS key - either  key ID, key ARN, alias name or ARN.
+# Alias needs to be prefixed with "alias".
+# To specify a KMS key in a different AWS account, use the ARN or alias.
+# Examples of each type:
+# Key ID:     1234abcd-12ab-34cd-56ef-1234567890ab
+# Key ARN:    arn:aws:kms:us-east-2:111122223333:key/1234abcd-12ab-34cd-56ef-1234567890ab
+# Alias name: alias/ExampleAlias
+# Alias ARN:  arn:aws:kms:us-east-2:111122223333:alias/ExampleAlias
+;key_id =
+# AWS access key ID
+;access_key_id =
+# AWS secret access key
+;secret_access_key =
+# AWS region (e.g., eu-north-1)
+;region =
+
+# Example of Azure Key Vault provider setup
+[security.encryption.azurekv.v1]
+# Azure Application directory ID (tenant)
+;tenant_id =
+# Azure Application application ID (client)
+;client_id =
+# Azure Application client secret
+;client_secret =
+# Azure Key Vault key name
+;key_id =
+# Azure Key Vault uri
+;vault_uri =
+
+# Example of Google Cloud KMS provider setup
+[security.encryption.googlekms.v1]
+# Google Cloud KMS key ID, see details https://cloud.google.com/kms/docs/getting-resource-ids#getting_the_id_for_a_key_and_version
+;key_id =
+# Path to service credentials JSON file, see details https://cloud.google.com/docs/authentication/getting-started
+;credentials_file =
+
+# Example of Hashicorp Vault provider setup
+[security.encryption.hashicorpvault.v1]
+# Token used to authenticate within Vault. We suggest to use periodic tokens: more on token types https://www.vaultproject.io/docs/concepts/tokens#service-tokens
+;token =
+# Location of the Vault server
+;url =
+# Mount point of the transit secret engine
+;transit_engine_path =
+# Key ring name
+;key_ring =
+# Specifies how often to check if a token needs to be renewed, should be less than a token's TTL or period value
+;token_renewal_interval = 5m
+
+
+# Caching is disabled on all data source by default
+# Visit the data source settings to enable caching
+[caching]
+# Setting 'enabled' to true enables query caching for data sources with configured caching.
+# To disable caching for a specific data source, refer to the data source’s configuration page.
+; enabled = true
+# The caching backend to use when storing cached queries. Options: redis, memory
+; backend = "memory"
+# The default TTL (time to live) if no other TTL is available.
+; ttl = 5m
+# This value limits the size of a single cache value. If a cache value (or query result) is submitted that exceeds this size, then it will be rejected.
+# To disable this limit, set this value to zero.
+; max_value_mb = 10
+# Method to use when filtering headers for caches that supports caching headers.
+# Permitted options: allowlist, denylist.
+; header_filtering = "allowlist"
+
+[caching.encryption]
+# Setting 'enabled' to true enables encryption of the values in the cache.
+;enabled = true
+# The key used for the encryption of the values in the cache. If it is not specified and encryption is enabled, the key will be randomly
+# generated on startup. This must be specified to allow the encrypted cache to persist between Grafana restarts. If not specified, the cache
+# will be cleared upon restarts.
+;encryption_key = "oH0aaomqRDyd7gkvZTKwsxVwlvFpyhko"
+
+[caching.memory]
+# When storing cache data, how often a background process will clean up stale data from the in-memory cache
+; gc_interval = 1m
+# The maximum size of the in-memory cache in megabytes. Once this size is reached, new cache items will be rejected. For more flexible control over cache eviction policies and size, please use the Redis or Memcached backend
+# To disable the maximum, set this value to 0. WARNING: Disabling the maximum is not recommended in production environments.
+; max_size_mb = 25
+
+[caching.redis]
+# url should be a redis URL
+; url = "redis://localhost:6379"
+# prefix redis keys with this string. Example: 'grafana:<key>'. This value can be left empty and no prefix will be set.
+; prefix = "grafana"
+# a comma-separated list of Redis cluster members in host:port format
+# if cluster is specified, the value for url is ignored
+; cluster =
+
+[caching.memcached]
+# A space-separated list of memcached servers
+; servers = "localhost:11211"
+
+[feature_highlights]
+# Setting 'enabled' to true enables highlighting Enterprise features in UI.
+enabled = false
\ No newline at end of file
diff --git a/monitoring/grafana/grafana_dashboards/Docker-monitoring.json b/monitoring/grafana/grafana_dashboards/Docker-monitoring.json
new file mode 100644
index 0000000000000000000000000000000000000000..10da0b2cd11329569e5ec146e31272741e1459fa
--- /dev/null
+++ b/monitoring/grafana/grafana_dashboards/Docker-monitoring.json
@@ -0,0 +1,690 @@
+{
+  "annotations": {
+    "list": [
+      {
+        "builtIn": 1,
+        "datasource": {
+          "type": "grafana",
+          "uid": "-- Grafana --"
+        },
+        "enable": true,
+        "hide": true,
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "name": "Annotations & Alerts",
+        "type": "dashboard"
+      }
+    ]
+  },
+  "description": "Docker monitoring with Prometheus and cAdvisor",
+  "editable": true,
+  "fiscalYearStartMonth": 0,
+  "gnetId": 193,
+  "graphTooltip": 1,
+  "id": 1,
+  "links": [],
+  "liveNow": false,
+  "panels": [
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "af6b44aa-0703-4979-825c-c1afba946534"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "mappings": [
+            {
+              "options": {
+                "match": "null",
+                "result": {
+                  "text": "N/A"
+                }
+              },
+              "type": "special"
+            }
+          ],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "none"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 3,
+        "w": 8,
+        "x": 0,
+        "y": 0
+      },
+      "id": 7,
+      "links": [],
+      "maxDataPoints": 100,
+      "options": {
+        "colorMode": "none",
+        "graphMode": "none",
+        "justifyMode": "auto",
+        "orientation": "horizontal",
+        "reduceOptions": {
+          "calcs": [
+            "mean"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "textMode": "auto"
+      },
+      "pluginVersion": "9.5.2",
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "af6b44aa-0703-4979-825c-c1afba946534"
+          },
+          "expr": "count(container_last_seen{image!=\"\"})",
+          "intervalFactor": 2,
+          "legendFormat": "",
+          "metric": "container_last_seen",
+          "refId": "A",
+          "step": 240
+        }
+      ],
+      "title": "Running containers",
+      "transparent": true,
+      "type": "stat"
+    },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "af6b44aa-0703-4979-825c-c1afba946534"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "mappings": [
+            {
+              "options": {
+                "match": "null",
+                "result": {
+                  "text": "N/A"
+                }
+              },
+              "type": "special"
+            }
+          ],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "mbytes"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 3,
+        "w": 8,
+        "x": 8,
+        "y": 0
+      },
+      "id": 5,
+      "links": [],
+      "maxDataPoints": 100,
+      "options": {
+        "colorMode": "none",
+        "graphMode": "none",
+        "justifyMode": "auto",
+        "orientation": "horizontal",
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "textMode": "auto"
+      },
+      "pluginVersion": "9.5.2",
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "af6b44aa-0703-4979-825c-c1afba946534"
+          },
+          "expr": "sum(container_memory_usage_bytes{image!=\"\"})/1024/1024",
+          "intervalFactor": 2,
+          "legendFormat": "",
+          "metric": "container_memory_usage_bytes",
+          "refId": "A",
+          "step": 240
+        }
+      ],
+      "title": "Total Memory Usage",
+      "transparent": true,
+      "type": "stat"
+    },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "af6b44aa-0703-4979-825c-c1afba946534"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "mappings": [
+            {
+              "options": {
+                "match": "null",
+                "result": {
+                  "text": "N/A"
+                }
+              },
+              "type": "special"
+            }
+          ],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "percent"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 3,
+        "w": 8,
+        "x": 16,
+        "y": 0
+      },
+      "id": 6,
+      "links": [],
+      "maxDataPoints": 100,
+      "options": {
+        "colorMode": "none",
+        "graphMode": "none",
+        "justifyMode": "auto",
+        "orientation": "horizontal",
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "textMode": "auto"
+      },
+      "pluginVersion": "9.5.2",
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "af6b44aa-0703-4979-825c-c1afba946534"
+          },
+          "expr": "sum(rate(container_cpu_user_seconds_total{image!=\"\"}[5m]) * 100)",
+          "intervalFactor": 2,
+          "legendFormat": "",
+          "metric": "container_memory_usage_bytes",
+          "refId": "A",
+          "step": 240
+        }
+      ],
+      "title": "Total CPU Usage",
+      "transparent": true,
+      "type": "stat"
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": {
+        "type": "prometheus",
+        "uid": "af6b44aa-0703-4979-825c-c1afba946534"
+      },
+      "decimals": 2,
+      "editable": true,
+      "error": false,
+      "fill": 1,
+      "fillGradient": 0,
+      "grid": {},
+      "gridPos": {
+        "h": 7,
+        "w": 24,
+        "x": 0,
+        "y": 3
+      },
+      "hiddenSeries": false,
+      "id": 2,
+      "isNew": true,
+      "legend": {
+        "alignAsTable": true,
+        "avg": true,
+        "current": true,
+        "max": false,
+        "min": false,
+        "rightSide": true,
+        "show": true,
+        "total": false,
+        "values": true
+      },
+      "lines": true,
+      "linewidth": 2,
+      "links": [],
+      "nullPointMode": "connected",
+      "options": {
+        "alertThreshold": true
+      },
+      "percentage": false,
+      "pluginVersion": "9.5.2",
+      "pointradius": 5,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "af6b44aa-0703-4979-825c-c1afba946534"
+          },
+          "expr": "rate(container_cpu_user_seconds_total{image!=\"\"}[5m]) * 100",
+          "intervalFactor": 2,
+          "legendFormat": "{{name}}",
+          "metric": "cpu",
+          "refId": "A",
+          "step": 10
+        }
+      ],
+      "thresholds": [],
+      "timeRegions": [],
+      "title": "CPU Usage",
+      "tooltip": {
+        "msResolution": false,
+        "shared": true,
+        "sort": 0,
+        "value_type": "cumulative"
+      },
+      "type": "graph",
+      "xaxis": {
+        "mode": "time",
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "format": "percent",
+          "logBase": 1,
+          "show": true
+        },
+        {
+          "format": "short",
+          "logBase": 1,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false
+      }
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": {
+        "type": "prometheus",
+        "uid": "af6b44aa-0703-4979-825c-c1afba946534"
+      },
+      "decimals": 2,
+      "editable": true,
+      "error": false,
+      "fill": 1,
+      "fillGradient": 0,
+      "grid": {},
+      "gridPos": {
+        "h": 7,
+        "w": 24,
+        "x": 0,
+        "y": 10
+      },
+      "hiddenSeries": false,
+      "id": 1,
+      "isNew": true,
+      "legend": {
+        "alignAsTable": true,
+        "avg": true,
+        "current": true,
+        "max": false,
+        "min": false,
+        "rightSide": true,
+        "show": true,
+        "total": false,
+        "values": true
+      },
+      "lines": true,
+      "linewidth": 2,
+      "links": [],
+      "nullPointMode": "connected",
+      "options": {
+        "alertThreshold": true
+      },
+      "percentage": false,
+      "pluginVersion": "9.5.2",
+      "pointradius": 5,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "af6b44aa-0703-4979-825c-c1afba946534"
+          },
+          "expr": "container_memory_usage_bytes{image!=\"\"}",
+          "hide": false,
+          "intervalFactor": 2,
+          "legendFormat": "{{name}}",
+          "metric": "container_memory_usage_bytes",
+          "refId": "A",
+          "step": 10
+        }
+      ],
+      "thresholds": [],
+      "timeRegions": [],
+      "title": "Memory Usage",
+      "tooltip": {
+        "msResolution": false,
+        "shared": true,
+        "sort": 0,
+        "value_type": "cumulative"
+      },
+      "type": "graph",
+      "xaxis": {
+        "mode": "time",
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "format": "bytes",
+          "label": "",
+          "logBase": 1,
+          "show": true
+        },
+        {
+          "format": "short",
+          "logBase": 1,
+          "show": false
+        }
+      ],
+      "yaxis": {
+        "align": false
+      }
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": {
+        "type": "prometheus",
+        "uid": "af6b44aa-0703-4979-825c-c1afba946534"
+      },
+      "editable": true,
+      "error": false,
+      "fill": 1,
+      "fillGradient": 0,
+      "grid": {},
+      "gridPos": {
+        "h": 7,
+        "w": 12,
+        "x": 0,
+        "y": 17
+      },
+      "hiddenSeries": false,
+      "id": 3,
+      "isNew": true,
+      "legend": {
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "show": true,
+        "total": false,
+        "values": false
+      },
+      "lines": true,
+      "linewidth": 2,
+      "links": [],
+      "nullPointMode": "connected",
+      "options": {
+        "alertThreshold": true
+      },
+      "percentage": false,
+      "pluginVersion": "9.5.2",
+      "pointradius": 5,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "af6b44aa-0703-4979-825c-c1afba946534"
+          },
+          "expr": "irate(container_network_receive_bytes_total{image!=\"\"}[5m])",
+          "intervalFactor": 2,
+          "legendFormat": "{{name}}",
+          "metric": "container_network_receive_bytes_total",
+          "refId": "A",
+          "step": 20
+        }
+      ],
+      "thresholds": [],
+      "timeRegions": [],
+      "title": "Network Rx",
+      "tooltip": {
+        "msResolution": false,
+        "shared": true,
+        "sort": 0,
+        "value_type": "cumulative"
+      },
+      "type": "graph",
+      "xaxis": {
+        "mode": "time",
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "format": "Bps",
+          "logBase": 1,
+          "show": true
+        },
+        {
+          "format": "short",
+          "logBase": 1,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false
+      }
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": {
+        "type": "prometheus",
+        "uid": "af6b44aa-0703-4979-825c-c1afba946534"
+      },
+      "editable": true,
+      "error": false,
+      "fill": 1,
+      "fillGradient": 0,
+      "grid": {},
+      "gridPos": {
+        "h": 7,
+        "w": 12,
+        "x": 12,
+        "y": 17
+      },
+      "hiddenSeries": false,
+      "id": 4,
+      "isNew": true,
+      "legend": {
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "show": true,
+        "total": false,
+        "values": false
+      },
+      "lines": true,
+      "linewidth": 2,
+      "links": [],
+      "nullPointMode": "connected",
+      "options": {
+        "alertThreshold": true
+      },
+      "percentage": false,
+      "pluginVersion": "9.5.2",
+      "pointradius": 5,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "af6b44aa-0703-4979-825c-c1afba946534"
+          },
+          "expr": "irate(container_network_transmit_bytes_total{image!=\"\"}[5m])",
+          "intervalFactor": 2,
+          "legendFormat": "{{name}}",
+          "refId": "A",
+          "step": 20
+        }
+      ],
+      "thresholds": [],
+      "timeRegions": [],
+      "title": "Network Tx",
+      "tooltip": {
+        "msResolution": false,
+        "shared": true,
+        "sort": 0,
+        "value_type": "cumulative"
+      },
+      "type": "graph",
+      "xaxis": {
+        "mode": "time",
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "format": "Bps",
+          "logBase": 1,
+          "show": true
+        },
+        {
+          "format": "short",
+          "logBase": 1,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false
+      }
+    }
+  ],
+  "refresh": "10s",
+  "schemaVersion": 38,
+  "style": "dark",
+  "tags": [
+    "docker"
+  ],
+  "templating": {
+    "list": []
+  },
+  "time": {
+    "from": "now-3h",
+    "to": "now"
+  },
+  "timepicker": {
+    "refresh_intervals": [
+      "5s",
+      "10s",
+      "30s",
+      "1m",
+      "5m",
+      "15m",
+      "30m",
+      "1h",
+      "2h",
+      "1d"
+    ],
+    "time_options": [
+      "5m",
+      "15m",
+      "1h",
+      "6h",
+      "12h",
+      "24h",
+      "2d",
+      "7d",
+      "30d"
+    ]
+  },
+  "timezone": "browser",
+  "title": "Docker monitoring",
+  "uid": "f66dea48-ca2f-46fb-a6f0-50bf50502d74",
+  "version": 2,
+  "weekStart": ""
+}
\ No newline at end of file
diff --git a/monitoring/grafana/grafana_dashboards/Loki-Logs.json b/monitoring/grafana/grafana_dashboards/Loki-Logs.json
new file mode 100644
index 0000000000000000000000000000000000000000..0a71994525b2e08e3ee8a810d8c5afdf406a053e
--- /dev/null
+++ b/monitoring/grafana/grafana_dashboards/Loki-Logs.json
@@ -0,0 +1,281 @@
+{
+  "annotations": {
+    "list": [
+      {
+        "builtIn": 1,
+        "datasource": {
+          "type": "datasource",
+          "uid": "grafana"
+        },
+        "enable": true,
+        "hide": true,
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "name": "Annotations & Alerts",
+        "type": "dashboard"
+      }
+    ]
+  },
+  "description": "Simple Loki dashboard",
+  "editable": true,
+  "fiscalYearStartMonth": 0,
+  "gnetId": 13198,
+  "graphTooltip": 0,
+  "id": 9,
+  "links": [],
+  "liveNow": false,
+  "panels": [
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": {
+        "type": "loki",
+        "uid": "$datasource"
+      },
+      "fill": 0,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 8,
+        "w": 24,
+        "x": 0,
+        "y": 0
+      },
+      "hiddenSeries": false,
+      "id": 4,
+      "legend": {
+        "alignAsTable": true,
+        "avg": false,
+        "current": false,
+        "hideEmpty": true,
+        "hideZero": true,
+        "max": false,
+        "min": false,
+        "rightSide": true,
+        "show": true,
+        "total": false,
+        "values": false
+      },
+      "lines": true,
+      "linewidth": 1,
+      "nullPointMode": "null",
+      "options": {
+        "alertThreshold": true
+      },
+      "percentage": false,
+      "pluginVersion": "9.5.2",
+      "pointradius": 2,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": true,
+      "steppedLine": false,
+      "targets": [
+        {
+          "datasource": {
+            "uid": "$datasource"
+          },
+          "editorMode": "code",
+          "expr": "count_over_time({container_name=~\"$app-$job\"} |~ \"$string\"[1m])",
+          "legendFormat": "{{ container_name }}",
+          "queryType": "range",
+          "refId": "A"
+        }
+      ],
+      "thresholds": [],
+      "timeRegions": [],
+      "title": "Metric Rate",
+      "tooltip": {
+        "shared": true,
+        "sort": 2,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "mode": "time",
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "format": "short",
+          "logBase": 1,
+          "show": true
+        },
+        {
+          "format": "short",
+          "logBase": 1,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false
+      }
+    },
+    {
+      "datasource": {
+        "type": "loki",
+        "uid": "e4f43364-7019-45a7-aa7a-14ce2d4ddb0b"
+      },
+      "gridPos": {
+        "h": 14,
+        "w": 24,
+        "x": 0,
+        "y": 8
+      },
+      "id": 2,
+      "options": {
+        "dedupStrategy": "none",
+        "enableLogDetails": true,
+        "prettifyLogMessage": false,
+        "showCommonLabels": false,
+        "showLabels": false,
+        "showTime": true,
+        "sortOrder": "Descending",
+        "wrapLogMessage": true
+      },
+      "pluginVersion": "7.1.3",
+      "targets": [
+        {
+          "datasource": {
+            "type": "loki",
+            "uid": "e4f43364-7019-45a7-aa7a-14ce2d4ddb0b"
+          },
+          "editorMode": "code",
+          "expr": "{job=~\"fluent-bit\"} |~ \"$string\"",
+          "legendFormat": "",
+          "queryType": "range",
+          "refId": "A"
+        }
+      ],
+      "title": "Loki Search",
+      "type": "logs"
+    }
+  ],
+  "refresh": "1m",
+  "schemaVersion": 38,
+  "style": "dark",
+  "tags": [],
+  "templating": {
+    "list": [
+      {
+        "current": {
+          "selected": false,
+          "text": "Loki",
+          "value": "Loki"
+        },
+        "hide": 0,
+        "includeAll": false,
+        "multi": false,
+        "name": "datasource",
+        "options": [],
+        "query": "loki",
+        "queryValue": "",
+        "refresh": 1,
+        "regex": "",
+        "skipUrlSync": false,
+        "type": "datasource"
+      },
+      {
+        "allValue": ".*",
+        "current": {
+          "selected": false,
+          "text": "All",
+          "value": "$__all"
+        },
+        "datasource": {
+          "type": "loki",
+          "uid": "$datasource"
+        },
+        "definition": "label_values(container_name)",
+        "hide": 0,
+        "includeAll": true,
+        "label": "app",
+        "multi": false,
+        "name": "app",
+        "options": [],
+        "query": "label_values(container_name)",
+        "refresh": 2,
+        "regex": "(.*)-.*-.*-.*-.*-.*",
+        "skipUrlSync": false,
+        "sort": 0,
+        "tagValuesQuery": "",
+        "tagsQuery": "",
+        "type": "query",
+        "useTags": false
+      },
+      {
+        "allValue": ".*",
+        "current": {
+          "selected": false,
+          "text": "All",
+          "value": "$__all"
+        },
+        "datasource": {
+          "type": "loki",
+          "uid": "$datasource"
+        },
+        "definition": "label_values(container_name)",
+        "hide": 0,
+        "includeAll": true,
+        "label": "job",
+        "multi": false,
+        "name": "job",
+        "options": [],
+        "query": "label_values(container_name)",
+        "refresh": 2,
+        "regex": "$app-(.*)",
+        "skipUrlSync": false,
+        "sort": 0,
+        "tagValuesQuery": "",
+        "tagsQuery": "",
+        "type": "query",
+        "useTags": false
+      },
+      {
+        "current": {
+          "selected": false,
+          "text": "",
+          "value": ""
+        },
+        "hide": 0,
+        "label": "string",
+        "name": "string",
+        "options": [
+          {
+            "selected": true,
+            "text": "",
+            "value": ""
+          }
+        ],
+        "query": "",
+        "skipUrlSync": false,
+        "type": "textbox"
+      }
+    ]
+  },
+  "time": {
+    "from": "now-1h",
+    "to": "now"
+  },
+  "timepicker": {
+    "refresh_intervals": [
+      "5s",
+      "10s",
+      "30s",
+      "1m",
+      "5m",
+      "15m",
+      "30m",
+      "1h",
+      "2h",
+      "1d"
+    ]
+  },
+  "timezone": "",
+  "title": "Loki Logs",
+  "uid": "ffxEJdvGz",
+  "version": 6,
+  "weekStart": ""
+}
\ No newline at end of file
diff --git a/monitoring/grafana/grafana_provisioning/grafana-datasources.yaml b/monitoring/grafana/grafana_provisioning/grafana-datasources.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..8a1c62a57b4545d1db20c1814e1be8c36a561030
--- /dev/null
+++ b/monitoring/grafana/grafana_provisioning/grafana-datasources.yaml
@@ -0,0 +1,54 @@
+apiVersion: 1
+
+datasources:
+  - name: Loki
+    type: loki
+    uid: e4f43364-7019-45a7-aa7a-14ce2d4ddb0b
+    typeName: Loki
+    typeLogoUrl: public/app/plugins/datasource/loki/img/loki_icon.svg
+    access: proxy
+    url: http://loki:3100
+    user: ''
+    database: ''
+    basicAuth: false
+    isDefault: false
+    jsonData:
+      derivedFields:
+      - datasourceUid: fee7e008-f836-424a-b701-88cad583c715
+        matcherRegex: '"traceID":\s*"([a-fA-F0-9]+)"'
+        name: traceID
+        url: "$${__value.raw}"
+    readOnly: false
+
+  - name: Prometheus
+    type: prometheus
+    typeName: Prometheus
+    typeLogoUrl: public/app/plugins/datasource/prometheus/img/prometheus_logo.svg
+    access: proxy
+    url: http://prometheus:9090
+    uid: af6b44aa-0703-4979-825c-c1afba946534
+    user: ''
+    database: ''
+    basicAuth: false
+    isDefault: false
+    jsonData:
+      httpMethod: POST
+      prometheusType: Prometheus
+      prometheusVersion: 2.40.1
+    readOnly: false
+
+  - name: Tempo
+    type: tempo
+    typeName: Tempo
+    typeLogoUrl: public/app/plugins/datasource/tempo/img/tempo_logo.svg
+    uid: fee7e008-f836-424a-b701-88cad583c715
+    access: proxy
+    url: http://tempo:3200
+    user: ''
+    database: ''
+    basicAuth: false
+    isDefault: false
+    jsonData:
+      lokiSearch:
+        datasourceUid: e4f43364-7019-45a7-aa7a-14ce2d4ddb0b
+    readOnly: false
\ No newline at end of file
diff --git a/monitoring/grafana/grafana_provisioning/grafana-default-provisioning.yaml b/monitoring/grafana/grafana_provisioning/grafana-default-provisioning.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..1a0f83a753d2d7d3f4d7cdf4c82825080a204440
--- /dev/null
+++ b/monitoring/grafana/grafana_provisioning/grafana-default-provisioning.yaml
@@ -0,0 +1,14 @@
+apiVersion: 1
+
+providers:
+
+  - name: Default # A uniquely identifiable name for the provider
+    orgId: 1
+    folder: "" # The folder where to place the dashboards
+    folderUid: ""
+    type: file
+    disableDeletion: false
+    allowUiUpdates: true
+    options:
+      path: /var/lib/grafana/dashboards
+
diff --git a/monitoring/grafana_config/provisioning/dashboards/default.yaml b/monitoring/grafana_config/provisioning/dashboards/default.yaml
new file mode 100755
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/monitoring/grafana_config/provisioning/datasources/datasources.yaml b/monitoring/grafana_config/provisioning/datasources/datasources.yaml
new file mode 100755
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/monitoring/otlp_collector/otel-config.yaml b/monitoring/otlp_collector/otel-config.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..ad15aa41d90a10d22c977cf6e590759fd9e260f5
--- /dev/null
+++ b/monitoring/otlp_collector/otel-config.yaml
@@ -0,0 +1,26 @@
+receivers:
+  otlp:
+    protocols:
+      grpc:
+        endpoint: 0.0.0.0:55680
+
+
+processors:
+  batch:
+
+
+exporters:
+  otlp:
+    #timeout: 60s
+    endpoint: tempo:4317
+    tls:
+      insecure: true
+
+
+service:
+  pipelines:
+    traces:
+      receivers: [otlp]
+      processors: [batch]
+      # exporters: [otlp]
+      exporters: [otlp]
\ No newline at end of file
diff --git a/monitoring/prometheus/prometheus.yml b/monitoring/prometheus/prometheus.yml
new file mode 100644
index 0000000000000000000000000000000000000000..f5f9df7352791c1f81ea11ec7cc3d02be7ec0a51
--- /dev/null
+++ b/monitoring/prometheus/prometheus.yml
@@ -0,0 +1,19 @@
+global:
+  scrape_interval: 15s
+  evaluation_interval: 15s
+alerting:
+  alertmanagers:
+  - static_configs:
+    - targets:
+    # whatever you want
+scrape_configs:
+  - job_name: 'prometheus'
+    static_configs:
+    - targets: ['prometheus:9090']
+      labels:
+        alias: 'prometheus'
+  - job_name: 'cadvisor'
+    static_configs:
+    - targets: ['cadvisor:8080']
+      labels:
+        alias: 'cadvisor'
\ No newline at end of file
diff --git a/monitoring/tempo/tempo.yaml b/monitoring/tempo/tempo.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..7d7bb4cfddf3afa5cdbd5adc148e9d7b45c0a319
--- /dev/null
+++ b/monitoring/tempo/tempo.yaml
@@ -0,0 +1,46 @@
+server:
+  http_listen_port: 3200
+
+distributor:
+  receivers:                           # this configuration will listen on all ports and protocols that tempo is capable of.
+    jaeger:                            # the receives all come from the OpenTelemetry collector.  more configuration information can
+      protocols:                       # be found there: https://github.com/open-telemetry/opentelemetry-collector/tree/main/receiver
+        thrift_http:                   #
+        grpc:                          # for a production deployment you should only enable the receivers you need!
+        thrift_binary:
+        thrift_compact:
+    zipkin:
+    otlp:
+      protocols:
+        http:
+        grpc:
+    opencensus:
+
+ingester:
+  max_block_duration: 20m               # cut the headblock when this much time passes. this is being set for demo purposes and should probably be left alone normally
+
+compactor:
+  compaction:
+    block_retention: 1h                # overall Tempo trace retention. set for demo purposes
+
+metrics_generator:
+  registry:
+    external_labels:
+      source: tempo
+      cluster: docker-compose
+  storage:
+    path: /tmp/tempo/generator/wal
+    remote_write:
+      - url: http://prometheus:9090/api/v1/write
+        send_exemplars: true
+
+storage:
+  trace:
+    backend: local                     # backend configuration to use
+    wal:
+      path: /tmp/tempo/wal             # where to store the the wal locally
+    local:
+      path: /tmp/tempo/blocks
+
+overrides:
+  metrics_generator_processors: [service-graphs, span-metrics] # enables metrics generator
\ No newline at end of file
diff --git a/prometheus/kustomization.yaml b/prometheus/kustomization.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..bebcddc3552d7a0b5b3d97e0274d12ae420a6516
--- /dev/null
+++ b/prometheus/kustomization.yaml
@@ -0,0 +1,11 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+namespace: evol5-capif-mon
+resources:
+    - prometheus-claim1-persistentvolumeclaim.yaml
+    - prometheus-claim2-persistentvolumeclaim.yaml
+    - prometheus-claim3-persistentvolumeclaim.yaml
+    - prometheus-claim4-persistentvolumeclaim.yaml
+    - prometheus-configmap.yaml
+    - prometheus-deployment.yaml
+    - prometheus-service.yaml
\ No newline at end of file
diff --git a/prometheus/prometheus-claim1-persistentvolumeclaim.yaml b/prometheus/prometheus-claim1-persistentvolumeclaim.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..99ca0f13183dfbb0894b1bbf99ab7633c646fcc2
--- /dev/null
+++ b/prometheus/prometheus-claim1-persistentvolumeclaim.yaml
@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  creationTimestamp: null
+  labels:
+    io.kompose.service: prometheus-claim1
+  name: prometheus-claim1
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 100Mi
+status: {}
diff --git a/prometheus/prometheus-claim2-persistentvolumeclaim.yaml b/prometheus/prometheus-claim2-persistentvolumeclaim.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..3a1a586d9a918b30bb41da7ae195da72f9cc29a0
--- /dev/null
+++ b/prometheus/prometheus-claim2-persistentvolumeclaim.yaml
@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  creationTimestamp: null
+  labels:
+    io.kompose.service: prometheus-claim2
+  name: prometheus-claim2
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 100Mi
+status: {}
diff --git a/prometheus/prometheus-claim3-persistentvolumeclaim.yaml b/prometheus/prometheus-claim3-persistentvolumeclaim.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..755a66b594deadef2a62a10b350334dd32b9e715
--- /dev/null
+++ b/prometheus/prometheus-claim3-persistentvolumeclaim.yaml
@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  creationTimestamp: null
+  labels:
+    io.kompose.service: prometheus-claim3
+  name: prometheus-claim3
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 100Mi
+status: {}
diff --git a/prometheus/prometheus-claim4-persistentvolumeclaim.yaml b/prometheus/prometheus-claim4-persistentvolumeclaim.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..9a6cb2d30c78a2e3f1070c92c797b0a8179cbff0
--- /dev/null
+++ b/prometheus/prometheus-claim4-persistentvolumeclaim.yaml
@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  creationTimestamp: null
+  labels:
+    io.kompose.service: prometheus-claim4
+  name: prometheus-claim4
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 100Mi
+status: {}
diff --git a/prometheus/prometheus-configmap.yaml b/prometheus/prometheus-configmap.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..ccfb013800255c2975dd6bc342af627f52ef0ba3
--- /dev/null
+++ b/prometheus/prometheus-configmap.yaml
@@ -0,0 +1,38 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: prometheus-configmap
+data:
+  prometheus.yml: |
+    # global:
+    #   scrape_interval: 5s
+    #   external_labels:
+    #     monitor: 'prakash-monitor'
+    # scrape_configs:
+    #   - job_name: 'prometheus'
+    #     static_configs:
+    #       - targets: ['0.0.0.0:9090'] ## IP Address of the localhost
+    #   - job_name: 'cAdvisor' 
+    #     static_configs:
+    #       - targets: ['0.0.0.0:8090']
+    #       #- cadvisor:8090
+
+    global:
+      scrape_interval: 15s
+      evaluation_interval: 15s
+    alerting:
+      alertmanagers:
+      - static_configs:
+        - targets:
+        # whatever you want
+    scrape_configs:
+      - job_name: 'prometheus'
+        static_configs:
+        - targets: ['prometheus:9090']
+          labels:
+            alias: 'prometheus'
+      - job_name: 'cadvisor'
+        static_configs:
+        - targets: ['cadvisor:8080']
+          labels:
+            alias: 'cadvisor'
\ No newline at end of file
diff --git a/prometheus/prometheus-deployment.yaml b/prometheus/prometheus-deployment.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..7ae939f45cc07c922d96437663dff48da61c4ef9
--- /dev/null
+++ b/prometheus/prometheus-deployment.yaml
@@ -0,0 +1,71 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  annotations:
+    kompose.cmd: kompose -f docker-compose.yml convert
+    kompose.version: 1.28.0 (c4137012e)
+  creationTimestamp: null
+  labels:
+    io.kompose.service: prometheus
+  name: prometheus
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      io.kompose.service: prometheus
+  strategy:
+    type: Recreate
+  template:
+    metadata:
+      annotations:
+        kompose.cmd: kompose -f docker-compose.yml convert
+        kompose.version: 1.28.0 (c4137012e)
+      creationTimestamp: null
+      labels:
+        io.kompose.network/monitoring-default: "true"
+        io.kompose.service: prometheus
+    spec:
+      containers:
+        - args:
+            - --config.file=/tmp/prometheus.yml
+            - --web.route-prefix=/
+            - --storage.tsdb.retention.time=200h
+            - --web.enable-lifecycle
+          image: prom/prometheus:latest
+          name: prometheus
+          ports:
+            - containerPort: 9090
+          resources: {}
+          volumeMounts:
+            - name: prometheus-config
+              mountPath: /tmp/prometheus.yml
+              subPath: prometheus.yml
+            - mountPath: /var/lib/prometheus
+              name: prometheus-claim1
+            - mountPath: /prometheus
+              name: prometheus-claim2
+            - mountPath: /etc/prometheus
+              name: prometheus-claim3
+            - mountPath: /etc/prometheus/alert.rules
+              name: prometheus-claim4
+      restartPolicy: Always
+      volumes:
+        - name: prometheus-config
+          configMap:
+            name: prometheus-configmap
+            items:
+            - key: "prometheus.yml"
+              path: "prometheus.yml"
+        - name: prometheus-claim1
+          persistentVolumeClaim:
+            claimName: prometheus-claim1
+        - name: prometheus-claim2
+          persistentVolumeClaim:
+            claimName: prometheus-claim2
+        - name: prometheus-claim3
+          persistentVolumeClaim:
+            claimName: prometheus-claim3
+        - name: prometheus-claim4
+          persistentVolumeClaim:
+            claimName: prometheus-claim4
+status: {}
diff --git a/prometheus/prometheus-service.yaml b/prometheus/prometheus-service.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..d7fa32d94c92574e44d1b99b74e06569181d32b7
--- /dev/null
+++ b/prometheus/prometheus-service.yaml
@@ -0,0 +1,19 @@
+apiVersion: v1
+kind: Service
+metadata:
+  annotations:
+    kompose.cmd: kompose -f docker-compose.yml convert
+    kompose.version: 1.28.0 (c4137012e)
+  creationTimestamp: null
+  labels:
+    io.kompose.service: prometheus
+  name: prometheus
+spec:
+  ports:
+    - name: "9090"
+      port: 9090
+      targetPort: 9090
+  selector:
+    io.kompose.service: prometheus
+status:
+  loadBalancer: {}
diff --git a/services/.env b/services/.env
new file mode 100644
index 0000000000000000000000000000000000000000..6d557f6add092bbab221994814543a9b8114b710
--- /dev/null
+++ b/services/.env
@@ -0,0 +1,24 @@
+ELASTIC_VERSION=8.4.3
+
+## Passwords for stack users
+#
+
+# User 'elastic' (built-in)
+#
+# Superuser role, full access to cluster management and data indices.
+# https://www.elastic.co/guide/en/elasticsearch/reference/current/built-in-users.html
+ELASTIC_PASSWORD='changeme'
+
+# User 'logstash_internal' (custom)
+#
+# The user Logstash uses to connect and send data to Elasticsearch.
+# https://www.elastic.co/guide/en/logstash/current/ls-security.html
+LOGSTASH_INTERNAL_PASSWORD='changeme'
+
+# User 'kibana_system' (built-in)
+#
+# The user Kibana uses to connect and communicate with Elasticsearch.
+# https://www.elastic.co/guide/en/elasticsearch/reference/current/built-in-users.html
+KIBANA_SYSTEM_PASSWORD='changeme'
+
+CAPIF_HOSTNAME="capif.apps.ocp-epg.hi.inet"
\ No newline at end of file
diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/.dockerignore b/services/TS29222_CAPIF_API_Invoker_Management_API/.dockerignore
new file mode 100644
index 0000000000000000000000000000000000000000..f9619601908b43d5d90c9befea5aa6ef6a732fa9
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Invoker_Management_API/.dockerignore
@@ -0,0 +1,72 @@
+.travis.yaml
+.openapi-generator-ignore
+README.md
+tox.ini
+git_push.sh
+test-requirements.txt
+setup.py
+
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+env/
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*,cover
+.hypothesis/
+venv/
+.python-version
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+#Ipython Notebook
+.ipynb_checkpoints
diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/.gitignore b/services/TS29222_CAPIF_API_Invoker_Management_API/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..43995bd42fa23bbc4c3a59d5fb9da99042fcf139
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Invoker_Management_API/.gitignore
@@ -0,0 +1,66 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+env/
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*,cover
+.hypothesis/
+venv/
+.venv/
+.python-version
+.pytest_cache
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+#Ipython Notebook
+.ipynb_checkpoints
diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/.openapi-generator-ignore b/services/TS29222_CAPIF_API_Invoker_Management_API/.openapi-generator-ignore
new file mode 100644
index 0000000000000000000000000000000000000000..7484ee590a3894506cf063799b885428f95a71be
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Invoker_Management_API/.openapi-generator-ignore
@@ -0,0 +1,23 @@
+# OpenAPI Generator Ignore
+# Generated by openapi-generator https://github.com/openapitools/openapi-generator
+
+# Use this file to prevent files from being overwritten by the generator.
+# The patterns follow closely to .gitignore or .dockerignore.
+
+# As an example, the C# client generator defines ApiClient.cs.
+# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line:
+#ApiClient.cs
+
+# You can match any string of characters against a directory, file or extension with a single asterisk (*):
+#foo/*/qux
+# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
+
+# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
+#foo/**/qux
+# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
+
+# You can also negate patterns with an exclamation (!).
+# For example, you can ignore all files in a docs folder with the file extension .md:
+#docs/*.md
+# Then explicitly reverse the ignore rule for a single file:
+#!docs/README.md
diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/.openapi-generator/FILES b/services/TS29222_CAPIF_API_Invoker_Management_API/.openapi-generator/FILES
new file mode 100644
index 0000000000000000000000000000000000000000..e0046a76daea25433263092830c0b5e9395780c8
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Invoker_Management_API/.openapi-generator/FILES
@@ -0,0 +1,46 @@
+.dockerignore
+.gitignore
+.travis.yml
+Dockerfile
+README.md
+api_invoker_management/__init__.py
+api_invoker_management/__main__.py
+api_invoker_management/controllers/__init__.py
+api_invoker_management/controllers/default_controller.py
+api_invoker_management/controllers/security_controller_.py
+api_invoker_management/encoder.py
+api_invoker_management/models/__init__.py
+api_invoker_management/models/aef_profile.py
+api_invoker_management/models/api_invoker_enrolment_details.py
+api_invoker_management/models/base_model_.py
+api_invoker_management/models/communication_type.py
+api_invoker_management/models/communication_type_any_of.py
+api_invoker_management/models/custom_operation.py
+api_invoker_management/models/data_format.py
+api_invoker_management/models/data_format_any_of.py
+api_invoker_management/models/interface_description.py
+api_invoker_management/models/invalid_param.py
+api_invoker_management/models/onboarding_information.py
+api_invoker_management/models/onboarding_notification.py
+api_invoker_management/models/operation.py
+api_invoker_management/models/operation_any_of.py
+api_invoker_management/models/problem_details.py
+api_invoker_management/models/protocol.py
+api_invoker_management/models/protocol_any_of.py
+api_invoker_management/models/published_api_path.py
+api_invoker_management/models/resource.py
+api_invoker_management/models/security_method.py
+api_invoker_management/models/security_method_any_of.py
+api_invoker_management/models/service_api_description.py
+api_invoker_management/models/shareable_information.py
+api_invoker_management/models/version.py
+api_invoker_management/models/websock_notif_config.py
+api_invoker_management/openapi/openapi.yaml
+api_invoker_management/test/__init__.py
+api_invoker_management/typing_utils.py
+api_invoker_management/util.py
+git_push.sh
+requirements.txt
+setup.py
+test-requirements.txt
+tox.ini
diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/.openapi-generator/VERSION b/services/TS29222_CAPIF_API_Invoker_Management_API/.openapi-generator/VERSION
new file mode 100644
index 0000000000000000000000000000000000000000..4b448de535c7dd619da0df6d8221995dbd5d118a
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Invoker_Management_API/.openapi-generator/VERSION
@@ -0,0 +1 @@
+5.3.0-SNAPSHOT
\ No newline at end of file
diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/.travis.yml b/services/TS29222_CAPIF_API_Invoker_Management_API/.travis.yml
new file mode 100644
index 0000000000000000000000000000000000000000..ad71ee5ca083a6923c91104533c5c7b86f297f3f
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Invoker_Management_API/.travis.yml
@@ -0,0 +1,14 @@
+# ref: https://docs.travis-ci.com/user/languages/python
+language: python
+python:
+  - "3.2"
+  - "3.3"
+  - "3.4"
+  - "3.5"
+  - "3.6"
+  - "3.7"
+  - "3.8"
+# command to install dependencies
+install: "pip install -r requirements.txt"
+# command to run tests
+script: nosetests
diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/Dockerfile b/services/TS29222_CAPIF_API_Invoker_Management_API/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..ac8732bcd88a9d3d26a6a0d7aacb78fdfaa749e2
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Invoker_Management_API/Dockerfile
@@ -0,0 +1,18 @@
+FROM public.ecr.aws/o2v4a8t6/opencapif/python:3-alpine
+
+RUN mkdir -p /usr/src/app
+WORKDIR /usr/src/app
+
+COPY requirements.txt /usr/src/app/requirements.txt
+
+RUN apk add -U --no-cache gcc build-base linux-headers ca-certificates libffi-dev libressl-dev libxslt-dev
+RUN pip3 install --no-cache-dir -r requirements.txt
+RUN apk add redis
+RUN apk add jq
+RUN apk add curl
+
+COPY . /usr/src/app
+
+EXPOSE 8080
+
+CMD ["sh", "prepare_invoker.sh"]
\ No newline at end of file
diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/README.md b/services/TS29222_CAPIF_API_Invoker_Management_API/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..0112c608dc439cfd55bb0a35f73fded7f33b256b
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Invoker_Management_API/README.md
@@ -0,0 +1,49 @@
+# OpenAPI generated server
+
+## Overview
+This server was generated by the [OpenAPI Generator](https://openapi-generator.tech) project. By using the
+[OpenAPI-Spec](https://openapis.org) from a remote server, you can easily generate a server stub.  This
+is an example of building a OpenAPI-enabled Flask server.
+
+This example uses the [Connexion](https://github.com/zalando/connexion) library on top of Flask.
+
+## Requirements
+Python 3.5.2+
+
+## Usage
+To run the server, please execute the following from the root directory:
+
+```
+pip3 install -r requirements.txt
+python3 -m api_invoker_management
+```
+
+and open your browser to here:
+
+```
+http://localhost:8080/api-invoker-management/v1/ui/
+```
+
+Your OpenAPI definition lives here:
+
+```
+http://localhost:8080/api-invoker-management/v1/openapi.json
+```
+
+To launch the integration tests, use tox:
+```
+sudo pip install tox
+tox
+```
+
+## Running with Docker
+
+To run the server on a Docker container, please execute the following from the root directory:
+
+```bash
+# building the image
+docker build -t api_invoker_management .
+
+# starting up a container
+docker run -p 8080:8080 api_invoker_management
+```
\ No newline at end of file
diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/__init__.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/__main__.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/__main__.py
new file mode 100644
index 0000000000000000000000000000000000000000..32ccc2eb015def617c98d798aa9ba55adf04cbd2
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/__main__.py
@@ -0,0 +1,152 @@
+#!/usr/bin/env python3
+
+import connexion
+import logging
+from api_invoker_management import encoder
+
+from flask import Flask, jsonify, request
+from flask_jwt_extended import JWTManager, jwt_required, create_access_token
+from pymongo import MongoClient
+from .config import Config
+from .core.consumer_messager import Subscriber
+from logging.handlers import RotatingFileHandler
+import os
+from fluent import sender
+from flask_executor import Executor
+from opentelemetry.instrumentation.flask import FlaskInstrumentor
+from opentelemetry import trace
+from opentelemetry.trace.propagation.tracecontext import TraceContextTextMapPropagator
+from opentelemetry.exporter.otlp.proto.grpc.trace_exporter import OTLPSpanExporter
+from opentelemetry.sdk.resources import Resource
+from opentelemetry.sdk.trace import TracerProvider
+from opentelemetry.sdk.trace.export import BatchSpanProcessor
+from opentelemetry.instrumentation.redis import RedisInstrumentor
+
+
+
+import sys
+import uuid
+
+
+
+NAME = "Invoker-Service"
+
+def configure_monitoring(app, config):
+
+    resource = Resource(attributes={"service.name": NAME})
+
+    fluent_bit_host = config['monitoring']['fluent_bit_host']
+    fluent_bit_port = config['monitoring']['fluent_bit_port']
+    fluent_bit_sender = sender.FluentSender('Invoker-Service', host=fluent_bit_host, port=fluent_bit_port)
+    propagator = TraceContextTextMapPropagator()
+
+    tracer_provider = TracerProvider(resource=resource)
+    trace.set_tracer_provider(tracer_provider)
+    exporter = OTLPSpanExporter(endpoint=f"http://{config['monitoring']['opentelemetry_url']}:{config['monitoring']['opentelemetry_port']}", insecure=True)
+    span_processor = BatchSpanProcessor(
+        exporter,
+        max_queue_size=config['monitoring']['opentelemetry_max_queue_size'],
+        schedule_delay_millis=config['monitoring']['opentelemetry_schedule_delay_millis'],
+        max_export_batch_size=config['monitoring']['opentelemetry_max_export_batch_size'],
+        export_timeout_millis=config['monitoring']['opentelemetry_export_timeout_millis'],
+    )
+
+    trace.get_tracer_provider().add_span_processor(span_processor)
+
+
+    FlaskInstrumentor().instrument_app(app)
+
+    RedisInstrumentor().instrument()
+
+
+    class FluentBitHandler(logging.Handler):
+
+        def __init__(self):
+            logging.Handler.__init__(self)
+
+        def emit(self, record):
+            log_entry = self.format(record)
+            log_data = {
+                'message': log_entry,
+                'level': record.levelname,
+                'timestamp': record.created,
+                'logger': record.name,
+                'function': record.funcName,
+                'line': record.lineno,
+                'container_name': os.environ.get('CONTAINER_NAME', ''),
+            }
+
+            # # Obtener el trace ID actual
+            current_context = trace.get_current_span().get_span_context()
+
+            trace_id = current_context.trace_id
+            traceparent_id = current_context.span_id
+            log_data['traceID'] = hex(trace_id)[2:]
+            if traceparent_id != None:
+                log_data['traceparent'] = hex(traceparent_id)[2:]
+            fluent_bit_sender.emit('Invoker_Service', log_data)
+
+    loggers = [app.logger, ]
+    for l in loggers:
+         l.addHandler(FluentBitHandler())
+
+def configure_logging(app):
+    del app.logger.handlers[:]
+    loggers = [app.logger, ]
+    handlers = []
+    console_handler = logging.StreamHandler()
+    console_handler.setLevel(logging.DEBUG)
+    console_handler.setFormatter(verbose_formatter())
+    file_handler = RotatingFileHandler(filename="invoker_logs.log", maxBytes=1024 * 1024 * 100, backupCount=20)
+    file_handler.setLevel(logging.DEBUG)
+    file_handler.setFormatter(verbose_formatter())
+    handlers.append(console_handler)
+    handlers.append(file_handler)
+
+
+    for l in loggers:
+        for handler in handlers:
+            l.addHandler(handler)
+        l.propagate = False
+        l.setLevel(logging.DEBUG)
+
+
+
+def verbose_formatter():
+    return logging.Formatter(
+        '{"timestamp": "%(asctime)s", "level": "%(levelname)s", "logger": "%(name)s", "function": "%(funcName)s", "line": %(lineno)d, "message": %(message)s}',
+        datefmt='%d/%m/%Y %H:%M:%S'
+    )
+
+with open("/usr/src/app/api_invoker_management/pubkey.pem", "rb") as pub_file:
+            pub_data = pub_file.read()
+
+app = connexion.App(__name__, specification_dir='./openapi/')
+app.app.json_encoder = encoder.JSONEncoder
+app.add_api('openapi.yaml',
+            arguments={'title': 'CAPIF_API_Invoker_Management_API'},
+            pythonic_params=True)
+
+app.app.config['JWT_ALGORITHM'] = 'RS256'
+app.app.config['JWT_PUBLIC_KEY'] = pub_data
+
+
+config = Config()
+
+jwt = JWTManager(app.app)
+configure_logging(app.app)
+
+if eval(os.environ.get("MONITORING").lower().capitalize()):
+    configure_monitoring(app.app, config.get_config())
+
+executor = Executor(app.app)
+subscriber = Subscriber()
+
+@app.app.before_first_request
+def create_listener_message():
+    executor.submit(subscriber.listen)
+
+if __name__ == '__main__':
+    import logging
+    app.run(debug=True, port=8080)
+
diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/config.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/config.py
new file mode 100644
index 0000000000000000000000000000000000000000..11e1c4f3626d7440c6cd999ed118afb3c93caa2e
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/config.py
@@ -0,0 +1,21 @@
+import yaml
+import os
+
+#Config class to get config
+class Config:
+	def __init__(self):
+		self.cached = 0
+		self.file="./config.yaml"
+		self.my_config = {}
+
+		stamp = os.stat(self.file).st_mtime
+		if stamp != self.cached:
+			self.cached = stamp
+			f = open(self.file)
+			self.my_config = yaml.safe_load(f)
+			f.close()
+
+	def get_config(self):
+		return self.my_config
+
+
diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/controllers/__init__.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/controllers/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/controllers/default_controller.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/controllers/default_controller.py
new file mode 100644
index 0000000000000000000000000000000000000000..456b4ecc8bbde1dbd1aff2c88b14bee17bdcf727
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/controllers/default_controller.py
@@ -0,0 +1,123 @@
+import connexion
+
+from api_invoker_management.models.api_invoker_enrolment_details import APIInvokerEnrolmentDetails  # noqa: E501
+from ..core.apiinvokerenrolmentdetails import InvokerManagementOperations
+from ..core.validate_user import ControlAccess
+
+import json
+from flask import Response, request, current_app
+from flask_jwt_extended import jwt_required, get_jwt_identity
+from ..encoder import JSONEncoder
+from ..models.problem_details import ProblemDetails
+from cryptography import x509
+from cryptography.hazmat.backends import default_backend
+from ..core.publisher import Publisher
+from functools import wraps
+
+invoker_operations = InvokerManagementOperations()
+publisher_ops = Publisher()
+valid_user = ControlAccess()
+
+
+def cert_validation():
+    def _cert_validation(f):
+        @wraps(f)
+        def __cert_validation(*args, **kwargs):
+
+            args = request.view_args
+            cert_tmp = request.headers['X-Ssl-Client-Cert']
+            cert_raw = cert_tmp.replace('\t', '')
+
+            cert = x509.load_pem_x509_certificate(str.encode(cert_raw), default_backend())
+
+            cn = cert.subject.get_attributes_for_oid(x509.OID_COMMON_NAME)[0].value.strip()
+
+            if cn != "superadmin":
+                cert_signature = cert.signature.hex()
+                result = valid_user.validate_user_cert(args["onboardingId"], cert_signature)
+
+                if result is not None:
+                    return result
+
+            result = f(**kwargs)
+            return result
+        return __cert_validation
+    return _cert_validation
+
+@cert_validation()
+def onboarded_invokers_onboarding_id_delete(onboarding_id):  # noqa: E501
+    """onboarded_invokers_onboarding_id_delete
+
+    Deletes an individual API Invoker. # noqa: E501
+
+    :param onboarding_id: String identifying an individual on-boarded API invoker resource
+    :type onboarding_id: str
+
+    :rtype: None
+    """
+
+    current_app.logger.info("Removing invoker")
+    res = invoker_operations.remove_apiinvokerenrolmentdetail(onboarding_id)
+
+    if res.status_code == 204:
+        current_app.logger.info("Invoker Removed")
+        publisher_ops.publish_message("events", "API_INVOKER_OFFBOARDED")
+        publisher_ops.publish_message("internal-messages", f"invoker-removed:{onboarding_id}")
+
+    return res
+
+@cert_validation()
+def onboarded_invokers_onboarding_id_put(onboarding_id, body):  # noqa: E501
+    """onboarded_invokers_onboarding_id_put
+
+    Updates an individual API invoker details. # noqa: E501
+
+    :param onboarding_id: String identifying an individual on-boarded API invoker resource
+    :type onboarding_id: str
+    :param api_invoker_enrolment_details: representation of the API invoker details to be updated in CAPIF core function
+    :type api_invoker_enrolment_details: dict | bytes
+
+    :rtype: APIInvokerEnrolmentDetails
+    """
+    current_app.logger.info("Updating invoker")
+    if connexion.request.is_json:
+        body = APIInvokerEnrolmentDetails.from_dict(connexion.request.get_json())  # noqa: E501
+    res = invoker_operations.update_apiinvokerenrolmentdetail(onboarding_id,body)
+
+    if res.status_code == 200:
+        current_app.logger.info("Invoker Updated")
+        publisher_ops.publish_message("events", "API_INVOKER_UPDATED")
+
+    return res
+
+
+@jwt_required()
+def onboarded_invokers_post(body):  # noqa: E501
+    """onboarded_invokers_post
+
+    Creates a new individual API Invoker profile. # noqa: E501
+
+    :param api_invoker_enrolment_details:
+    :type api_invoker_enrolment_details: dict | bytes
+
+    :rtype: APIInvokerEnrolmentDetails
+    """
+
+    identity = get_jwt_identity()
+    username, role = identity.split()
+
+    if role != "invoker":
+        prob = ProblemDetails(title="Unauthorized", status=401, detail="Role not authorized for this API route",
+                              cause="User role must be invoker")
+        return Response(json.dumps(prob, cls=JSONEncoder), status=401, mimetype='application/json')
+
+    if connexion.request.is_json:
+        body = APIInvokerEnrolmentDetails.from_dict(connexion.request.get_json())  # noqa: E501
+
+    current_app.logger.info("Creating Invoker")
+    res = invoker_operations.add_apiinvokerenrolmentdetail(body, username)
+    if res.status_code == 201:
+        current_app.logger.info("Invoker Created")
+        publisher_ops.publish_message("events", "API_INVOKER_ONBOARDED")
+
+    return res
diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/controllers/security_controller_.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/controllers/security_controller_.py
new file mode 100644
index 0000000000000000000000000000000000000000..6d294ffd6df1a26a469dbb4e72533b01503468dd
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/controllers/security_controller_.py
@@ -0,0 +1,2 @@
+from typing import List
+
diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/core/apiinvokerenrolmentdetails.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/core/apiinvokerenrolmentdetails.py
new file mode 100644
index 0000000000000000000000000000000000000000..8969ec17bffce2d94e8b94ce315d1a7b04d52e08
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/core/apiinvokerenrolmentdetails.py
@@ -0,0 +1,159 @@
+import rfc3987
+from pymongo import ReturnDocument
+import secrets
+import requests
+from .responses import bad_request_error, not_found_error, forbidden_error, internal_server_error, make_response
+from flask import current_app, Flask, Response
+import json
+from ..util import dict_to_camel_case
+from .auth_manager import AuthManager
+from .resources import Resource
+from ..config import Config
+
+
+
+class InvokerManagementOperations(Resource):
+
+    def __check_api_invoker_id(self, api_invoker_id):
+
+        current_app.logger.debug("Cheking api invoker id")
+        mycol = self.db.get_col_by_name(self.db.invoker_enrolment_details)
+        my_query = {'api_invoker_id':api_invoker_id}
+        old_values = mycol.find_one(my_query)
+
+        if old_values is None:
+            current_app.logger.error("Not found api invoker id")
+            return not_found_error(detail="Please provide an existing Netapp ID", cause= "Not exist NetappID" )
+
+        return old_values
+
+    def __sign_cert(self, publick_key, invoker_id):
+
+        url = f"http://{self.config['ca_factory']['url']}:{self.config['ca_factory']['port']}/v1/pki_int/sign/my-ca"
+        headers = {'X-Vault-Token': self.config['ca_factory']['token']}
+        data = {
+            'format':'pem_bundle',
+            'ttl': '43000h',
+            'csr': publick_key,
+            'common_name': invoker_id
+        }
+
+        response = requests.request("POST", url, headers=headers, data=data, verify = False)
+        print(response)
+        response_payload = json.loads(response.text)
+
+        return response_payload
+
+    def __init__(self):
+        Resource.__init__(self)
+        self.auth_manager = AuthManager()
+        self.config = Config().get_config()
+
+
+    def add_apiinvokerenrolmentdetail(self, apiinvokerenrolmentdetail, username):
+
+        mycol = self.db.get_col_by_name(self.db.invoker_enrolment_details)
+        register = self.db.get_col_by_name_register(self.db.capif_users)
+
+        #try:
+
+        current_app.logger.debug("Creating invoker resource")
+        res = mycol.find_one({'onboarding_information.api_invoker_public_key': apiinvokerenrolmentdetail.onboarding_information.api_invoker_public_key})
+
+        if res is not None:
+            current_app.logger.error("Generating forbbiden error, invoker registered")
+            return forbidden_error(detail= "Invoker already registered", cause = "Identical invoker public key")
+
+        if rfc3987.match(apiinvokerenrolmentdetail.notification_destination, rule="URI") is None:
+            current_app.logger.error("Bad url format")
+            return bad_request_error(detail="Bad Param", cause = "Detected Bad formar of param", invalid_params=[{"param": "notificationDestination", "reason": "Not valid URL format"}])
+
+        current_app.logger.debug("Signing Certificate")
+
+        api_invoker_id = 'INV'+str(secrets.token_hex(15))
+        cert = self.__sign_cert(apiinvokerenrolmentdetail.onboarding_information.api_invoker_public_key, api_invoker_id)
+
+        
+        apiinvokerenrolmentdetail.api_invoker_id = api_invoker_id
+        current_app.logger.debug(cert)
+        apiinvokerenrolmentdetail.onboarding_information.api_invoker_certificate = cert['data']['certificate']
+        mycol.insert_one(apiinvokerenrolmentdetail.to_dict())
+        register.update_one({'username':username}, {"$push":{'list_invokers':api_invoker_id}})
+
+
+        current_app.logger.debug("Invoker inserted in database")
+        current_app.logger.debug("Netapp onboarded sucessfuly")
+
+        self.auth_manager.add_auth_invoker(cert['data']['certificate'], api_invoker_id)
+
+        res = make_response(object=apiinvokerenrolmentdetail, status=201)
+        res.headers['Location'] = "/api-invoker-management/v1/onboardedInvokers/" + str(api_invoker_id)
+        return res
+
+        # except Exception as e:
+        #     exception = "An exception occurred in create invoker"
+        #     current_app.logger.error(exception + "::" + str(e))
+        #     return internal_server_error(detail=exception, cause=str(e))
+
+    def update_apiinvokerenrolmentdetail(self, onboard_id, apiinvokerenrolmentdetail):
+
+        mycol = self.db.get_col_by_name(self.db.invoker_enrolment_details)
+
+        try:
+            current_app.logger.debug("Updating invoker resource")
+            result = self.__check_api_invoker_id(onboard_id)
+
+            if isinstance(result, Response):
+                return result
+
+            if apiinvokerenrolmentdetail.onboarding_information.api_invoker_public_key != result["onboarding_information"]["api_invoker_public_key"]:
+                cert = self.__sign_cert(apiinvokerenrolmentdetail.onboarding_information.api_invoker_public_key, result["api_invoker_id"])
+                apiinvokerenrolmentdetail.onboarding_information.api_invoker_certificate = cert['data']['certificate']
+                self.auth_manager.update_auth_invoker(cert['data']["certificate"], onboard_id)
+
+            apiinvokerenrolmentdetail_update = apiinvokerenrolmentdetail.to_dict()
+            apiinvokerenrolmentdetail_update = {
+                key: value for key, value in apiinvokerenrolmentdetail_update.items() if value is not None
+            }
+
+            result = mycol.find_one_and_update(result, {"$set":apiinvokerenrolmentdetail_update}, projection={'_id': 0},return_document=ReturnDocument.AFTER ,upsert=False)
+
+            result = {
+                key: value for key, value in result.items() if value is not None
+            }
+
+            current_app.logger.debug("Invoker Resource inserted in database")
+            res = make_response(object=dict_to_camel_case(result), status=200)
+            return res
+
+        except Exception as e:
+            exception = "An exception occurred in update invoker"
+            current_app.logger.error(exception + "::" + str(e))
+            return internal_server_error(detail=exception, cause=str(e))
+
+    def remove_apiinvokerenrolmentdetail(self, onboard_id):
+
+        mycol = self.db.get_col_by_name(self.db.invoker_enrolment_details)
+        register = self.db.get_col_by_name_register(self.db.capif_users)
+        try:
+            current_app.logger.debug("Removing invoker resource")
+            result = self.__check_api_invoker_id(onboard_id)
+
+            if isinstance(result, Response):
+                return result
+
+            mycol.delete_one({'api_invoker_id':onboard_id})
+            register.update_one({'list_invokers':onboard_id}, {"$pull":{'list_invokers':onboard_id}})
+            self.auth_manager.remove_auth_invoker(onboard_id)
+
+            current_app.logger.debug("Invoker resource removed from database")
+            current_app.logger.debug("Netapp offboarded sucessfuly")
+            out =  "The Netapp matching onboardingId  " + onboard_id + " was offboarded."
+            return make_response(out, status=204)
+
+        except Exception as e:
+            exception = "An exception occurred in remove invoker"
+            current_app.logger.error(exception + "::" + str(e))
+            return internal_server_error(detail=exception, cause=str(e))
+
+
diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/core/auth_manager.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/core/auth_manager.py
new file mode 100644
index 0000000000000000000000000000000000000000..cfab01e271b46df831399394a92ce54732ff8003
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/core/auth_manager.py
@@ -0,0 +1,25 @@
+
+from flask import current_app
+from cryptography import x509
+from cryptography.hazmat.backends import default_backend
+from .resources import Resource
+
+
+class AuthManager(Resource):
+
+    def add_auth_invoker(self, cert, invoker_id):
+        cert_col = self.db.get_col_by_name(self.db.certs_col)
+
+        cert_encode = x509.load_pem_x509_certificate(str.encode(cert), default_backend())
+        cert_col.insert_one({"cert_signature":cert_encode.signature.hex(), "role":"invoker", "id": invoker_id, "resources": {}})
+
+    def update_auth_invoker(self, cert, invoker_id):
+        cert_col = self.db.get_col_by_name(self.db.certs_col)
+
+        cert_encode = x509.load_pem_x509_certificate(str.encode(cert), default_backend())
+        cert_col.find_one_and_update({"id":invoker_id}, {"$set":{"cert_signature":cert_encode.signature.hex()}})
+
+    def remove_auth_invoker(self, invoker_id):
+        cert_col = self.db.get_col_by_name(self.db.certs_col)
+
+        cert_col.delete_one({"id":invoker_id})
diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/core/consumer_messager.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/core/consumer_messager.py
new file mode 100644
index 0000000000000000000000000000000000000000..26f8d6b025229c757bd7e909699c337d02a4a53d
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/core/consumer_messager.py
@@ -0,0 +1,26 @@
+# subscriber.py
+import redis
+from .invoker_internal_ops import InvokerInternalOperations
+from flask import current_app
+
+class Subscriber():
+
+    def __init__(self):
+        self.r = redis.Redis(host='redis', port=6379, db=0)
+        self.invoker_ops = InvokerInternalOperations()
+        self.p = self.r.pubsub()
+        self.p.subscribe("internal-messages")
+
+    def listen(self):
+        for raw_message in self.p.listen():
+            if raw_message["type"] == "message" and raw_message["channel"].decode('utf-8') == "internal-messages":
+                message, invoker_id, api_id = raw_message["data"].decode('utf-8').split(":")
+                if message == "security-context-created":
+                    current_app.logger.debug("Internal message received, updating Api list on invoker")
+                    self.invoker_ops.update_services_list(invoker_id, api_id)
+                if message == "security-context-removed":
+                    current_app.logger.debug("Internal message received, removing service in  Api list of invoker")
+                    self.invoker_ops.remove_services_list(invoker_id, api_id)
+
+
+
diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/core/invoker_internal_ops.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/core/invoker_internal_ops.py
new file mode 100644
index 0000000000000000000000000000000000000000..a0aa138a0d9c63b49446b4fa04c93e6afde3d03a
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/core/invoker_internal_ops.py
@@ -0,0 +1,40 @@
+
+from .resources import Resource
+from flask import current_app
+
+
+class InvokerInternalOperations(Resource):
+
+    def update_services_list(self, invoker_id, api_id):
+
+        service_col = self.db.get_col_by_name(self.db.service_col)
+        invoker_col = self.db.get_col_by_name(self.db.invoker_enrolment_details)
+
+        invoker = invoker_col.find_one({'api_invoker_id':invoker_id})
+        service = service_col.find_one({'api_id': api_id}, {"_id":0})
+
+        invoker_api_list = invoker["api_list"]
+        if invoker_api_list is None:
+            invoker_api_list = []
+
+        invoker_api_list.append(service)
+        invoker["api_list"] = invoker_api_list
+
+        invoker_col.update_one({'api_invoker_id':invoker_id}, {"$set":invoker})
+
+    def remove_services_list(self, invoker_id, api_id):
+        service_col = self.db.get_col_by_name(self.db.service_col)
+        invoker_col = self.db.get_col_by_name(self.db.invoker_enrolment_details)
+
+        invoker = invoker_col.find_one({'api_invoker_id':invoker_id})
+        service = service_col.find_one({'api_id': api_id})
+
+        invoker_api_list = invoker["api_list"]
+
+        if service in invoker_api_list:
+            invoker_api_list.remove(service)
+
+        invoker["api_list"] = invoker_api_list
+
+        invoker_col.update_one({'api_invoker_id':invoker_id}, {"$set":invoker})
+
diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/core/publisher.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/core/publisher.py
new file mode 100644
index 0000000000000000000000000000000000000000..3898c4b8309b14a05f8b5de89626fac8ebea4fc4
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/core/publisher.py
@@ -0,0 +1,11 @@
+import redis
+import sys
+from flask import current_app
+
+class Publisher():
+
+    def __init__(self):
+        self. r = redis.Redis(host='redis', port=6379, db=0)
+
+    def publish_message(self, channel, message):
+        self.r.publish(channel, message)
diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/core/resources.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/core/resources.py
new file mode 100644
index 0000000000000000000000000000000000000000..94e29ec07359c93a78d520f24fa91c88971d65c4
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/core/resources.py
@@ -0,0 +1,7 @@
+from abc import ABC, abstractmethod
+from ..db.db import MongoDatabse
+
+class Resource(ABC):
+
+    def __init__(self):
+        self.db = MongoDatabse()
\ No newline at end of file
diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/core/responses.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/core/responses.py
new file mode 100644
index 0000000000000000000000000000000000000000..962c4b6dd6ae07bce79dc8e810f10a507d526663
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/core/responses.py
@@ -0,0 +1,31 @@
+from ..models.problem_details import ProblemDetails
+from ..encoder import JSONEncoder
+from flask import Response
+import json
+
+mimetype = "application/json"
+
+def make_response(object, status):
+    res = Response(json.dumps(object, cls=JSONEncoder), status=status, mimetype=mimetype)
+
+    return res
+
+def internal_server_error(detail, cause):
+    prob = ProblemDetails(title="Internal Server Error", status=500, detail=detail, cause=cause)
+
+    return Response(json.dumps(prob, cls=JSONEncoder), status=500, mimetype=mimetype)
+
+def forbidden_error(detail, cause):
+    prob = ProblemDetails(title="Forbidden", status=403, detail=detail, cause=cause)
+
+    return Response(json.dumps(prob, cls=JSONEncoder), status=403, mimetype=mimetype)
+
+def bad_request_error(detail, cause, invalid_params):
+    prob = ProblemDetails(title="Bad Request", status=400, detail=detail, cause=cause, invalid_params=invalid_params)
+
+    return Response(json.dumps(prob, cls=JSONEncoder), status=400, mimetype=cause)
+
+def not_found_error(detail, cause):
+    prob = ProblemDetails(title="Not Found", status=404, detail=detail, cause=cause)
+
+    return Response(json.dumps(prob, cls=JSONEncoder), status=404, mimetype=mimetype)
\ No newline at end of file
diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/core/validate_user.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/core/validate_user.py
new file mode 100644
index 0000000000000000000000000000000000000000..5a2a5dc560b1a7a6c2a62791ded0792da4746a90
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/core/validate_user.py
@@ -0,0 +1,26 @@
+from flask import current_app, Response
+import json
+from ..models.problem_details import ProblemDetails
+from ..encoder import JSONEncoder
+from .resources import Resource
+from .responses import internal_server_error
+
+class ControlAccess(Resource):
+
+    def validate_user_cert(self, api_invoker_id, cert_signature):
+
+        cert_col = self.db.get_col_by_name(self.db.certs_col)
+
+        try:
+            my_query = {'invoker_id':api_invoker_id}
+            cert_entry = cert_col.find_one(my_query)
+
+            if cert_entry is not None:
+                if cert_entry["cert_signature"] != cert_signature:
+                    prob = ProblemDetails(title="Unauthorized", detail="User not authorized", cause="You are not the owner of this resource")
+                    return Response(json.dumps(prob, cls=JSONEncoder), status=401, mimetype="application/json")
+
+        except Exception as e:
+            exception = "An exception occurred in validate invoker"
+            current_app.logger.error(exception + "::" + str(e))
+            return internal_server_error(detail=exception, cause=str(e))
\ No newline at end of file
diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/db/db.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/db/db.py
new file mode 100644
index 0000000000000000000000000000000000000000..32a34b857cd44ea065ab6dc30b8c75a7c671fc5a
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/db/db.py
@@ -0,0 +1,76 @@
+import atexit
+import time
+from pymongo import MongoClient
+from pymongo.errors import AutoReconnect
+from ..config import Config
+from bson.codec_options import CodecOptions
+import os
+from opentelemetry.instrumentation.pymongo import PymongoInstrumentor
+
+if eval(os.environ.get("MONITORING").lower().capitalize()):
+    PymongoInstrumentor().instrument()
+
+class MongoDatabse():
+
+    def __init__(self):
+        self.config = Config().get_config()
+        self.db = self.__connect()
+        self.register = self.__connect_register()
+        self.invoker_enrolment_details = self.config['mongo']['col']
+        self.capif_users = self.config['mongo']['capif_users_col']
+        self.service_col = self.config['mongo']["service_col"]
+        self.certs_col = self.config['mongo']['certs_col']
+
+
+    def get_col_by_name(self, name):
+        return self.db[name].with_options(codec_options=CodecOptions(tz_aware=True))
+    
+    def get_col_by_name_register(self, name):
+        return self.register[name].with_options(codec_options=CodecOptions(tz_aware=True))
+
+
+    def __connect(self, max_retries=3, retry_delay=1):
+
+        retries = 0
+
+        while retries < max_retries:
+            try:
+                uri = f"mongodb://{self.config['mongo']['user']}:{self.config['mongo']['password']}@" \
+                      f"{self.config['mongo']['host']}:{self.config['mongo']['port']}"
+
+                
+                client = MongoClient(uri)
+                mydb = client[self.config['mongo']['db']]
+                mydb.command("ping")
+                return mydb
+            except AutoReconnect:
+                retries += 1
+                print(f"Reconnecting... Retry {retries} of {max_retries}")
+                time.sleep(retry_delay)
+        return None
+    
+    def __connect_register(self, max_retries=3, retry_delay=1):
+
+        retries = 0
+
+        while retries < max_retries:
+            try:
+                uri = f"mongodb://{self.config['mongo_register']['user']}:{self.config['mongo_register']['password']}@" \
+                      f"{self.config['mongo_register']['host']}:{self.config['mongo_register']['port']}"
+
+                
+                client = MongoClient(uri)
+                mydb = client[self.config['mongo_register']['db']]
+                mydb.command("ping")
+                return mydb
+            except AutoReconnect:
+                retries += 1
+                print(f"Reconnecting... Retry {retries} of {max_retries}")
+                time.sleep(retry_delay)
+        return None
+
+    def close_connection(self):
+        if self.db.client:
+            self.db.client.close()
+        if self.register.client:
+            self.register.client.close()
diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/encoder.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/encoder.py
new file mode 100644
index 0000000000000000000000000000000000000000..04b06eb0adb09b675ccd98384aa98fc9fabbbe2c
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/encoder.py
@@ -0,0 +1,20 @@
+from connexion.apps.flask_app import FlaskJSONEncoder
+import six
+
+from api_invoker_management.models.base_model_ import Model
+
+
+class JSONEncoder(FlaskJSONEncoder):
+    include_nulls = False
+
+    def default(self, o):
+        if isinstance(o, Model):
+            dikt = {}
+            for attr, _ in six.iteritems(o.openapi_types):
+                value = getattr(o, attr)
+                if value is None and not self.include_nulls:
+                    continue
+                attr = o.attribute_map[attr]
+                dikt[attr] = value
+            return dikt
+        return FlaskJSONEncoder.default(self, o)
diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/__init__.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..1aa7151920f7bb18378ee65b526ed45649060d14
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/__init__.py
@@ -0,0 +1,29 @@
+# coding: utf-8
+
+# flake8: noqa
+from __future__ import absolute_import
+# import models into model package
+from api_invoker_management.models.api_invoker_enrolment_details import APIInvokerEnrolmentDetails
+from api_invoker_management.models.aef_profile import AefProfile
+from api_invoker_management.models.communication_type import CommunicationType
+from api_invoker_management.models.communication_type_any_of import CommunicationTypeAnyOf
+from api_invoker_management.models.custom_operation import CustomOperation
+from api_invoker_management.models.data_format import DataFormat
+from api_invoker_management.models.data_format_any_of import DataFormatAnyOf
+from api_invoker_management.models.interface_description import InterfaceDescription
+from api_invoker_management.models.invalid_param import InvalidParam
+from api_invoker_management.models.onboarding_information import OnboardingInformation
+from api_invoker_management.models.onboarding_notification import OnboardingNotification
+from api_invoker_management.models.operation import Operation
+from api_invoker_management.models.operation_any_of import OperationAnyOf
+from api_invoker_management.models.problem_details import ProblemDetails
+from api_invoker_management.models.protocol import Protocol
+from api_invoker_management.models.protocol_any_of import ProtocolAnyOf
+from api_invoker_management.models.published_api_path import PublishedApiPath
+from api_invoker_management.models.resource import Resource
+from api_invoker_management.models.security_method import SecurityMethod
+from api_invoker_management.models.security_method_any_of import SecurityMethodAnyOf
+from api_invoker_management.models.service_api_description import ServiceAPIDescription
+from api_invoker_management.models.shareable_information import ShareableInformation
+from api_invoker_management.models.version import Version
+from api_invoker_management.models.websock_notif_config import WebsockNotifConfig
diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/aef_profile.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/aef_profile.py
new file mode 100644
index 0000000000000000000000000000000000000000..23a84c93cb8a37b17d92d6899d8f5d6a538ce1ee
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/aef_profile.py
@@ -0,0 +1,250 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from api_invoker_management.models.base_model_ import Model
+from api_invoker_management.models.data_format import DataFormat
+from api_invoker_management.models.interface_description import InterfaceDescription
+from api_invoker_management.models.protocol import Protocol
+from api_invoker_management.models.security_method import SecurityMethod
+from api_invoker_management.models.version import Version
+from api_invoker_management import util
+
+from api_invoker_management.models.data_format import DataFormat  # noqa: E501
+from api_invoker_management.models.interface_description import InterfaceDescription  # noqa: E501
+from api_invoker_management.models.protocol import Protocol  # noqa: E501
+from api_invoker_management.models.security_method import SecurityMethod  # noqa: E501
+from api_invoker_management.models.version import Version  # noqa: E501
+
+class AefProfile(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, aef_id=None, versions=None, protocol=None, data_format=None, security_methods=None, domain_name=None, interface_descriptions=None):  # noqa: E501
+        """AefProfile - a model defined in OpenAPI
+
+        :param aef_id: The aef_id of this AefProfile.  # noqa: E501
+        :type aef_id: str
+        :param versions: The versions of this AefProfile.  # noqa: E501
+        :type versions: List[Version]
+        :param protocol: The protocol of this AefProfile.  # noqa: E501
+        :type protocol: Protocol
+        :param data_format: The data_format of this AefProfile.  # noqa: E501
+        :type data_format: DataFormat
+        :param security_methods: The security_methods of this AefProfile.  # noqa: E501
+        :type security_methods: List[SecurityMethod]
+        :param domain_name: The domain_name of this AefProfile.  # noqa: E501
+        :type domain_name: str
+        :param interface_descriptions: The interface_descriptions of this AefProfile.  # noqa: E501
+        :type interface_descriptions: List[InterfaceDescription]
+        """
+        self.openapi_types = {
+            'aef_id': str,
+            'versions': List[Version],
+            'protocol': Protocol,
+            'data_format': DataFormat,
+            'security_methods': List[SecurityMethod],
+            'domain_name': str,
+            'interface_descriptions': List[InterfaceDescription]
+        }
+
+        self.attribute_map = {
+            'aef_id': 'aefId',
+            'versions': 'versions',
+            'protocol': 'protocol',
+            'data_format': 'dataFormat',
+            'security_methods': 'securityMethods',
+            'domain_name': 'domainName',
+            'interface_descriptions': 'interfaceDescriptions'
+        }
+
+        self._aef_id = aef_id
+        self._versions = versions
+        self._protocol = protocol
+        self._data_format = data_format
+        self._security_methods = security_methods
+        self._domain_name = domain_name
+        self._interface_descriptions = interface_descriptions
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'AefProfile':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The AefProfile of this AefProfile.  # noqa: E501
+        :rtype: AefProfile
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def aef_id(self):
+        """Gets the aef_id of this AefProfile.
+
+        Identifier of the API exposing function  # noqa: E501
+
+        :return: The aef_id of this AefProfile.
+        :rtype: str
+        """
+        return self._aef_id
+
+    @aef_id.setter
+    def aef_id(self, aef_id):
+        """Sets the aef_id of this AefProfile.
+
+        Identifier of the API exposing function  # noqa: E501
+
+        :param aef_id: The aef_id of this AefProfile.
+        :type aef_id: str
+        """
+        if aef_id is None:
+            raise ValueError("Invalid value for `aef_id`, must not be `None`")  # noqa: E501
+
+        self._aef_id = aef_id
+
+    @property
+    def versions(self):
+        """Gets the versions of this AefProfile.
+
+        API version  # noqa: E501
+
+        :return: The versions of this AefProfile.
+        :rtype: List[Version]
+        """
+        return self._versions
+
+    @versions.setter
+    def versions(self, versions):
+        """Sets the versions of this AefProfile.
+
+        API version  # noqa: E501
+
+        :param versions: The versions of this AefProfile.
+        :type versions: List[Version]
+        """
+        if versions is None:
+            raise ValueError("Invalid value for `versions`, must not be `None`")  # noqa: E501
+        if versions is not None and len(versions) < 1:
+            raise ValueError("Invalid value for `versions`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._versions = versions
+
+    @property
+    def protocol(self):
+        """Gets the protocol of this AefProfile.
+
+
+        :return: The protocol of this AefProfile.
+        :rtype: Protocol
+        """
+        return self._protocol
+
+    @protocol.setter
+    def protocol(self, protocol):
+        """Sets the protocol of this AefProfile.
+
+
+        :param protocol: The protocol of this AefProfile.
+        :type protocol: Protocol
+        """
+
+        self._protocol = protocol
+
+    @property
+    def data_format(self):
+        """Gets the data_format of this AefProfile.
+
+
+        :return: The data_format of this AefProfile.
+        :rtype: DataFormat
+        """
+        return self._data_format
+
+    @data_format.setter
+    def data_format(self, data_format):
+        """Sets the data_format of this AefProfile.
+
+
+        :param data_format: The data_format of this AefProfile.
+        :type data_format: DataFormat
+        """
+
+        self._data_format = data_format
+
+    @property
+    def security_methods(self):
+        """Gets the security_methods of this AefProfile.
+
+        Security methods supported by the AEF  # noqa: E501
+
+        :return: The security_methods of this AefProfile.
+        :rtype: List[SecurityMethod]
+        """
+        return self._security_methods
+
+    @security_methods.setter
+    def security_methods(self, security_methods):
+        """Sets the security_methods of this AefProfile.
+
+        Security methods supported by the AEF  # noqa: E501
+
+        :param security_methods: The security_methods of this AefProfile.
+        :type security_methods: List[SecurityMethod]
+        """
+        if security_methods is not None and len(security_methods) < 1:
+            raise ValueError("Invalid value for `security_methods`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._security_methods = security_methods
+
+    @property
+    def domain_name(self):
+        """Gets the domain_name of this AefProfile.
+
+        Domain to which API belongs to  # noqa: E501
+
+        :return: The domain_name of this AefProfile.
+        :rtype: str
+        """
+        return self._domain_name
+
+    @domain_name.setter
+    def domain_name(self, domain_name):
+        """Sets the domain_name of this AefProfile.
+
+        Domain to which API belongs to  # noqa: E501
+
+        :param domain_name: The domain_name of this AefProfile.
+        :type domain_name: str
+        """
+
+        self._domain_name = domain_name
+
+    @property
+    def interface_descriptions(self):
+        """Gets the interface_descriptions of this AefProfile.
+
+        Interface details  # noqa: E501
+
+        :return: The interface_descriptions of this AefProfile.
+        :rtype: List[InterfaceDescription]
+        """
+        return self._interface_descriptions
+
+    @interface_descriptions.setter
+    def interface_descriptions(self, interface_descriptions):
+        """Sets the interface_descriptions of this AefProfile.
+
+        Interface details  # noqa: E501
+
+        :param interface_descriptions: The interface_descriptions of this AefProfile.
+        :type interface_descriptions: List[InterfaceDescription]
+        """
+        if interface_descriptions is not None and len(interface_descriptions) < 1:
+            raise ValueError("Invalid value for `interface_descriptions`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._interface_descriptions = interface_descriptions
diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/api_invoker_enrolment_details.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/api_invoker_enrolment_details.py
new file mode 100644
index 0000000000000000000000000000000000000000..b7667b5305f7992a9497fdb2f43ee54fa020391d
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/api_invoker_enrolment_details.py
@@ -0,0 +1,271 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from api_invoker_management.models.base_model_ import Model
+from api_invoker_management import util
+
+from api_invoker_management.models.onboarding_information import OnboardingInformation  # noqa: E501
+from api_invoker_management.models.service_api_description import ServiceAPIDescription  # noqa: E501
+from api_invoker_management.models.websock_notif_config import WebsockNotifConfig  # noqa: E501
+import re  # noqa: E501
+
+
+class APIInvokerEnrolmentDetails(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, api_invoker_id=None, onboarding_information=None, notification_destination=None, request_test_notification=None, websock_notif_config=None, api_list=None, api_invoker_information=None, supported_features=None):  # noqa: E501
+        """APIInvokerEnrolmentDetails - a model defined in OpenAPI
+
+        :param api_invoker_id: The api_invoker_id of this APIInvokerEnrolmentDetails.  # noqa: E501
+        :type api_invoker_id: str
+        :param onboarding_information: The onboarding_information of this APIInvokerEnrolmentDetails.  # noqa: E501
+        :type onboarding_information: OnboardingInformation
+        :param notification_destination: The notification_destination of this APIInvokerEnrolmentDetails.  # noqa: E501
+        :type notification_destination: str
+        :param request_test_notification: The request_test_notification of this APIInvokerEnrolmentDetails.  # noqa: E501
+        :type request_test_notification: bool
+        :param websock_notif_config: The websock_notif_config of this APIInvokerEnrolmentDetails.  # noqa: E501
+        :type websock_notif_config: WebsockNotifConfig
+        :param api_list: The api_list of this APIInvokerEnrolmentDetails.  # noqa: E501
+        :type api_list: List[ServiceAPIDescription]
+        :param api_invoker_information: The api_invoker_information of this APIInvokerEnrolmentDetails.  # noqa: E501
+        :type api_invoker_information: str
+        :param supported_features: The supported_features of this APIInvokerEnrolmentDetails.  # noqa: E501
+        :type supported_features: str
+        """
+        self.openapi_types = {
+            'api_invoker_id': str,
+            'onboarding_information': OnboardingInformation,
+            'notification_destination': str,
+            'request_test_notification': bool,
+            'websock_notif_config': WebsockNotifConfig,
+            'api_list': List[ServiceAPIDescription],
+            'api_invoker_information': str,
+            'supported_features': str
+        }
+
+        self.attribute_map = {
+            'api_invoker_id': 'apiInvokerId',
+            'onboarding_information': 'onboardingInformation',
+            'notification_destination': 'notificationDestination',
+            'request_test_notification': 'requestTestNotification',
+            'websock_notif_config': 'websockNotifConfig',
+            'api_list': 'apiList',
+            'api_invoker_information': 'apiInvokerInformation',
+            'supported_features': 'supportedFeatures'
+        }
+
+        self._api_invoker_id = api_invoker_id
+        self._onboarding_information = onboarding_information
+        self._notification_destination = notification_destination
+        self._request_test_notification = request_test_notification
+        self._websock_notif_config = websock_notif_config
+        self._api_list = api_list
+        self._api_invoker_information = api_invoker_information
+        self._supported_features = supported_features
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'APIInvokerEnrolmentDetails':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The APIInvokerEnrolmentDetails of this APIInvokerEnrolmentDetails.  # noqa: E501
+        :rtype: APIInvokerEnrolmentDetails
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def api_invoker_id(self):
+        """Gets the api_invoker_id of this APIInvokerEnrolmentDetails.
+
+        API invoker ID assigned by the CAPIF core function to the API invoker while on-boarding the API invoker. Shall not be present in the HTTP POST request from the API invoker to the CAPIF core function, to on-board itself. Shall be present in all other HTTP requests and responses.  # noqa: E501
+
+        :return: The api_invoker_id of this APIInvokerEnrolmentDetails.
+        :rtype: str
+        """
+        return self._api_invoker_id
+
+    @api_invoker_id.setter
+    def api_invoker_id(self, api_invoker_id):
+        """Sets the api_invoker_id of this APIInvokerEnrolmentDetails.
+
+        API invoker ID assigned by the CAPIF core function to the API invoker while on-boarding the API invoker. Shall not be present in the HTTP POST request from the API invoker to the CAPIF core function, to on-board itself. Shall be present in all other HTTP requests and responses.  # noqa: E501
+
+        :param api_invoker_id: The api_invoker_id of this APIInvokerEnrolmentDetails.
+        :type api_invoker_id: str
+        """
+
+        self._api_invoker_id = api_invoker_id
+
+    @property
+    def onboarding_information(self):
+        """Gets the onboarding_information of this APIInvokerEnrolmentDetails.
+
+
+        :return: The onboarding_information of this APIInvokerEnrolmentDetails.
+        :rtype: OnboardingInformation
+        """
+        return self._onboarding_information
+
+    @onboarding_information.setter
+    def onboarding_information(self, onboarding_information):
+        """Sets the onboarding_information of this APIInvokerEnrolmentDetails.
+
+
+        :param onboarding_information: The onboarding_information of this APIInvokerEnrolmentDetails.
+        :type onboarding_information: OnboardingInformation
+        """
+        if onboarding_information is None:
+            raise ValueError("Invalid value for `onboarding_information`, must not be `None`")  # noqa: E501
+
+        self._onboarding_information = onboarding_information
+
+    @property
+    def notification_destination(self):
+        """Gets the notification_destination of this APIInvokerEnrolmentDetails.
+
+        string providing an URI formatted according to IETF RFC 3986.  # noqa: E501
+
+        :return: The notification_destination of this APIInvokerEnrolmentDetails.
+        :rtype: str
+        """
+        return self._notification_destination
+
+    @notification_destination.setter
+    def notification_destination(self, notification_destination):
+        """Sets the notification_destination of this APIInvokerEnrolmentDetails.
+
+        string providing an URI formatted according to IETF RFC 3986.  # noqa: E501
+
+        :param notification_destination: The notification_destination of this APIInvokerEnrolmentDetails.
+        :type notification_destination: str
+        """
+        if notification_destination is None:
+            raise ValueError("Invalid value for `notification_destination`, must not be `None`")  # noqa: E501
+
+        self._notification_destination = notification_destination
+
+    @property
+    def request_test_notification(self):
+        """Gets the request_test_notification of this APIInvokerEnrolmentDetails.
+
+        Set to true by Subscriber to request the CAPIF core function to send a test notification as defined in in subclause 7.6. Set to false or omitted otherwise.  # noqa: E501
+
+        :return: The request_test_notification of this APIInvokerEnrolmentDetails.
+        :rtype: bool
+        """
+        return self._request_test_notification
+
+    @request_test_notification.setter
+    def request_test_notification(self, request_test_notification):
+        """Sets the request_test_notification of this APIInvokerEnrolmentDetails.
+
+        Set to true by Subscriber to request the CAPIF core function to send a test notification as defined in in subclause 7.6. Set to false or omitted otherwise.  # noqa: E501
+
+        :param request_test_notification: The request_test_notification of this APIInvokerEnrolmentDetails.
+        :type request_test_notification: bool
+        """
+
+        self._request_test_notification = request_test_notification
+
+    @property
+    def websock_notif_config(self):
+        """Gets the websock_notif_config of this APIInvokerEnrolmentDetails.
+
+
+        :return: The websock_notif_config of this APIInvokerEnrolmentDetails.
+        :rtype: WebsockNotifConfig
+        """
+        return self._websock_notif_config
+
+    @websock_notif_config.setter
+    def websock_notif_config(self, websock_notif_config):
+        """Sets the websock_notif_config of this APIInvokerEnrolmentDetails.
+
+
+        :param websock_notif_config: The websock_notif_config of this APIInvokerEnrolmentDetails.
+        :type websock_notif_config: WebsockNotifConfig
+        """
+
+        self._websock_notif_config = websock_notif_config
+
+    @property
+    def api_list(self):
+        """Gets the api_list of this APIInvokerEnrolmentDetails.
+
+        The list of service APIs that the API Invoker is allowed to invoke  # noqa: E501
+
+        :return: The api_list of this APIInvokerEnrolmentDetails.
+        :rtype: List[ServiceAPIDescription]
+        """
+        return self._api_list
+
+    @api_list.setter
+    def api_list(self, api_list):
+        """Sets the api_list of this APIInvokerEnrolmentDetails.
+
+        The list of service APIs that the API Invoker is allowed to invoke  # noqa: E501
+
+        :param api_list: The api_list of this APIInvokerEnrolmentDetails.
+        :type api_list: List[ServiceAPIDescription]
+        """
+        if api_list is not None and len(api_list) < 1:
+            raise ValueError("Invalid value for `api_list`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._api_list = api_list
+
+    @property
+    def api_invoker_information(self):
+        """Gets the api_invoker_information of this APIInvokerEnrolmentDetails.
+
+        Generic information related to the API invoker such as details of the device or the application.  # noqa: E501
+
+        :return: The api_invoker_information of this APIInvokerEnrolmentDetails.
+        :rtype: str
+        """
+        return self._api_invoker_information
+
+    @api_invoker_information.setter
+    def api_invoker_information(self, api_invoker_information):
+        """Sets the api_invoker_information of this APIInvokerEnrolmentDetails.
+
+        Generic information related to the API invoker such as details of the device or the application.  # noqa: E501
+
+        :param api_invoker_information: The api_invoker_information of this APIInvokerEnrolmentDetails.
+        :type api_invoker_information: str
+        """
+
+        self._api_invoker_information = api_invoker_information
+
+    @property
+    def supported_features(self):
+        """Gets the supported_features of this APIInvokerEnrolmentDetails.
+
+        A string used to indicate the features supported by an API that is used as defined in clause 6.6 in 3GPP TS 29.500. The string shall contain a bitmask indicating supported features in hexadecimal representation Each character in the string shall take a value of \"0\" to \"9\", \"a\" to \"f\" or \"A\" to \"F\" and shall represent the support of 4 features as described in table 5.2.2-3. The most significant character representing the highest-numbered features shall appear first in the string, and the character representing features 1 to 4 shall appear last in the string. The list of features and their numbering (starting with 1) are defined separately for each API. If the string contains a lower number of characters than there are defined features for an API, all features that would be represented by characters that are not present in the string are not supported  # noqa: E501
+
+        :return: The supported_features of this APIInvokerEnrolmentDetails.
+        :rtype: str
+        """
+        return self._supported_features
+
+    @supported_features.setter
+    def supported_features(self, supported_features):
+        """Sets the supported_features of this APIInvokerEnrolmentDetails.
+
+        A string used to indicate the features supported by an API that is used as defined in clause 6.6 in 3GPP TS 29.500. The string shall contain a bitmask indicating supported features in hexadecimal representation Each character in the string shall take a value of \"0\" to \"9\", \"a\" to \"f\" or \"A\" to \"F\" and shall represent the support of 4 features as described in table 5.2.2-3. The most significant character representing the highest-numbered features shall appear first in the string, and the character representing features 1 to 4 shall appear last in the string. The list of features and their numbering (starting with 1) are defined separately for each API. If the string contains a lower number of characters than there are defined features for an API, all features that would be represented by characters that are not present in the string are not supported  # noqa: E501
+
+        :param supported_features: The supported_features of this APIInvokerEnrolmentDetails.
+        :type supported_features: str
+        """
+        if supported_features is not None and not re.search(r'^[A-Fa-f0-9]*$', supported_features):  # noqa: E501
+            raise ValueError("Invalid value for `supported_features`, must be a follow pattern or equal to `/^[A-Fa-f0-9]*$/`")  # noqa: E501
+
+        self._supported_features = supported_features
diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/base_model_.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/base_model_.py
new file mode 100644
index 0000000000000000000000000000000000000000..5b0ea2f02325d69c4c325b915147e0bacd818dc8
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/base_model_.py
@@ -0,0 +1,69 @@
+import pprint
+
+import six
+import typing
+
+from api_invoker_management import util
+
+T = typing.TypeVar('T')
+
+
+class Model(object):
+    # openapiTypes: The key is attribute name and the
+    # value is attribute type.
+    openapi_types = {}
+
+    # attributeMap: The key is attribute name and the
+    # value is json key in definition.
+    attribute_map = {}
+
+    @classmethod
+    def from_dict(cls: typing.Type[T], dikt) -> T:
+        """Returns the dict as a model"""
+        return util.deserialize_model(dikt, cls)
+
+    def to_dict(self):
+        """Returns the model properties as a dict
+
+        :rtype: dict
+        """
+        result = {}
+
+        for attr, _ in six.iteritems(self.openapi_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model
+
+        :rtype: str
+        """
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/communication_type.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/communication_type.py
new file mode 100644
index 0000000000000000000000000000000000000000..48e559c2cf651aa97b44ec8fef76623a20c41705
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/communication_type.py
@@ -0,0 +1,39 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from api_invoker_management.models.base_model_ import Model
+from api_invoker_management.models.communication_type_any_of import CommunicationTypeAnyOf
+from api_invoker_management import util
+
+from api_invoker_management.models.communication_type_any_of import CommunicationTypeAnyOf  # noqa: E501
+
+class CommunicationType(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self):  # noqa: E501
+        """CommunicationType - a model defined in OpenAPI
+
+        """
+        self.openapi_types = {
+        }
+
+        self.attribute_map = {
+        }
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'CommunicationType':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The CommunicationType of this CommunicationType.  # noqa: E501
+        :rtype: CommunicationType
+        """
+        return util.deserialize_model(dikt, cls)
diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/communication_type_any_of.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/communication_type_any_of.py
new file mode 100644
index 0000000000000000000000000000000000000000..461a002acf4838d1a1f4b68c772cb0efd63c6e8a
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/communication_type_any_of.py
@@ -0,0 +1,42 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from api_invoker_management.models.base_model_ import Model
+from api_invoker_management import util
+
+
+class CommunicationTypeAnyOf(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    """
+    allowed enum values
+    """
+    REQUEST_RESPONSE = "REQUEST_RESPONSE"
+    SUBSCRIBE_NOTIFY = "SUBSCRIBE_NOTIFY"
+    def __init__(self):  # noqa: E501
+        """CommunicationTypeAnyOf - a model defined in OpenAPI
+
+        """
+        self.openapi_types = {
+        }
+
+        self.attribute_map = {
+        }
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'CommunicationTypeAnyOf':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The CommunicationType_anyOf of this CommunicationTypeAnyOf.  # noqa: E501
+        :rtype: CommunicationTypeAnyOf
+        """
+        return util.deserialize_model(dikt, cls)
diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/custom_operation.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/custom_operation.py
new file mode 100644
index 0000000000000000000000000000000000000000..5663c98c162751b3a9cf4f5bd8e91a783ed24bda
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/custom_operation.py
@@ -0,0 +1,158 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from api_invoker_management.models.base_model_ import Model
+from api_invoker_management.models.communication_type import CommunicationType
+from api_invoker_management.models.operation import Operation
+from api_invoker_management import util
+
+from api_invoker_management.models.communication_type import CommunicationType  # noqa: E501
+from api_invoker_management.models.operation import Operation  # noqa: E501
+
+class CustomOperation(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, comm_type=None, cust_op_name=None, operations=None, description=None):  # noqa: E501
+        """CustomOperation - a model defined in OpenAPI
+
+        :param comm_type: The comm_type of this CustomOperation.  # noqa: E501
+        :type comm_type: CommunicationType
+        :param cust_op_name: The cust_op_name of this CustomOperation.  # noqa: E501
+        :type cust_op_name: str
+        :param operations: The operations of this CustomOperation.  # noqa: E501
+        :type operations: List[Operation]
+        :param description: The description of this CustomOperation.  # noqa: E501
+        :type description: str
+        """
+        self.openapi_types = {
+            'comm_type': CommunicationType,
+            'cust_op_name': str,
+            'operations': List[Operation],
+            'description': str
+        }
+
+        self.attribute_map = {
+            'comm_type': 'commType',
+            'cust_op_name': 'custOpName',
+            'operations': 'operations',
+            'description': 'description'
+        }
+
+        self._comm_type = comm_type
+        self._cust_op_name = cust_op_name
+        self._operations = operations
+        self._description = description
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'CustomOperation':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The CustomOperation of this CustomOperation.  # noqa: E501
+        :rtype: CustomOperation
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def comm_type(self):
+        """Gets the comm_type of this CustomOperation.
+
+
+        :return: The comm_type of this CustomOperation.
+        :rtype: CommunicationType
+        """
+        return self._comm_type
+
+    @comm_type.setter
+    def comm_type(self, comm_type):
+        """Sets the comm_type of this CustomOperation.
+
+
+        :param comm_type: The comm_type of this CustomOperation.
+        :type comm_type: CommunicationType
+        """
+        if comm_type is None:
+            raise ValueError("Invalid value for `comm_type`, must not be `None`")  # noqa: E501
+
+        self._comm_type = comm_type
+
+    @property
+    def cust_op_name(self):
+        """Gets the cust_op_name of this CustomOperation.
+
+        it is set as {custOpName} part of the URI structure for a custom operation without resource association as defined in subclause 4.4 of 3GPP TS 29.501.  # noqa: E501
+
+        :return: The cust_op_name of this CustomOperation.
+        :rtype: str
+        """
+        return self._cust_op_name
+
+    @cust_op_name.setter
+    def cust_op_name(self, cust_op_name):
+        """Sets the cust_op_name of this CustomOperation.
+
+        it is set as {custOpName} part of the URI structure for a custom operation without resource association as defined in subclause 4.4 of 3GPP TS 29.501.  # noqa: E501
+
+        :param cust_op_name: The cust_op_name of this CustomOperation.
+        :type cust_op_name: str
+        """
+        if cust_op_name is None:
+            raise ValueError("Invalid value for `cust_op_name`, must not be `None`")  # noqa: E501
+
+        self._cust_op_name = cust_op_name
+
+    @property
+    def operations(self):
+        """Gets the operations of this CustomOperation.
+
+        Supported HTTP methods for the API resource. Only applicable when the protocol in AefProfile indicates HTTP.  # noqa: E501
+
+        :return: The operations of this CustomOperation.
+        :rtype: List[Operation]
+        """
+        return self._operations
+
+    @operations.setter
+    def operations(self, operations):
+        """Sets the operations of this CustomOperation.
+
+        Supported HTTP methods for the API resource. Only applicable when the protocol in AefProfile indicates HTTP.  # noqa: E501
+
+        :param operations: The operations of this CustomOperation.
+        :type operations: List[Operation]
+        """
+        if operations is not None and len(operations) < 1:
+            raise ValueError("Invalid value for `operations`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._operations = operations
+
+    @property
+    def description(self):
+        """Gets the description of this CustomOperation.
+
+        Text description of the custom operation  # noqa: E501
+
+        :return: The description of this CustomOperation.
+        :rtype: str
+        """
+        return self._description
+
+    @description.setter
+    def description(self, description):
+        """Sets the description of this CustomOperation.
+
+        Text description of the custom operation  # noqa: E501
+
+        :param description: The description of this CustomOperation.
+        :type description: str
+        """
+
+        self._description = description
diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/data_format.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/data_format.py
new file mode 100644
index 0000000000000000000000000000000000000000..c8ed3beefabcdb8b4193971d961d5053d37a49ba
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/data_format.py
@@ -0,0 +1,39 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from api_invoker_management.models.base_model_ import Model
+from api_invoker_management.models.data_format_any_of import DataFormatAnyOf
+from api_invoker_management import util
+
+from api_invoker_management.models.data_format_any_of import DataFormatAnyOf  # noqa: E501
+
+class DataFormat(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self):  # noqa: E501
+        """DataFormat - a model defined in OpenAPI
+
+        """
+        self.openapi_types = {
+        }
+
+        self.attribute_map = {
+        }
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'DataFormat':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The DataFormat of this DataFormat.  # noqa: E501
+        :rtype: DataFormat
+        """
+        return util.deserialize_model(dikt, cls)
diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/data_format_any_of.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/data_format_any_of.py
new file mode 100644
index 0000000000000000000000000000000000000000..a022aab149daaa87ac8d4bf442629f4464ed38c2
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/data_format_any_of.py
@@ -0,0 +1,41 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from api_invoker_management.models.base_model_ import Model
+from api_invoker_management import util
+
+
+class DataFormatAnyOf(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    """
+    allowed enum values
+    """
+    JSON = "JSON"
+    def __init__(self):  # noqa: E501
+        """DataFormatAnyOf - a model defined in OpenAPI
+
+        """
+        self.openapi_types = {
+        }
+
+        self.attribute_map = {
+        }
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'DataFormatAnyOf':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The DataFormat_anyOf of this DataFormatAnyOf.  # noqa: E501
+        :rtype: DataFormatAnyOf
+        """
+        return util.deserialize_model(dikt, cls)
diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/interface_description.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/interface_description.py
new file mode 100644
index 0000000000000000000000000000000000000000..1e0050bf2319d28e41d59cbbd8774d40e1068576
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/interface_description.py
@@ -0,0 +1,158 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from api_invoker_management.models.base_model_ import Model
+from api_invoker_management.models.security_method import SecurityMethod
+from api_invoker_management import util
+
+from api_invoker_management.models.security_method import SecurityMethod  # noqa: E501
+
+class InterfaceDescription(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, ipv4_addr=None, ipv6_addr=None, port=None, security_methods=None):  # noqa: E501
+        """InterfaceDescription - a model defined in OpenAPI
+
+        :param ipv4_addr: The ipv4_addr of this InterfaceDescription.  # noqa: E501
+        :type ipv4_addr: str
+        :param ipv6_addr: The ipv6_addr of this InterfaceDescription.  # noqa: E501
+        :type ipv6_addr: str
+        :param port: The port of this InterfaceDescription.  # noqa: E501
+        :type port: int
+        :param security_methods: The security_methods of this InterfaceDescription.  # noqa: E501
+        :type security_methods: List[SecurityMethod]
+        """
+        self.openapi_types = {
+            'ipv4_addr': str,
+            'ipv6_addr': str,
+            'port': int,
+            'security_methods': List[SecurityMethod]
+        }
+
+        self.attribute_map = {
+            'ipv4_addr': 'ipv4Addr',
+            'ipv6_addr': 'ipv6Addr',
+            'port': 'port',
+            'security_methods': 'securityMethods'
+        }
+
+        self._ipv4_addr = ipv4_addr
+        self._ipv6_addr = ipv6_addr
+        self._port = port
+        self._security_methods = security_methods
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'InterfaceDescription':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The InterfaceDescription of this InterfaceDescription.  # noqa: E501
+        :rtype: InterfaceDescription
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def ipv4_addr(self):
+        """Gets the ipv4_addr of this InterfaceDescription.
+
+        string identifying a Ipv4 address formatted in the \"dotted decimal\" notation as defined in IETF RFC 1166.  # noqa: E501
+
+        :return: The ipv4_addr of this InterfaceDescription.
+        :rtype: str
+        """
+        return self._ipv4_addr
+
+    @ipv4_addr.setter
+    def ipv4_addr(self, ipv4_addr):
+        """Sets the ipv4_addr of this InterfaceDescription.
+
+        string identifying a Ipv4 address formatted in the \"dotted decimal\" notation as defined in IETF RFC 1166.  # noqa: E501
+
+        :param ipv4_addr: The ipv4_addr of this InterfaceDescription.
+        :type ipv4_addr: str
+        """
+
+        self._ipv4_addr = ipv4_addr
+
+    @property
+    def ipv6_addr(self):
+        """Gets the ipv6_addr of this InterfaceDescription.
+
+        string identifying a Ipv6 address formatted according to clause 4 in IETF RFC 5952. The mixed Ipv4 Ipv6 notation according to clause 5 of IETF RFC 5952 shall not be used.  # noqa: E501
+
+        :return: The ipv6_addr of this InterfaceDescription.
+        :rtype: str
+        """
+        return self._ipv6_addr
+
+    @ipv6_addr.setter
+    def ipv6_addr(self, ipv6_addr):
+        """Sets the ipv6_addr of this InterfaceDescription.
+
+        string identifying a Ipv6 address formatted according to clause 4 in IETF RFC 5952. The mixed Ipv4 Ipv6 notation according to clause 5 of IETF RFC 5952 shall not be used.  # noqa: E501
+
+        :param ipv6_addr: The ipv6_addr of this InterfaceDescription.
+        :type ipv6_addr: str
+        """
+
+        self._ipv6_addr = ipv6_addr
+
+    @property
+    def port(self):
+        """Gets the port of this InterfaceDescription.
+
+        Unsigned integer with valid values between 0 and 65535.  # noqa: E501
+
+        :return: The port of this InterfaceDescription.
+        :rtype: int
+        """
+        return self._port
+
+    @port.setter
+    def port(self, port):
+        """Sets the port of this InterfaceDescription.
+
+        Unsigned integer with valid values between 0 and 65535.  # noqa: E501
+
+        :param port: The port of this InterfaceDescription.
+        :type port: int
+        """
+        if port is not None and port > 65535:  # noqa: E501
+            raise ValueError("Invalid value for `port`, must be a value less than or equal to `65535`")  # noqa: E501
+        if port is not None and port < 0:  # noqa: E501
+            raise ValueError("Invalid value for `port`, must be a value greater than or equal to `0`")  # noqa: E501
+
+        self._port = port
+
+    @property
+    def security_methods(self):
+        """Gets the security_methods of this InterfaceDescription.
+
+        Security methods supported by the interface, it take precedence over the security methods provided in AefProfile, for this specific interface.  # noqa: E501
+
+        :return: The security_methods of this InterfaceDescription.
+        :rtype: List[SecurityMethod]
+        """
+        return self._security_methods
+
+    @security_methods.setter
+    def security_methods(self, security_methods):
+        """Sets the security_methods of this InterfaceDescription.
+
+        Security methods supported by the interface, it take precedence over the security methods provided in AefProfile, for this specific interface.  # noqa: E501
+
+        :param security_methods: The security_methods of this InterfaceDescription.
+        :type security_methods: List[SecurityMethod]
+        """
+        if security_methods is not None and len(security_methods) < 1:
+            raise ValueError("Invalid value for `security_methods`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._security_methods = security_methods
diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/invalid_param.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/invalid_param.py
new file mode 100644
index 0000000000000000000000000000000000000000..1fa0f4c341232cf077cb42cd89748bd83ea856e7
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/invalid_param.py
@@ -0,0 +1,96 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from api_invoker_management.models.base_model_ import Model
+from api_invoker_management import util
+
+
+class InvalidParam(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, param=None, reason=None):  # noqa: E501
+        """InvalidParam - a model defined in OpenAPI
+
+        :param param: The param of this InvalidParam.  # noqa: E501
+        :type param: str
+        :param reason: The reason of this InvalidParam.  # noqa: E501
+        :type reason: str
+        """
+        self.openapi_types = {
+            'param': str,
+            'reason': str
+        }
+
+        self.attribute_map = {
+            'param': 'param',
+            'reason': 'reason'
+        }
+
+        self._param = param
+        self._reason = reason
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'InvalidParam':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The InvalidParam of this InvalidParam.  # noqa: E501
+        :rtype: InvalidParam
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def param(self):
+        """Gets the param of this InvalidParam.
+
+        Attribute's name encoded as a JSON Pointer, or header's name.  # noqa: E501
+
+        :return: The param of this InvalidParam.
+        :rtype: str
+        """
+        return self._param
+
+    @param.setter
+    def param(self, param):
+        """Sets the param of this InvalidParam.
+
+        Attribute's name encoded as a JSON Pointer, or header's name.  # noqa: E501
+
+        :param param: The param of this InvalidParam.
+        :type param: str
+        """
+        if param is None:
+            raise ValueError("Invalid value for `param`, must not be `None`")  # noqa: E501
+
+        self._param = param
+
+    @property
+    def reason(self):
+        """Gets the reason of this InvalidParam.
+
+        A human-readable reason, e.g. \"must be a positive integer\".  # noqa: E501
+
+        :return: The reason of this InvalidParam.
+        :rtype: str
+        """
+        return self._reason
+
+    @reason.setter
+    def reason(self, reason):
+        """Sets the reason of this InvalidParam.
+
+        A human-readable reason, e.g. \"must be a positive integer\".  # noqa: E501
+
+        :param reason: The reason of this InvalidParam.
+        :type reason: str
+        """
+
+        self._reason = reason
diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/onboarding_information.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/onboarding_information.py
new file mode 100644
index 0000000000000000000000000000000000000000..17b8de0cc5cea56ab477174c067d79960f1d5e1f
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/onboarding_information.py
@@ -0,0 +1,124 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from api_invoker_management.models.base_model_ import Model
+from api_invoker_management import util
+
+
+class OnboardingInformation(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, api_invoker_public_key=None, api_invoker_certificate=None, onboarding_secret=None):  # noqa: E501
+        """OnboardingInformation - a model defined in OpenAPI
+
+        :param api_invoker_public_key: The api_invoker_public_key of this OnboardingInformation.  # noqa: E501
+        :type api_invoker_public_key: str
+        :param api_invoker_certificate: The api_invoker_certificate of this OnboardingInformation.  # noqa: E501
+        :type api_invoker_certificate: str
+        :param onboarding_secret: The onboarding_secret of this OnboardingInformation.  # noqa: E501
+        :type onboarding_secret: str
+        """
+        self.openapi_types = {
+            'api_invoker_public_key': str,
+            'api_invoker_certificate': str,
+            'onboarding_secret': str
+        }
+
+        self.attribute_map = {
+            'api_invoker_public_key': 'apiInvokerPublicKey',
+            'api_invoker_certificate': 'apiInvokerCertificate',
+            'onboarding_secret': 'onboardingSecret'
+        }
+
+        self._api_invoker_public_key = api_invoker_public_key
+        self._api_invoker_certificate = api_invoker_certificate
+        self._onboarding_secret = onboarding_secret
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'OnboardingInformation':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The OnboardingInformation of this OnboardingInformation.  # noqa: E501
+        :rtype: OnboardingInformation
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def api_invoker_public_key(self):
+        """Gets the api_invoker_public_key of this OnboardingInformation.
+
+        The API Invoker’s public key  # noqa: E501
+
+        :return: The api_invoker_public_key of this OnboardingInformation.
+        :rtype: str
+        """
+        return self._api_invoker_public_key
+
+    @api_invoker_public_key.setter
+    def api_invoker_public_key(self, api_invoker_public_key):
+        """Sets the api_invoker_public_key of this OnboardingInformation.
+
+        The API Invoker’s public key  # noqa: E501
+
+        :param api_invoker_public_key: The api_invoker_public_key of this OnboardingInformation.
+        :type api_invoker_public_key: str
+        """
+        if api_invoker_public_key is None:
+            raise ValueError("Invalid value for `api_invoker_public_key`, must not be `None`")  # noqa: E501
+
+        self._api_invoker_public_key = api_invoker_public_key
+
+    @property
+    def api_invoker_certificate(self):
+        """Gets the api_invoker_certificate of this OnboardingInformation.
+
+        The API Invoker’s generic client certificate, provided by the CAPIF core function.  # noqa: E501
+
+        :return: The api_invoker_certificate of this OnboardingInformation.
+        :rtype: str
+        """
+        return self._api_invoker_certificate
+
+    @api_invoker_certificate.setter
+    def api_invoker_certificate(self, api_invoker_certificate):
+        """Sets the api_invoker_certificate of this OnboardingInformation.
+
+        The API Invoker’s generic client certificate, provided by the CAPIF core function.  # noqa: E501
+
+        :param api_invoker_certificate: The api_invoker_certificate of this OnboardingInformation.
+        :type api_invoker_certificate: str
+        """
+
+        self._api_invoker_certificate = api_invoker_certificate
+
+    @property
+    def onboarding_secret(self):
+        """Gets the onboarding_secret of this OnboardingInformation.
+
+        The API Invoker’s onboarding secret, provided by the CAPIF core function.  # noqa: E501
+
+        :return: The onboarding_secret of this OnboardingInformation.
+        :rtype: str
+        """
+        return self._onboarding_secret
+
+    @onboarding_secret.setter
+    def onboarding_secret(self, onboarding_secret):
+        """Sets the onboarding_secret of this OnboardingInformation.
+
+        The API Invoker’s onboarding secret, provided by the CAPIF core function.  # noqa: E501
+
+        :param onboarding_secret: The onboarding_secret of this OnboardingInformation.
+        :type onboarding_secret: str
+        """
+
+        self._onboarding_secret = onboarding_secret
diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/onboarding_notification.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/onboarding_notification.py
new file mode 100644
index 0000000000000000000000000000000000000000..09a99cf6876b23c6dcb89062d68e461bd377deb1
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/onboarding_notification.py
@@ -0,0 +1,156 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from api_invoker_management.models.base_model_ import Model
+from api_invoker_management.models.api_invoker_enrolment_details import APIInvokerEnrolmentDetails
+from api_invoker_management.models.service_api_description import ServiceAPIDescription
+from api_invoker_management import util
+
+from api_invoker_management.models.api_invoker_enrolment_details import APIInvokerEnrolmentDetails  # noqa: E501
+from api_invoker_management.models.service_api_description import ServiceAPIDescription  # noqa: E501
+
+class OnboardingNotification(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, result=None, resource_location=None, api_invoker_enrolment_details=None, api_list=None):  # noqa: E501
+        """OnboardingNotification - a model defined in OpenAPI
+
+        :param result: The result of this OnboardingNotification.  # noqa: E501
+        :type result: bool
+        :param resource_location: The resource_location of this OnboardingNotification.  # noqa: E501
+        :type resource_location: str
+        :param api_invoker_enrolment_details: The api_invoker_enrolment_details of this OnboardingNotification.  # noqa: E501
+        :type api_invoker_enrolment_details: APIInvokerEnrolmentDetails
+        :param api_list: The api_list of this OnboardingNotification.  # noqa: E501
+        :type api_list: List[ServiceAPIDescription]
+        """
+        self.openapi_types = {
+            'result': bool,
+            'resource_location': str,
+            'api_invoker_enrolment_details': APIInvokerEnrolmentDetails,
+            'api_list': List[ServiceAPIDescription]
+        }
+
+        self.attribute_map = {
+            'result': 'result',
+            'resource_location': 'resourceLocation',
+            'api_invoker_enrolment_details': 'apiInvokerEnrolmentDetails',
+            'api_list': 'apiList'
+        }
+
+        self._result = result
+        self._resource_location = resource_location
+        self._api_invoker_enrolment_details = api_invoker_enrolment_details
+        self._api_list = api_list
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'OnboardingNotification':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The OnboardingNotification of this OnboardingNotification.  # noqa: E501
+        :rtype: OnboardingNotification
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def result(self):
+        """Gets the result of this OnboardingNotification.
+
+        Set to \"true\" indicate successful on-boarding. Otherwise set to \"false\"  # noqa: E501
+
+        :return: The result of this OnboardingNotification.
+        :rtype: bool
+        """
+        return self._result
+
+    @result.setter
+    def result(self, result):
+        """Sets the result of this OnboardingNotification.
+
+        Set to \"true\" indicate successful on-boarding. Otherwise set to \"false\"  # noqa: E501
+
+        :param result: The result of this OnboardingNotification.
+        :type result: bool
+        """
+        if result is None:
+            raise ValueError("Invalid value for `result`, must not be `None`")  # noqa: E501
+
+        self._result = result
+
+    @property
+    def resource_location(self):
+        """Gets the resource_location of this OnboardingNotification.
+
+        string providing an URI formatted according to IETF RFC 3986.  # noqa: E501
+
+        :return: The resource_location of this OnboardingNotification.
+        :rtype: str
+        """
+        return self._resource_location
+
+    @resource_location.setter
+    def resource_location(self, resource_location):
+        """Sets the resource_location of this OnboardingNotification.
+
+        string providing an URI formatted according to IETF RFC 3986.  # noqa: E501
+
+        :param resource_location: The resource_location of this OnboardingNotification.
+        :type resource_location: str
+        """
+
+        self._resource_location = resource_location
+
+    @property
+    def api_invoker_enrolment_details(self):
+        """Gets the api_invoker_enrolment_details of this OnboardingNotification.
+
+
+        :return: The api_invoker_enrolment_details of this OnboardingNotification.
+        :rtype: APIInvokerEnrolmentDetails
+        """
+        return self._api_invoker_enrolment_details
+
+    @api_invoker_enrolment_details.setter
+    def api_invoker_enrolment_details(self, api_invoker_enrolment_details):
+        """Sets the api_invoker_enrolment_details of this OnboardingNotification.
+
+
+        :param api_invoker_enrolment_details: The api_invoker_enrolment_details of this OnboardingNotification.
+        :type api_invoker_enrolment_details: APIInvokerEnrolmentDetails
+        """
+
+        self._api_invoker_enrolment_details = api_invoker_enrolment_details
+
+    @property
+    def api_list(self):
+        """Gets the api_list of this OnboardingNotification.
+
+        The list of service APIs that the API Invoker is allowed to invoke  # noqa: E501
+
+        :return: The api_list of this OnboardingNotification.
+        :rtype: List[ServiceAPIDescription]
+        """
+        return self._api_list
+
+    @api_list.setter
+    def api_list(self, api_list):
+        """Sets the api_list of this OnboardingNotification.
+
+        The list of service APIs that the API Invoker is allowed to invoke  # noqa: E501
+
+        :param api_list: The api_list of this OnboardingNotification.
+        :type api_list: List[ServiceAPIDescription]
+        """
+        if api_list is not None and len(api_list) < 1:
+            raise ValueError("Invalid value for `api_list`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._api_list = api_list
diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/operation.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/operation.py
new file mode 100644
index 0000000000000000000000000000000000000000..620d6a8c5bc4330af08abb3d8c2ffe19876c0359
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/operation.py
@@ -0,0 +1,39 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from api_invoker_management.models.base_model_ import Model
+from api_invoker_management.models.operation_any_of import OperationAnyOf
+from api_invoker_management import util
+
+from api_invoker_management.models.operation_any_of import OperationAnyOf  # noqa: E501
+
+class Operation(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self):  # noqa: E501
+        """Operation - a model defined in OpenAPI
+
+        """
+        self.openapi_types = {
+        }
+
+        self.attribute_map = {
+        }
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'Operation':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The Operation of this Operation.  # noqa: E501
+        :rtype: Operation
+        """
+        return util.deserialize_model(dikt, cls)
diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/operation_any_of.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/operation_any_of.py
new file mode 100644
index 0000000000000000000000000000000000000000..f3fff37e480d4ec18323aeb476126c27ea8956ad
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/operation_any_of.py
@@ -0,0 +1,45 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from api_invoker_management.models.base_model_ import Model
+from api_invoker_management import util
+
+
+class OperationAnyOf(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    """
+    allowed enum values
+    """
+    GET = "GET"
+    POST = "POST"
+    PUT = "PUT"
+    PATCH = "PATCH"
+    DELETE = "DELETE"
+    def __init__(self):  # noqa: E501
+        """OperationAnyOf - a model defined in OpenAPI
+
+        """
+        self.openapi_types = {
+        }
+
+        self.attribute_map = {
+        }
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'OperationAnyOf':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The Operation_anyOf of this OperationAnyOf.  # noqa: E501
+        :rtype: OperationAnyOf
+        """
+        return util.deserialize_model(dikt, cls)
diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/problem_details.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/problem_details.py
new file mode 100644
index 0000000000000000000000000000000000000000..c28a360726c8d1d8e95150683e71e258aeddf38e
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/problem_details.py
@@ -0,0 +1,270 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from api_invoker_management.models.base_model_ import Model
+from api_invoker_management.models.invalid_param import InvalidParam
+import re
+from api_invoker_management import util
+
+from api_invoker_management.models.invalid_param import InvalidParam  # noqa: E501
+import re  # noqa: E501
+
+class ProblemDetails(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, type=None, title=None, status=None, detail=None, instance=None, cause=None, invalid_params=None, supported_features=None):  # noqa: E501
+        """ProblemDetails - a model defined in OpenAPI
+
+        :param type: The type of this ProblemDetails.  # noqa: E501
+        :type type: str
+        :param title: The title of this ProblemDetails.  # noqa: E501
+        :type title: str
+        :param status: The status of this ProblemDetails.  # noqa: E501
+        :type status: int
+        :param detail: The detail of this ProblemDetails.  # noqa: E501
+        :type detail: str
+        :param instance: The instance of this ProblemDetails.  # noqa: E501
+        :type instance: str
+        :param cause: The cause of this ProblemDetails.  # noqa: E501
+        :type cause: str
+        :param invalid_params: The invalid_params of this ProblemDetails.  # noqa: E501
+        :type invalid_params: List[InvalidParam]
+        :param supported_features: The supported_features of this ProblemDetails.  # noqa: E501
+        :type supported_features: str
+        """
+        self.openapi_types = {
+            'type': str,
+            'title': str,
+            'status': int,
+            'detail': str,
+            'instance': str,
+            'cause': str,
+            'invalid_params': List[InvalidParam],
+            'supported_features': str
+        }
+
+        self.attribute_map = {
+            'type': 'type',
+            'title': 'title',
+            'status': 'status',
+            'detail': 'detail',
+            'instance': 'instance',
+            'cause': 'cause',
+            'invalid_params': 'invalidParams',
+            'supported_features': 'supportedFeatures'
+        }
+
+        self._type = type
+        self._title = title
+        self._status = status
+        self._detail = detail
+        self._instance = instance
+        self._cause = cause
+        self._invalid_params = invalid_params
+        self._supported_features = supported_features
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'ProblemDetails':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The ProblemDetails of this ProblemDetails.  # noqa: E501
+        :rtype: ProblemDetails
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def type(self):
+        """Gets the type of this ProblemDetails.
+
+        string providing an URI formatted according to IETF RFC 3986.  # noqa: E501
+
+        :return: The type of this ProblemDetails.
+        :rtype: str
+        """
+        return self._type
+
+    @type.setter
+    def type(self, type):
+        """Sets the type of this ProblemDetails.
+
+        string providing an URI formatted according to IETF RFC 3986.  # noqa: E501
+
+        :param type: The type of this ProblemDetails.
+        :type type: str
+        """
+
+        self._type = type
+
+    @property
+    def title(self):
+        """Gets the title of this ProblemDetails.
+
+        A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem.  # noqa: E501
+
+        :return: The title of this ProblemDetails.
+        :rtype: str
+        """
+        return self._title
+
+    @title.setter
+    def title(self, title):
+        """Sets the title of this ProblemDetails.
+
+        A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem.  # noqa: E501
+
+        :param title: The title of this ProblemDetails.
+        :type title: str
+        """
+
+        self._title = title
+
+    @property
+    def status(self):
+        """Gets the status of this ProblemDetails.
+
+        The HTTP status code for this occurrence of the problem.  # noqa: E501
+
+        :return: The status of this ProblemDetails.
+        :rtype: int
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """Sets the status of this ProblemDetails.
+
+        The HTTP status code for this occurrence of the problem.  # noqa: E501
+
+        :param status: The status of this ProblemDetails.
+        :type status: int
+        """
+
+        self._status = status
+
+    @property
+    def detail(self):
+        """Gets the detail of this ProblemDetails.
+
+        A human-readable explanation specific to this occurrence of the problem.  # noqa: E501
+
+        :return: The detail of this ProblemDetails.
+        :rtype: str
+        """
+        return self._detail
+
+    @detail.setter
+    def detail(self, detail):
+        """Sets the detail of this ProblemDetails.
+
+        A human-readable explanation specific to this occurrence of the problem.  # noqa: E501
+
+        :param detail: The detail of this ProblemDetails.
+        :type detail: str
+        """
+
+        self._detail = detail
+
+    @property
+    def instance(self):
+        """Gets the instance of this ProblemDetails.
+
+        string providing an URI formatted according to IETF RFC 3986.  # noqa: E501
+
+        :return: The instance of this ProblemDetails.
+        :rtype: str
+        """
+        return self._instance
+
+    @instance.setter
+    def instance(self, instance):
+        """Sets the instance of this ProblemDetails.
+
+        string providing an URI formatted according to IETF RFC 3986.  # noqa: E501
+
+        :param instance: The instance of this ProblemDetails.
+        :type instance: str
+        """
+
+        self._instance = instance
+
+    @property
+    def cause(self):
+        """Gets the cause of this ProblemDetails.
+
+        A machine-readable application error cause specific to this occurrence of the problem. This IE should be present and provide application-related error information, if available.  # noqa: E501
+
+        :return: The cause of this ProblemDetails.
+        :rtype: str
+        """
+        return self._cause
+
+    @cause.setter
+    def cause(self, cause):
+        """Sets the cause of this ProblemDetails.
+
+        A machine-readable application error cause specific to this occurrence of the problem. This IE should be present and provide application-related error information, if available.  # noqa: E501
+
+        :param cause: The cause of this ProblemDetails.
+        :type cause: str
+        """
+
+        self._cause = cause
+
+    @property
+    def invalid_params(self):
+        """Gets the invalid_params of this ProblemDetails.
+
+        Description of invalid parameters, for a request rejected due to invalid parameters.  # noqa: E501
+
+        :return: The invalid_params of this ProblemDetails.
+        :rtype: List[InvalidParam]
+        """
+        return self._invalid_params
+
+    @invalid_params.setter
+    def invalid_params(self, invalid_params):
+        """Sets the invalid_params of this ProblemDetails.
+
+        Description of invalid parameters, for a request rejected due to invalid parameters.  # noqa: E501
+
+        :param invalid_params: The invalid_params of this ProblemDetails.
+        :type invalid_params: List[InvalidParam]
+        """
+        if invalid_params is not None and len(invalid_params) < 1:
+            raise ValueError("Invalid value for `invalid_params`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._invalid_params = invalid_params
+
+    @property
+    def supported_features(self):
+        """Gets the supported_features of this ProblemDetails.
+
+        A string used to indicate the features supported by an API that is used as defined in clause 6.6 in 3GPP TS 29.500. The string shall contain a bitmask indicating supported features in hexadecimal representation Each character in the string shall take a value of \"0\" to \"9\", \"a\" to \"f\" or \"A\" to \"F\" and shall represent the support of 4 features as described in table 5.2.2-3. The most significant character representing the highest-numbered features shall appear first in the string, and the character representing features 1 to 4 shall appear last in the string. The list of features and their numbering (starting with 1) are defined separately for each API. If the string contains a lower number of characters than there are defined features for an API, all features that would be represented by characters that are not present in the string are not supported  # noqa: E501
+
+        :return: The supported_features of this ProblemDetails.
+        :rtype: str
+        """
+        return self._supported_features
+
+    @supported_features.setter
+    def supported_features(self, supported_features):
+        """Sets the supported_features of this ProblemDetails.
+
+        A string used to indicate the features supported by an API that is used as defined in clause 6.6 in 3GPP TS 29.500. The string shall contain a bitmask indicating supported features in hexadecimal representation Each character in the string shall take a value of \"0\" to \"9\", \"a\" to \"f\" or \"A\" to \"F\" and shall represent the support of 4 features as described in table 5.2.2-3. The most significant character representing the highest-numbered features shall appear first in the string, and the character representing features 1 to 4 shall appear last in the string. The list of features and their numbering (starting with 1) are defined separately for each API. If the string contains a lower number of characters than there are defined features for an API, all features that would be represented by characters that are not present in the string are not supported  # noqa: E501
+
+        :param supported_features: The supported_features of this ProblemDetails.
+        :type supported_features: str
+        """
+        if supported_features is not None and not re.search(r'^[A-Fa-f0-9]*$', supported_features):  # noqa: E501
+            raise ValueError("Invalid value for `supported_features`, must be a follow pattern or equal to `/^[A-Fa-f0-9]*$/`")  # noqa: E501
+
+        self._supported_features = supported_features
diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/protocol.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/protocol.py
new file mode 100644
index 0000000000000000000000000000000000000000..f68a15d847177cf1194f6cc877111b85324032e2
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/protocol.py
@@ -0,0 +1,39 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from api_invoker_management.models.base_model_ import Model
+from api_invoker_management.models.protocol_any_of import ProtocolAnyOf
+from api_invoker_management import util
+
+from api_invoker_management.models.protocol_any_of import ProtocolAnyOf  # noqa: E501
+
+class Protocol(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self):  # noqa: E501
+        """Protocol - a model defined in OpenAPI
+
+        """
+        self.openapi_types = {
+        }
+
+        self.attribute_map = {
+        }
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'Protocol':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The Protocol of this Protocol.  # noqa: E501
+        :rtype: Protocol
+        """
+        return util.deserialize_model(dikt, cls)
diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/protocol_any_of.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/protocol_any_of.py
new file mode 100644
index 0000000000000000000000000000000000000000..eafceb4d5ed7312cdc1d3a9b0c380de804a0f4f9
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/protocol_any_of.py
@@ -0,0 +1,42 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from api_invoker_management.models.base_model_ import Model
+from api_invoker_management import util
+
+
+class ProtocolAnyOf(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    """
+    allowed enum values
+    """
+    _1_1 = "HTTP_1_1"
+    _2 = "HTTP_2"
+    def __init__(self):  # noqa: E501
+        """ProtocolAnyOf - a model defined in OpenAPI
+
+        """
+        self.openapi_types = {
+        }
+
+        self.attribute_map = {
+        }
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'ProtocolAnyOf':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The Protocol_anyOf of this ProtocolAnyOf.  # noqa: E501
+        :rtype: ProtocolAnyOf
+        """
+        return util.deserialize_model(dikt, cls)
diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/published_api_path.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/published_api_path.py
new file mode 100644
index 0000000000000000000000000000000000000000..01b94e667f4db5639022fd337c236cd2ed63a2bf
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/published_api_path.py
@@ -0,0 +1,68 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from api_invoker_management.models.base_model_ import Model
+from api_invoker_management import util
+
+
+class PublishedApiPath(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, ccf_ids=None):  # noqa: E501
+        """PublishedApiPath - a model defined in OpenAPI
+
+        :param ccf_ids: The ccf_ids of this PublishedApiPath.  # noqa: E501
+        :type ccf_ids: List[str]
+        """
+        self.openapi_types = {
+            'ccf_ids': List[str]
+        }
+
+        self.attribute_map = {
+            'ccf_ids': 'ccfIds'
+        }
+
+        self._ccf_ids = ccf_ids
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'PublishedApiPath':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The PublishedApiPath of this PublishedApiPath.  # noqa: E501
+        :rtype: PublishedApiPath
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def ccf_ids(self):
+        """Gets the ccf_ids of this PublishedApiPath.
+
+        A list of CCF identifiers where the service API is already published.  # noqa: E501
+
+        :return: The ccf_ids of this PublishedApiPath.
+        :rtype: List[str]
+        """
+        return self._ccf_ids
+
+    @ccf_ids.setter
+    def ccf_ids(self, ccf_ids):
+        """Sets the ccf_ids of this PublishedApiPath.
+
+        A list of CCF identifiers where the service API is already published.  # noqa: E501
+
+        :param ccf_ids: The ccf_ids of this PublishedApiPath.
+        :type ccf_ids: List[str]
+        """
+        if ccf_ids is not None and len(ccf_ids) < 1:
+            raise ValueError("Invalid value for `ccf_ids`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._ccf_ids = ccf_ids
diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/resource.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/resource.py
new file mode 100644
index 0000000000000000000000000000000000000000..e2cea42e3cb8af3beb0770028804f81b35b8d421
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/resource.py
@@ -0,0 +1,216 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from api_invoker_management.models.base_model_ import Model
+from api_invoker_management.models.communication_type import CommunicationType
+from api_invoker_management.models.operation import Operation
+from api_invoker_management import util
+
+from api_invoker_management.models.communication_type import CommunicationType  # noqa: E501
+from api_invoker_management.models.operation import Operation  # noqa: E501
+
+class Resource(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, resource_name=None, comm_type=None, uri=None, cust_op_name=None, operations=None, description=None):  # noqa: E501
+        """Resource - a model defined in OpenAPI
+
+        :param resource_name: The resource_name of this Resource.  # noqa: E501
+        :type resource_name: str
+        :param comm_type: The comm_type of this Resource.  # noqa: E501
+        :type comm_type: CommunicationType
+        :param uri: The uri of this Resource.  # noqa: E501
+        :type uri: str
+        :param cust_op_name: The cust_op_name of this Resource.  # noqa: E501
+        :type cust_op_name: str
+        :param operations: The operations of this Resource.  # noqa: E501
+        :type operations: List[Operation]
+        :param description: The description of this Resource.  # noqa: E501
+        :type description: str
+        """
+        self.openapi_types = {
+            'resource_name': str,
+            'comm_type': CommunicationType,
+            'uri': str,
+            'cust_op_name': str,
+            'operations': List[Operation],
+            'description': str
+        }
+
+        self.attribute_map = {
+            'resource_name': 'resourceName',
+            'comm_type': 'commType',
+            'uri': 'uri',
+            'cust_op_name': 'custOpName',
+            'operations': 'operations',
+            'description': 'description'
+        }
+
+        self._resource_name = resource_name
+        self._comm_type = comm_type
+        self._uri = uri
+        self._cust_op_name = cust_op_name
+        self._operations = operations
+        self._description = description
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'Resource':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The Resource of this Resource.  # noqa: E501
+        :rtype: Resource
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def resource_name(self):
+        """Gets the resource_name of this Resource.
+
+        Resource name  # noqa: E501
+
+        :return: The resource_name of this Resource.
+        :rtype: str
+        """
+        return self._resource_name
+
+    @resource_name.setter
+    def resource_name(self, resource_name):
+        """Sets the resource_name of this Resource.
+
+        Resource name  # noqa: E501
+
+        :param resource_name: The resource_name of this Resource.
+        :type resource_name: str
+        """
+        if resource_name is None:
+            raise ValueError("Invalid value for `resource_name`, must not be `None`")  # noqa: E501
+
+        self._resource_name = resource_name
+
+    @property
+    def comm_type(self):
+        """Gets the comm_type of this Resource.
+
+
+        :return: The comm_type of this Resource.
+        :rtype: CommunicationType
+        """
+        return self._comm_type
+
+    @comm_type.setter
+    def comm_type(self, comm_type):
+        """Sets the comm_type of this Resource.
+
+
+        :param comm_type: The comm_type of this Resource.
+        :type comm_type: CommunicationType
+        """
+        if comm_type is None:
+            raise ValueError("Invalid value for `comm_type`, must not be `None`")  # noqa: E501
+
+        self._comm_type = comm_type
+
+    @property
+    def uri(self):
+        """Gets the uri of this Resource.
+
+        Relative URI of the API resource, it is set as {apiSpecificResourceUriPart} part of the URI structure as defined in subclause 4.4 of 3GPP TS 29.501.  # noqa: E501
+
+        :return: The uri of this Resource.
+        :rtype: str
+        """
+        return self._uri
+
+    @uri.setter
+    def uri(self, uri):
+        """Sets the uri of this Resource.
+
+        Relative URI of the API resource, it is set as {apiSpecificResourceUriPart} part of the URI structure as defined in subclause 4.4 of 3GPP TS 29.501.  # noqa: E501
+
+        :param uri: The uri of this Resource.
+        :type uri: str
+        """
+        if uri is None:
+            raise ValueError("Invalid value for `uri`, must not be `None`")  # noqa: E501
+
+        self._uri = uri
+
+    @property
+    def cust_op_name(self):
+        """Gets the cust_op_name of this Resource.
+
+        it is set as {custOpName} part of the URI structure for a custom operation associated with a resource as defined in subclause 4.4 of 3GPP TS 29.501.  # noqa: E501
+
+        :return: The cust_op_name of this Resource.
+        :rtype: str
+        """
+        return self._cust_op_name
+
+    @cust_op_name.setter
+    def cust_op_name(self, cust_op_name):
+        """Sets the cust_op_name of this Resource.
+
+        it is set as {custOpName} part of the URI structure for a custom operation associated with a resource as defined in subclause 4.4 of 3GPP TS 29.501.  # noqa: E501
+
+        :param cust_op_name: The cust_op_name of this Resource.
+        :type cust_op_name: str
+        """
+
+        self._cust_op_name = cust_op_name
+
+    @property
+    def operations(self):
+        """Gets the operations of this Resource.
+
+        Supported HTTP methods for the API resource. Only applicable when the protocol in AefProfile indicates HTTP.  # noqa: E501
+
+        :return: The operations of this Resource.
+        :rtype: List[Operation]
+        """
+        return self._operations
+
+    @operations.setter
+    def operations(self, operations):
+        """Sets the operations of this Resource.
+
+        Supported HTTP methods for the API resource. Only applicable when the protocol in AefProfile indicates HTTP.  # noqa: E501
+
+        :param operations: The operations of this Resource.
+        :type operations: List[Operation]
+        """
+        if operations is not None and len(operations) < 1:
+            raise ValueError("Invalid value for `operations`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._operations = operations
+
+    @property
+    def description(self):
+        """Gets the description of this Resource.
+
+        Text description of the API resource  # noqa: E501
+
+        :return: The description of this Resource.
+        :rtype: str
+        """
+        return self._description
+
+    @description.setter
+    def description(self, description):
+        """Sets the description of this Resource.
+
+        Text description of the API resource  # noqa: E501
+
+        :param description: The description of this Resource.
+        :type description: str
+        """
+
+        self._description = description
diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/security_method.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/security_method.py
new file mode 100644
index 0000000000000000000000000000000000000000..e66fa6543f0aae1fd4d7c1139980d4366f746b41
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/security_method.py
@@ -0,0 +1,39 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from api_invoker_management.models.base_model_ import Model
+from api_invoker_management.models.security_method_any_of import SecurityMethodAnyOf
+from api_invoker_management import util
+
+from api_invoker_management.models.security_method_any_of import SecurityMethodAnyOf  # noqa: E501
+
+class SecurityMethod(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self):  # noqa: E501
+        """SecurityMethod - a model defined in OpenAPI
+
+        """
+        self.openapi_types = {
+        }
+
+        self.attribute_map = {
+        }
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'SecurityMethod':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The SecurityMethod of this SecurityMethod.  # noqa: E501
+        :rtype: SecurityMethod
+        """
+        return util.deserialize_model(dikt, cls)
diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/security_method_any_of.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/security_method_any_of.py
new file mode 100644
index 0000000000000000000000000000000000000000..e446cf32eef91e444c63b27e7c8d080d9f8bd951
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/security_method_any_of.py
@@ -0,0 +1,43 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from api_invoker_management.models.base_model_ import Model
+from api_invoker_management import util
+
+
+class SecurityMethodAnyOf(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    """
+    allowed enum values
+    """
+    PSK = "PSK"
+    PKI = "PKI"
+    OAUTH = "OAUTH"
+    def __init__(self):  # noqa: E501
+        """SecurityMethodAnyOf - a model defined in OpenAPI
+
+        """
+        self.openapi_types = {
+        }
+
+        self.attribute_map = {
+        }
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'SecurityMethodAnyOf':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The SecurityMethod_anyOf of this SecurityMethodAnyOf.  # noqa: E501
+        :rtype: SecurityMethodAnyOf
+        """
+        return util.deserialize_model(dikt, cls)
diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/service_api_description.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/service_api_description.py
new file mode 100644
index 0000000000000000000000000000000000000000..e194fdb10782d7cc7f07f34aa2415578f5829861
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/service_api_description.py
@@ -0,0 +1,328 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from api_invoker_management.models.base_model_ import Model
+from api_invoker_management.models.aef_profile import AefProfile
+from api_invoker_management.models.published_api_path import PublishedApiPath
+from api_invoker_management.models.shareable_information import ShareableInformation
+import re
+from api_invoker_management import util
+
+from api_invoker_management.models.aef_profile import AefProfile  # noqa: E501
+from api_invoker_management.models.published_api_path import PublishedApiPath  # noqa: E501
+from api_invoker_management.models.shareable_information import ShareableInformation  # noqa: E501
+import re  # noqa: E501
+
+class ServiceAPIDescription(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, api_name=None, api_id=None, aef_profiles=None, description=None, supported_features=None, shareable_info=None, service_api_category=None, api_supp_feats=None, pub_api_path=None, ccf_id=None):  # noqa: E501
+        """ServiceAPIDescription - a model defined in OpenAPI
+
+        :param api_name: The api_name of this ServiceAPIDescription.  # noqa: E501
+        :type api_name: str
+        :param api_id: The api_id of this ServiceAPIDescription.  # noqa: E501
+        :type api_id: str
+        :param aef_profiles: The aef_profiles of this ServiceAPIDescription.  # noqa: E501
+        :type aef_profiles: List[AefProfile]
+        :param description: The description of this ServiceAPIDescription.  # noqa: E501
+        :type description: str
+        :param supported_features: The supported_features of this ServiceAPIDescription.  # noqa: E501
+        :type supported_features: str
+        :param shareable_info: The shareable_info of this ServiceAPIDescription.  # noqa: E501
+        :type shareable_info: ShareableInformation
+        :param service_api_category: The service_api_category of this ServiceAPIDescription.  # noqa: E501
+        :type service_api_category: str
+        :param api_supp_feats: The api_supp_feats of this ServiceAPIDescription.  # noqa: E501
+        :type api_supp_feats: str
+        :param pub_api_path: The pub_api_path of this ServiceAPIDescription.  # noqa: E501
+        :type pub_api_path: PublishedApiPath
+        :param ccf_id: The ccf_id of this ServiceAPIDescription.  # noqa: E501
+        :type ccf_id: str
+        """
+        self.openapi_types = {
+            'api_name': str,
+            'api_id': str,
+            'aef_profiles': List[AefProfile],
+            'description': str,
+            'supported_features': str,
+            'shareable_info': ShareableInformation,
+            'service_api_category': str,
+            'api_supp_feats': str,
+            'pub_api_path': PublishedApiPath,
+            'ccf_id': str
+        }
+
+        self.attribute_map = {
+            'api_name': 'apiName',
+            'api_id': 'apiId',
+            'aef_profiles': 'aefProfiles',
+            'description': 'description',
+            'supported_features': 'supportedFeatures',
+            'shareable_info': 'shareableInfo',
+            'service_api_category': 'serviceAPICategory',
+            'api_supp_feats': 'apiSuppFeats',
+            'pub_api_path': 'pubApiPath',
+            'ccf_id': 'ccfId'
+        }
+
+        self._api_name = api_name
+        self._api_id = api_id
+        self._aef_profiles = aef_profiles
+        self._description = description
+        self._supported_features = supported_features
+        self._shareable_info = shareable_info
+        self._service_api_category = service_api_category
+        self._api_supp_feats = api_supp_feats
+        self._pub_api_path = pub_api_path
+        self._ccf_id = ccf_id
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'ServiceAPIDescription':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The ServiceAPIDescription of this ServiceAPIDescription.  # noqa: E501
+        :rtype: ServiceAPIDescription
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def api_name(self):
+        """Gets the api_name of this ServiceAPIDescription.
+
+        API name, it is set as {apiName} part of the URI structure as defined in subclause 4.4 of 3GPP TS 29.501.  # noqa: E501
+
+        :return: The api_name of this ServiceAPIDescription.
+        :rtype: str
+        """
+        return self._api_name
+
+    @api_name.setter
+    def api_name(self, api_name):
+        """Sets the api_name of this ServiceAPIDescription.
+
+        API name, it is set as {apiName} part of the URI structure as defined in subclause 4.4 of 3GPP TS 29.501.  # noqa: E501
+
+        :param api_name: The api_name of this ServiceAPIDescription.
+        :type api_name: str
+        """
+        if api_name is None:
+            raise ValueError("Invalid value for `api_name`, must not be `None`")  # noqa: E501
+
+        self._api_name = api_name
+
+    @property
+    def api_id(self):
+        """Gets the api_id of this ServiceAPIDescription.
+
+        API identifier assigned by the CAPIF core function to the published service API. Shall not be present in the HTTP POST request from the API publishing function to the CAPIF core function. Shall be present in the HTTP POST response from the CAPIF core function to the API publishing function and in the HTTP GET response from the CAPIF core function to the API invoker (discovery API).  # noqa: E501
+
+        :return: The api_id of this ServiceAPIDescription.
+        :rtype: str
+        """
+        return self._api_id
+
+    @api_id.setter
+    def api_id(self, api_id):
+        """Sets the api_id of this ServiceAPIDescription.
+
+        API identifier assigned by the CAPIF core function to the published service API. Shall not be present in the HTTP POST request from the API publishing function to the CAPIF core function. Shall be present in the HTTP POST response from the CAPIF core function to the API publishing function and in the HTTP GET response from the CAPIF core function to the API invoker (discovery API).  # noqa: E501
+
+        :param api_id: The api_id of this ServiceAPIDescription.
+        :type api_id: str
+        """
+
+        self._api_id = api_id
+
+    @property
+    def aef_profiles(self):
+        """Gets the aef_profiles of this ServiceAPIDescription.
+
+        AEF profile information, which includes the exposed API details (e.g. protocol).  # noqa: E501
+
+        :return: The aef_profiles of this ServiceAPIDescription.
+        :rtype: List[AefProfile]
+        """
+        return self._aef_profiles
+
+    @aef_profiles.setter
+    def aef_profiles(self, aef_profiles):
+        """Sets the aef_profiles of this ServiceAPIDescription.
+
+        AEF profile information, which includes the exposed API details (e.g. protocol).  # noqa: E501
+
+        :param aef_profiles: The aef_profiles of this ServiceAPIDescription.
+        :type aef_profiles: List[AefProfile]
+        """
+        if aef_profiles is not None and len(aef_profiles) < 1:
+            raise ValueError("Invalid value for `aef_profiles`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._aef_profiles = aef_profiles
+
+    @property
+    def description(self):
+        """Gets the description of this ServiceAPIDescription.
+
+        Text description of the API  # noqa: E501
+
+        :return: The description of this ServiceAPIDescription.
+        :rtype: str
+        """
+        return self._description
+
+    @description.setter
+    def description(self, description):
+        """Sets the description of this ServiceAPIDescription.
+
+        Text description of the API  # noqa: E501
+
+        :param description: The description of this ServiceAPIDescription.
+        :type description: str
+        """
+
+        self._description = description
+
+    @property
+    def supported_features(self):
+        """Gets the supported_features of this ServiceAPIDescription.
+
+        A string used to indicate the features supported by an API that is used as defined in clause 6.6 in 3GPP TS 29.500. The string shall contain a bitmask indicating supported features in hexadecimal representation Each character in the string shall take a value of \"0\" to \"9\", \"a\" to \"f\" or \"A\" to \"F\" and shall represent the support of 4 features as described in table 5.2.2-3. The most significant character representing the highest-numbered features shall appear first in the string, and the character representing features 1 to 4 shall appear last in the string. The list of features and their numbering (starting with 1) are defined separately for each API. If the string contains a lower number of characters than there are defined features for an API, all features that would be represented by characters that are not present in the string are not supported  # noqa: E501
+
+        :return: The supported_features of this ServiceAPIDescription.
+        :rtype: str
+        """
+        return self._supported_features
+
+    @supported_features.setter
+    def supported_features(self, supported_features):
+        """Sets the supported_features of this ServiceAPIDescription.
+
+        A string used to indicate the features supported by an API that is used as defined in clause 6.6 in 3GPP TS 29.500. The string shall contain a bitmask indicating supported features in hexadecimal representation Each character in the string shall take a value of \"0\" to \"9\", \"a\" to \"f\" or \"A\" to \"F\" and shall represent the support of 4 features as described in table 5.2.2-3. The most significant character representing the highest-numbered features shall appear first in the string, and the character representing features 1 to 4 shall appear last in the string. The list of features and their numbering (starting with 1) are defined separately for each API. If the string contains a lower number of characters than there are defined features for an API, all features that would be represented by characters that are not present in the string are not supported  # noqa: E501
+
+        :param supported_features: The supported_features of this ServiceAPIDescription.
+        :type supported_features: str
+        """
+        if supported_features is not None and not re.search(r'^[A-Fa-f0-9]*$', supported_features):  # noqa: E501
+            raise ValueError("Invalid value for `supported_features`, must be a follow pattern or equal to `/^[A-Fa-f0-9]*$/`")  # noqa: E501
+
+        self._supported_features = supported_features
+
+    @property
+    def shareable_info(self):
+        """Gets the shareable_info of this ServiceAPIDescription.
+
+
+        :return: The shareable_info of this ServiceAPIDescription.
+        :rtype: ShareableInformation
+        """
+        return self._shareable_info
+
+    @shareable_info.setter
+    def shareable_info(self, shareable_info):
+        """Sets the shareable_info of this ServiceAPIDescription.
+
+
+        :param shareable_info: The shareable_info of this ServiceAPIDescription.
+        :type shareable_info: ShareableInformation
+        """
+
+        self._shareable_info = shareable_info
+
+    @property
+    def service_api_category(self):
+        """Gets the service_api_category of this ServiceAPIDescription.
+
+
+        :return: The service_api_category of this ServiceAPIDescription.
+        :rtype: str
+        """
+        return self._service_api_category
+
+    @service_api_category.setter
+    def service_api_category(self, service_api_category):
+        """Sets the service_api_category of this ServiceAPIDescription.
+
+
+        :param service_api_category: The service_api_category of this ServiceAPIDescription.
+        :type service_api_category: str
+        """
+
+        self._service_api_category = service_api_category
+
+    @property
+    def api_supp_feats(self):
+        """Gets the api_supp_feats of this ServiceAPIDescription.
+
+        A string used to indicate the features supported by an API that is used as defined in clause 6.6 in 3GPP TS 29.500. The string shall contain a bitmask indicating supported features in hexadecimal representation Each character in the string shall take a value of \"0\" to \"9\", \"a\" to \"f\" or \"A\" to \"F\" and shall represent the support of 4 features as described in table 5.2.2-3. The most significant character representing the highest-numbered features shall appear first in the string, and the character representing features 1 to 4 shall appear last in the string. The list of features and their numbering (starting with 1) are defined separately for each API. If the string contains a lower number of characters than there are defined features for an API, all features that would be represented by characters that are not present in the string are not supported  # noqa: E501
+
+        :return: The api_supp_feats of this ServiceAPIDescription.
+        :rtype: str
+        """
+        return self._api_supp_feats
+
+    @api_supp_feats.setter
+    def api_supp_feats(self, api_supp_feats):
+        """Sets the api_supp_feats of this ServiceAPIDescription.
+
+        A string used to indicate the features supported by an API that is used as defined in clause 6.6 in 3GPP TS 29.500. The string shall contain a bitmask indicating supported features in hexadecimal representation Each character in the string shall take a value of \"0\" to \"9\", \"a\" to \"f\" or \"A\" to \"F\" and shall represent the support of 4 features as described in table 5.2.2-3. The most significant character representing the highest-numbered features shall appear first in the string, and the character representing features 1 to 4 shall appear last in the string. The list of features and their numbering (starting with 1) are defined separately for each API. If the string contains a lower number of characters than there are defined features for an API, all features that would be represented by characters that are not present in the string are not supported  # noqa: E501
+
+        :param api_supp_feats: The api_supp_feats of this ServiceAPIDescription.
+        :type api_supp_feats: str
+        """
+        if api_supp_feats is not None and not re.search(r'^[A-Fa-f0-9]*$', api_supp_feats):  # noqa: E501
+            raise ValueError("Invalid value for `api_supp_feats`, must be a follow pattern or equal to `/^[A-Fa-f0-9]*$/`")  # noqa: E501
+
+        self._api_supp_feats = api_supp_feats
+
+    @property
+    def pub_api_path(self):
+        """Gets the pub_api_path of this ServiceAPIDescription.
+
+
+        :return: The pub_api_path of this ServiceAPIDescription.
+        :rtype: PublishedApiPath
+        """
+        return self._pub_api_path
+
+    @pub_api_path.setter
+    def pub_api_path(self, pub_api_path):
+        """Sets the pub_api_path of this ServiceAPIDescription.
+
+
+        :param pub_api_path: The pub_api_path of this ServiceAPIDescription.
+        :type pub_api_path: PublishedApiPath
+        """
+
+        self._pub_api_path = pub_api_path
+
+    @property
+    def ccf_id(self):
+        """Gets the ccf_id of this ServiceAPIDescription.
+
+        CAPIF core function identifier.  # noqa: E501
+
+        :return: The ccf_id of this ServiceAPIDescription.
+        :rtype: str
+        """
+        return self._ccf_id
+
+    @ccf_id.setter
+    def ccf_id(self, ccf_id):
+        """Sets the ccf_id of this ServiceAPIDescription.
+
+        CAPIF core function identifier.  # noqa: E501
+
+        :param ccf_id: The ccf_id of this ServiceAPIDescription.
+        :type ccf_id: str
+        """
+
+        self._ccf_id = ccf_id
diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/shareable_information.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/shareable_information.py
new file mode 100644
index 0000000000000000000000000000000000000000..4a369d9bdca15de00797e0cb095963f19d1ba0db
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/shareable_information.py
@@ -0,0 +1,98 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from api_invoker_management.models.base_model_ import Model
+from api_invoker_management import util
+
+
+class ShareableInformation(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, is_shareable=None, capif_prov_doms=None):  # noqa: E501
+        """ShareableInformation - a model defined in OpenAPI
+
+        :param is_shareable: The is_shareable of this ShareableInformation.  # noqa: E501
+        :type is_shareable: bool
+        :param capif_prov_doms: The capif_prov_doms of this ShareableInformation.  # noqa: E501
+        :type capif_prov_doms: List[str]
+        """
+        self.openapi_types = {
+            'is_shareable': bool,
+            'capif_prov_doms': List[str]
+        }
+
+        self.attribute_map = {
+            'is_shareable': 'isShareable',
+            'capif_prov_doms': 'capifProvDoms'
+        }
+
+        self._is_shareable = is_shareable
+        self._capif_prov_doms = capif_prov_doms
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'ShareableInformation':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The ShareableInformation of this ShareableInformation.  # noqa: E501
+        :rtype: ShareableInformation
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def is_shareable(self):
+        """Gets the is_shareable of this ShareableInformation.
+
+        Set to \"true\" indicates that the service API and/or the service API category can be shared to the list of CAPIF provider domain information. Otherwise set to \"false\".  # noqa: E501
+
+        :return: The is_shareable of this ShareableInformation.
+        :rtype: bool
+        """
+        return self._is_shareable
+
+    @is_shareable.setter
+    def is_shareable(self, is_shareable):
+        """Sets the is_shareable of this ShareableInformation.
+
+        Set to \"true\" indicates that the service API and/or the service API category can be shared to the list of CAPIF provider domain information. Otherwise set to \"false\".  # noqa: E501
+
+        :param is_shareable: The is_shareable of this ShareableInformation.
+        :type is_shareable: bool
+        """
+        if is_shareable is None:
+            raise ValueError("Invalid value for `is_shareable`, must not be `None`")  # noqa: E501
+
+        self._is_shareable = is_shareable
+
+    @property
+    def capif_prov_doms(self):
+        """Gets the capif_prov_doms of this ShareableInformation.
+
+        List of CAPIF provider domains to which the service API information to be shared.  # noqa: E501
+
+        :return: The capif_prov_doms of this ShareableInformation.
+        :rtype: List[str]
+        """
+        return self._capif_prov_doms
+
+    @capif_prov_doms.setter
+    def capif_prov_doms(self, capif_prov_doms):
+        """Sets the capif_prov_doms of this ShareableInformation.
+
+        List of CAPIF provider domains to which the service API information to be shared.  # noqa: E501
+
+        :param capif_prov_doms: The capif_prov_doms of this ShareableInformation.
+        :type capif_prov_doms: List[str]
+        """
+        if capif_prov_doms is not None and len(capif_prov_doms) < 1:
+            raise ValueError("Invalid value for `capif_prov_doms`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._capif_prov_doms = capif_prov_doms
diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/version.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/version.py
new file mode 100644
index 0000000000000000000000000000000000000000..6f0521ba1067133e584e2865bba945679fd47785
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/version.py
@@ -0,0 +1,160 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from api_invoker_management.models.base_model_ import Model
+from api_invoker_management.models.custom_operation import CustomOperation
+from api_invoker_management.models.resource import Resource
+from api_invoker_management import util
+
+from api_invoker_management.models.custom_operation import CustomOperation  # noqa: E501
+from api_invoker_management.models.resource import Resource  # noqa: E501
+
+class Version(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, api_version=None, expiry=None, resources=None, cust_operations=None):  # noqa: E501
+        """Version - a model defined in OpenAPI
+
+        :param api_version: The api_version of this Version.  # noqa: E501
+        :type api_version: str
+        :param expiry: The expiry of this Version.  # noqa: E501
+        :type expiry: datetime
+        :param resources: The resources of this Version.  # noqa: E501
+        :type resources: List[Resource]
+        :param cust_operations: The cust_operations of this Version.  # noqa: E501
+        :type cust_operations: List[CustomOperation]
+        """
+        self.openapi_types = {
+            'api_version': str,
+            'expiry': datetime,
+            'resources': List[Resource],
+            'cust_operations': List[CustomOperation]
+        }
+
+        self.attribute_map = {
+            'api_version': 'apiVersion',
+            'expiry': 'expiry',
+            'resources': 'resources',
+            'cust_operations': 'custOperations'
+        }
+
+        self._api_version = api_version
+        self._expiry = expiry
+        self._resources = resources
+        self._cust_operations = cust_operations
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'Version':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The Version of this Version.  # noqa: E501
+        :rtype: Version
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def api_version(self):
+        """Gets the api_version of this Version.
+
+        API major version in URI (e.g. v1)  # noqa: E501
+
+        :return: The api_version of this Version.
+        :rtype: str
+        """
+        return self._api_version
+
+    @api_version.setter
+    def api_version(self, api_version):
+        """Sets the api_version of this Version.
+
+        API major version in URI (e.g. v1)  # noqa: E501
+
+        :param api_version: The api_version of this Version.
+        :type api_version: str
+        """
+        if api_version is None:
+            raise ValueError("Invalid value for `api_version`, must not be `None`")  # noqa: E501
+
+        self._api_version = api_version
+
+    @property
+    def expiry(self):
+        """Gets the expiry of this Version.
+
+        string with format \"date-time\" as defined in OpenAPI.  # noqa: E501
+
+        :return: The expiry of this Version.
+        :rtype: datetime
+        """
+        return self._expiry
+
+    @expiry.setter
+    def expiry(self, expiry):
+        """Sets the expiry of this Version.
+
+        string with format \"date-time\" as defined in OpenAPI.  # noqa: E501
+
+        :param expiry: The expiry of this Version.
+        :type expiry: datetime
+        """
+
+        self._expiry = expiry
+
+    @property
+    def resources(self):
+        """Gets the resources of this Version.
+
+        Resources supported by the API.  # noqa: E501
+
+        :return: The resources of this Version.
+        :rtype: List[Resource]
+        """
+        return self._resources
+
+    @resources.setter
+    def resources(self, resources):
+        """Sets the resources of this Version.
+
+        Resources supported by the API.  # noqa: E501
+
+        :param resources: The resources of this Version.
+        :type resources: List[Resource]
+        """
+        if resources is not None and len(resources) < 1:
+            raise ValueError("Invalid value for `resources`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._resources = resources
+
+    @property
+    def cust_operations(self):
+        """Gets the cust_operations of this Version.
+
+        Custom operations without resource association.  # noqa: E501
+
+        :return: The cust_operations of this Version.
+        :rtype: List[CustomOperation]
+        """
+        return self._cust_operations
+
+    @cust_operations.setter
+    def cust_operations(self, cust_operations):
+        """Sets the cust_operations of this Version.
+
+        Custom operations without resource association.  # noqa: E501
+
+        :param cust_operations: The cust_operations of this Version.
+        :type cust_operations: List[CustomOperation]
+        """
+        if cust_operations is not None and len(cust_operations) < 1:
+            raise ValueError("Invalid value for `cust_operations`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._cust_operations = cust_operations
diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/websock_notif_config.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/websock_notif_config.py
new file mode 100644
index 0000000000000000000000000000000000000000..4bf3f9217a9670b20ad71b891e4c5e4e72ec020f
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/models/websock_notif_config.py
@@ -0,0 +1,94 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from api_invoker_management.models.base_model_ import Model
+from api_invoker_management import util
+
+
+class WebsockNotifConfig(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, websocket_uri=None, request_websocket_uri=None):  # noqa: E501
+        """WebsockNotifConfig - a model defined in OpenAPI
+
+        :param websocket_uri: The websocket_uri of this WebsockNotifConfig.  # noqa: E501
+        :type websocket_uri: str
+        :param request_websocket_uri: The request_websocket_uri of this WebsockNotifConfig.  # noqa: E501
+        :type request_websocket_uri: bool
+        """
+        self.openapi_types = {
+            'websocket_uri': str,
+            'request_websocket_uri': bool
+        }
+
+        self.attribute_map = {
+            'websocket_uri': 'websocketUri',
+            'request_websocket_uri': 'requestWebsocketUri'
+        }
+
+        self._websocket_uri = websocket_uri
+        self._request_websocket_uri = request_websocket_uri
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'WebsockNotifConfig':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The WebsockNotifConfig of this WebsockNotifConfig.  # noqa: E501
+        :rtype: WebsockNotifConfig
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def websocket_uri(self):
+        """Gets the websocket_uri of this WebsockNotifConfig.
+
+        string formatted according to IETF RFC 3986 identifying a referenced resource.  # noqa: E501
+
+        :return: The websocket_uri of this WebsockNotifConfig.
+        :rtype: str
+        """
+        return self._websocket_uri
+
+    @websocket_uri.setter
+    def websocket_uri(self, websocket_uri):
+        """Sets the websocket_uri of this WebsockNotifConfig.
+
+        string formatted according to IETF RFC 3986 identifying a referenced resource.  # noqa: E501
+
+        :param websocket_uri: The websocket_uri of this WebsockNotifConfig.
+        :type websocket_uri: str
+        """
+
+        self._websocket_uri = websocket_uri
+
+    @property
+    def request_websocket_uri(self):
+        """Gets the request_websocket_uri of this WebsockNotifConfig.
+
+        Set by the SCS/AS to indicate that the Websocket delivery is requested.  # noqa: E501
+
+        :return: The request_websocket_uri of this WebsockNotifConfig.
+        :rtype: bool
+        """
+        return self._request_websocket_uri
+
+    @request_websocket_uri.setter
+    def request_websocket_uri(self, request_websocket_uri):
+        """Sets the request_websocket_uri of this WebsockNotifConfig.
+
+        Set by the SCS/AS to indicate that the Websocket delivery is requested.  # noqa: E501
+
+        :param request_websocket_uri: The request_websocket_uri of this WebsockNotifConfig.
+        :type request_websocket_uri: bool
+        """
+
+        self._request_websocket_uri = request_websocket_uri
diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/openapi/openapi.yaml b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/openapi/openapi.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..d574fb198f0177162587e43738559ffe9c8b8965
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/openapi/openapi.yaml
@@ -0,0 +1,2448 @@
+openapi: 3.0.0
+info:
+  description: |
+    API for API invoker management.
+    © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
+    All rights reserved.
+  title: CAPIF_API_Invoker_Management_API
+  version: 1.2.0-alpha.2
+externalDocs:
+  description: 3GPP TS 29.222 V17.2.0 Common API Framework for 3GPP Northbound APIs
+  url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.222/
+servers:
+- url: '{apiRoot}/api-invoker-management/v1'
+  variables:
+    apiRoot:
+      default: https://example.com
+      description: apiRoot as defined in subclause 7.5 of 3GPP TS 29.222
+paths:
+  /onboardedInvokers:
+    post:
+      callbacks:
+        notificationDestination:
+          '{request.body#/notificationDestination}':
+            post:
+              description: Notify the API Invoker about the onboarding completion
+              operationId: notificationDestination_request_bodyNotificationDestinationPost
+              requestBody:
+                content:
+                  application/json:
+                    schema:
+                      $ref: '#/components/schemas/OnboardingNotification'
+                required: true
+              responses:
+                "204":
+                  description: No Content (successful onboarding notification)
+                "307":
+                  description: Temporary Redirect
+                  headers:
+                    Location:
+                      description: An alternative URI of the resource.
+                      required: true
+                      schema:
+                        type: string
+                "308":
+                  description: Permanent Redirect
+                  headers:
+                    Location:
+                      description: An alternative URI of the resource.
+                      required: true
+                      schema:
+                        type: string
+                "400":
+                  content:
+                    application/problem+json:
+                      schema:
+                        $ref: '#/components/schemas/ProblemDetails'
+                  description: Bad request
+                "401":
+                  content:
+                    application/problem+json:
+                      schema:
+                        $ref: '#/components/schemas/ProblemDetails'
+                  description: Unauthorized
+                "403":
+                  content:
+                    application/problem+json:
+                      schema:
+                        $ref: '#/components/schemas/ProblemDetails'
+                  description: Forbidden
+                "404":
+                  content:
+                    application/problem+json:
+                      schema:
+                        $ref: '#/components/schemas/ProblemDetails'
+                  description: Not Found
+                "411":
+                  content:
+                    application/problem+json:
+                      schema:
+                        $ref: '#/components/schemas/ProblemDetails'
+                  description: Length Required
+                "413":
+                  content:
+                    application/problem+json:
+                      schema:
+                        $ref: '#/components/schemas/ProblemDetails'
+                  description: Payload Too Large
+                "415":
+                  content:
+                    application/problem+json:
+                      schema:
+                        $ref: '#/components/schemas/ProblemDetails'
+                  description: Unsupported Media Type
+                "429":
+                  content:
+                    application/problem+json:
+                      schema:
+                        $ref: '#/components/schemas/ProblemDetails'
+                  description: Too Many Requests
+                "500":
+                  content:
+                    application/problem+json:
+                      schema:
+                        $ref: '#/components/schemas/ProblemDetails'
+                  description: Internal Server Error
+                "503":
+                  content:
+                    application/problem+json:
+                      schema:
+                        $ref: '#/components/schemas/ProblemDetails'
+                  description: Service Unavailable
+                default:
+                  description: Generic Error
+              x-callback-request: true
+      description: Creates a new individual API Invoker profile.
+      operationId: onboarded_invokers_post
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/APIInvokerEnrolmentDetails'
+        required: true
+      responses:
+        "201":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/APIInvokerEnrolmentDetails'
+          description: API invoker on-boarded successfully.
+          headers:
+            Location:
+              description: 'Contains the URI of the newly created resource, according
+                to the structure: {apiRoot}/api-invoker-management/v1/onboardedInvokers/{onboardingId}'
+              explode: false
+              required: true
+              schema:
+                type: string
+              style: simple
+        "202":
+          description: The CAPIF core has accepted the Onboarding request and is processing
+            it.
+        "400":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Bad request
+        "401":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Unauthorized
+        "403":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Forbidden
+        "404":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Not Found
+        "411":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Length Required
+        "413":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Payload Too Large
+        "415":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Unsupported Media Type
+        "429":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Too Many Requests
+        "500":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Internal Server Error
+        "503":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Service Unavailable
+        default:
+          description: Generic Error
+      x-openapi-router-controller: api_invoker_management.controllers.default_controller
+  /onboardedInvokers/{onboardingId}:
+    delete:
+      description: Deletes an individual API Invoker.
+      operationId: onboarded_invokers_onboarding_id_delete
+      parameters:
+      - description: String identifying an individual on-boarded API invoker resource
+        explode: false
+        in: path
+        name: onboardingId
+        required: true
+        schema:
+          type: string
+        style: simple
+      responses:
+        "204":
+          description: The individual API Invoker matching onboardingId was offboarded.
+        "307":
+          description: Temporary Redirect
+          headers:
+            Location:
+              description: An alternative URI of the resource.
+              required: true
+              schema:
+                type: string
+        "308":
+          description: Permanent Redirect
+          headers:
+            Location:
+              description: An alternative URI of the resource.
+              required: true
+              schema:
+                type: string
+        "400":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Bad request
+        "401":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Unauthorized
+        "403":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Forbidden
+        "404":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Not Found
+        "429":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Too Many Requests
+        "500":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Internal Server Error
+        "503":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Service Unavailable
+        default:
+          description: Generic Error
+      x-openapi-router-controller: api_invoker_management.controllers.default_controller
+    put:
+      callbacks:
+        notificationDestination:
+          '{request.body#/notificationDestination}':
+            post:
+              description: Notify the API Invoker about the API invoker update completion
+              operationId: notificationDestination_request_bodyNotificationDestinationPost
+              requestBody:
+                content:
+                  application/json:
+                    schema:
+                      $ref: '#/components/schemas/OnboardingNotification'
+                required: true
+              responses:
+                "204":
+                  description: No Content (successful API invoker update notification)
+                "307":
+                  description: Temporary Redirect
+                  headers:
+                    Location:
+                      description: An alternative URI of the resource.
+                      required: true
+                      schema:
+                        type: string
+                "308":
+                  description: Permanent Redirect
+                  headers:
+                    Location:
+                      description: An alternative URI of the resource.
+                      required: true
+                      schema:
+                        type: string
+                "400":
+                  content:
+                    application/problem+json:
+                      schema:
+                        $ref: '#/components/schemas/ProblemDetails'
+                  description: Bad request
+                "401":
+                  content:
+                    application/problem+json:
+                      schema:
+                        $ref: '#/components/schemas/ProblemDetails'
+                  description: Unauthorized
+                "403":
+                  content:
+                    application/problem+json:
+                      schema:
+                        $ref: '#/components/schemas/ProblemDetails'
+                  description: Forbidden
+                "404":
+                  content:
+                    application/problem+json:
+                      schema:
+                        $ref: '#/components/schemas/ProblemDetails'
+                  description: Not Found
+                "411":
+                  content:
+                    application/problem+json:
+                      schema:
+                        $ref: '#/components/schemas/ProblemDetails'
+                  description: Length Required
+                "413":
+                  content:
+                    application/problem+json:
+                      schema:
+                        $ref: '#/components/schemas/ProblemDetails'
+                  description: Payload Too Large
+                "415":
+                  content:
+                    application/problem+json:
+                      schema:
+                        $ref: '#/components/schemas/ProblemDetails'
+                  description: Unsupported Media Type
+                "429":
+                  content:
+                    application/problem+json:
+                      schema:
+                        $ref: '#/components/schemas/ProblemDetails'
+                  description: Too Many Requests
+                "500":
+                  content:
+                    application/problem+json:
+                      schema:
+                        $ref: '#/components/schemas/ProblemDetails'
+                  description: Internal Server Error
+                "503":
+                  content:
+                    application/problem+json:
+                      schema:
+                        $ref: '#/components/schemas/ProblemDetails'
+                  description: Service Unavailable
+                default:
+                  description: Generic Error
+              x-callback-request: true
+      description: Updates an individual API invoker details.
+      operationId: onboarded_invokers_onboarding_id_put
+      parameters:
+      - description: String identifying an individual on-boarded API invoker resource
+        explode: false
+        in: path
+        name: onboardingId
+        required: true
+        schema:
+          type: string
+        style: simple
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/APIInvokerEnrolmentDetails'
+        description: representation of the API invoker details to be updated in CAPIF
+          core function
+        required: true
+      responses:
+        "200":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/APIInvokerEnrolmentDetails'
+          description: API invoker details updated successfully.
+        "202":
+          description: The CAPIF core has accepted the API invoker update details
+            request and is processing it.
+        "204":
+          description: API invoker’s information updated successfully, with no content
+            to be sent in the response body.
+        "307":
+          description: Temporary Redirect
+          headers:
+            Location:
+              description: An alternative URI of the resource.
+              required: true
+              schema:
+                type: string
+        "308":
+          description: Permanent Redirect
+          headers:
+            Location:
+              description: An alternative URI of the resource.
+              required: true
+              schema:
+                type: string
+        "400":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Bad request
+        "401":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Unauthorized
+        "403":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Forbidden
+        "404":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Not Found
+        "411":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Length Required
+        "413":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Payload Too Large
+        "415":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Unsupported Media Type
+        "429":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Too Many Requests
+        "500":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Internal Server Error
+        "503":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Service Unavailable
+        default:
+          description: Generic Error
+      x-openapi-router-controller: api_invoker_management.controllers.default_controller
+components:
+  schemas:
+    OnboardingInformation:
+      description: Represents on-boarding information of the API invoker.
+      example:
+        apiInvokerPublicKey: apiInvokerPublicKey
+        onboardingSecret: onboardingSecret
+        apiInvokerCertificate: apiInvokerCertificate
+      properties:
+        apiInvokerPublicKey:
+          description: The API Invoker’s public key
+          title: apiInvokerPublicKey
+          type: string
+        apiInvokerCertificate:
+          description: The API Invoker’s generic client certificate, provided by the
+            CAPIF core function.
+          title: apiInvokerCertificate
+          type: string
+        onboardingSecret:
+          description: The API Invoker’s onboarding secret, provided by the CAPIF
+            core function.
+          title: onboardingSecret
+          type: string
+      required:
+      - apiInvokerPublicKey
+      title: OnboardingInformation
+      type: object
+    APIList:
+      description: The list of service APIs that the API Invoker is allowed to invoke
+      items:
+        $ref: '#/components/schemas/ServiceAPIDescription'
+      minItems: 1
+      title: apiList
+      type: array
+    APIInvokerEnrolmentDetails:
+      description: Information about the API Invoker that requested to onboard
+      example:
+        notificationDestination: notificationDestination
+        supportedFeatures: supportedFeatures
+        apiInvokerId: apiInvokerId
+        apiInvokerInformation: apiInvokerInformation
+        websockNotifConfig:
+          requestWebsocketUri: true
+          websocketUri: websocketUri
+        onboardingInformation:
+          apiInvokerPublicKey: apiInvokerPublicKey
+          onboardingSecret: onboardingSecret
+          apiInvokerCertificate: apiInvokerCertificate
+        requestTestNotification: true
+        apiList:
+        - serviceAPICategory: serviceAPICategory
+          ccfId: ccfId
+          apiName: apiName
+          shareableInfo:
+            capifProvDoms:
+            - capifProvDoms
+            - capifProvDoms
+            isShareable: true
+          supportedFeatures: supportedFeatures
+          description: description
+          apiSuppFeats: apiSuppFeats
+          apiId: apiId
+          aefProfiles:
+          - securityMethods:
+            - null
+            - null
+            versions:
+            - apiVersion: apiVersion
+              resources:
+              - operations:
+                - null
+                - null
+                description: description
+                resourceName: resourceName
+                custOpName: custOpName
+                uri: uri
+              - operations:
+                - null
+                - null
+                description: description
+                resourceName: resourceName
+                custOpName: custOpName
+                uri: uri
+              custOperations:
+              - operations:
+                - null
+                - null
+                description: description
+                custOpName: custOpName
+              - operations:
+                - null
+                - null
+                description: description
+                custOpName: custOpName
+              expiry: 2000-01-23T04:56:07.000+00:00
+            - apiVersion: apiVersion
+              resources:
+              - operations:
+                - null
+                - null
+                description: description
+                resourceName: resourceName
+                custOpName: custOpName
+                uri: uri
+              - operations:
+                - null
+                - null
+                description: description
+                resourceName: resourceName
+                custOpName: custOpName
+                uri: uri
+              custOperations:
+              - operations:
+                - null
+                - null
+                description: description
+                custOpName: custOpName
+              - operations:
+                - null
+                - null
+                description: description
+                custOpName: custOpName
+              expiry: 2000-01-23T04:56:07.000+00:00
+            domainName: domainName
+            aefId: aefId
+            interfaceDescriptions:
+            - ipv6Addr: ipv6Addr
+              securityMethods:
+              - null
+              - null
+              port: 5248
+              ipv4Addr: ipv4Addr
+            - ipv6Addr: ipv6Addr
+              securityMethods:
+              - null
+              - null
+              port: 5248
+              ipv4Addr: ipv4Addr
+          - securityMethods:
+            - null
+            - null
+            versions:
+            - apiVersion: apiVersion
+              resources:
+              - operations:
+                - null
+                - null
+                description: description
+                resourceName: resourceName
+                custOpName: custOpName
+                uri: uri
+              - operations:
+                - null
+                - null
+                description: description
+                resourceName: resourceName
+                custOpName: custOpName
+                uri: uri
+              custOperations:
+              - operations:
+                - null
+                - null
+                description: description
+                custOpName: custOpName
+              - operations:
+                - null
+                - null
+                description: description
+                custOpName: custOpName
+              expiry: 2000-01-23T04:56:07.000+00:00
+            - apiVersion: apiVersion
+              resources:
+              - operations:
+                - null
+                - null
+                description: description
+                resourceName: resourceName
+                custOpName: custOpName
+                uri: uri
+              - operations:
+                - null
+                - null
+                description: description
+                resourceName: resourceName
+                custOpName: custOpName
+                uri: uri
+              custOperations:
+              - operations:
+                - null
+                - null
+                description: description
+                custOpName: custOpName
+              - operations:
+                - null
+                - null
+                description: description
+                custOpName: custOpName
+              expiry: 2000-01-23T04:56:07.000+00:00
+            domainName: domainName
+            aefId: aefId
+            interfaceDescriptions:
+            - ipv6Addr: ipv6Addr
+              securityMethods:
+              - null
+              - null
+              port: 5248
+              ipv4Addr: ipv4Addr
+            - ipv6Addr: ipv6Addr
+              securityMethods:
+              - null
+              - null
+              port: 5248
+              ipv4Addr: ipv4Addr
+          pubApiPath:
+            ccfIds:
+            - ccfIds
+            - ccfIds
+        - serviceAPICategory: serviceAPICategory
+          ccfId: ccfId
+          apiName: apiName
+          shareableInfo:
+            capifProvDoms:
+            - capifProvDoms
+            - capifProvDoms
+            isShareable: true
+          supportedFeatures: supportedFeatures
+          description: description
+          apiSuppFeats: apiSuppFeats
+          apiId: apiId
+          aefProfiles:
+          - securityMethods:
+            - null
+            - null
+            versions:
+            - apiVersion: apiVersion
+              resources:
+              - operations:
+                - null
+                - null
+                description: description
+                resourceName: resourceName
+                custOpName: custOpName
+                uri: uri
+              - operations:
+                - null
+                - null
+                description: description
+                resourceName: resourceName
+                custOpName: custOpName
+                uri: uri
+              custOperations:
+              - operations:
+                - null
+                - null
+                description: description
+                custOpName: custOpName
+              - operations:
+                - null
+                - null
+                description: description
+                custOpName: custOpName
+              expiry: 2000-01-23T04:56:07.000+00:00
+            - apiVersion: apiVersion
+              resources:
+              - operations:
+                - null
+                - null
+                description: description
+                resourceName: resourceName
+                custOpName: custOpName
+                uri: uri
+              - operations:
+                - null
+                - null
+                description: description
+                resourceName: resourceName
+                custOpName: custOpName
+                uri: uri
+              custOperations:
+              - operations:
+                - null
+                - null
+                description: description
+                custOpName: custOpName
+              - operations:
+                - null
+                - null
+                description: description
+                custOpName: custOpName
+              expiry: 2000-01-23T04:56:07.000+00:00
+            domainName: domainName
+            aefId: aefId
+            interfaceDescriptions:
+            - ipv6Addr: ipv6Addr
+              securityMethods:
+              - null
+              - null
+              port: 5248
+              ipv4Addr: ipv4Addr
+            - ipv6Addr: ipv6Addr
+              securityMethods:
+              - null
+              - null
+              port: 5248
+              ipv4Addr: ipv4Addr
+          - securityMethods:
+            - null
+            - null
+            versions:
+            - apiVersion: apiVersion
+              resources:
+              - operations:
+                - null
+                - null
+                description: description
+                resourceName: resourceName
+                custOpName: custOpName
+                uri: uri
+              - operations:
+                - null
+                - null
+                description: description
+                resourceName: resourceName
+                custOpName: custOpName
+                uri: uri
+              custOperations:
+              - operations:
+                - null
+                - null
+                description: description
+                custOpName: custOpName
+              - operations:
+                - null
+                - null
+                description: description
+                custOpName: custOpName
+              expiry: 2000-01-23T04:56:07.000+00:00
+            - apiVersion: apiVersion
+              resources:
+              - operations:
+                - null
+                - null
+                description: description
+                resourceName: resourceName
+                custOpName: custOpName
+                uri: uri
+              - operations:
+                - null
+                - null
+                description: description
+                resourceName: resourceName
+                custOpName: custOpName
+                uri: uri
+              custOperations:
+              - operations:
+                - null
+                - null
+                description: description
+                custOpName: custOpName
+              - operations:
+                - null
+                - null
+                description: description
+                custOpName: custOpName
+              expiry: 2000-01-23T04:56:07.000+00:00
+            domainName: domainName
+            aefId: aefId
+            interfaceDescriptions:
+            - ipv6Addr: ipv6Addr
+              securityMethods:
+              - null
+              - null
+              port: 5248
+              ipv4Addr: ipv4Addr
+            - ipv6Addr: ipv6Addr
+              securityMethods:
+              - null
+              - null
+              port: 5248
+              ipv4Addr: ipv4Addr
+          pubApiPath:
+            ccfIds:
+            - ccfIds
+            - ccfIds
+      properties:
+        apiInvokerId:
+          description: API invoker ID assigned by the CAPIF core function to the API
+            invoker while on-boarding the API invoker. Shall not be present in the
+            HTTP POST request from the API invoker to the CAPIF core function, to
+            on-board itself. Shall be present in all other HTTP requests and responses.
+          readOnly: true
+          title: apiInvokerId
+          type: string
+        onboardingInformation:
+          $ref: '#/components/schemas/OnboardingInformation'
+        notificationDestination:
+          description: string providing an URI formatted according to IETF RFC 3986.
+          title: notificationDestination
+          type: string
+        requestTestNotification:
+          description: Set to true by Subscriber to request the CAPIF core function
+            to send a test notification as defined in in subclause 7.6. Set to false
+            or omitted otherwise.
+          title: requestTestNotification
+          type: boolean
+        websockNotifConfig:
+          $ref: '#/components/schemas/WebsockNotifConfig'
+        apiList:
+          description: The list of service APIs that the API Invoker is allowed to
+            invoke
+          items:
+            $ref: '#/components/schemas/ServiceAPIDescription'
+          minItems: 1
+          title: apiList
+          type: array
+        apiInvokerInformation:
+          description: Generic information related to the API invoker such as details
+            of the device or the application.
+          title: apiInvokerInformation
+          type: string
+        supportedFeatures:
+          description: A string used to indicate the features supported by an API
+            that is used as defined in clause 6.6 in 3GPP TS 29.500. The string shall
+            contain a bitmask indicating supported features in hexadecimal representation
+            Each character in the string shall take a value of "0" to "9", "a" to
+            "f" or "A" to "F" and shall represent the support of 4 features as described
+            in table 5.2.2-3. The most significant character representing the highest-numbered
+            features shall appear first in the string, and the character representing
+            features 1 to 4 shall appear last in the string. The list of features
+            and their numbering (starting with 1) are defined separately for each
+            API. If the string contains a lower number of characters than there are
+            defined features for an API, all features that would be represented by
+            characters that are not present in the string are not supported
+          pattern: ^[A-Fa-f0-9]*$
+          title: SupportedFeatures
+          type: string
+      required:
+      - notificationDestination
+      - onboardingInformation
+      title: APIInvokerEnrolmentDetails
+      type: object
+    OnboardingNotification:
+      description: Represents a notification of on-boarding or update result.
+      example:
+        result: true
+        apiInvokerEnrolmentDetails:
+          notificationDestination: notificationDestination
+          supportedFeatures: supportedFeatures
+          apiInvokerId: apiInvokerId
+          apiInvokerInformation: apiInvokerInformation
+          websockNotifConfig:
+            requestWebsocketUri: true
+            websocketUri: websocketUri
+          onboardingInformation:
+            apiInvokerPublicKey: apiInvokerPublicKey
+            onboardingSecret: onboardingSecret
+            apiInvokerCertificate: apiInvokerCertificate
+          requestTestNotification: true
+          apiList:
+          - serviceAPICategory: serviceAPICategory
+            ccfId: ccfId
+            apiName: apiName
+            shareableInfo:
+              capifProvDoms:
+              - capifProvDoms
+              - capifProvDoms
+              isShareable: true
+            supportedFeatures: supportedFeatures
+            description: description
+            apiSuppFeats: apiSuppFeats
+            apiId: apiId
+            aefProfiles:
+            - securityMethods:
+              - null
+              - null
+              versions:
+              - apiVersion: apiVersion
+                resources:
+                - operations:
+                  - null
+                  - null
+                  description: description
+                  resourceName: resourceName
+                  custOpName: custOpName
+                  uri: uri
+                - operations:
+                  - null
+                  - null
+                  description: description
+                  resourceName: resourceName
+                  custOpName: custOpName
+                  uri: uri
+                custOperations:
+                - operations:
+                  - null
+                  - null
+                  description: description
+                  custOpName: custOpName
+                - operations:
+                  - null
+                  - null
+                  description: description
+                  custOpName: custOpName
+                expiry: 2000-01-23T04:56:07.000+00:00
+              - apiVersion: apiVersion
+                resources:
+                - operations:
+                  - null
+                  - null
+                  description: description
+                  resourceName: resourceName
+                  custOpName: custOpName
+                  uri: uri
+                - operations:
+                  - null
+                  - null
+                  description: description
+                  resourceName: resourceName
+                  custOpName: custOpName
+                  uri: uri
+                custOperations:
+                - operations:
+                  - null
+                  - null
+                  description: description
+                  custOpName: custOpName
+                - operations:
+                  - null
+                  - null
+                  description: description
+                  custOpName: custOpName
+                expiry: 2000-01-23T04:56:07.000+00:00
+              domainName: domainName
+              aefId: aefId
+              interfaceDescriptions:
+              - ipv6Addr: ipv6Addr
+                securityMethods:
+                - null
+                - null
+                port: 5248
+                ipv4Addr: ipv4Addr
+              - ipv6Addr: ipv6Addr
+                securityMethods:
+                - null
+                - null
+                port: 5248
+                ipv4Addr: ipv4Addr
+            - securityMethods:
+              - null
+              - null
+              versions:
+              - apiVersion: apiVersion
+                resources:
+                - operations:
+                  - null
+                  - null
+                  description: description
+                  resourceName: resourceName
+                  custOpName: custOpName
+                  uri: uri
+                - operations:
+                  - null
+                  - null
+                  description: description
+                  resourceName: resourceName
+                  custOpName: custOpName
+                  uri: uri
+                custOperations:
+                - operations:
+                  - null
+                  - null
+                  description: description
+                  custOpName: custOpName
+                - operations:
+                  - null
+                  - null
+                  description: description
+                  custOpName: custOpName
+                expiry: 2000-01-23T04:56:07.000+00:00
+              - apiVersion: apiVersion
+                resources:
+                - operations:
+                  - null
+                  - null
+                  description: description
+                  resourceName: resourceName
+                  custOpName: custOpName
+                  uri: uri
+                - operations:
+                  - null
+                  - null
+                  description: description
+                  resourceName: resourceName
+                  custOpName: custOpName
+                  uri: uri
+                custOperations:
+                - operations:
+                  - null
+                  - null
+                  description: description
+                  custOpName: custOpName
+                - operations:
+                  - null
+                  - null
+                  description: description
+                  custOpName: custOpName
+                expiry: 2000-01-23T04:56:07.000+00:00
+              domainName: domainName
+              aefId: aefId
+              interfaceDescriptions:
+              - ipv6Addr: ipv6Addr
+                securityMethods:
+                - null
+                - null
+                port: 5248
+                ipv4Addr: ipv4Addr
+              - ipv6Addr: ipv6Addr
+                securityMethods:
+                - null
+                - null
+                port: 5248
+                ipv4Addr: ipv4Addr
+            pubApiPath:
+              ccfIds:
+              - ccfIds
+              - ccfIds
+          - serviceAPICategory: serviceAPICategory
+            ccfId: ccfId
+            apiName: apiName
+            shareableInfo:
+              capifProvDoms:
+              - capifProvDoms
+              - capifProvDoms
+              isShareable: true
+            supportedFeatures: supportedFeatures
+            description: description
+            apiSuppFeats: apiSuppFeats
+            apiId: apiId
+            aefProfiles:
+            - securityMethods:
+              - null
+              - null
+              versions:
+              - apiVersion: apiVersion
+                resources:
+                - operations:
+                  - null
+                  - null
+                  description: description
+                  resourceName: resourceName
+                  custOpName: custOpName
+                  uri: uri
+                - operations:
+                  - null
+                  - null
+                  description: description
+                  resourceName: resourceName
+                  custOpName: custOpName
+                  uri: uri
+                custOperations:
+                - operations:
+                  - null
+                  - null
+                  description: description
+                  custOpName: custOpName
+                - operations:
+                  - null
+                  - null
+                  description: description
+                  custOpName: custOpName
+                expiry: 2000-01-23T04:56:07.000+00:00
+              - apiVersion: apiVersion
+                resources:
+                - operations:
+                  - null
+                  - null
+                  description: description
+                  resourceName: resourceName
+                  custOpName: custOpName
+                  uri: uri
+                - operations:
+                  - null
+                  - null
+                  description: description
+                  resourceName: resourceName
+                  custOpName: custOpName
+                  uri: uri
+                custOperations:
+                - operations:
+                  - null
+                  - null
+                  description: description
+                  custOpName: custOpName
+                - operations:
+                  - null
+                  - null
+                  description: description
+                  custOpName: custOpName
+                expiry: 2000-01-23T04:56:07.000+00:00
+              domainName: domainName
+              aefId: aefId
+              interfaceDescriptions:
+              - ipv6Addr: ipv6Addr
+                securityMethods:
+                - null
+                - null
+                port: 5248
+                ipv4Addr: ipv4Addr
+              - ipv6Addr: ipv6Addr
+                securityMethods:
+                - null
+                - null
+                port: 5248
+                ipv4Addr: ipv4Addr
+            - securityMethods:
+              - null
+              - null
+              versions:
+              - apiVersion: apiVersion
+                resources:
+                - operations:
+                  - null
+                  - null
+                  description: description
+                  resourceName: resourceName
+                  custOpName: custOpName
+                  uri: uri
+                - operations:
+                  - null
+                  - null
+                  description: description
+                  resourceName: resourceName
+                  custOpName: custOpName
+                  uri: uri
+                custOperations:
+                - operations:
+                  - null
+                  - null
+                  description: description
+                  custOpName: custOpName
+                - operations:
+                  - null
+                  - null
+                  description: description
+                  custOpName: custOpName
+                expiry: 2000-01-23T04:56:07.000+00:00
+              - apiVersion: apiVersion
+                resources:
+                - operations:
+                  - null
+                  - null
+                  description: description
+                  resourceName: resourceName
+                  custOpName: custOpName
+                  uri: uri
+                - operations:
+                  - null
+                  - null
+                  description: description
+                  resourceName: resourceName
+                  custOpName: custOpName
+                  uri: uri
+                custOperations:
+                - operations:
+                  - null
+                  - null
+                  description: description
+                  custOpName: custOpName
+                - operations:
+                  - null
+                  - null
+                  description: description
+                  custOpName: custOpName
+                expiry: 2000-01-23T04:56:07.000+00:00
+              domainName: domainName
+              aefId: aefId
+              interfaceDescriptions:
+              - ipv6Addr: ipv6Addr
+                securityMethods:
+                - null
+                - null
+                port: 5248
+                ipv4Addr: ipv4Addr
+              - ipv6Addr: ipv6Addr
+                securityMethods:
+                - null
+                - null
+                port: 5248
+                ipv4Addr: ipv4Addr
+            pubApiPath:
+              ccfIds:
+              - ccfIds
+              - ccfIds
+        resourceLocation: resourceLocation
+        apiList:
+        - serviceAPICategory: serviceAPICategory
+          ccfId: ccfId
+          apiName: apiName
+          shareableInfo:
+            capifProvDoms:
+            - capifProvDoms
+            - capifProvDoms
+            isShareable: true
+          supportedFeatures: supportedFeatures
+          description: description
+          apiSuppFeats: apiSuppFeats
+          apiId: apiId
+          aefProfiles:
+          - securityMethods:
+            - null
+            - null
+            versions:
+            - apiVersion: apiVersion
+              resources:
+              - operations:
+                - null
+                - null
+                description: description
+                resourceName: resourceName
+                custOpName: custOpName
+                uri: uri
+              - operations:
+                - null
+                - null
+                description: description
+                resourceName: resourceName
+                custOpName: custOpName
+                uri: uri
+              custOperations:
+              - operations:
+                - null
+                - null
+                description: description
+                custOpName: custOpName
+              - operations:
+                - null
+                - null
+                description: description
+                custOpName: custOpName
+              expiry: 2000-01-23T04:56:07.000+00:00
+            - apiVersion: apiVersion
+              resources:
+              - operations:
+                - null
+                - null
+                description: description
+                resourceName: resourceName
+                custOpName: custOpName
+                uri: uri
+              - operations:
+                - null
+                - null
+                description: description
+                resourceName: resourceName
+                custOpName: custOpName
+                uri: uri
+              custOperations:
+              - operations:
+                - null
+                - null
+                description: description
+                custOpName: custOpName
+              - operations:
+                - null
+                - null
+                description: description
+                custOpName: custOpName
+              expiry: 2000-01-23T04:56:07.000+00:00
+            domainName: domainName
+            aefId: aefId
+            interfaceDescriptions:
+            - ipv6Addr: ipv6Addr
+              securityMethods:
+              - null
+              - null
+              port: 5248
+              ipv4Addr: ipv4Addr
+            - ipv6Addr: ipv6Addr
+              securityMethods:
+              - null
+              - null
+              port: 5248
+              ipv4Addr: ipv4Addr
+          - securityMethods:
+            - null
+            - null
+            versions:
+            - apiVersion: apiVersion
+              resources:
+              - operations:
+                - null
+                - null
+                description: description
+                resourceName: resourceName
+                custOpName: custOpName
+                uri: uri
+              - operations:
+                - null
+                - null
+                description: description
+                resourceName: resourceName
+                custOpName: custOpName
+                uri: uri
+              custOperations:
+              - operations:
+                - null
+                - null
+                description: description
+                custOpName: custOpName
+              - operations:
+                - null
+                - null
+                description: description
+                custOpName: custOpName
+              expiry: 2000-01-23T04:56:07.000+00:00
+            - apiVersion: apiVersion
+              resources:
+              - operations:
+                - null
+                - null
+                description: description
+                resourceName: resourceName
+                custOpName: custOpName
+                uri: uri
+              - operations:
+                - null
+                - null
+                description: description
+                resourceName: resourceName
+                custOpName: custOpName
+                uri: uri
+              custOperations:
+              - operations:
+                - null
+                - null
+                description: description
+                custOpName: custOpName
+              - operations:
+                - null
+                - null
+                description: description
+                custOpName: custOpName
+              expiry: 2000-01-23T04:56:07.000+00:00
+            domainName: domainName
+            aefId: aefId
+            interfaceDescriptions:
+            - ipv6Addr: ipv6Addr
+              securityMethods:
+              - null
+              - null
+              port: 5248
+              ipv4Addr: ipv4Addr
+            - ipv6Addr: ipv6Addr
+              securityMethods:
+              - null
+              - null
+              port: 5248
+              ipv4Addr: ipv4Addr
+          pubApiPath:
+            ccfIds:
+            - ccfIds
+            - ccfIds
+        - serviceAPICategory: serviceAPICategory
+          ccfId: ccfId
+          apiName: apiName
+          shareableInfo:
+            capifProvDoms:
+            - capifProvDoms
+            - capifProvDoms
+            isShareable: true
+          supportedFeatures: supportedFeatures
+          description: description
+          apiSuppFeats: apiSuppFeats
+          apiId: apiId
+          aefProfiles:
+          - securityMethods:
+            - null
+            - null
+            versions:
+            - apiVersion: apiVersion
+              resources:
+              - operations:
+                - null
+                - null
+                description: description
+                resourceName: resourceName
+                custOpName: custOpName
+                uri: uri
+              - operations:
+                - null
+                - null
+                description: description
+                resourceName: resourceName
+                custOpName: custOpName
+                uri: uri
+              custOperations:
+              - operations:
+                - null
+                - null
+                description: description
+                custOpName: custOpName
+              - operations:
+                - null
+                - null
+                description: description
+                custOpName: custOpName
+              expiry: 2000-01-23T04:56:07.000+00:00
+            - apiVersion: apiVersion
+              resources:
+              - operations:
+                - null
+                - null
+                description: description
+                resourceName: resourceName
+                custOpName: custOpName
+                uri: uri
+              - operations:
+                - null
+                - null
+                description: description
+                resourceName: resourceName
+                custOpName: custOpName
+                uri: uri
+              custOperations:
+              - operations:
+                - null
+                - null
+                description: description
+                custOpName: custOpName
+              - operations:
+                - null
+                - null
+                description: description
+                custOpName: custOpName
+              expiry: 2000-01-23T04:56:07.000+00:00
+            domainName: domainName
+            aefId: aefId
+            interfaceDescriptions:
+            - ipv6Addr: ipv6Addr
+              securityMethods:
+              - null
+              - null
+              port: 5248
+              ipv4Addr: ipv4Addr
+            - ipv6Addr: ipv6Addr
+              securityMethods:
+              - null
+              - null
+              port: 5248
+              ipv4Addr: ipv4Addr
+          - securityMethods:
+            - null
+            - null
+            versions:
+            - apiVersion: apiVersion
+              resources:
+              - operations:
+                - null
+                - null
+                description: description
+                resourceName: resourceName
+                custOpName: custOpName
+                uri: uri
+              - operations:
+                - null
+                - null
+                description: description
+                resourceName: resourceName
+                custOpName: custOpName
+                uri: uri
+              custOperations:
+              - operations:
+                - null
+                - null
+                description: description
+                custOpName: custOpName
+              - operations:
+                - null
+                - null
+                description: description
+                custOpName: custOpName
+              expiry: 2000-01-23T04:56:07.000+00:00
+            - apiVersion: apiVersion
+              resources:
+              - operations:
+                - null
+                - null
+                description: description
+                resourceName: resourceName
+                custOpName: custOpName
+                uri: uri
+              - operations:
+                - null
+                - null
+                description: description
+                resourceName: resourceName
+                custOpName: custOpName
+                uri: uri
+              custOperations:
+              - operations:
+                - null
+                - null
+                description: description
+                custOpName: custOpName
+              - operations:
+                - null
+                - null
+                description: description
+                custOpName: custOpName
+              expiry: 2000-01-23T04:56:07.000+00:00
+            domainName: domainName
+            aefId: aefId
+            interfaceDescriptions:
+            - ipv6Addr: ipv6Addr
+              securityMethods:
+              - null
+              - null
+              port: 5248
+              ipv4Addr: ipv4Addr
+            - ipv6Addr: ipv6Addr
+              securityMethods:
+              - null
+              - null
+              port: 5248
+              ipv4Addr: ipv4Addr
+          pubApiPath:
+            ccfIds:
+            - ccfIds
+            - ccfIds
+      properties:
+        result:
+          description: Set to "true" indicate successful on-boarding. Otherwise set
+            to "false"
+          type: boolean
+        resourceLocation:
+          description: string providing an URI formatted according to IETF RFC 3986.
+          title: notificationDestination
+          type: string
+        apiInvokerEnrolmentDetails:
+          $ref: '#/components/schemas/APIInvokerEnrolmentDetails'
+        apiList:
+          description: The list of service APIs that the API Invoker is allowed to
+            invoke
+          items:
+            $ref: '#/components/schemas/ServiceAPIDescription'
+          minItems: 1
+          title: apiList
+          type: array
+      required:
+      - result
+      type: object
+    ProblemDetails:
+      description: Represents additional information and details on an error response.
+      properties:
+        type:
+          description: string providing an URI formatted according to IETF RFC 3986.
+          title: notificationDestination
+          type: string
+        title:
+          description: A short, human-readable summary of the problem type. It should
+            not change from occurrence to occurrence of the problem.
+          title: title
+          type: string
+        status:
+          description: The HTTP status code for this occurrence of the problem.
+          title: status
+          type: integer
+        detail:
+          description: A human-readable explanation specific to this occurrence of
+            the problem.
+          title: detail
+          type: string
+        instance:
+          description: string providing an URI formatted according to IETF RFC 3986.
+          title: notificationDestination
+          type: string
+        cause:
+          description: A machine-readable application error cause specific to this
+            occurrence of the problem. This IE should be present and provide application-related
+            error information, if available.
+          title: cause
+          type: string
+        invalidParams:
+          description: Description of invalid parameters, for a request rejected due
+            to invalid parameters.
+          items:
+            $ref: '#/components/schemas/InvalidParam'
+          minItems: 1
+          title: invalidParams
+          type: array
+        supportedFeatures:
+          description: A string used to indicate the features supported by an API
+            that is used as defined in clause 6.6 in 3GPP TS 29.500. The string shall
+            contain a bitmask indicating supported features in hexadecimal representation
+            Each character in the string shall take a value of "0" to "9", "a" to
+            "f" or "A" to "F" and shall represent the support of 4 features as described
+            in table 5.2.2-3. The most significant character representing the highest-numbered
+            features shall appear first in the string, and the character representing
+            features 1 to 4 shall appear last in the string. The list of features
+            and their numbering (starting with 1) are defined separately for each
+            API. If the string contains a lower number of characters than there are
+            defined features for an API, all features that would be represented by
+            characters that are not present in the string are not supported
+          pattern: ^[A-Fa-f0-9]*$
+          title: SupportedFeatures
+          type: string
+      title: ProblemDetails
+      type: object
+    Uri:
+      description: string providing an URI formatted according to IETF RFC 3986.
+      title: notificationDestination
+      type: string
+    InvalidParam:
+      description: Represents the description of invalid parameters, for a request
+        rejected due to invalid parameters.
+      properties:
+        param:
+          description: Attribute's name encoded as a JSON Pointer, or header's name.
+          title: param
+          type: string
+        reason:
+          description: A human-readable reason, e.g. "must be a positive integer".
+          title: reason
+          type: string
+      required:
+      - param
+      title: InvalidParam
+      type: object
+    ServiceAPIDescription:
+      description: Represents the description of a service API as published by the
+        APF.
+      example:
+        serviceAPICategory: serviceAPICategory
+        ccfId: ccfId
+        apiName: apiName
+        shareableInfo:
+          capifProvDoms:
+          - capifProvDoms
+          - capifProvDoms
+          isShareable: true
+        supportedFeatures: supportedFeatures
+        description: description
+        apiSuppFeats: apiSuppFeats
+        apiId: apiId
+        aefProfiles:
+        - securityMethods:
+          - null
+          - null
+          versions:
+          - apiVersion: apiVersion
+            resources:
+            - operations:
+              - null
+              - null
+              description: description
+              resourceName: resourceName
+              custOpName: custOpName
+              uri: uri
+            - operations:
+              - null
+              - null
+              description: description
+              resourceName: resourceName
+              custOpName: custOpName
+              uri: uri
+            custOperations:
+            - operations:
+              - null
+              - null
+              description: description
+              custOpName: custOpName
+            - operations:
+              - null
+              - null
+              description: description
+              custOpName: custOpName
+            expiry: 2000-01-23T04:56:07.000+00:00
+          - apiVersion: apiVersion
+            resources:
+            - operations:
+              - null
+              - null
+              description: description
+              resourceName: resourceName
+              custOpName: custOpName
+              uri: uri
+            - operations:
+              - null
+              - null
+              description: description
+              resourceName: resourceName
+              custOpName: custOpName
+              uri: uri
+            custOperations:
+            - operations:
+              - null
+              - null
+              description: description
+              custOpName: custOpName
+            - operations:
+              - null
+              - null
+              description: description
+              custOpName: custOpName
+            expiry: 2000-01-23T04:56:07.000+00:00
+          domainName: domainName
+          aefId: aefId
+          interfaceDescriptions:
+          - ipv6Addr: ipv6Addr
+            securityMethods:
+            - null
+            - null
+            port: 5248
+            ipv4Addr: ipv4Addr
+          - ipv6Addr: ipv6Addr
+            securityMethods:
+            - null
+            - null
+            port: 5248
+            ipv4Addr: ipv4Addr
+        - securityMethods:
+          - null
+          - null
+          versions:
+          - apiVersion: apiVersion
+            resources:
+            - operations:
+              - null
+              - null
+              description: description
+              resourceName: resourceName
+              custOpName: custOpName
+              uri: uri
+            - operations:
+              - null
+              - null
+              description: description
+              resourceName: resourceName
+              custOpName: custOpName
+              uri: uri
+            custOperations:
+            - operations:
+              - null
+              - null
+              description: description
+              custOpName: custOpName
+            - operations:
+              - null
+              - null
+              description: description
+              custOpName: custOpName
+            expiry: 2000-01-23T04:56:07.000+00:00
+          - apiVersion: apiVersion
+            resources:
+            - operations:
+              - null
+              - null
+              description: description
+              resourceName: resourceName
+              custOpName: custOpName
+              uri: uri
+            - operations:
+              - null
+              - null
+              description: description
+              resourceName: resourceName
+              custOpName: custOpName
+              uri: uri
+            custOperations:
+            - operations:
+              - null
+              - null
+              description: description
+              custOpName: custOpName
+            - operations:
+              - null
+              - null
+              description: description
+              custOpName: custOpName
+            expiry: 2000-01-23T04:56:07.000+00:00
+          domainName: domainName
+          aefId: aefId
+          interfaceDescriptions:
+          - ipv6Addr: ipv6Addr
+            securityMethods:
+            - null
+            - null
+            port: 5248
+            ipv4Addr: ipv4Addr
+          - ipv6Addr: ipv6Addr
+            securityMethods:
+            - null
+            - null
+            port: 5248
+            ipv4Addr: ipv4Addr
+        pubApiPath:
+          ccfIds:
+          - ccfIds
+          - ccfIds
+      properties:
+        apiName:
+          description: API name, it is set as {apiName} part of the URI structure
+            as defined in subclause 4.4 of 3GPP TS 29.501.
+          title: apiName
+          type: string
+        apiId:
+          description: API identifier assigned by the CAPIF core function to the published
+            service API. Shall not be present in the HTTP POST request from the API
+            publishing function to the CAPIF core function. Shall be present in the
+            HTTP POST response from the CAPIF core function to the API publishing
+            function and in the HTTP GET response from the CAPIF core function to
+            the API invoker (discovery API).
+          title: apiId
+          type: string
+        aefProfiles:
+          description: AEF profile information, which includes the exposed API details
+            (e.g. protocol).
+          items:
+            $ref: '#/components/schemas/AefProfile'
+          minItems: 1
+          title: aefProfiles
+          type: array
+        description:
+          description: Text description of the API
+          title: description
+          type: string
+        supportedFeatures:
+          description: A string used to indicate the features supported by an API
+            that is used as defined in clause 6.6 in 3GPP TS 29.500. The string shall
+            contain a bitmask indicating supported features in hexadecimal representation
+            Each character in the string shall take a value of "0" to "9", "a" to
+            "f" or "A" to "F" and shall represent the support of 4 features as described
+            in table 5.2.2-3. The most significant character representing the highest-numbered
+            features shall appear first in the string, and the character representing
+            features 1 to 4 shall appear last in the string. The list of features
+            and their numbering (starting with 1) are defined separately for each
+            API. If the string contains a lower number of characters than there are
+            defined features for an API, all features that would be represented by
+            characters that are not present in the string are not supported
+          pattern: ^[A-Fa-f0-9]*$
+          title: SupportedFeatures
+          type: string
+        shareableInfo:
+          $ref: '#/components/schemas/ShareableInformation'
+        serviceAPICategory:
+          title: serviceAPICategory
+          type: string
+        apiSuppFeats:
+          description: A string used to indicate the features supported by an API
+            that is used as defined in clause 6.6 in 3GPP TS 29.500. The string shall
+            contain a bitmask indicating supported features in hexadecimal representation
+            Each character in the string shall take a value of "0" to "9", "a" to
+            "f" or "A" to "F" and shall represent the support of 4 features as described
+            in table 5.2.2-3. The most significant character representing the highest-numbered
+            features shall appear first in the string, and the character representing
+            features 1 to 4 shall appear last in the string. The list of features
+            and their numbering (starting with 1) are defined separately for each
+            API. If the string contains a lower number of characters than there are
+            defined features for an API, all features that would be represented by
+            characters that are not present in the string are not supported
+          pattern: ^[A-Fa-f0-9]*$
+          title: SupportedFeatures
+          type: string
+        pubApiPath:
+          $ref: '#/components/schemas/PublishedApiPath'
+        ccfId:
+          description: CAPIF core function identifier.
+          title: ccfId
+          type: string
+      required:
+      - apiName
+      title: ServiceAPIDescription
+      type: object
+    AefProfile:
+      description: Represents the AEF profile data.
+      example:
+        securityMethods:
+        - null
+        - null
+        versions:
+        - apiVersion: apiVersion
+          resources:
+          - operations:
+            - null
+            - null
+            description: description
+            resourceName: resourceName
+            custOpName: custOpName
+            uri: uri
+          - operations:
+            - null
+            - null
+            description: description
+            resourceName: resourceName
+            custOpName: custOpName
+            uri: uri
+          custOperations:
+          - operations:
+            - null
+            - null
+            description: description
+            custOpName: custOpName
+          - operations:
+            - null
+            - null
+            description: description
+            custOpName: custOpName
+          expiry: 2000-01-23T04:56:07.000+00:00
+        - apiVersion: apiVersion
+          resources:
+          - operations:
+            - null
+            - null
+            description: description
+            resourceName: resourceName
+            custOpName: custOpName
+            uri: uri
+          - operations:
+            - null
+            - null
+            description: description
+            resourceName: resourceName
+            custOpName: custOpName
+            uri: uri
+          custOperations:
+          - operations:
+            - null
+            - null
+            description: description
+            custOpName: custOpName
+          - operations:
+            - null
+            - null
+            description: description
+            custOpName: custOpName
+          expiry: 2000-01-23T04:56:07.000+00:00
+        domainName: domainName
+        aefId: aefId
+        interfaceDescriptions:
+        - ipv6Addr: ipv6Addr
+          securityMethods:
+          - null
+          - null
+          port: 5248
+          ipv4Addr: ipv4Addr
+        - ipv6Addr: ipv6Addr
+          securityMethods:
+          - null
+          - null
+          port: 5248
+          ipv4Addr: ipv4Addr
+      oneOf:
+      - required:
+        - domainName
+      - required:
+        - interfaceDescriptions
+      properties:
+        aefId:
+          description: Identifier of the API exposing function
+          title: aefId
+          type: string
+        versions:
+          description: API version
+          items:
+            $ref: '#/components/schemas/Version'
+          minItems: 1
+          title: versions
+          type: array
+        protocol:
+          $ref: '#/components/schemas/Protocol'
+        dataFormat:
+          $ref: '#/components/schemas/DataFormat'
+        securityMethods:
+          description: Security methods supported by the AEF
+          items:
+            $ref: '#/components/schemas/SecurityMethod'
+          minItems: 1
+          title: securityMethods
+          type: array
+        domainName:
+          description: Domain to which API belongs to
+          title: domainName
+          type: string
+        interfaceDescriptions:
+          description: Interface details
+          items:
+            $ref: '#/components/schemas/InterfaceDescription'
+          minItems: 1
+          title: interfaceDescriptions
+          type: array
+      required:
+      - aefId
+      - versions
+      title: AefProfile
+      type: object
+    Version:
+      description: Represents the API version information.
+      example:
+        apiVersion: apiVersion
+        resources:
+        - operations:
+          - null
+          - null
+          description: description
+          resourceName: resourceName
+          custOpName: custOpName
+          uri: uri
+        - operations:
+          - null
+          - null
+          description: description
+          resourceName: resourceName
+          custOpName: custOpName
+          uri: uri
+        custOperations:
+        - operations:
+          - null
+          - null
+          description: description
+          custOpName: custOpName
+        - operations:
+          - null
+          - null
+          description: description
+          custOpName: custOpName
+        expiry: 2000-01-23T04:56:07.000+00:00
+      properties:
+        apiVersion:
+          description: API major version in URI (e.g. v1)
+          title: apiVersion
+          type: string
+        expiry:
+          description: string with format "date-time" as defined in OpenAPI.
+          format: date-time
+          title: DateTime
+          type: string
+        resources:
+          description: Resources supported by the API.
+          items:
+            $ref: '#/components/schemas/Resource'
+          minItems: 1
+          title: resources
+          type: array
+        custOperations:
+          description: Custom operations without resource association.
+          items:
+            $ref: '#/components/schemas/CustomOperation'
+          minItems: 1
+          title: custOperations
+          type: array
+      required:
+      - apiVersion
+      title: Version
+      type: object
+    Resource:
+      description: Represents the API resource data.
+      example:
+        operations:
+        - null
+        - null
+        description: description
+        resourceName: resourceName
+        custOpName: custOpName
+        uri: uri
+      properties:
+        resourceName:
+          description: Resource name
+          title: resourceName
+          type: string
+        commType:
+          $ref: '#/components/schemas/CommunicationType'
+        uri:
+          description: Relative URI of the API resource, it is set as {apiSpecificResourceUriPart}
+            part of the URI structure as defined in subclause 4.4 of 3GPP TS 29.501.
+          title: uri
+          type: string
+        custOpName:
+          description: it is set as {custOpName} part of the URI structure for a custom
+            operation associated with a resource as defined in subclause 4.4 of 3GPP
+            TS 29.501.
+          title: custOpName
+          type: string
+        operations:
+          description: Supported HTTP methods for the API resource. Only applicable
+            when the protocol in AefProfile indicates HTTP.
+          items:
+            $ref: '#/components/schemas/Operation'
+          minItems: 1
+          title: operations
+          type: array
+        description:
+          description: Text description of the API resource
+          title: description
+          type: string
+      required:
+      - commType
+      - resourceName
+      - uri
+      title: Resource
+      type: object
+    CommunicationType:
+      anyOf:
+      - $ref: '#/components/schemas/CommunicationType_anyOf'
+      - description: |
+          This string provides forward-compatibility with future extensions to the enumeration but is not used to encode content defined in the present version of this API.
+        type: string
+      description: |
+        Possible values are - REQUEST_RESPONSE: The communication is of the type request-response - SUBSCRIBE_NOTIFY: The communication is of the type subscribe-notify
+      title: CommunicationType
+    Operation:
+      anyOf:
+      - $ref: '#/components/schemas/Operation_anyOf'
+      - description: |
+          This string provides forward-compatibility with future extensions to the enumeration but is not used to encode content defined in the present version of this API.
+        type: string
+      description: |
+        Possible values are - GET: HTTP GET method - POST: HTTP POST method - PUT: HTTP PUT method - PATCH: HTTP PATCH method - DELETE: HTTP DELETE method
+      title: Operation
+    CustomOperation:
+      description: Represents the description of a custom operation.
+      example:
+        operations:
+        - null
+        - null
+        description: description
+        custOpName: custOpName
+      properties:
+        commType:
+          $ref: '#/components/schemas/CommunicationType'
+        custOpName:
+          description: it is set as {custOpName} part of the URI structure for a custom
+            operation without resource association as defined in subclause 4.4 of
+            3GPP TS 29.501.
+          title: custOpName
+          type: string
+        operations:
+          description: Supported HTTP methods for the API resource. Only applicable
+            when the protocol in AefProfile indicates HTTP.
+          items:
+            $ref: '#/components/schemas/Operation'
+          minItems: 1
+          title: operations
+          type: array
+        description:
+          description: Text description of the custom operation
+          title: description
+          type: string
+      required:
+      - commType
+      - custOpName
+      title: CustomOperation
+      type: object
+    Protocol:
+      anyOf:
+      - $ref: '#/components/schemas/Protocol_anyOf'
+      - description: |
+          This string provides forward-compatibility with future extensions to the enumeration but is not used to encode content defined in the present version of this API.
+        type: string
+      description: |
+        Possible values are - HTTP_1_1: HTTP version 1.1 - HTTP_2: HTTP version 2
+      title: Protocol
+    DataFormat:
+      anyOf:
+      - $ref: '#/components/schemas/DataFormat_anyOf'
+      - description: |
+          This string provides forward-compatibility with future extensions to the enumeration but is not used to encode content defined in the present version of this API.
+        type: string
+      description: |
+        Possible values are - JSON: JavaScript Object Notation
+      title: DataFormat
+    SecurityMethod:
+      anyOf:
+      - $ref: '#/components/schemas/SecurityMethod_anyOf'
+      - description: |
+          This string provides forward-compatibility with future extensions to the enumeration but is not used to encode content defined in the present version of this API.
+        type: string
+      description: |
+        Possible values are - PSK: Security method 1 (Using TLS-PSK) as described in 3GPP TS 33.122 - PKI: Security method 2 (Using PKI) as described in 3GPP TS 33.122 - OAUTH: Security method 3 (TLS with OAuth token) as described in 3GPP TS 33.122
+      title: SecurityMethod
+    InterfaceDescription:
+      description: Represents the description of an API's interface.
+      example:
+        ipv6Addr: ipv6Addr
+        securityMethods:
+        - null
+        - null
+        port: 5248
+        ipv4Addr: ipv4Addr
+      oneOf:
+      - required:
+        - ipv4Addr
+      - required:
+        - ipv6Addr
+      properties:
+        ipv4Addr:
+          description: string identifying a Ipv4 address formatted in the "dotted
+            decimal" notation as defined in IETF RFC 1166.
+          title: Ipv4Addr
+          type: string
+        ipv6Addr:
+          description: string identifying a Ipv6 address formatted according to clause
+            4 in IETF RFC 5952. The mixed Ipv4 Ipv6 notation according to clause 5
+            of IETF RFC 5952 shall not be used.
+          title: Ipv6Addr
+          type: string
+        port:
+          description: Unsigned integer with valid values between 0 and 65535.
+          maximum: 65535
+          minimum: 0
+          title: Port
+          type: integer
+        securityMethods:
+          description: Security methods supported by the interface, it take precedence
+            over the security methods provided in AefProfile, for this specific interface.
+          items:
+            $ref: '#/components/schemas/SecurityMethod'
+          minItems: 1
+          title: securityMethods
+          type: array
+      title: InterfaceDescription
+      type: object
+    ShareableInformation:
+      description: Indicates whether the service API and/or the service API category
+        can be shared to the list of CAPIF provider domains.
+      example:
+        capifProvDoms:
+        - capifProvDoms
+        - capifProvDoms
+        isShareable: true
+      properties:
+        isShareable:
+          description: Set to "true" indicates that the service API and/or the service
+            API category can be shared to the list of CAPIF provider domain information.
+            Otherwise set to "false".
+          title: isShareable
+          type: boolean
+        capifProvDoms:
+          description: List of CAPIF provider domains to which the service API information
+            to be shared.
+          items:
+            type: string
+          minItems: 1
+          title: capifProvDoms
+          type: array
+      required:
+      - isShareable
+      title: ShareableInformation
+      type: object
+    PublishedApiPath:
+      description: Represents the published API path within the same CAPIF provider
+        domain.
+      example:
+        ccfIds:
+        - ccfIds
+        - ccfIds
+      properties:
+        ccfIds:
+          description: A list of CCF identifiers where the service API is already
+            published.
+          items:
+            type: string
+          minItems: 1
+          title: ccfIds
+          type: array
+      title: PublishedApiPath
+      type: object
+    WebsockNotifConfig:
+      description: Represents the configuration information for the delivery of notifications
+        over Websockets.
+      example:
+        requestWebsocketUri: true
+        websocketUri: websocketUri
+      properties:
+        websocketUri:
+          description: string formatted according to IETF RFC 3986 identifying a referenced
+            resource.
+          title: Link
+          type: string
+        requestWebsocketUri:
+          description: Set by the SCS/AS to indicate that the Websocket delivery is
+            requested.
+          title: requestWebsocketUri
+          type: boolean
+      title: WebsockNotifConfig
+      type: object
+    Link:
+      description: string formatted according to IETF RFC 3986 identifying a referenced
+        resource.
+      title: Link
+      type: string
+    SupportedFeatures:
+      description: A string used to indicate the features supported by an API that
+        is used as defined in clause 6.6 in 3GPP TS 29.500. The string shall contain
+        a bitmask indicating supported features in hexadecimal representation Each
+        character in the string shall take a value of "0" to "9", "a" to "f" or "A"
+        to "F" and shall represent the support of 4 features as described in table 5.2.2-3.
+        The most significant character representing the highest-numbered features
+        shall appear first in the string, and the character representing features
+        1 to 4 shall appear last in the string. The list of features and their numbering
+        (starting with 1) are defined separately for each API. If the string contains
+        a lower number of characters than there are defined features for an API, all
+        features that would be represented by characters that are not present in the
+        string are not supported
+      pattern: ^[A-Fa-f0-9]*$
+      title: SupportedFeatures
+      type: string
+    DateTime:
+      description: string with format "date-time" as defined in OpenAPI.
+      format: date-time
+      title: DateTime
+      type: string
+    Ipv4Addr:
+      description: string identifying a Ipv4 address formatted in the "dotted decimal"
+        notation as defined in IETF RFC 1166.
+      title: Ipv4Addr
+      type: string
+    Ipv6Addr:
+      description: string identifying a Ipv6 address formatted according to clause
+        4 in IETF RFC 5952. The mixed Ipv4 Ipv6 notation according to clause 5 of
+        IETF RFC 5952 shall not be used.
+      title: Ipv6Addr
+      type: string
+    Port:
+      description: Unsigned integer with valid values between 0 and 65535.
+      maximum: 65535
+      minimum: 0
+      title: Port
+      type: integer
+    CommunicationType_anyOf:
+      enum:
+      - REQUEST_RESPONSE
+      - SUBSCRIBE_NOTIFY
+      title: CommunicationType_anyOf
+      type: string
+    Operation_anyOf:
+      enum:
+      - GET
+      - POST
+      - PUT
+      - PATCH
+      - DELETE
+      title: Operation_anyOf
+      type: string
+    Protocol_anyOf:
+      enum:
+      - HTTP_1_1
+      - HTTP_2
+      title: Protocol_anyOf
+      type: string
+    DataFormat_anyOf:
+      enum:
+      - JSON
+      title: DataFormat_anyOf
+      type: string
+    SecurityMethod_anyOf:
+      enum:
+      - PSK
+      - PKI
+      - OAUTH
+      title: SecurityMethod_anyOf
+      type: string
diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/typing_utils.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/typing_utils.py
new file mode 100644
index 0000000000000000000000000000000000000000..0563f81fd5345282a33705038dfa77fdcaa15872
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/typing_utils.py
@@ -0,0 +1,32 @@
+# coding: utf-8
+
+import sys
+
+if sys.version_info < (3, 7):
+    import typing
+
+    def is_generic(klass):
+        """ Determine whether klass is a generic class """
+        return type(klass) == typing.GenericMeta
+
+    def is_dict(klass):
+        """ Determine whether klass is a Dict """
+        return klass.__extra__ == dict
+
+    def is_list(klass):
+        """ Determine whether klass is a List """
+        return klass.__extra__ == list
+
+else:
+
+    def is_generic(klass):
+        """ Determine whether klass is a generic class """
+        return hasattr(klass, '__origin__')
+
+    def is_dict(klass):
+        """ Determine whether klass is a Dict """
+        return klass.__origin__ == dict
+
+    def is_list(klass):
+        """ Determine whether klass is a List """
+        return klass.__origin__ == list
diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/util.py b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/util.py
new file mode 100644
index 0000000000000000000000000000000000000000..6ce55d89b6a2673f6ad15702c9335d578877825e
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/util.py
@@ -0,0 +1,172 @@
+import datetime
+
+import six
+import typing
+from api_invoker_management import typing_utils
+
+def dict_to_camel_case(my_dict):
+
+
+        result = {}
+
+        for attr, value in my_dict.items():
+
+            my_key = ''.join(word.title() for word in attr.split('_'))
+            my_key= ''.join([my_key[0].lower(), my_key[1:]])
+
+            if isinstance(value, list):
+                result[my_key] = list(map(
+                    lambda x: dict_to_camel_case(x) if isinstance(x, dict) else x, value ))
+
+            elif hasattr(value, "to_dict"):
+                result[my_key] = dict_to_camel_case(value)
+
+            elif isinstance(value, dict):
+                value = dict_to_camel_case(value)
+                result[my_key] = value
+            else:
+                result[my_key] = value
+
+        return result
+
+def _deserialize(data, klass):
+    """Deserializes dict, list, str into an object.
+
+    :param data: dict, list or str.
+    :param klass: class literal, or string of class name.
+
+    :return: object.
+    """
+    if data is None:
+        return None
+
+    if klass in six.integer_types or klass in (float, str, bool, bytearray):
+        return _deserialize_primitive(data, klass)
+    elif klass == object:
+        return _deserialize_object(data)
+    elif klass == datetime.date:
+        return deserialize_date(data)
+    elif klass == datetime.datetime:
+        return deserialize_datetime(data)
+    elif typing_utils.is_generic(klass):
+        if typing_utils.is_list(klass):
+            return _deserialize_list(data, klass.__args__[0])
+        if typing_utils.is_dict(klass):
+            return _deserialize_dict(data, klass.__args__[1])
+    else:
+        return deserialize_model(data, klass)
+
+
+def _deserialize_primitive(data, klass):
+    """Deserializes to primitive type.
+
+    :param data: data to deserialize.
+    :param klass: class literal.
+
+    :return: int, long, float, str, bool.
+    :rtype: int | long | float | str | bool
+    """
+    try:
+        value = klass(data)
+    except UnicodeEncodeError:
+        value = six.u(data)
+    except TypeError:
+        value = data
+    return value
+
+
+def _deserialize_object(value):
+    """Return an original value.
+
+    :return: object.
+    """
+    return value
+
+
+def deserialize_date(string):
+    """Deserializes string to date.
+
+    :param string: str.
+    :type string: str
+    :return: date.
+    :rtype: date
+    """
+    if string is None:
+      return None
+    
+    try:
+        from dateutil.parser import parse
+        return parse(string).date()
+    except ImportError:
+        return string
+
+
+def deserialize_datetime(string):
+    """Deserializes string to datetime.
+
+    The string should be in iso8601 datetime format.
+
+    :param string: str.
+    :type string: str
+    :return: datetime.
+    :rtype: datetime
+    """
+    if string is None:
+      return None
+    
+    try:
+        from dateutil.parser import parse
+        return parse(string)
+    except ImportError:
+        return string
+
+
+def deserialize_model(data, klass):
+    """Deserializes list or dict to model.
+
+    :param data: dict, list.
+    :type data: dict | list
+    :param klass: class literal.
+    :return: model object.
+    """
+    instance = klass()
+
+    if not instance.openapi_types:
+        return data
+
+    for attr, attr_type in six.iteritems(instance.openapi_types):
+        if data is not None \
+                and instance.attribute_map[attr] in data \
+                and isinstance(data, (list, dict)):
+            value = data[instance.attribute_map[attr]]
+            setattr(instance, attr, _deserialize(value, attr_type))
+
+    return instance
+
+
+def _deserialize_list(data, boxed_type):
+    """Deserializes a list and its elements.
+
+    :param data: list to deserialize.
+    :type data: list
+    :param boxed_type: class literal.
+
+    :return: deserialized list.
+    :rtype: list
+    """
+    return [_deserialize(sub_data, boxed_type)
+            for sub_data in data]
+
+
+def _deserialize_dict(data, boxed_type):
+    """Deserializes a dict and its elements.
+
+    :param data: dict to deserialize.
+    :type data: dict
+    :param boxed_type: class literal.
+
+    :return: deserialized dict.
+    :rtype: dict
+    """
+    return {k: _deserialize(v, boxed_type)
+            for k, v in six.iteritems(data)}
diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/config.yaml b/services/TS29222_CAPIF_API_Invoker_Management_API/config.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..e208a78ccfe2a48d16071e149b36575ba865e4d7
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Invoker_Management_API/config.yaml
@@ -0,0 +1,35 @@
+mongo: {
+  'user': 'root',
+  'password': 'example',
+  'db': 'capif',
+  'col': 'invokerdetails',
+  'capif_users_col': "user",
+  'certs_col': "certs",
+  'service_col': 'serviceapidescriptions',
+  'host': 'mongo',
+  'port': "27017"
+}
+mongo_register: {
+  'user': 'root',
+  'password': 'example',
+  'db': 'capif_users',
+  'col': 'user',
+  'host': 'mongo_register',
+  'port': '27017'
+}
+ca_factory: {
+  "url": "vault",
+  "port": "8200",
+  "token": "dev-only-token"
+}
+
+monitoring: {
+  "fluent_bit_host": fluent-bit,
+  "fluent_bit_port": 24224,
+  "opentelemetry_url": "otel-collector",
+  "opentelemetry_port": "55680",
+  "opentelemetry_max_queue_size": 8192,
+  "opentelemetry_schedule_delay_millis": 20000,
+  "opentelemetry_max_export_batch_size": 2048,
+  "opentelemetry_export_timeout_millis": 60000
+}
\ No newline at end of file
diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/git_push.sh b/services/TS29222_CAPIF_API_Invoker_Management_API/git_push.sh
new file mode 100644
index 0000000000000000000000000000000000000000..9405f72e950cdb8ca24c3cf4d15cee7eac62fde7
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Invoker_Management_API/git_push.sh
@@ -0,0 +1,57 @@
+#!/bin/sh
+# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
+#
+# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl "minor update" "gitlab.com"
+
+git_user_id=$1
+git_repo_id=$2
+release_note=$3
+git_host=$4
+
+if [ "$git_host" = "" ]; then
+    git_host="github.com"
+    echo "[INFO] No command line input provided. Set \$git_host to $git_host"
+fi
+
+if [ "$git_user_id" = "" ]; then
+    git_user_id="GIT_USER_ID"
+    echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id"
+fi
+
+if [ "$git_repo_id" = "" ]; then
+    git_repo_id="GIT_REPO_ID"
+    echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id"
+fi
+
+if [ "$release_note" = "" ]; then
+    release_note="Minor update"
+    echo "[INFO] No command line input provided. Set \$release_note to $release_note"
+fi
+
+# Initialize the local directory as a Git repository
+git init
+
+# Adds the files in the local repository and stages them for commit.
+git add .
+
+# Commits the tracked changes and prepares them to be pushed to a remote repository.
+git commit -m "$release_note"
+
+# Sets the new remote
+git_remote=`git remote`
+if [ "$git_remote" = "" ]; then # git remote not defined
+
+    if [ "$GIT_TOKEN" = "" ]; then
+        echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git credential in your environment."
+        git remote add origin https://${git_host}/${git_user_id}/${git_repo_id}.git
+    else
+        git remote add origin https://${git_user_id}:${GIT_TOKEN}@${git_host}/${git_user_id}/${git_repo_id}.git
+    fi
+
+fi
+
+git pull origin master
+
+# Pushes (Forces) the changes in the local repository up to the remote repository
+echo "Git pushing to https://${git_host}/${git_user_id}/${git_repo_id}.git"
+git push origin master 2>&1 | grep -v 'To https'
diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/prepare_invoker.sh b/services/TS29222_CAPIF_API_Invoker_Management_API/prepare_invoker.sh
new file mode 100644
index 0000000000000000000000000000000000000000..90ce2be086ecaa87740728f0f1f32c10627b0c1e
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Invoker_Management_API/prepare_invoker.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+
+VAULT_ADDR="http://$VAULT_HOSTNAME:$VAULT_PORT"
+VAULT_TOKEN=$VAULT_ACCESS_TOKEN
+
+curl  -vv -k -retry 30 \
+    --retry-all-errors \
+    --connect-timeout 5 \
+    --max-time 10 \
+    --retry-delay 10 \
+    --retry-max-time 300 \
+    --header "X-Vault-Token: $VAULT_TOKEN" \
+    --request GET "$VAULT_ADDR/v1/secret/data/server_cert/pub" 2>/dev/null | jq -r '.data.data.pub_key' -j > /usr/src/app/api_invoker_management/pubkey.pem
+
+
+cd /usr/src/app/
+python3 -m api_invoker_management
\ No newline at end of file
diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/requirements.txt b/services/TS29222_CAPIF_API_Invoker_Management_API/requirements.txt
new file mode 100644
index 0000000000000000000000000000000000000000..ce843e66061b4a6627a867b9853ce81adb411441
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Invoker_Management_API/requirements.txt
@@ -0,0 +1,21 @@
+connexion[swagger-ui] == 2.14.2; python_version>="3.6"
+swagger-ui-bundle >= 0.0.2
+python_dateutil >= 2.6.0
+setuptools >= 21.0.0
+Flask == 2.0.3
+pymongo == 4.3.3
+flask_jwt_extended == 4.4.4
+pyopenssl == 23.0.0
+rfc3987 == 1.3.8
+redis ==  4.5.4
+opentelemetry-instrumentation == 0.40b0
+opentelemetry-instrumentation-flask == 0.40b0
+opentelemetry-instrumentation-redis == 0.40b0
+opentelemetry-instrumentation-pymongo == 0.40b0
+opentelemetry-exporter-otlp == 1.19.0
+opentelemetry-exporter-jaeger==1.17.0
+fluent == 0.10.0
+fluent-logger == 0.10.0
+opentelemetry-api == 1.19.0
+opentelemetry-sdk == 1.19.0
+flask_executor == 1.0.0
diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/setup.py b/services/TS29222_CAPIF_API_Invoker_Management_API/setup.py
new file mode 100644
index 0000000000000000000000000000000000000000..8bd54a4473b3b6f1d29aca7e7bf80ada78ed124f
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Invoker_Management_API/setup.py
@@ -0,0 +1,39 @@
+# coding: utf-8
+
+import sys
+from setuptools import setup, find_packages
+
+NAME = "api_invoker_management"
+VERSION = "1.0.0"
+
+# To install the library, run the following
+#
+# python setup.py install
+#
+# prerequisite: setuptools
+# http://pypi.python.org/pypi/setuptools
+
+REQUIRES = [
+    "connexion>=2.0.2",
+    "swagger-ui-bundle>=0.0.2",
+    "python_dateutil>=2.6.0"
+]
+
+setup(
+    name=NAME,
+    version=VERSION,
+    description="CAPIF_API_Invoker_Management_API",
+    author_email="",
+    url="",
+    keywords=["OpenAPI", "CAPIF_API_Invoker_Management_API"],
+    install_requires=REQUIRES,
+    packages=find_packages(),
+    package_data={'': ['openapi/openapi.yaml']},
+    include_package_data=True,
+    entry_points={
+        'console_scripts': ['api_invoker_management=api_invoker_management.__main__:main']},
+    long_description="""\
+    API for API invoker management. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. 
+    """
+)
+
diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/test-requirements.txt b/services/TS29222_CAPIF_API_Invoker_Management_API/test-requirements.txt
new file mode 100644
index 0000000000000000000000000000000000000000..0970f28c7c5a344d7fd9b9c893c584e7336df266
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Invoker_Management_API/test-requirements.txt
@@ -0,0 +1,4 @@
+pytest~=4.6.7 # needed for python 2.7+3.4
+pytest-cov>=2.8.1
+pytest-randomly==1.2.3 # needed for python 2.7+3.4
+Flask-Testing==0.8.0
diff --git a/services/TS29222_CAPIF_API_Invoker_Management_API/tox.ini b/services/TS29222_CAPIF_API_Invoker_Management_API/tox.ini
new file mode 100644
index 0000000000000000000000000000000000000000..80a64e2ad2a49bb6891bd06f0f2e74031b41c342
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Invoker_Management_API/tox.ini
@@ -0,0 +1,11 @@
+[tox]
+envlist = py3
+skipsdist=True
+
+[testenv]
+deps=-r{toxinidir}/requirements.txt
+     -r{toxinidir}/test-requirements.txt
+	 {toxinidir}
+
+commands=
+   pytest --cov=api_invoker_management
diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/.dockerignore b/services/TS29222_CAPIF_API_Provider_Management_API/.dockerignore
new file mode 100644
index 0000000000000000000000000000000000000000..f9619601908b43d5d90c9befea5aa6ef6a732fa9
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Provider_Management_API/.dockerignore
@@ -0,0 +1,72 @@
+.travis.yaml
+.openapi-generator-ignore
+README.md
+tox.ini
+git_push.sh
+test-requirements.txt
+setup.py
+
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+env/
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*,cover
+.hypothesis/
+venv/
+.python-version
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+#Ipython Notebook
+.ipynb_checkpoints
diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/.gitignore b/services/TS29222_CAPIF_API_Provider_Management_API/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..43995bd42fa23bbc4c3a59d5fb9da99042fcf139
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Provider_Management_API/.gitignore
@@ -0,0 +1,66 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+env/
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*,cover
+.hypothesis/
+venv/
+.venv/
+.python-version
+.pytest_cache
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+#Ipython Notebook
+.ipynb_checkpoints
diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/.openapi-generator-ignore b/services/TS29222_CAPIF_API_Provider_Management_API/.openapi-generator-ignore
new file mode 100644
index 0000000000000000000000000000000000000000..7484ee590a3894506cf063799b885428f95a71be
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Provider_Management_API/.openapi-generator-ignore
@@ -0,0 +1,23 @@
+# OpenAPI Generator Ignore
+# Generated by openapi-generator https://github.com/openapitools/openapi-generator
+
+# Use this file to prevent files from being overwritten by the generator.
+# The patterns follow closely to .gitignore or .dockerignore.
+
+# As an example, the C# client generator defines ApiClient.cs.
+# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line:
+#ApiClient.cs
+
+# You can match any string of characters against a directory, file or extension with a single asterisk (*):
+#foo/*/qux
+# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
+
+# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
+#foo/**/qux
+# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
+
+# You can also negate patterns with an exclamation (!).
+# For example, you can ignore all files in a docs folder with the file extension .md:
+#docs/*.md
+# Then explicitly reverse the ignore rule for a single file:
+#!docs/README.md
diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/.openapi-generator/FILES b/services/TS29222_CAPIF_API_Provider_Management_API/.openapi-generator/FILES
new file mode 100644
index 0000000000000000000000000000000000000000..4baa18d102547e4af62eb3fcf54176b0ad20ad2e
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Provider_Management_API/.openapi-generator/FILES
@@ -0,0 +1,29 @@
+.dockerignore
+.gitignore
+.travis.yml
+Dockerfile
+README.md
+api_provider_management/__init__.py
+api_provider_management/__main__.py
+api_provider_management/controllers/__init__.py
+api_provider_management/controllers/default_controller.py
+api_provider_management/controllers/security_controller_.py
+api_provider_management/encoder.py
+api_provider_management/models/__init__.py
+api_provider_management/models/api_provider_enrolment_details.py
+api_provider_management/models/api_provider_func_role.py
+api_provider_management/models/api_provider_func_role_any_of.py
+api_provider_management/models/api_provider_function_details.py
+api_provider_management/models/base_model_.py
+api_provider_management/models/invalid_param.py
+api_provider_management/models/problem_details.py
+api_provider_management/models/registration_information.py
+api_provider_management/openapi/openapi.yaml
+api_provider_management/test/__init__.py
+api_provider_management/typing_utils.py
+api_provider_management/util.py
+git_push.sh
+requirements.txt
+setup.py
+test-requirements.txt
+tox.ini
diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/.openapi-generator/VERSION b/services/TS29222_CAPIF_API_Provider_Management_API/.openapi-generator/VERSION
new file mode 100644
index 0000000000000000000000000000000000000000..4b448de535c7dd619da0df6d8221995dbd5d118a
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Provider_Management_API/.openapi-generator/VERSION
@@ -0,0 +1 @@
+5.3.0-SNAPSHOT
\ No newline at end of file
diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/.travis.yml b/services/TS29222_CAPIF_API_Provider_Management_API/.travis.yml
new file mode 100644
index 0000000000000000000000000000000000000000..ad71ee5ca083a6923c91104533c5c7b86f297f3f
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Provider_Management_API/.travis.yml
@@ -0,0 +1,14 @@
+# ref: https://docs.travis-ci.com/user/languages/python
+language: python
+python:
+  - "3.2"
+  - "3.3"
+  - "3.4"
+  - "3.5"
+  - "3.6"
+  - "3.7"
+  - "3.8"
+# command to install dependencies
+install: "pip install -r requirements.txt"
+# command to run tests
+script: nosetests
diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/Dockerfile b/services/TS29222_CAPIF_API_Provider_Management_API/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..5f2713c9eaf2187221eddce8996768dd5a684490
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Provider_Management_API/Dockerfile
@@ -0,0 +1,18 @@
+FROM public.ecr.aws/o2v4a8t6/opencapif/python:3-alpine
+
+RUN mkdir -p /usr/src/app
+WORKDIR /usr/src/app
+
+COPY requirements.txt /usr/src/app/
+
+RUN apk add -U --no-cache gcc build-base linux-headers ca-certificates libffi-dev libressl-dev libxslt-dev
+RUN pip3 install --no-cache-dir -r requirements.txt
+RUN apk add redis
+RUN apk add jq
+RUN apk add curl
+
+COPY . /usr/src/app
+
+EXPOSE 8080
+
+CMD ["sh", "prepare_provider.sh"]
\ No newline at end of file
diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/README.md b/services/TS29222_CAPIF_API_Provider_Management_API/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..c9acf914cff1769f2c2527ba1c6398f97c607d1c
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Provider_Management_API/README.md
@@ -0,0 +1,49 @@
+# OpenAPI generated server
+
+## Overview
+This server was generated by the [OpenAPI Generator](https://openapi-generator.tech) project. By using the
+[OpenAPI-Spec](https://openapis.org) from a remote server, you can easily generate a server stub.  This
+is an example of building a OpenAPI-enabled Flask server.
+
+This example uses the [Connexion](https://github.com/zalando/connexion) library on top of Flask.
+
+## Requirements
+Python 3.5.2+
+
+## Usage
+To run the server, please execute the following from the root directory:
+
+```
+pip3 install -r requirements.txt
+python3 -m api_provider_management
+```
+
+and open your browser to here:
+
+```
+http://localhost:8080/api-provider-management/v1/ui/
+```
+
+Your OpenAPI definition lives here:
+
+```
+http://localhost:8080/api-provider-management/v1/openapi.json
+```
+
+To launch the integration tests, use tox:
+```
+sudo pip install tox
+tox
+```
+
+## Running with Docker
+
+To run the server on a Docker container, please execute the following from the root directory:
+
+```bash
+# building the image
+docker build -t api_provider_management .
+
+# starting up a container
+docker run -p 8080:8080 api_provider_management
+```
\ No newline at end of file
diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/__init__.py b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/__main__.py b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/__main__.py
new file mode 100644
index 0000000000000000000000000000000000000000..f52d69c40eaa4612ea6069b5226490ec95c17fc2
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/__main__.py
@@ -0,0 +1,136 @@
+#!/usr/bin/env python3
+
+import connexion
+import logging
+
+from api_provider_management import encoder
+from flask_jwt_extended import JWTManager
+from logging.handlers import RotatingFileHandler
+from .config import Config
+import os
+import sys
+from fluent import sender
+from flask_executor import Executor
+from opentelemetry.instrumentation.flask import FlaskInstrumentor
+from opentelemetry import trace
+from opentelemetry.trace.propagation.tracecontext import TraceContextTextMapPropagator
+from opentelemetry.exporter.otlp.proto.grpc.trace_exporter import OTLPSpanExporter
+from opentelemetry.sdk.resources import Resource
+from opentelemetry.sdk.trace import TracerProvider
+from opentelemetry.sdk.trace.export import BatchSpanProcessor
+from opentelemetry.instrumentation.redis import RedisInstrumentor
+
+
+
+NAME = "Provider-Service"
+
+def configure_monitoring(app, config):
+
+    resource = Resource(attributes={"service.name": NAME})
+
+    fluent_bit_host = config['monitoring']['fluent_bit_host']
+    fluent_bit_port = config['monitoring']['fluent_bit_port']
+    fluent_bit_sender = sender.FluentSender('Provider-Service', host=fluent_bit_host, port=fluent_bit_port)
+    propagator = TraceContextTextMapPropagator()
+
+    tracer_provider = TracerProvider(resource=resource)
+    trace.set_tracer_provider(tracer_provider)
+    exporter = OTLPSpanExporter(endpoint=f"http://{config['monitoring']['opentelemetry_url']}:{config['monitoring']['opentelemetry_port']}", insecure=True)
+    span_processor = BatchSpanProcessor(
+        exporter,
+        max_queue_size=config['monitoring']['opentelemetry_max_queue_size'],
+        schedule_delay_millis=config['monitoring']['opentelemetry_schedule_delay_millis'],
+        max_export_batch_size=config['monitoring']['opentelemetry_max_export_batch_size'],
+        export_timeout_millis=config['monitoring']['opentelemetry_export_timeout_millis'],
+    )
+
+    trace.get_tracer_provider().add_span_processor(span_processor)
+
+    FlaskInstrumentor().instrument_app(app)
+
+    RedisInstrumentor().instrument()
+
+    class FluentBitHandler(logging.Handler):
+
+        def __init__(self):
+            logging.Handler.__init__(self)
+
+        def emit(self, record):
+            log_entry = self.format(record)
+            log_data = {
+                'message': log_entry,
+                'level': record.levelname,
+                'timestamp': record.created,
+                'logger': record.name,
+                'function': record.funcName,
+                'line': record.lineno,
+                'container_name': os.environ.get('CONTAINER_NAME', ''),
+            }
+
+            # # Obtener el trace ID actual
+            current_context = trace.get_current_span().get_span_context()
+
+            trace_id = current_context.trace_id
+            traceparent_id = current_context.span_id
+            log_data['traceID'] = hex(trace_id)[2:]
+            if traceparent_id != None:
+                log_data['traceparent'] = hex(traceparent_id)[2:]
+            fluent_bit_sender.emit('Provider_Service', log_data)
+
+    loggers = [app.logger, ]
+    for l in loggers:
+         l.addHandler(FluentBitHandler())
+
+def configure_logging(app):
+    del app.logger.handlers[:]
+    loggers = [app.logger, ]
+    handlers = []
+    console_handler = logging.StreamHandler()
+    console_handler.setLevel(logging.DEBUG)
+    console_handler.setFormatter(verbose_formatter())
+    file_handler = RotatingFileHandler(filename="provider_logs.log", maxBytes=1024 * 1024 * 100, backupCount=20)
+    file_handler.setLevel(logging.DEBUG)
+    file_handler.setFormatter(verbose_formatter())
+    handlers.append(console_handler)
+    handlers.append(file_handler)
+
+    for l in loggers:
+        for handler in handlers:
+            l.addHandler(handler)
+        l.propagate = False
+        l.setLevel(logging.DEBUG)
+
+def verbose_formatter():
+    return logging.Formatter(
+        '{"timestamp": "%(asctime)s", "level": "%(levelname)s", "logger": "%(name)s", "function": "%(funcName)s", "line": %(lineno)d, "message": %(message)s}',
+        datefmt='%d/%m/%Y %H:%M:%S'
+    )
+
+def main():
+
+    with open("/usr/src/app/api_provider_management/pubkey.pem", "rb") as pub_file:
+            pub_data = pub_file.read()
+
+    app = connexion.App(__name__, specification_dir='./openapi/')
+    app.app.json_encoder = encoder.JSONEncoder
+    app.add_api('openapi.yaml',
+                arguments={'title': 'CAPIF_API_Provider_Management_API'},
+                pythonic_params=True)
+
+    config = Config()
+    configure_logging(app.app)
+
+    if eval(os.environ.get("MONITORING").lower().capitalize()):
+        configure_monitoring(app.app, config.get_config())
+
+    app.app.config['JWT_ALGORITHM'] = 'RS256'
+    app.app.config['JWT_PUBLIC_KEY'] = pub_data
+
+    JWTManager(app.app)
+
+
+    app.run(port=8080, debug=True)
+
+
+if __name__ == '__main__':
+    main()
diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/config.py b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/config.py
new file mode 100644
index 0000000000000000000000000000000000000000..377b14f8c368cebf98409223d089fc31326d1987
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/config.py
@@ -0,0 +1,18 @@
+import yaml
+import os
+
+#Config class to get config
+class Config:
+	def __init__(self):
+		self.cached = 0
+		self.file="./config.yaml"
+		self.my_config = {}
+		stamp = os.stat(self.file).st_mtime
+		if stamp != self.cached:
+			self.cached = stamp
+			f = open(self.file)
+			self.my_config = yaml.safe_load(f)
+			f.close()
+
+	def get_config(self):
+		return self.my_config
diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/controllers/__init__.py b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/controllers/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/controllers/default_controller.py b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/controllers/default_controller.py
new file mode 100644
index 0000000000000000000000000000000000000000..70e53734507bc9a3838db164d277b808e3bc0f4e
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/controllers/default_controller.py
@@ -0,0 +1,115 @@
+import connexion
+import six
+import json
+
+from flask import Response, request, current_app
+from ..core.provider_enrolment_details_api import ProviderManagementOperations
+from ..encoder import JSONEncoder
+from api_provider_management.models.api_provider_enrolment_details import APIProviderEnrolmentDetails  # noqa: E501
+from api_provider_management.models.problem_details import ProblemDetails  # noqa: E501
+from api_provider_management import util
+from cryptography import x509
+from cryptography.hazmat.backends import default_backend
+from flask_jwt_extended import jwt_required, get_jwt_identity
+from cryptography import x509
+from functools import wraps
+from ..core.validate_user import ControlAccess
+
+import sys
+
+
+provider_management_ops = ProviderManagementOperations()
+valid_user = ControlAccess()
+
+def cert_validation():
+    def _cert_validation(f):
+        @wraps(f)
+        def __cert_validation(*args, **kwargs):
+
+            args = request.view_args
+            cert_tmp = request.headers['X-Ssl-Client-Cert']
+            cert_raw = cert_tmp.replace('\t', '')
+
+            cert = x509.load_pem_x509_certificate(str.encode(cert_raw), default_backend())
+
+            cn = cert.subject.get_attributes_for_oid(x509.OID_COMMON_NAME)[0].value.strip()
+
+            if cn != "superadmin":
+                cert_signature = cert.signature.hex()
+                result = valid_user.validate_user_cert(args["registrationId"], cert_signature)
+
+                if result is not None:
+                    return result
+
+            result = f(**kwargs)
+            return result
+        return __cert_validation
+    return _cert_validation
+
+@jwt_required()
+def registrations_post(body):  # noqa: E501
+    """registrations_post
+
+    Registers a new API Provider domain with API provider domain functions profiles. # noqa: E501
+
+    :param api_provider_enrolment_details: 
+    :type api_provider_enrolment_details: dict | bytes
+
+    :rtype: APIProviderEnrolmentDetails
+    """
+
+    identity = get_jwt_identity()
+    username, role = identity.split()
+
+    current_app.logger.info("Registering Provider Domain")
+    if role != "provider":
+        prob = ProblemDetails(title="Unauthorized", status=401, detail="Role not authorized for this API route",
+                              cause="User role must be provider")
+        return Response(json.dumps(prob, cls=JSONEncoder), status=401, mimetype='application/json')
+
+
+    if connexion.request.is_json:
+        body = APIProviderEnrolmentDetails.from_dict(connexion.request.get_json())  # noqa: E501
+
+
+    res = provider_management_ops.register_api_provider_enrolment_details(body, username)
+
+    return res
+
+@cert_validation()
+def registrations_registration_id_delete(registration_id):  # noqa: E501
+    """registrations_registration_id_delete
+
+    Deregisters API provider domain by deleting API provider domain and functions. # noqa: E501
+
+    :param registration_id: String identifying an registered API provider domain resource.
+    :type registration_id: str
+
+    :rtype: None
+    """
+    current_app.logger.info("Removing Provider Domain")
+    res = provider_management_ops.delete_api_provider_enrolment_details(registration_id)
+
+    return res
+
+
+@cert_validation()
+def registrations_registration_id_put(registration_id, body):  # noqa: E501
+    """registrations_registration_id_put
+
+    Updates an API provider domain&#39;s registration details. # noqa: E501
+
+    :param registration_id: String identifying an registered API provider domain resource.
+    :type registration_id: str
+    :param api_provider_enrolment_details: Representation of the API provider domain registration details to be updated in CAPIF core function.
+    :type api_provider_enrolment_details: dict | bytes
+
+    :rtype: APIProviderEnrolmentDetails
+    """
+    current_app.logger.info("Updating Provider Domain")
+    if connexion.request.is_json:
+        body = APIProviderEnrolmentDetails.from_dict(connexion.request.get_json())  # noqa: E501
+
+    res = provider_management_ops.update_api_provider_enrolment_details(registration_id,body)
+
+    return res
diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/controllers/individual_api_provider_enrolment_details_controller.py b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/controllers/individual_api_provider_enrolment_details_controller.py
new file mode 100644
index 0000000000000000000000000000000000000000..dde822bbfbd9a8099bf4f7dcc9f84dfc7f57a2ad
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/controllers/individual_api_provider_enrolment_details_controller.py
@@ -0,0 +1,38 @@
+from email.quoprimime import body_decode
+import connexion
+import six
+import json
+
+from flask import Response, request, current_app
+from ..core.provider_enrolment_details_api import ProviderManagementOperations
+from ..encoder import JSONEncoder
+from api_provider_management.models.api_provider_enrolment_details import APIProviderEnrolmentDetails  # noqa: E501
+from api_provider_management.models.api_provider_enrolment_details_patch import APIProviderEnrolmentDetailsPatch  # noqa: E501
+from api_provider_management.models.problem_details import ProblemDetails  # noqa: E501
+from api_provider_management import util
+from cryptography.hazmat.backends import default_backend
+from cryptography import x509
+
+provider_management_ops = ProviderManagementOperations()
+
+
+def modify_ind_api_provider_enrolment(registration_id, body):  # noqa: E501
+    """modify_ind_api_provider_enrolment
+
+    Modify an individual API provider details. # noqa: E501
+
+    :param registration_id: 
+    :type registration_id: str
+    :param api_provider_enrolment_details_patch: 
+    :type api_provider_enrolment_details_patch: dict | bytes
+
+    :rtype: APIProviderEnrolmentDetails
+    """
+
+    current_app.logger.info("Patch Provider Domain")
+    if connexion.request.is_json:
+        body = APIProviderEnrolmentDetailsPatch.from_dict(connexion.request.get_json())  # noqa: E501
+
+    res = provider_management_ops.update_api_provider_enrolment_details(registration_id, body)
+
+    return res
diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/controllers/security_controller_.py b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/controllers/security_controller_.py
new file mode 100644
index 0000000000000000000000000000000000000000..6d294ffd6df1a26a469dbb4e72533b01503468dd
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/controllers/security_controller_.py
@@ -0,0 +1,2 @@
+from typing import List
+
diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/core/auth_manager.py b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/core/auth_manager.py
new file mode 100644
index 0000000000000000000000000000000000000000..a4a2d2419926d281426ce7876f4d45c1165fed40
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/core/auth_manager.py
@@ -0,0 +1,27 @@
+
+from flask import current_app
+from cryptography import x509
+from cryptography.hazmat.backends import default_backend
+from .resources import Resource
+
+
+class AuthManager(Resource):
+
+    def add_auth_provider(self, cert, func_id, role, provider_id):
+        cert_col = self.db.get_col_by_name(self.db.certs_col)
+
+        cert_encode = x509.load_pem_x509_certificate(str.encode(cert), default_backend())
+
+        cert_col.insert_one({"cert_signature":cert_encode.signature.hex(), "provider_id": provider_id, "role":role,"id": func_id, "resources": {}})
+
+    def update_auth_provider(self, cert, func_id, provider_id, role):
+        cert_col = self.db.get_col_by_name(self.db.certs_col)
+
+        cert_encode = x509.load_pem_x509_certificate(str.encode(cert), default_backend())
+        cert_col.find_one_and_update({"provider_id":provider_id, "role":role}, {"$set":{"cert_signature":cert_encode.signature.hex(), "id":func_id}})
+
+    def remove_auth_provider(self, func_ids):
+
+        cert_col = self.db.get_col_by_name(self.db.certs_col)
+        for func_id in func_ids:
+            cert_col.delete_one({"id":func_id})
diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/core/provider_enrolment_details_api.py b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/core/provider_enrolment_details_api.py
new file mode 100644
index 0000000000000000000000000000000000000000..2077003b10f9ceaed4585d005783d81db741a5c9
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/core/provider_enrolment_details_api.py
@@ -0,0 +1,169 @@
+
+from pymongo import ReturnDocument
+import secrets
+from flask import current_app, Flask, Response
+from ..core.sign_certificate import sign_certificate
+from .responses import internal_server_error, not_found_error, forbidden_error, make_response, bad_request_error
+
+from ..util import dict_to_camel_case, clean_empty
+from .resources import Resource
+from .auth_manager import AuthManager
+
+
+class ProviderManagementOperations(Resource):
+
+    def __check_api_provider_domain(self, api_prov_dom_id):
+        mycol = self.db.get_col_by_name(self.db.provider_enrolment_details)
+
+        current_app.logger.debug("Checking api provider domain id")
+        search_filter = {'api_prov_dom_id': api_prov_dom_id}
+        provider_enrolment_details = mycol.find_one(search_filter)
+
+        if provider_enrolment_details is None:
+            current_app.logger.error("Not found api provider domain")
+            return not_found_error(detail="Not Exist Provider Enrolment Details", cause="Not found registrations to send this api provider details")
+
+        return provider_enrolment_details
+
+    def __init__(self):
+        Resource.__init__(self)
+        self.auth_manager = AuthManager()
+
+    def register_api_provider_enrolment_details(self, api_provider_enrolment_details, username):
+        try:
+            mycol = self.db.get_col_by_name(self.db.provider_enrolment_details)
+            register = self.db.get_col_by_name_register(self.db.capif_users)
+
+            current_app.logger.debug("Creating api provider domain")
+            search_filter = {'reg_sec': api_provider_enrolment_details.reg_sec}
+            my_provider_enrolment_details = mycol.find_one(search_filter)
+
+            if my_provider_enrolment_details is not None:
+                current_app.logger.error("Found provider registered with same id")
+                return forbidden_error(detail="Provider already registered", cause="Identical provider reg sec")
+
+            api_provider_enrolment_details.api_prov_dom_id = secrets.token_hex(15)
+
+            current_app.logger.debug("Geretaing certs to api prov funcs")
+
+            for api_provider_func in api_provider_enrolment_details.api_prov_funcs:
+                api_provider_func.api_prov_func_id = api_provider_func.api_prov_func_role + str(secrets.token_hex(15))
+                certificate = sign_certificate(api_provider_func.reg_info.api_prov_pub_key, api_provider_func.api_prov_func_id)
+                api_provider_func.reg_info.api_prov_cert = certificate
+
+                self.auth_manager.add_auth_provider(certificate, api_provider_func.api_prov_func_id, api_provider_func.api_prov_func_role, api_provider_enrolment_details.api_prov_dom_id)
+
+
+            mycol.insert_one(api_provider_enrolment_details.to_dict())
+            register.update_one({'username':username}, {"$push":{'list_providers':api_provider_enrolment_details.api_prov_dom_id}})
+
+            current_app.logger.debug("Provider inserted in database")
+
+            res = make_response(object=api_provider_enrolment_details, status=201)
+            res.headers['Location'] = "/api-provider-management/v1/registrations/" + str(api_provider_enrolment_details.api_prov_dom_id)
+            return res
+
+        except Exception as e:
+            exception = "An exception occurred in register provider"
+            current_app.logger.error(exception + "::" + str(e))
+            return internal_server_error(detail=exception, cause=str(e))
+
+    def delete_api_provider_enrolment_details(self, api_prov_dom_id):
+        try:
+            mycol = self.db.get_col_by_name(self.db.provider_enrolment_details)
+            register = self.db.get_col_by_name_register(self.db.capif_users)
+
+            current_app.logger.debug("Deleting provider domain")
+            result = self.__check_api_provider_domain(api_prov_dom_id)
+
+            if isinstance(result, Response):
+                return result
+
+            apf_id = [ provider_func['api_prov_func_id'] for provider_func in result["api_prov_funcs"] if provider_func['api_prov_func_role'] == 'APF' ]
+            aef_id = [ provider_func['api_prov_func_id'] for provider_func in result["api_prov_funcs"] if provider_func['api_prov_func_role'] == 'AEF' ]
+            amf_id = [ provider_func['api_prov_func_id'] for provider_func in result["api_prov_funcs"] if provider_func['api_prov_func_role'] == 'AMF' ]
+
+            mycol.delete_one({'api_prov_dom_id': api_prov_dom_id})
+            register.update_one({'list_providers':api_prov_dom_id}, {"$pull":{'list_providers':api_prov_dom_id}})
+            out =  "The provider matching apiProvDomainId  " + api_prov_dom_id + " was offboarded."
+            current_app.logger.debug("Removed provider domain from database")
+
+            self.auth_manager.remove_auth_provider([apf_id[0], aef_id[0], amf_id[0]])
+
+            self.publish_ops.publish_message("internal-messages", f"provider-removed:{aef_id[0]}:{apf_id[0]}")
+            return make_response(object=out, status=204)
+
+        except Exception as e:
+            exception = "An exception occurred in delete provider"
+            current_app.logger.error(exception + "::" + str(e))
+            return internal_server_error(detail=exception, cause=str(e))
+
+    def update_api_provider_enrolment_details(self, api_prov_dom_id, api_provider_enrolment_details):
+        try:
+            mycol = self.db.get_col_by_name(self.db.provider_enrolment_details)
+
+            current_app.logger.debug("Updating api provider domain")
+            result = self.__check_api_provider_domain(api_prov_dom_id)
+
+            if isinstance(result, Response):
+                return result
+
+            for func in api_provider_enrolment_details.api_prov_funcs:
+                if func.api_prov_func_id is None:
+                    func.api_prov_func_id = func.api_prov_func_role + str(secrets.token_hex(15))
+                    certificate = sign_certificate(func.reg_info.api_prov_pub_key, func.api_prov_func_id)
+                    func.reg_info.api_prov_cert = certificate
+
+                    self.auth_manager.update_auth_provider(certificate, func.api_prov_func_id, api_prov_dom_id, func.api_prov_func_role)
+                else:
+                    api_prov_funcs = result["api_prov_funcs"]
+                    for api_func in api_prov_funcs:
+                        if func.api_prov_func_id == api_func["api_prov_func_id"]:
+                            if func.api_prov_func_role != api_func["api_prov_func_role"]:
+                                return bad_request_error(detail="Bad Role in provider", cause="Different role in update reqeuest", invalid_params=[{"param":"api_prov_func_role","reason":"differente role with same id"}])
+                            if func.reg_info.api_prov_pub_key != api_func["reg_info"]["api_prov_pub_key"]:
+                                certificate = sign_certificate(func.reg_info.api_prov_pub_key, api_func["api_prov_func_id"])
+                                func.reg_info.api_prov_cert = certificate
+                                self.auth_manager.update_auth_provider(certificate, func.api_prov_func_id, api_prov_dom_id, func.api_prov_func_role)
+
+
+            api_provider_enrolment_details = api_provider_enrolment_details.to_dict()
+            api_provider_enrolment_details = clean_empty(api_provider_enrolment_details)
+
+            result = mycol.find_one_and_update(result, {"$set":api_provider_enrolment_details}, projection={'_id': 0},return_document=ReturnDocument.AFTER ,upsert=False)
+
+            result = clean_empty(result)
+
+            current_app.logger.debug("Provider domain updated in database")
+            return make_response(object=dict_to_camel_case(result), status=200)
+
+        except Exception as e:
+            exception = "An exception occurred in update provider"
+            current_app.logger.error(exception + "::" + str(e))
+            return internal_server_error(detail=exception, cause=str(e))
+
+    def patch_api_provider_enrolment_details(self, api_prov_dom_id, api_provider_enrolment_details_patch):
+        try:
+            mycol = self.db.get_col_by_name(self.db.provider_enrolment_details)
+
+            current_app.logger.debug("Updating api provider domain")
+            result = self.__check_api_provider_domain(api_prov_dom_id)
+
+            if isinstance(result, Response):
+                return result
+
+            api_provider_enrolment_details_patch = api_provider_enrolment_details_patch.to_dict()
+            api_provider_enrolment_details_patch = clean_empty(api_provider_enrolment_details_patch)
+
+            result = mycol.find_one_and_update(result, {"$set":api_provider_enrolment_details_patch}, projection={'_id': 0},return_document=ReturnDocument.AFTER ,upsert=False)
+
+            result = clean_empty(result)
+
+            current_app.logger.debug("Provider domain updated in database")
+
+            return make_response(object=dict_to_camel_case(result), status=200)
+
+        except Exception as e:
+            exception = "An exception occurred in patch provider"
+            current_app.logger.error(exception + "::" + str(e))
+            return internal_server_error(detail=exception, cause=str(e))
\ No newline at end of file
diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/core/publisher.py b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/core/publisher.py
new file mode 100644
index 0000000000000000000000000000000000000000..38d7259fbf3480e808cd67c3f25f965a5ffcdba4
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/core/publisher.py
@@ -0,0 +1,10 @@
+import redis
+import sys
+
+class Publisher():
+
+    def __init__(self):
+        self. r = redis.Redis(host='redis', port=6379, db=0)
+
+    def publish_message(self, channel, message):
+        self.r.publish(channel, message)
\ No newline at end of file
diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/core/resources.py b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/core/resources.py
new file mode 100644
index 0000000000000000000000000000000000000000..86e99d4bfcd5811fcc9256cfdb82839266dbd8b5
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/core/resources.py
@@ -0,0 +1,9 @@
+from abc import ABC, abstractmethod
+from ..db.db import MongoDatabse
+from .publisher import Publisher
+
+class Resource(ABC):
+
+    def __init__(self):
+        self.db = MongoDatabse()
+        self.publish_ops = Publisher()
\ No newline at end of file
diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/core/responses.py b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/core/responses.py
new file mode 100644
index 0000000000000000000000000000000000000000..962c4b6dd6ae07bce79dc8e810f10a507d526663
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/core/responses.py
@@ -0,0 +1,31 @@
+from ..models.problem_details import ProblemDetails
+from ..encoder import JSONEncoder
+from flask import Response
+import json
+
+mimetype = "application/json"
+
+def make_response(object, status):
+    res = Response(json.dumps(object, cls=JSONEncoder), status=status, mimetype=mimetype)
+
+    return res
+
+def internal_server_error(detail, cause):
+    prob = ProblemDetails(title="Internal Server Error", status=500, detail=detail, cause=cause)
+
+    return Response(json.dumps(prob, cls=JSONEncoder), status=500, mimetype=mimetype)
+
+def forbidden_error(detail, cause):
+    prob = ProblemDetails(title="Forbidden", status=403, detail=detail, cause=cause)
+
+    return Response(json.dumps(prob, cls=JSONEncoder), status=403, mimetype=mimetype)
+
+def bad_request_error(detail, cause, invalid_params):
+    prob = ProblemDetails(title="Bad Request", status=400, detail=detail, cause=cause, invalid_params=invalid_params)
+
+    return Response(json.dumps(prob, cls=JSONEncoder), status=400, mimetype=cause)
+
+def not_found_error(detail, cause):
+    prob = ProblemDetails(title="Not Found", status=404, detail=detail, cause=cause)
+
+    return Response(json.dumps(prob, cls=JSONEncoder), status=404, mimetype=mimetype)
\ No newline at end of file
diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/core/sign_certificate.py b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/core/sign_certificate.py
new file mode 100644
index 0000000000000000000000000000000000000000..6ec96cf181ad21ebcbeec3247a34b17da559e214
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/core/sign_certificate.py
@@ -0,0 +1,22 @@
+import requests
+import json
+import sys
+from ..config import Config
+
+def sign_certificate(publick_key, provider_id):
+
+    config =  Config().get_config()
+    url = f"http://{config['ca_factory']['url']}:{config['ca_factory']['port']}/v1/pki_int/sign/my-ca"
+
+    headers = {'X-Vault-Token': config['ca_factory']['token']}
+    data = {
+        'format':'pem_bundle',
+        'ttl': '43000h',
+        'csr': publick_key,
+        'common_name': provider_id
+    }
+
+    response = requests.request("POST", url, headers=headers, data=json.dumps(data), verify = False)
+    response_payload = json.loads(response.text)
+
+    return response_payload["data"]["certificate"]
\ No newline at end of file
diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/core/validate_user.py b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/core/validate_user.py
new file mode 100644
index 0000000000000000000000000000000000000000..4d101aee06bd0e3a763f8727c7bdb2f9a09caa61
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/core/validate_user.py
@@ -0,0 +1,26 @@
+from flask import current_app, Response
+import json
+from ..models.problem_details import ProblemDetails
+from ..encoder import JSONEncoder
+from .resources import Resource
+from .responses import internal_server_error
+
+class ControlAccess(Resource):
+
+    def validate_user_cert(self, api_provider_id, cert_signature):
+
+        cert_col = self.db.get_col_by_name(self.db.certs_col)
+
+        try:
+            my_query = {'provider_id':api_provider_id, "role": "AMF"}
+            cert_entry = cert_col.find_one(my_query)
+
+            if cert_entry is not None:
+                if cert_entry["cert_signature"] != cert_signature:
+                    prob = ProblemDetails(title="Unauthorized", detail="User not authorized", cause="You are not the owner of this resource")
+                    return Response(json.dumps(prob, cls=JSONEncoder), status=401, mimetype="application/json")
+
+        except Exception as e:
+            exception = "An exception occurred in validate amf"
+            current_app.logger.error(exception + "::" + str(e))
+            return internal_server_error(detail=exception, cause=str(e))
\ No newline at end of file
diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/db/db.py b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/db/db.py
new file mode 100644
index 0000000000000000000000000000000000000000..a5d843a4bc61f0edac3caae779c1f16852378ea8
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/db/db.py
@@ -0,0 +1,73 @@
+import atexit
+import time
+from pymongo import MongoClient
+from pymongo.errors import AutoReconnect
+from ..config import Config
+from bson.codec_options import CodecOptions
+import os
+from opentelemetry.instrumentation.pymongo import PymongoInstrumentor
+
+if eval(os.environ.get("MONITORING").lower().capitalize()):
+    PymongoInstrumentor().instrument()
+
+
+class MongoDatabse():
+
+    def __init__(self):
+        self.config = Config().get_config()
+        self.db = self.__connect()
+        self.register = self.__connect_register()
+        self.provider_enrolment_details = self.config['mongo']['col']
+        self.capif_users = self.config['mongo']['capif_users']
+        self.certs_col = self.config['mongo']['certs_col']
+
+    def get_col_by_name(self, name):
+        return self.db[name].with_options(codec_options=CodecOptions(tz_aware=True))
+    def get_col_by_name_register(self, name):
+        return self.register[name].with_options(codec_options=CodecOptions(tz_aware=True))
+
+
+
+    def __connect(self, max_retries=3, retry_delay=1):
+        retries = 0
+        while retries < max_retries:
+            try:
+                uri = f"mongodb://{self.config['mongo']['user']}:{self.config['mongo']['password']}@" \
+                      f"{self.config['mongo']['host']}:{self.config['mongo']['port']}"
+                client = MongoClient(uri)
+                mydb = client[self.config['mongo']['db']]
+                mydb.command("ping")
+                return mydb
+            except AutoReconnect:
+                retries += 1
+                print(f"Reconnecting... Retry {retries} of {max_retries}")
+                time.sleep(retry_delay)
+        return None
+    
+    def __connect_register(self, max_retries=3, retry_delay=1):
+
+        retries = 0
+
+        while retries < max_retries:
+            try:
+                uri = f"mongodb://{self.config['mongo_register']['user']}:{self.config['mongo_register']['password']}@" \
+                      f"{self.config['mongo_register']['host']}:{self.config['mongo_register']['port']}"
+
+                
+                client = MongoClient(uri)
+                mydb = client[self.config['mongo_register']['db']]
+                mydb.command("ping")
+                return mydb
+            except AutoReconnect:
+                retries += 1
+                print(f"Reconnecting... Retry {retries} of {max_retries}")
+                time.sleep(retry_delay)
+        return None
+
+    def close_connection(self):
+        if self.db.client:
+            self.db.client.close()
+        if self.register.client:
+            self.register.client.close()
+
+
diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/encoder.py b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/encoder.py
new file mode 100644
index 0000000000000000000000000000000000000000..01531f242309ec381907e92bba20d3cf9f01306d
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/encoder.py
@@ -0,0 +1,20 @@
+from connexion.apps.flask_app import FlaskJSONEncoder
+import six
+
+from api_provider_management.models.base_model_ import Model
+
+
+class JSONEncoder(FlaskJSONEncoder):
+    include_nulls = False
+
+    def default(self, o):
+        if isinstance(o, Model):
+            dikt = {}
+            for attr, _ in six.iteritems(o.openapi_types):
+                value = getattr(o, attr)
+                if value is None and not self.include_nulls:
+                    continue
+                attr = o.attribute_map[attr]
+                dikt[attr] = value
+            return dikt
+        return FlaskJSONEncoder.default(self, o)
diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/__init__.py b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..785be4594c57a40d7cdc175382399c56cdfd471c
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/__init__.py
@@ -0,0 +1,13 @@
+# coding: utf-8
+
+# flake8: noqa
+from __future__ import absolute_import
+# import models into model package
+from api_provider_management.models.api_provider_enrolment_details import APIProviderEnrolmentDetails
+from api_provider_management.models.api_provider_enrolment_details_patch import APIProviderEnrolmentDetailsPatch
+from api_provider_management.models.api_provider_function_details import APIProviderFunctionDetails
+from api_provider_management.models.api_provider_func_role import ApiProviderFuncRole
+from api_provider_management.models.api_provider_func_role_any_of import ApiProviderFuncRoleAnyOf
+from api_provider_management.models.invalid_param import InvalidParam
+from api_provider_management.models.problem_details import ProblemDetails
+from api_provider_management.models.registration_information import RegistrationInformation
diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/api_provider_enrolment_details.py b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/api_provider_enrolment_details.py
new file mode 100644
index 0000000000000000000000000000000000000000..b4d4f38ccbf4d55583af86cdf700339164da3668
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/api_provider_enrolment_details.py
@@ -0,0 +1,216 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from api_provider_management.models.base_model_ import Model
+from api_provider_management.models.api_provider_function_details import APIProviderFunctionDetails
+import re
+from api_provider_management import util
+
+from api_provider_management.models.api_provider_function_details import APIProviderFunctionDetails  # noqa: E501
+import re  # noqa: E501
+
+class APIProviderEnrolmentDetails(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, api_prov_dom_id=None, reg_sec=None, api_prov_funcs=None, api_prov_dom_info=None, supp_feat=None, fail_reason=None):  # noqa: E501
+        """APIProviderEnrolmentDetails - a model defined in OpenAPI
+
+        :param api_prov_dom_id: The api_prov_dom_id of this APIProviderEnrolmentDetails.  # noqa: E501
+        :type api_prov_dom_id: str
+        :param reg_sec: The reg_sec of this APIProviderEnrolmentDetails.  # noqa: E501
+        :type reg_sec: str
+        :param api_prov_funcs: The api_prov_funcs of this APIProviderEnrolmentDetails.  # noqa: E501
+        :type api_prov_funcs: List[APIProviderFunctionDetails]
+        :param api_prov_dom_info: The api_prov_dom_info of this APIProviderEnrolmentDetails.  # noqa: E501
+        :type api_prov_dom_info: str
+        :param supp_feat: The supp_feat of this APIProviderEnrolmentDetails.  # noqa: E501
+        :type supp_feat: str
+        :param fail_reason: The fail_reason of this APIProviderEnrolmentDetails.  # noqa: E501
+        :type fail_reason: str
+        """
+        self.openapi_types = {
+            'api_prov_dom_id': str,
+            'reg_sec': str,
+            'api_prov_funcs': List[APIProviderFunctionDetails],
+            'api_prov_dom_info': str,
+            'supp_feat': str,
+            'fail_reason': str
+        }
+
+        self.attribute_map = {
+            'api_prov_dom_id': 'apiProvDomId',
+            'reg_sec': 'regSec',
+            'api_prov_funcs': 'apiProvFuncs',
+            'api_prov_dom_info': 'apiProvDomInfo',
+            'supp_feat': 'suppFeat',
+            'fail_reason': 'failReason'
+        }
+
+        self._api_prov_dom_id = api_prov_dom_id
+        self._reg_sec = reg_sec
+        self._api_prov_funcs = api_prov_funcs
+        self._api_prov_dom_info = api_prov_dom_info
+        self._supp_feat = supp_feat
+        self._fail_reason = fail_reason
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'APIProviderEnrolmentDetails':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The APIProviderEnrolmentDetails of this APIProviderEnrolmentDetails.  # noqa: E501
+        :rtype: APIProviderEnrolmentDetails
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def api_prov_dom_id(self):
+        """Gets the api_prov_dom_id of this APIProviderEnrolmentDetails.
+
+        API provider domain ID assigned by the CAPIF core function to the API management function while registering the API provider domain. Shall not be present in the HTTP POST request from the API Management function to the CAPIF core function, to on-board itself. Shall be present in all other HTTP requests and responses.   # noqa: E501
+
+        :return: The api_prov_dom_id of this APIProviderEnrolmentDetails.
+        :rtype: str
+        """
+        return self._api_prov_dom_id
+
+    @api_prov_dom_id.setter
+    def api_prov_dom_id(self, api_prov_dom_id):
+        """Sets the api_prov_dom_id of this APIProviderEnrolmentDetails.
+
+        API provider domain ID assigned by the CAPIF core function to the API management function while registering the API provider domain. Shall not be present in the HTTP POST request from the API Management function to the CAPIF core function, to on-board itself. Shall be present in all other HTTP requests and responses.   # noqa: E501
+
+        :param api_prov_dom_id: The api_prov_dom_id of this APIProviderEnrolmentDetails.
+        :type api_prov_dom_id: str
+        """
+
+        self._api_prov_dom_id = api_prov_dom_id
+
+    @property
+    def reg_sec(self):
+        """Gets the reg_sec of this APIProviderEnrolmentDetails.
+
+        Security information necessary for the CAPIF core function to validate the registration of the API provider domain. Shall be present in HTTP POST request from API management function to CAPIF core function for API provider domain registration.   # noqa: E501
+
+        :return: The reg_sec of this APIProviderEnrolmentDetails.
+        :rtype: str
+        """
+        return self._reg_sec
+
+    @reg_sec.setter
+    def reg_sec(self, reg_sec):
+        """Sets the reg_sec of this APIProviderEnrolmentDetails.
+
+        Security information necessary for the CAPIF core function to validate the registration of the API provider domain. Shall be present in HTTP POST request from API management function to CAPIF core function for API provider domain registration.   # noqa: E501
+
+        :param reg_sec: The reg_sec of this APIProviderEnrolmentDetails.
+        :type reg_sec: str
+        """
+        if reg_sec is None:
+            raise ValueError("Invalid value for `reg_sec`, must not be `None`")  # noqa: E501
+
+        self._reg_sec = reg_sec
+
+    @property
+    def api_prov_funcs(self):
+        """Gets the api_prov_funcs of this APIProviderEnrolmentDetails.
+
+        A list of individual API provider domain functions details. When included by the API management function in the HTTP request message, it lists the API provider domain functions that the API management function intends to register/update in registration or update registration procedure. When included by the CAPIF core function in the HTTP response message, it lists the API domain functions details that are registered or updated successfully.   # noqa: E501
+
+        :return: The api_prov_funcs of this APIProviderEnrolmentDetails.
+        :rtype: List[APIProviderFunctionDetails]
+        """
+        return self._api_prov_funcs
+
+    @api_prov_funcs.setter
+    def api_prov_funcs(self, api_prov_funcs):
+        """Sets the api_prov_funcs of this APIProviderEnrolmentDetails.
+
+        A list of individual API provider domain functions details. When included by the API management function in the HTTP request message, it lists the API provider domain functions that the API management function intends to register/update in registration or update registration procedure. When included by the CAPIF core function in the HTTP response message, it lists the API domain functions details that are registered or updated successfully.   # noqa: E501
+
+        :param api_prov_funcs: The api_prov_funcs of this APIProviderEnrolmentDetails.
+        :type api_prov_funcs: List[APIProviderFunctionDetails]
+        """
+        if api_prov_funcs is not None and len(api_prov_funcs) < 1:
+            raise ValueError("Invalid value for `api_prov_funcs`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._api_prov_funcs = api_prov_funcs
+
+    @property
+    def api_prov_dom_info(self):
+        """Gets the api_prov_dom_info of this APIProviderEnrolmentDetails.
+
+        Generic information related to the API provider domain such as details of the API provider applications.   # noqa: E501
+
+        :return: The api_prov_dom_info of this APIProviderEnrolmentDetails.
+        :rtype: str
+        """
+        return self._api_prov_dom_info
+
+    @api_prov_dom_info.setter
+    def api_prov_dom_info(self, api_prov_dom_info):
+        """Sets the api_prov_dom_info of this APIProviderEnrolmentDetails.
+
+        Generic information related to the API provider domain such as details of the API provider applications.   # noqa: E501
+
+        :param api_prov_dom_info: The api_prov_dom_info of this APIProviderEnrolmentDetails.
+        :type api_prov_dom_info: str
+        """
+
+        self._api_prov_dom_info = api_prov_dom_info
+
+    @property
+    def supp_feat(self):
+        """Gets the supp_feat of this APIProviderEnrolmentDetails.
+
+        A string used to indicate the features supported by an API that is used as defined in clause  6.6 in 3GPP TS 29.500. The string shall contain a bitmask indicating supported features in  hexadecimal representation Each character in the string shall take a value of \"0\" to \"9\",  \"a\" to \"f\" or \"A\" to \"F\" and shall represent the support of 4 features as described in  table 5.2.2-3. The most significant character representing the highest-numbered features shall  appear first in the string, and the character representing features 1 to 4 shall appear last  in the string. The list of features and their numbering (starting with 1) are defined  separately for each API. If the string contains a lower number of characters than there are  defined features for an API, all features that would be represented by characters that are not  present in the string are not supported.   # noqa: E501
+
+        :return: The supp_feat of this APIProviderEnrolmentDetails.
+        :rtype: str
+        """
+        return self._supp_feat
+
+    @supp_feat.setter
+    def supp_feat(self, supp_feat):
+        """Sets the supp_feat of this APIProviderEnrolmentDetails.
+
+        A string used to indicate the features supported by an API that is used as defined in clause  6.6 in 3GPP TS 29.500. The string shall contain a bitmask indicating supported features in  hexadecimal representation Each character in the string shall take a value of \"0\" to \"9\",  \"a\" to \"f\" or \"A\" to \"F\" and shall represent the support of 4 features as described in  table 5.2.2-3. The most significant character representing the highest-numbered features shall  appear first in the string, and the character representing features 1 to 4 shall appear last  in the string. The list of features and their numbering (starting with 1) are defined  separately for each API. If the string contains a lower number of characters than there are  defined features for an API, all features that would be represented by characters that are not  present in the string are not supported.   # noqa: E501
+
+        :param supp_feat: The supp_feat of this APIProviderEnrolmentDetails.
+        :type supp_feat: str
+        """
+        if supp_feat is not None and not re.search(r'^[A-Fa-f0-9]*$', supp_feat):  # noqa: E501
+            raise ValueError("Invalid value for `supp_feat`, must be a follow pattern or equal to `/^[A-Fa-f0-9]*$/`")  # noqa: E501
+
+        self._supp_feat = supp_feat
+
+    @property
+    def fail_reason(self):
+        """Gets the fail_reason of this APIProviderEnrolmentDetails.
+
+        Registration or update specific failure information of failed API provider domain function registrations.Shall be present in the HTTP response body if atleast one of the API provider domain function registration or update registration fails.   # noqa: E501
+
+        :return: The fail_reason of this APIProviderEnrolmentDetails.
+        :rtype: str
+        """
+        return self._fail_reason
+
+    @fail_reason.setter
+    def fail_reason(self, fail_reason):
+        """Sets the fail_reason of this APIProviderEnrolmentDetails.
+
+        Registration or update specific failure information of failed API provider domain function registrations.Shall be present in the HTTP response body if atleast one of the API provider domain function registration or update registration fails.   # noqa: E501
+
+        :param fail_reason: The fail_reason of this APIProviderEnrolmentDetails.
+        :type fail_reason: str
+        """
+
+        self._fail_reason = fail_reason
diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/api_provider_enrolment_details_patch.py b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/api_provider_enrolment_details_patch.py
new file mode 100644
index 0000000000000000000000000000000000000000..acd27280a669540b1aa61a46bb8769b2303dfa3e
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/api_provider_enrolment_details_patch.py
@@ -0,0 +1,98 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from api_provider_management.models.base_model_ import Model
+from api_provider_management.models.api_provider_function_details import APIProviderFunctionDetails
+from api_provider_management import util
+
+from api_provider_management.models.api_provider_function_details import APIProviderFunctionDetails  # noqa: E501
+
+class APIProviderEnrolmentDetailsPatch(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, api_prov_funcs=None, api_prov_dom_info=None):  # noqa: E501
+        """APIProviderEnrolmentDetailsPatch - a model defined in OpenAPI
+
+        :param api_prov_funcs: The api_prov_funcs of this APIProviderEnrolmentDetailsPatch.  # noqa: E501
+        :type api_prov_funcs: List[APIProviderFunctionDetails]
+        :param api_prov_dom_info: The api_prov_dom_info of this APIProviderEnrolmentDetailsPatch.  # noqa: E501
+        :type api_prov_dom_info: str
+        """
+        self.openapi_types = {
+            'api_prov_funcs': List[APIProviderFunctionDetails],
+            'api_prov_dom_info': str
+        }
+
+        self.attribute_map = {
+            'api_prov_funcs': 'apiProvFuncs',
+            'api_prov_dom_info': 'apiProvDomInfo'
+        }
+
+        self._api_prov_funcs = api_prov_funcs
+        self._api_prov_dom_info = api_prov_dom_info
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'APIProviderEnrolmentDetailsPatch':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The APIProviderEnrolmentDetailsPatch of this APIProviderEnrolmentDetailsPatch.  # noqa: E501
+        :rtype: APIProviderEnrolmentDetailsPatch
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def api_prov_funcs(self):
+        """Gets the api_prov_funcs of this APIProviderEnrolmentDetailsPatch.
+
+        A list of individual API provider domain functions details. When included by the API management function in the HTTP request message, it lists the API provider domain functions that the API management function intends to register/update in registration or update registration procedure.    # noqa: E501
+
+        :return: The api_prov_funcs of this APIProviderEnrolmentDetailsPatch.
+        :rtype: List[APIProviderFunctionDetails]
+        """
+        return self._api_prov_funcs
+
+    @api_prov_funcs.setter
+    def api_prov_funcs(self, api_prov_funcs):
+        """Sets the api_prov_funcs of this APIProviderEnrolmentDetailsPatch.
+
+        A list of individual API provider domain functions details. When included by the API management function in the HTTP request message, it lists the API provider domain functions that the API management function intends to register/update in registration or update registration procedure.    # noqa: E501
+
+        :param api_prov_funcs: The api_prov_funcs of this APIProviderEnrolmentDetailsPatch.
+        :type api_prov_funcs: List[APIProviderFunctionDetails]
+        """
+        if api_prov_funcs is not None and len(api_prov_funcs) < 1:
+            raise ValueError("Invalid value for `api_prov_funcs`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._api_prov_funcs = api_prov_funcs
+
+    @property
+    def api_prov_dom_info(self):
+        """Gets the api_prov_dom_info of this APIProviderEnrolmentDetailsPatch.
+
+        Generic information related to the API provider domain such as details of the API provider applications.   # noqa: E501
+
+        :return: The api_prov_dom_info of this APIProviderEnrolmentDetailsPatch.
+        :rtype: str
+        """
+        return self._api_prov_dom_info
+
+    @api_prov_dom_info.setter
+    def api_prov_dom_info(self, api_prov_dom_info):
+        """Sets the api_prov_dom_info of this APIProviderEnrolmentDetailsPatch.
+
+        Generic information related to the API provider domain such as details of the API provider applications.   # noqa: E501
+
+        :param api_prov_dom_info: The api_prov_dom_info of this APIProviderEnrolmentDetailsPatch.
+        :type api_prov_dom_info: str
+        """
+
+        self._api_prov_dom_info = api_prov_dom_info
diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/api_provider_func_role.py b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/api_provider_func_role.py
new file mode 100644
index 0000000000000000000000000000000000000000..9c2b1da61c34951fd9d5c9441e6e5ee580a993b4
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/api_provider_func_role.py
@@ -0,0 +1,39 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from api_provider_management.models.base_model_ import Model
+from api_provider_management.models.api_provider_func_role_any_of import ApiProviderFuncRoleAnyOf
+from api_provider_management import util
+
+from api_provider_management.models.api_provider_func_role_any_of import ApiProviderFuncRoleAnyOf  # noqa: E501
+
+class ApiProviderFuncRole(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self):  # noqa: E501
+        """ApiProviderFuncRole - a model defined in OpenAPI
+
+        """
+        self.openapi_types = {
+        }
+
+        self.attribute_map = {
+        }
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'ApiProviderFuncRole':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The ApiProviderFuncRole of this ApiProviderFuncRole.  # noqa: E501
+        :rtype: ApiProviderFuncRole
+        """
+        return util.deserialize_model(dikt, cls)
diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/api_provider_func_role_any_of.py b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/api_provider_func_role_any_of.py
new file mode 100644
index 0000000000000000000000000000000000000000..8d4b9b03cd933dd40e4d5efabb7781863e05b54e
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/api_provider_func_role_any_of.py
@@ -0,0 +1,43 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from api_provider_management.models.base_model_ import Model
+from api_provider_management import util
+
+
+class ApiProviderFuncRoleAnyOf(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    """
+    allowed enum values
+    """
+    AEF = "AEF"
+    APF = "APF"
+    AMF = "AMF"
+    def __init__(self):  # noqa: E501
+        """ApiProviderFuncRoleAnyOf - a model defined in OpenAPI
+
+        """
+        self.openapi_types = {
+        }
+
+        self.attribute_map = {
+        }
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'ApiProviderFuncRoleAnyOf':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The ApiProviderFuncRole_anyOf of this ApiProviderFuncRoleAnyOf.  # noqa: E501
+        :rtype: ApiProviderFuncRoleAnyOf
+        """
+        return util.deserialize_model(dikt, cls)
diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/api_provider_function_details.py b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/api_provider_function_details.py
new file mode 100644
index 0000000000000000000000000000000000000000..eb21ba7e963f7062c81e444efd1a4ee9ab1d4f00
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/api_provider_function_details.py
@@ -0,0 +1,154 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from api_provider_management.models.base_model_ import Model
+from api_provider_management.models.api_provider_func_role import ApiProviderFuncRole
+from api_provider_management.models.registration_information import RegistrationInformation
+from api_provider_management import util
+
+from api_provider_management.models.api_provider_func_role import ApiProviderFuncRole  # noqa: E501
+from api_provider_management.models.registration_information import RegistrationInformation  # noqa: E501
+
+class APIProviderFunctionDetails(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, api_prov_func_id=None, reg_info=None, api_prov_func_role=None, api_prov_func_info=None):  # noqa: E501
+        """APIProviderFunctionDetails - a model defined in OpenAPI
+
+        :param api_prov_func_id: The api_prov_func_id of this APIProviderFunctionDetails.  # noqa: E501
+        :type api_prov_func_id: str
+        :param reg_info: The reg_info of this APIProviderFunctionDetails.  # noqa: E501
+        :type reg_info: RegistrationInformation
+        :param api_prov_func_role: The api_prov_func_role of this APIProviderFunctionDetails.  # noqa: E501
+        :type api_prov_func_role: ApiProviderFuncRole
+        :param api_prov_func_info: The api_prov_func_info of this APIProviderFunctionDetails.  # noqa: E501
+        :type api_prov_func_info: str
+        """
+        self.openapi_types = {
+            'api_prov_func_id': str,
+            'reg_info': RegistrationInformation,
+            'api_prov_func_role': ApiProviderFuncRole,
+            'api_prov_func_info': str
+        }
+
+        self.attribute_map = {
+            'api_prov_func_id': 'apiProvFuncId',
+            'reg_info': 'regInfo',
+            'api_prov_func_role': 'apiProvFuncRole',
+            'api_prov_func_info': 'apiProvFuncInfo'
+        }
+
+        self._api_prov_func_id = api_prov_func_id
+        self._reg_info = reg_info
+        self._api_prov_func_role = api_prov_func_role
+        self._api_prov_func_info = api_prov_func_info
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'APIProviderFunctionDetails':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The APIProviderFunctionDetails of this APIProviderFunctionDetails.  # noqa: E501
+        :rtype: APIProviderFunctionDetails
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def api_prov_func_id(self):
+        """Gets the api_prov_func_id of this APIProviderFunctionDetails.
+
+        API provider domain functionID assigned by the CAPIF core function to the API provider domain function while registering/updating the API provider domain. Shall not be present in the HTTP POST request from the API management function to the CAPIF core function, to register itself. Shall be present in all other HTTP requests and responses.   # noqa: E501
+
+        :return: The api_prov_func_id of this APIProviderFunctionDetails.
+        :rtype: str
+        """
+        return self._api_prov_func_id
+
+    @api_prov_func_id.setter
+    def api_prov_func_id(self, api_prov_func_id):
+        """Sets the api_prov_func_id of this APIProviderFunctionDetails.
+
+        API provider domain functionID assigned by the CAPIF core function to the API provider domain function while registering/updating the API provider domain. Shall not be present in the HTTP POST request from the API management function to the CAPIF core function, to register itself. Shall be present in all other HTTP requests and responses.   # noqa: E501
+
+        :param api_prov_func_id: The api_prov_func_id of this APIProviderFunctionDetails.
+        :type api_prov_func_id: str
+        """
+
+        self._api_prov_func_id = api_prov_func_id
+
+    @property
+    def reg_info(self):
+        """Gets the reg_info of this APIProviderFunctionDetails.
+
+
+        :return: The reg_info of this APIProviderFunctionDetails.
+        :rtype: RegistrationInformation
+        """
+        return self._reg_info
+
+    @reg_info.setter
+    def reg_info(self, reg_info):
+        """Sets the reg_info of this APIProviderFunctionDetails.
+
+
+        :param reg_info: The reg_info of this APIProviderFunctionDetails.
+        :type reg_info: RegistrationInformation
+        """
+        if reg_info is None:
+            raise ValueError("Invalid value for `reg_info`, must not be `None`")  # noqa: E501
+
+        self._reg_info = reg_info
+
+    @property
+    def api_prov_func_role(self):
+        """Gets the api_prov_func_role of this APIProviderFunctionDetails.
+
+
+        :return: The api_prov_func_role of this APIProviderFunctionDetails.
+        :rtype: ApiProviderFuncRole
+        """
+        return self._api_prov_func_role
+
+    @api_prov_func_role.setter
+    def api_prov_func_role(self, api_prov_func_role):
+        """Sets the api_prov_func_role of this APIProviderFunctionDetails.
+
+
+        :param api_prov_func_role: The api_prov_func_role of this APIProviderFunctionDetails.
+        :type api_prov_func_role: ApiProviderFuncRole
+        """
+        if api_prov_func_role is None:
+            raise ValueError("Invalid value for `api_prov_func_role`, must not be `None`")  # noqa: E501
+
+        self._api_prov_func_role = api_prov_func_role
+
+    @property
+    def api_prov_func_info(self):
+        """Gets the api_prov_func_info of this APIProviderFunctionDetails.
+
+        Generic information related to the API provider domain function such as details of the API provider applications.   # noqa: E501
+
+        :return: The api_prov_func_info of this APIProviderFunctionDetails.
+        :rtype: str
+        """
+        return self._api_prov_func_info
+
+    @api_prov_func_info.setter
+    def api_prov_func_info(self, api_prov_func_info):
+        """Sets the api_prov_func_info of this APIProviderFunctionDetails.
+
+        Generic information related to the API provider domain function such as details of the API provider applications.   # noqa: E501
+
+        :param api_prov_func_info: The api_prov_func_info of this APIProviderFunctionDetails.
+        :type api_prov_func_info: str
+        """
+
+        self._api_prov_func_info = api_prov_func_info
diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/base_model_.py b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/base_model_.py
new file mode 100644
index 0000000000000000000000000000000000000000..bd3a034f6d93e20fafba7a238d4c89172ab4a603
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/base_model_.py
@@ -0,0 +1,69 @@
+import pprint
+
+import six
+import typing
+
+from api_provider_management import util
+
+T = typing.TypeVar('T')
+
+
+class Model(object):
+    # openapiTypes: The key is attribute name and the
+    # value is attribute type.
+    openapi_types = {}
+
+    # attributeMap: The key is attribute name and the
+    # value is json key in definition.
+    attribute_map = {}
+
+    @classmethod
+    def from_dict(cls: typing.Type[T], dikt) -> T:
+        """Returns the dict as a model"""
+        return util.deserialize_model(dikt, cls)
+
+    def to_dict(self):
+        """Returns the model properties as a dict
+
+        :rtype: dict
+        """
+        result = {}
+
+        for attr, _ in six.iteritems(self.openapi_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model
+
+        :rtype: str
+        """
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/invalid_param.py b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/invalid_param.py
new file mode 100644
index 0000000000000000000000000000000000000000..58aae71fa366b79b77982308d29a36a37de0738c
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/invalid_param.py
@@ -0,0 +1,96 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from api_provider_management.models.base_model_ import Model
+from api_provider_management import util
+
+
+class InvalidParam(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, param=None, reason=None):  # noqa: E501
+        """InvalidParam - a model defined in OpenAPI
+
+        :param param: The param of this InvalidParam.  # noqa: E501
+        :type param: str
+        :param reason: The reason of this InvalidParam.  # noqa: E501
+        :type reason: str
+        """
+        self.openapi_types = {
+            'param': str,
+            'reason': str
+        }
+
+        self.attribute_map = {
+            'param': 'param',
+            'reason': 'reason'
+        }
+
+        self._param = param
+        self._reason = reason
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'InvalidParam':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The InvalidParam of this InvalidParam.  # noqa: E501
+        :rtype: InvalidParam
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def param(self):
+        """Gets the param of this InvalidParam.
+
+        Attribute's name encoded as a JSON Pointer, or header's name.  # noqa: E501
+
+        :return: The param of this InvalidParam.
+        :rtype: str
+        """
+        return self._param
+
+    @param.setter
+    def param(self, param):
+        """Sets the param of this InvalidParam.
+
+        Attribute's name encoded as a JSON Pointer, or header's name.  # noqa: E501
+
+        :param param: The param of this InvalidParam.
+        :type param: str
+        """
+        if param is None:
+            raise ValueError("Invalid value for `param`, must not be `None`")  # noqa: E501
+
+        self._param = param
+
+    @property
+    def reason(self):
+        """Gets the reason of this InvalidParam.
+
+        A human-readable reason, e.g. \"must be a positive integer\".  # noqa: E501
+
+        :return: The reason of this InvalidParam.
+        :rtype: str
+        """
+        return self._reason
+
+    @reason.setter
+    def reason(self, reason):
+        """Sets the reason of this InvalidParam.
+
+        A human-readable reason, e.g. \"must be a positive integer\".  # noqa: E501
+
+        :param reason: The reason of this InvalidParam.
+        :type reason: str
+        """
+
+        self._reason = reason
diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/problem_details.py b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/problem_details.py
new file mode 100644
index 0000000000000000000000000000000000000000..44fe3443f43e2b09ef86fec1c55921eaa422bc51
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/problem_details.py
@@ -0,0 +1,270 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from api_provider_management.models.base_model_ import Model
+from api_provider_management.models.invalid_param import InvalidParam
+import re
+from api_provider_management import util
+
+from api_provider_management.models.invalid_param import InvalidParam  # noqa: E501
+import re  # noqa: E501
+
+class ProblemDetails(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, type=None, title=None, status=None, detail=None, instance=None, cause=None, invalid_params=None, supported_features=None):  # noqa: E501
+        """ProblemDetails - a model defined in OpenAPI
+
+        :param type: The type of this ProblemDetails.  # noqa: E501
+        :type type: str
+        :param title: The title of this ProblemDetails.  # noqa: E501
+        :type title: str
+        :param status: The status of this ProblemDetails.  # noqa: E501
+        :type status: int
+        :param detail: The detail of this ProblemDetails.  # noqa: E501
+        :type detail: str
+        :param instance: The instance of this ProblemDetails.  # noqa: E501
+        :type instance: str
+        :param cause: The cause of this ProblemDetails.  # noqa: E501
+        :type cause: str
+        :param invalid_params: The invalid_params of this ProblemDetails.  # noqa: E501
+        :type invalid_params: List[InvalidParam]
+        :param supported_features: The supported_features of this ProblemDetails.  # noqa: E501
+        :type supported_features: str
+        """
+        self.openapi_types = {
+            'type': str,
+            'title': str,
+            'status': int,
+            'detail': str,
+            'instance': str,
+            'cause': str,
+            'invalid_params': List[InvalidParam],
+            'supported_features': str
+        }
+
+        self.attribute_map = {
+            'type': 'type',
+            'title': 'title',
+            'status': 'status',
+            'detail': 'detail',
+            'instance': 'instance',
+            'cause': 'cause',
+            'invalid_params': 'invalidParams',
+            'supported_features': 'supportedFeatures'
+        }
+
+        self._type = type
+        self._title = title
+        self._status = status
+        self._detail = detail
+        self._instance = instance
+        self._cause = cause
+        self._invalid_params = invalid_params
+        self._supported_features = supported_features
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'ProblemDetails':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The ProblemDetails of this ProblemDetails.  # noqa: E501
+        :rtype: ProblemDetails
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def type(self):
+        """Gets the type of this ProblemDetails.
+
+        string providing an URI formatted according to IETF RFC 3986.  # noqa: E501
+
+        :return: The type of this ProblemDetails.
+        :rtype: str
+        """
+        return self._type
+
+    @type.setter
+    def type(self, type):
+        """Sets the type of this ProblemDetails.
+
+        string providing an URI formatted according to IETF RFC 3986.  # noqa: E501
+
+        :param type: The type of this ProblemDetails.
+        :type type: str
+        """
+
+        self._type = type
+
+    @property
+    def title(self):
+        """Gets the title of this ProblemDetails.
+
+        A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem.  # noqa: E501
+
+        :return: The title of this ProblemDetails.
+        :rtype: str
+        """
+        return self._title
+
+    @title.setter
+    def title(self, title):
+        """Sets the title of this ProblemDetails.
+
+        A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem.  # noqa: E501
+
+        :param title: The title of this ProblemDetails.
+        :type title: str
+        """
+
+        self._title = title
+
+    @property
+    def status(self):
+        """Gets the status of this ProblemDetails.
+
+        The HTTP status code for this occurrence of the problem.  # noqa: E501
+
+        :return: The status of this ProblemDetails.
+        :rtype: int
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """Sets the status of this ProblemDetails.
+
+        The HTTP status code for this occurrence of the problem.  # noqa: E501
+
+        :param status: The status of this ProblemDetails.
+        :type status: int
+        """
+
+        self._status = status
+
+    @property
+    def detail(self):
+        """Gets the detail of this ProblemDetails.
+
+        A human-readable explanation specific to this occurrence of the problem.  # noqa: E501
+
+        :return: The detail of this ProblemDetails.
+        :rtype: str
+        """
+        return self._detail
+
+    @detail.setter
+    def detail(self, detail):
+        """Sets the detail of this ProblemDetails.
+
+        A human-readable explanation specific to this occurrence of the problem.  # noqa: E501
+
+        :param detail: The detail of this ProblemDetails.
+        :type detail: str
+        """
+
+        self._detail = detail
+
+    @property
+    def instance(self):
+        """Gets the instance of this ProblemDetails.
+
+        string providing an URI formatted according to IETF RFC 3986.  # noqa: E501
+
+        :return: The instance of this ProblemDetails.
+        :rtype: str
+        """
+        return self._instance
+
+    @instance.setter
+    def instance(self, instance):
+        """Sets the instance of this ProblemDetails.
+
+        string providing an URI formatted according to IETF RFC 3986.  # noqa: E501
+
+        :param instance: The instance of this ProblemDetails.
+        :type instance: str
+        """
+
+        self._instance = instance
+
+    @property
+    def cause(self):
+        """Gets the cause of this ProblemDetails.
+
+        A machine-readable application error cause specific to this occurrence of the problem. This IE should be present and provide application-related error information, if available.  # noqa: E501
+
+        :return: The cause of this ProblemDetails.
+        :rtype: str
+        """
+        return self._cause
+
+    @cause.setter
+    def cause(self, cause):
+        """Sets the cause of this ProblemDetails.
+
+        A machine-readable application error cause specific to this occurrence of the problem. This IE should be present and provide application-related error information, if available.  # noqa: E501
+
+        :param cause: The cause of this ProblemDetails.
+        :type cause: str
+        """
+
+        self._cause = cause
+
+    @property
+    def invalid_params(self):
+        """Gets the invalid_params of this ProblemDetails.
+
+        Description of invalid parameters, for a request rejected due to invalid parameters.  # noqa: E501
+
+        :return: The invalid_params of this ProblemDetails.
+        :rtype: List[InvalidParam]
+        """
+        return self._invalid_params
+
+    @invalid_params.setter
+    def invalid_params(self, invalid_params):
+        """Sets the invalid_params of this ProblemDetails.
+
+        Description of invalid parameters, for a request rejected due to invalid parameters.  # noqa: E501
+
+        :param invalid_params: The invalid_params of this ProblemDetails.
+        :type invalid_params: List[InvalidParam]
+        """
+        if invalid_params is not None and len(invalid_params) < 1:
+            raise ValueError("Invalid value for `invalid_params`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._invalid_params = invalid_params
+
+    @property
+    def supported_features(self):
+        """Gets the supported_features of this ProblemDetails.
+
+        A string used to indicate the features supported by an API that is used as defined in clause  6.6 in 3GPP TS 29.500. The string shall contain a bitmask indicating supported features in  hexadecimal representation Each character in the string shall take a value of \"0\" to \"9\",  \"a\" to \"f\" or \"A\" to \"F\" and shall represent the support of 4 features as described in  table 5.2.2-3. The most significant character representing the highest-numbered features shall  appear first in the string, and the character representing features 1 to 4 shall appear last  in the string. The list of features and their numbering (starting with 1) are defined  separately for each API. If the string contains a lower number of characters than there are  defined features for an API, all features that would be represented by characters that are not  present in the string are not supported.   # noqa: E501
+
+        :return: The supported_features of this ProblemDetails.
+        :rtype: str
+        """
+        return self._supported_features
+
+    @supported_features.setter
+    def supported_features(self, supported_features):
+        """Sets the supported_features of this ProblemDetails.
+
+        A string used to indicate the features supported by an API that is used as defined in clause  6.6 in 3GPP TS 29.500. The string shall contain a bitmask indicating supported features in  hexadecimal representation Each character in the string shall take a value of \"0\" to \"9\",  \"a\" to \"f\" or \"A\" to \"F\" and shall represent the support of 4 features as described in  table 5.2.2-3. The most significant character representing the highest-numbered features shall  appear first in the string, and the character representing features 1 to 4 shall appear last  in the string. The list of features and their numbering (starting with 1) are defined  separately for each API. If the string contains a lower number of characters than there are  defined features for an API, all features that would be represented by characters that are not  present in the string are not supported.   # noqa: E501
+
+        :param supported_features: The supported_features of this ProblemDetails.
+        :type supported_features: str
+        """
+        if supported_features is not None and not re.search(r'^[A-Fa-f0-9]*$', supported_features):  # noqa: E501
+            raise ValueError("Invalid value for `supported_features`, must be a follow pattern or equal to `/^[A-Fa-f0-9]*$/`")  # noqa: E501
+
+        self._supported_features = supported_features
diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/registration_information.py b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/registration_information.py
new file mode 100644
index 0000000000000000000000000000000000000000..7e1b08a5a690d25adfca1a4ad65b9d0a4ce5c642
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/models/registration_information.py
@@ -0,0 +1,96 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from api_provider_management.models.base_model_ import Model
+from api_provider_management import util
+
+
+class RegistrationInformation(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, api_prov_pub_key=None, api_prov_cert=None):  # noqa: E501
+        """RegistrationInformation - a model defined in OpenAPI
+
+        :param api_prov_pub_key: The api_prov_pub_key of this RegistrationInformation.  # noqa: E501
+        :type api_prov_pub_key: str
+        :param api_prov_cert: The api_prov_cert of this RegistrationInformation.  # noqa: E501
+        :type api_prov_cert: str
+        """
+        self.openapi_types = {
+            'api_prov_pub_key': str,
+            'api_prov_cert': str
+        }
+
+        self.attribute_map = {
+            'api_prov_pub_key': 'apiProvPubKey',
+            'api_prov_cert': 'apiProvCert'
+        }
+
+        self._api_prov_pub_key = api_prov_pub_key
+        self._api_prov_cert = api_prov_cert
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'RegistrationInformation':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The RegistrationInformation of this RegistrationInformation.  # noqa: E501
+        :rtype: RegistrationInformation
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def api_prov_pub_key(self):
+        """Gets the api_prov_pub_key of this RegistrationInformation.
+
+        Public Key of API Provider domain function.  # noqa: E501
+
+        :return: The api_prov_pub_key of this RegistrationInformation.
+        :rtype: str
+        """
+        return self._api_prov_pub_key
+
+    @api_prov_pub_key.setter
+    def api_prov_pub_key(self, api_prov_pub_key):
+        """Sets the api_prov_pub_key of this RegistrationInformation.
+
+        Public Key of API Provider domain function.  # noqa: E501
+
+        :param api_prov_pub_key: The api_prov_pub_key of this RegistrationInformation.
+        :type api_prov_pub_key: str
+        """
+        if api_prov_pub_key is None:
+            raise ValueError("Invalid value for `api_prov_pub_key`, must not be `None`")  # noqa: E501
+
+        self._api_prov_pub_key = api_prov_pub_key
+
+    @property
+    def api_prov_cert(self):
+        """Gets the api_prov_cert of this RegistrationInformation.
+
+        API provider domain function's client certificate  # noqa: E501
+
+        :return: The api_prov_cert of this RegistrationInformation.
+        :rtype: str
+        """
+        return self._api_prov_cert
+
+    @api_prov_cert.setter
+    def api_prov_cert(self, api_prov_cert):
+        """Sets the api_prov_cert of this RegistrationInformation.
+
+        API provider domain function's client certificate  # noqa: E501
+
+        :param api_prov_cert: The api_prov_cert of this RegistrationInformation.
+        :type api_prov_cert: str
+        """
+
+        self._api_prov_cert = api_prov_cert
diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/openapi/openapi.yaml b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/openapi/openapi.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..59ea36c94dd56e2d674f07c5c18368fd133e54c8
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/openapi/openapi.yaml
@@ -0,0 +1,619 @@
+openapi: 3.0.0
+info:
+  description: "API for API provider domain functions management.  \n© 2022, 3GPP\
+    \ Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).  \nAll rights\
+    \ reserved.\n"
+  title: CAPIF_API_Provider_Management_API
+  version: 1.1.0
+externalDocs:
+  description: 3GPP TS 29.222 V17.5.0 Common API Framework for 3GPP Northbound APIs
+  url: https://www.3gpp.org/ftp/Specs/archive/29_series/29.222/
+servers:
+- url: '{apiRoot}/api-provider-management/v1'
+  variables:
+    apiRoot:
+      default: https://example.com
+      description: apiRoot as defined in clause 7.5 of 3GPP TS 29.222
+paths:
+  /registrations:
+    post:
+      description: Registers a new API Provider domain with API provider domain functions
+        profiles.
+      operationId: registrations_post
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/APIProviderEnrolmentDetails'
+        required: true
+      responses:
+        "201":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/APIProviderEnrolmentDetails'
+          description: API provider domain registered successfully
+          headers:
+            Location:
+              description: |
+                Contains the URI of the newly created resource, according to the structure {apiRoot}/api-provider-management/v1/registrations/{registrationId}
+              explode: false
+              required: true
+              schema:
+                type: string
+              style: simple
+        "400":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Bad request
+        "401":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Unauthorized
+        "403":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Forbidden
+        "404":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Not Found
+        "411":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Length Required
+        "413":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Payload Too Large
+        "415":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Unsupported Media Type
+        "429":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Too Many Requests
+        "500":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Internal Server Error
+        "503":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Service Unavailable
+        default:
+          description: Generic Error
+      x-openapi-router-controller: api_provider_management.controllers.default_controller
+  /registrations/{registrationId}:
+    delete:
+      description: Deregisters API provider domain by deleting API provider domain
+        and functions.
+      operationId: registrations_registration_id_delete
+      parameters:
+      - description: String identifying an registered API provider domain resource.
+        explode: false
+        in: path
+        name: registrationId
+        required: true
+        schema:
+          type: string
+        style: simple
+      responses:
+        "204":
+          description: The API provider domain matching registrationId is deleted.
+        "307":
+          description: Temporary Redirect
+          headers:
+            Location:
+              description: An alternative URI of the resource.
+              required: true
+              schema:
+                type: string
+        "308":
+          description: Permanent Redirect
+          headers:
+            Location:
+              description: An alternative URI of the resource.
+              required: true
+              schema:
+                type: string
+        "400":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Bad request
+        "401":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Unauthorized
+        "403":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Forbidden
+        "404":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Not Found
+        "429":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Too Many Requests
+        "500":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Internal Server Error
+        "503":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Service Unavailable
+        default:
+          description: Generic Error
+      x-openapi-router-controller: api_provider_management.controllers.default_controller
+    patch:
+      description: Modify an individual API provider details.
+      operationId: modify_ind_api_provider_enrolment
+      parameters:
+      - explode: false
+        in: path
+        name: registrationId
+        required: true
+        schema:
+          type: string
+        style: simple
+      requestBody:
+        content:
+          application/merge-patch+json:
+            schema:
+              $ref: '#/components/schemas/APIProviderEnrolmentDetailsPatch'
+        required: true
+      responses:
+        "200":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/APIProviderEnrolmentDetails'
+          description: |
+            The definition of the service API is modified successfully and a representation of the updated service API is returned in the request body.
+        "204":
+          description: No Content. The definition of the service API is modified successfully.
+        "307":
+          description: Temporary Redirect
+          headers:
+            Location:
+              description: An alternative URI of the resource.
+              required: true
+              schema:
+                type: string
+        "308":
+          description: Permanent Redirect
+          headers:
+            Location:
+              description: An alternative URI of the resource.
+              required: true
+              schema:
+                type: string
+        "400":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Bad request
+        "401":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Unauthorized
+        "403":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Forbidden
+        "404":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Not Found
+        "411":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Length Required
+        "413":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Payload Too Large
+        "415":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Unsupported Media Type
+        "429":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Too Many Requests
+        "500":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Internal Server Error
+        "503":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Service Unavailable
+        default:
+          description: Generic Error
+      tags:
+      - Individual API Provider enrolment details
+      x-openapi-router-controller: api_provider_management.controllers.individual_api_provider_enrolment_details_controller
+    put:
+      description: Updates an API provider domain's registration details.
+      operationId: registrations_registration_id_put
+      parameters:
+      - description: String identifying an registered API provider domain resource.
+        explode: false
+        in: path
+        name: registrationId
+        required: true
+        schema:
+          type: string
+        style: simple
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/APIProviderEnrolmentDetails'
+        description: |
+          Representation of the API provider domain registration details to be updated in CAPIF core function.
+        required: true
+      responses:
+        "200":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/APIProviderEnrolmentDetails'
+          description: API provider domain registration details updated successfully.
+        "204":
+          description: No Content
+        "307":
+          description: Temporary Redirect
+          headers:
+            Location:
+              description: An alternative URI of the resource.
+              required: true
+              schema:
+                type: string
+        "308":
+          description: Permanent Redirect
+          headers:
+            Location:
+              description: An alternative URI of the resource.
+              required: true
+              schema:
+                type: string
+        "400":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Bad request
+        "401":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Unauthorized
+        "403":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Forbidden
+        "404":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Not Found
+        "411":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Length Required
+        "413":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Payload Too Large
+        "415":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Unsupported Media Type
+        "429":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Too Many Requests
+        "500":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Internal Server Error
+        "503":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Service Unavailable
+        default:
+          description: Generic Error
+      x-openapi-router-controller: api_provider_management.controllers.default_controller
+components:
+  schemas:
+    APIProviderEnrolmentDetails:
+      description: Represents an API provider domain's enrolment details.
+      example:
+        regSec: regSec
+        apiProvFuncs:
+        - apiProvFuncId: apiProvFuncId
+          apiProvFuncInfo: apiProvFuncInfo
+          regInfo:
+            apiProvCert: apiProvCert
+            apiProvPubKey: apiProvPubKey
+        - apiProvFuncId: apiProvFuncId
+          apiProvFuncInfo: apiProvFuncInfo
+          regInfo:
+            apiProvCert: apiProvCert
+            apiProvPubKey: apiProvPubKey
+        failReason: failReason
+        apiProvDomId: apiProvDomId
+        apiProvDomInfo: apiProvDomInfo
+        suppFeat: suppFeat
+      properties:
+        apiProvDomId:
+          description: |
+            API provider domain ID assigned by the CAPIF core function to the API management function while registering the API provider domain. Shall not be present in the HTTP POST request from the API Management function to the CAPIF core function, to on-board itself. Shall be present in all other HTTP requests and responses.
+          readOnly: true
+          title: apiProvDomId
+          type: string
+        regSec:
+          description: |
+            Security information necessary for the CAPIF core function to validate the registration of the API provider domain. Shall be present in HTTP POST request from API management function to CAPIF core function for API provider domain registration.
+          title: regSec
+          type: string
+        apiProvFuncs:
+          description: |
+            A list of individual API provider domain functions details. When included by the API management function in the HTTP request message, it lists the API provider domain functions that the API management function intends to register/update in registration or update registration procedure. When included by the CAPIF core function in the HTTP response message, it lists the API domain functions details that are registered or updated successfully.
+          items:
+            $ref: '#/components/schemas/APIProviderFunctionDetails'
+          minItems: 1
+          title: apiProvFuncs
+          type: array
+        apiProvDomInfo:
+          description: |
+            Generic information related to the API provider domain such as details of the API provider applications.
+          title: apiProvDomInfo
+          type: string
+        suppFeat:
+          description: |
+            A string used to indicate the features supported by an API that is used as defined in clause  6.6 in 3GPP TS 29.500. The string shall contain a bitmask indicating supported features in  hexadecimal representation Each character in the string shall take a value of "0" to "9",  "a" to "f" or "A" to "F" and shall represent the support of 4 features as described in  table 5.2.2-3. The most significant character representing the highest-numbered features shall  appear first in the string, and the character representing features 1 to 4 shall appear last  in the string. The list of features and their numbering (starting with 1) are defined  separately for each API. If the string contains a lower number of characters than there are  defined features for an API, all features that would be represented by characters that are not  present in the string are not supported.
+          pattern: ^[A-Fa-f0-9]*$
+          title: suppFeat
+          type: string
+        failReason:
+          description: |
+            Registration or update specific failure information of failed API provider domain function registrations.Shall be present in the HTTP response body if atleast one of the API provider domain function registration or update registration fails.
+          title: failReason
+          type: string
+      required:
+      - regSec
+      title: APIProviderEnrolmentDetails
+      type: object
+    APIProviderFunctionDetails:
+      description: Represents API provider domain function's details.
+      example:
+        apiProvFuncId: apiProvFuncId
+        apiProvFuncInfo: apiProvFuncInfo
+        regInfo:
+          apiProvCert: apiProvCert
+          apiProvPubKey: apiProvPubKey
+      properties:
+        apiProvFuncId:
+          description: |
+            API provider domain functionID assigned by the CAPIF core function to the API provider domain function while registering/updating the API provider domain. Shall not be present in the HTTP POST request from the API management function to the CAPIF core function, to register itself. Shall be present in all other HTTP requests and responses.
+          title: apiProvFuncId
+          type: string
+        regInfo:
+          $ref: '#/components/schemas/RegistrationInformation'
+        apiProvFuncRole:
+          $ref: '#/components/schemas/ApiProviderFuncRole'
+        apiProvFuncInfo:
+          description: |
+            Generic information related to the API provider domain function such as details of the API provider applications.
+          title: apiProvFuncInfo
+          type: string
+      required:
+      - apiProvFuncRole
+      - regInfo
+      title: APIProviderFunctionDetails
+      type: object
+    RegistrationInformation:
+      description: |
+        Represents registration information of an individual API provider domain function.
+      example:
+        apiProvCert: apiProvCert
+        apiProvPubKey: apiProvPubKey
+      properties:
+        apiProvPubKey:
+          description: Public Key of API Provider domain function.
+          title: apiProvPubKey
+          type: string
+        apiProvCert:
+          description: API provider domain function's client certificate
+          title: apiProvCert
+          type: string
+      required:
+      - apiProvPubKey
+      title: RegistrationInformation
+      type: object
+    ApiProviderFuncRole:
+      anyOf:
+      - $ref: '#/components/schemas/ApiProviderFuncRole_anyOf'
+      - description: |
+          This string provides forward-compatiblity with future extensions to the enumeration but is not used to encode content defined in the present version of this API.
+        type: string
+      description: |
+        Possible values are:
+        - AEF: API provider function is API Exposing Function.
+        - APF: API provider function is API Publishing Function.
+        - AMF: API Provider function is API Management Function.
+      title: ApiProviderFuncRole
+    APIProviderEnrolmentDetailsPatch:
+      description: Represents an API provider domain's enrolment details.
+      properties:
+        apiProvFuncs:
+          description: "A list of individual API provider domain functions details.\
+            \ When included by the API management function in the HTTP request message,\
+            \ it lists the API provider domain functions that the API management function\
+            \ intends to register/update in registration or update registration procedure.\
+            \ \n"
+          items:
+            $ref: '#/components/schemas/APIProviderFunctionDetails'
+          minItems: 1
+          type: array
+        apiProvDomInfo:
+          description: |
+            Generic information related to the API provider domain such as details of the API provider applications.
+          type: string
+      type: object
+    ProblemDetails:
+      description: Represents additional information and details on an error response.
+      properties:
+        type:
+          description: string providing an URI formatted according to IETF RFC 3986.
+          title: type
+          type: string
+        title:
+          description: A short, human-readable summary of the problem type. It should
+            not change from occurrence to occurrence of the problem.
+          title: title
+          type: string
+        status:
+          description: The HTTP status code for this occurrence of the problem.
+          title: status
+          type: integer
+        detail:
+          description: A human-readable explanation specific to this occurrence of
+            the problem.
+          title: detail
+          type: string
+        instance:
+          description: string providing an URI formatted according to IETF RFC 3986.
+          title: type
+          type: string
+        cause:
+          description: A machine-readable application error cause specific to this
+            occurrence of the problem. This IE should be present and provide application-related
+            error information, if available.
+          title: cause
+          type: string
+        invalidParams:
+          description: Description of invalid parameters, for a request rejected due
+            to invalid parameters.
+          items:
+            $ref: '#/components/schemas/InvalidParam'
+          minItems: 1
+          title: invalidParams
+          type: array
+        supportedFeatures:
+          description: |
+            A string used to indicate the features supported by an API that is used as defined in clause  6.6 in 3GPP TS 29.500. The string shall contain a bitmask indicating supported features in  hexadecimal representation Each character in the string shall take a value of "0" to "9",  "a" to "f" or "A" to "F" and shall represent the support of 4 features as described in  table 5.2.2-3. The most significant character representing the highest-numbered features shall  appear first in the string, and the character representing features 1 to 4 shall appear last  in the string. The list of features and their numbering (starting with 1) are defined  separately for each API. If the string contains a lower number of characters than there are  defined features for an API, all features that would be represented by characters that are not  present in the string are not supported.
+          pattern: ^[A-Fa-f0-9]*$
+          title: suppFeat
+          type: string
+      title: ProblemDetails
+      type: object
+    Uri:
+      description: string providing an URI formatted according to IETF RFC 3986.
+      title: type
+      type: string
+    InvalidParam:
+      description: Represents the description of invalid parameters, for a request
+        rejected due to invalid parameters.
+      properties:
+        param:
+          description: Attribute's name encoded as a JSON Pointer, or header's name.
+          title: param
+          type: string
+        reason:
+          description: A human-readable reason, e.g. "must be a positive integer".
+          title: reason
+          type: string
+      required:
+      - param
+      title: InvalidParam
+      type: object
+    SupportedFeatures:
+      description: |
+        A string used to indicate the features supported by an API that is used as defined in clause  6.6 in 3GPP TS 29.500. The string shall contain a bitmask indicating supported features in  hexadecimal representation Each character in the string shall take a value of "0" to "9",  "a" to "f" or "A" to "F" and shall represent the support of 4 features as described in  table 5.2.2-3. The most significant character representing the highest-numbered features shall  appear first in the string, and the character representing features 1 to 4 shall appear last  in the string. The list of features and their numbering (starting with 1) are defined  separately for each API. If the string contains a lower number of characters than there are  defined features for an API, all features that would be represented by characters that are not  present in the string are not supported.
+      pattern: ^[A-Fa-f0-9]*$
+      title: suppFeat
+      type: string
+    ApiProviderFuncRole_anyOf:
+      enum:
+      - AEF
+      - APF
+      - AMF
+      title: ApiProviderFuncRole_anyOf
+      type: string
diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/typing_utils.py b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/typing_utils.py
new file mode 100644
index 0000000000000000000000000000000000000000..0563f81fd5345282a33705038dfa77fdcaa15872
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/typing_utils.py
@@ -0,0 +1,32 @@
+# coding: utf-8
+
+import sys
+
+if sys.version_info < (3, 7):
+    import typing
+
+    def is_generic(klass):
+        """ Determine whether klass is a generic class """
+        return type(klass) == typing.GenericMeta
+
+    def is_dict(klass):
+        """ Determine whether klass is a Dict """
+        return klass.__extra__ == dict
+
+    def is_list(klass):
+        """ Determine whether klass is a List """
+        return klass.__extra__ == list
+
+else:
+
+    def is_generic(klass):
+        """ Determine whether klass is a generic class """
+        return hasattr(klass, '__origin__')
+
+    def is_dict(klass):
+        """ Determine whether klass is a Dict """
+        return klass.__origin__ == dict
+
+    def is_list(klass):
+        """ Determine whether klass is a List """
+        return klass.__origin__ == list
diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/util.py b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/util.py
new file mode 100644
index 0000000000000000000000000000000000000000..e769d2852d772e8716895c7c9313987f4e44bf74
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/util.py
@@ -0,0 +1,183 @@
+import datetime
+
+import six
+import typing
+from api_provider_management import typing_utils
+
+def clean_empty(d):
+    if isinstance(d, dict):
+        return {
+            k: v
+            for k, v in ((k, clean_empty(v)) for k, v in d.items())
+            if v
+        }
+    if isinstance(d, list):
+        return [v for v in map(clean_empty, d) if v]
+    return d
+
+def dict_to_camel_case(my_dict):
+
+
+        result = {}
+
+        for attr, value in my_dict.items():
+
+            my_key = ''.join(word.title() for word in attr.split('_'))
+            my_key= ''.join([my_key[0].lower(), my_key[1:]])
+
+            if isinstance(value, list):
+                result[my_key] = list(map(
+                    lambda x: dict_to_camel_case(x) if isinstance(x, dict) else x, value ))
+
+            elif hasattr(value, "to_dict"):
+                result[my_key] = dict_to_camel_case(value)
+
+            elif isinstance(value, dict):
+                value = dict_to_camel_case(value)
+                result[my_key] = value
+            else:
+                result[my_key] = value
+
+        return result
+
+def _deserialize(data, klass):
+    """Deserializes dict, list, str into an object.
+
+    :param data: dict, list or str.
+    :param klass: class literal, or string of class name.
+
+    :return: object.
+    """
+    if data is None:
+        return None
+
+    if klass in six.integer_types or klass in (float, str, bool, bytearray):
+        return _deserialize_primitive(data, klass)
+    elif klass == object:
+        return _deserialize_object(data)
+    elif klass == datetime.date:
+        return deserialize_date(data)
+    elif klass == datetime.datetime:
+        return deserialize_datetime(data)
+    elif typing_utils.is_generic(klass):
+        if typing_utils.is_list(klass):
+            return _deserialize_list(data, klass.__args__[0])
+        if typing_utils.is_dict(klass):
+            return _deserialize_dict(data, klass.__args__[1])
+    else:
+        return deserialize_model(data, klass)
+
+
+def _deserialize_primitive(data, klass):
+    """Deserializes to primitive type.
+
+    :param data: data to deserialize.
+    :param klass: class literal.
+
+    :return: int, long, float, str, bool.
+    :rtype: int | long | float | str | bool
+    """
+    try:
+        value = klass(data)
+    except UnicodeEncodeError:
+        value = six.u(data)
+    except TypeError:
+        value = data
+    return value
+
+
+def _deserialize_object(value):
+    """Return an original value.
+
+    :return: object.
+    """
+    return value
+
+
+def deserialize_date(string):
+    """Deserializes string to date.
+
+    :param string: str.
+    :type string: str
+    :return: date.
+    :rtype: date
+    """
+    if string is None:
+      return None
+    
+    try:
+        from dateutil.parser import parse
+        return parse(string).date()
+    except ImportError:
+        return string
+
+
+def deserialize_datetime(string):
+    """Deserializes string to datetime.
+
+    The string should be in iso8601 datetime format.
+
+    :param string: str.
+    :type string: str
+    :return: datetime.
+    :rtype: datetime
+    """
+    if string is None:
+      return None
+    
+    try:
+        from dateutil.parser import parse
+        return parse(string)
+    except ImportError:
+        return string
+
+
+def deserialize_model(data, klass):
+    """Deserializes list or dict to model.
+
+    :param data: dict, list.
+    :type data: dict | list
+    :param klass: class literal.
+    :return: model object.
+    """
+    instance = klass()
+
+    if not instance.openapi_types:
+        return data
+
+    for attr, attr_type in six.iteritems(instance.openapi_types):
+        if data is not None \
+                and instance.attribute_map[attr] in data \
+                and isinstance(data, (list, dict)):
+            value = data[instance.attribute_map[attr]]
+            setattr(instance, attr, _deserialize(value, attr_type))
+
+    return instance
+
+
+def _deserialize_list(data, boxed_type):
+    """Deserializes a list and its elements.
+
+    :param data: list to deserialize.
+    :type data: list
+    :param boxed_type: class literal.
+
+    :return: deserialized list.
+    :rtype: list
+    """
+    return [_deserialize(sub_data, boxed_type)
+            for sub_data in data]
+
+
+def _deserialize_dict(data, boxed_type):
+    """Deserializes a dict and its elements.
+
+    :param data: dict to deserialize.
+    :type data: dict
+    :param boxed_type: class literal.
+
+    :return: deserialized dict.
+    :rtype: dict
+    """
+    return {k: _deserialize(v, boxed_type)
+            for k, v in six.iteritems(data)}
diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/config.yaml b/services/TS29222_CAPIF_API_Provider_Management_API/config.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..8de29a4385fffc05236cae4a9e72f9490969e47f
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Provider_Management_API/config.yaml
@@ -0,0 +1,37 @@
+mongo: {
+  'user': 'root',
+  'password': 'example',
+  'db': 'capif',
+  'col': 'providerenrolmentdetails',
+  'certs_col': "certs",
+  'capif_users': 'user',
+  'host': 'mongo',
+  'port': "27017"
+}
+
+mongo_register: {
+  'user': 'root',
+  'password': 'example',
+  'db': 'capif_users',
+  'col': 'user',
+  'host': 'mongo_register',
+  'port': '27017'
+}
+
+ca_factory: {
+  "url": "vault",
+  "port": "8200",
+  "token": "dev-only-token"
+}
+
+
+monitoring: {
+  "fluent_bit_host": fluent-bit,
+  "fluent_bit_port": 24224,
+  "opentelemetry_url": "otel-collector",
+  "opentelemetry_port": "55680",
+  "opentelemetry_max_queue_size": 8192,
+  "opentelemetry_schedule_delay_millis": 20000,
+  "opentelemetry_max_export_batch_size": 2048,
+  "opentelemetry_export_timeout_millis": 60000
+}
diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/git_push.sh b/services/TS29222_CAPIF_API_Provider_Management_API/git_push.sh
new file mode 100644
index 0000000000000000000000000000000000000000..9405f72e950cdb8ca24c3cf4d15cee7eac62fde7
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Provider_Management_API/git_push.sh
@@ -0,0 +1,57 @@
+#!/bin/sh
+# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
+#
+# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl "minor update" "gitlab.com"
+
+git_user_id=$1
+git_repo_id=$2
+release_note=$3
+git_host=$4
+
+if [ "$git_host" = "" ]; then
+    git_host="github.com"
+    echo "[INFO] No command line input provided. Set \$git_host to $git_host"
+fi
+
+if [ "$git_user_id" = "" ]; then
+    git_user_id="GIT_USER_ID"
+    echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id"
+fi
+
+if [ "$git_repo_id" = "" ]; then
+    git_repo_id="GIT_REPO_ID"
+    echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id"
+fi
+
+if [ "$release_note" = "" ]; then
+    release_note="Minor update"
+    echo "[INFO] No command line input provided. Set \$release_note to $release_note"
+fi
+
+# Initialize the local directory as a Git repository
+git init
+
+# Adds the files in the local repository and stages them for commit.
+git add .
+
+# Commits the tracked changes and prepares them to be pushed to a remote repository.
+git commit -m "$release_note"
+
+# Sets the new remote
+git_remote=`git remote`
+if [ "$git_remote" = "" ]; then # git remote not defined
+
+    if [ "$GIT_TOKEN" = "" ]; then
+        echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git credential in your environment."
+        git remote add origin https://${git_host}/${git_user_id}/${git_repo_id}.git
+    else
+        git remote add origin https://${git_user_id}:${GIT_TOKEN}@${git_host}/${git_user_id}/${git_repo_id}.git
+    fi
+
+fi
+
+git pull origin master
+
+# Pushes (Forces) the changes in the local repository up to the remote repository
+echo "Git pushing to https://${git_host}/${git_user_id}/${git_repo_id}.git"
+git push origin master 2>&1 | grep -v 'To https'
diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/prepare_provider.sh b/services/TS29222_CAPIF_API_Provider_Management_API/prepare_provider.sh
new file mode 100644
index 0000000000000000000000000000000000000000..93bf420144dcbd0fdfb40055dc94104d9e63d07b
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Provider_Management_API/prepare_provider.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+VAULT_ADDR="http://$VAULT_HOSTNAME:$VAULT_PORT"
+VAULT_TOKEN=$VAULT_ACCESS_TOKEN
+
+curl  -vv -k -retry 30 \
+    --retry-all-errors \
+    --connect-timeout 5 \
+    --max-time 10 \
+    --retry-delay 10 \
+    --retry-max-time 300 \
+    --header "X-Vault-Token: $VAULT_TOKEN" \
+    --request GET "$VAULT_ADDR/v1/secret/data/server_cert/pub" 2>/dev/null | jq -r '.data.data.pub_key' -j > /usr/src/app/api_provider_management/pubkey.pem
+
+
+
+cd /usr/src/app/
+python3 -m api_provider_management
+
diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/requirements.txt b/services/TS29222_CAPIF_API_Provider_Management_API/requirements.txt
new file mode 100644
index 0000000000000000000000000000000000000000..d45d1e529f471f976ba4d88f0141be29bc38a4be
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Provider_Management_API/requirements.txt
@@ -0,0 +1,21 @@
+connexion[swagger-ui] == 2.14.2; python_version>="3.6"
+swagger-ui-bundle >= 0.0.2
+python_dateutil >= 2.6.0
+setuptools >= 21.0.0
+Flask == 2.0.3
+pymongo == 4.0.1
+redis ==  4.5.4
+flask_jwt_extended == 4.4.4
+pyopenssl == 23.0.0
+rfc3987 == 1.3.8
+opentelemetry-instrumentation == 0.38b0
+opentelemetry-instrumentation-flask == 0.38b0
+opentelemetry-instrumentation-redis == 0.38b0
+opentelemetry-instrumentation-pymongo == 0.38b0
+opentelemetry-exporter-otlp == 1.17.0
+fluent == 0.10.0
+fluent-logger == 0.10.0
+opentelemetry-api == 1.17.0
+opentelemetry-sdk == 1.17.0
+flask_executor == 1.0.0
+
diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/setup.py b/services/TS29222_CAPIF_API_Provider_Management_API/setup.py
new file mode 100644
index 0000000000000000000000000000000000000000..ac408ac3938277e2847fe0056dcde52dd04290ef
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Provider_Management_API/setup.py
@@ -0,0 +1,39 @@
+# coding: utf-8
+
+import sys
+from setuptools import setup, find_packages
+
+NAME = "api_provider_management"
+VERSION = "1.0.0"
+
+# To install the library, run the following
+#
+# python setup.py install
+#
+# prerequisite: setuptools
+# http://pypi.python.org/pypi/setuptools
+
+REQUIRES = [
+    "connexion>=2.0.2",
+    "swagger-ui-bundle>=0.0.2",
+    "python_dateutil>=2.6.0"
+]
+
+setup(
+    name=NAME,
+    version=VERSION,
+    description="CAPIF_API_Provider_Management_API",
+    author_email="",
+    url="",
+    keywords=["OpenAPI", "CAPIF_API_Provider_Management_API"],
+    install_requires=REQUIRES,
+    packages=find_packages(),
+    package_data={'': ['openapi/openapi.yaml']},
+    include_package_data=True,
+    entry_points={
+        'console_scripts': ['api_provider_management=api_provider_management.__main__:main']},
+    long_description="""\
+    API for API provider domain functions management. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. 
+    """
+)
+
diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/test-requirements.txt b/services/TS29222_CAPIF_API_Provider_Management_API/test-requirements.txt
new file mode 100644
index 0000000000000000000000000000000000000000..0970f28c7c5a344d7fd9b9c893c584e7336df266
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Provider_Management_API/test-requirements.txt
@@ -0,0 +1,4 @@
+pytest~=4.6.7 # needed for python 2.7+3.4
+pytest-cov>=2.8.1
+pytest-randomly==1.2.3 # needed for python 2.7+3.4
+Flask-Testing==0.8.0
diff --git a/services/TS29222_CAPIF_API_Provider_Management_API/tox.ini b/services/TS29222_CAPIF_API_Provider_Management_API/tox.ini
new file mode 100644
index 0000000000000000000000000000000000000000..5dbd9624ce969db078cb84dbd4a749a54258deba
--- /dev/null
+++ b/services/TS29222_CAPIF_API_Provider_Management_API/tox.ini
@@ -0,0 +1,11 @@
+[tox]
+envlist = py3
+skipsdist=True
+
+[testenv]
+deps=-r{toxinidir}/requirements.txt
+     -r{toxinidir}/test-requirements.txt
+	 {toxinidir}
+
+commands=
+   pytest --cov=api_provider_management
diff --git a/services/TS29222_CAPIF_Access_Control_Policy_API/.dockerignore b/services/TS29222_CAPIF_Access_Control_Policy_API/.dockerignore
new file mode 100644
index 0000000000000000000000000000000000000000..f9619601908b43d5d90c9befea5aa6ef6a732fa9
--- /dev/null
+++ b/services/TS29222_CAPIF_Access_Control_Policy_API/.dockerignore
@@ -0,0 +1,72 @@
+.travis.yaml
+.openapi-generator-ignore
+README.md
+tox.ini
+git_push.sh
+test-requirements.txt
+setup.py
+
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+env/
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*,cover
+.hypothesis/
+venv/
+.python-version
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+#Ipython Notebook
+.ipynb_checkpoints
diff --git a/services/TS29222_CAPIF_Access_Control_Policy_API/.gitignore b/services/TS29222_CAPIF_Access_Control_Policy_API/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..43995bd42fa23bbc4c3a59d5fb9da99042fcf139
--- /dev/null
+++ b/services/TS29222_CAPIF_Access_Control_Policy_API/.gitignore
@@ -0,0 +1,66 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+env/
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*,cover
+.hypothesis/
+venv/
+.venv/
+.python-version
+.pytest_cache
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+#Ipython Notebook
+.ipynb_checkpoints
diff --git a/services/TS29222_CAPIF_Access_Control_Policy_API/.openapi-generator-ignore b/services/TS29222_CAPIF_Access_Control_Policy_API/.openapi-generator-ignore
new file mode 100644
index 0000000000000000000000000000000000000000..7484ee590a3894506cf063799b885428f95a71be
--- /dev/null
+++ b/services/TS29222_CAPIF_Access_Control_Policy_API/.openapi-generator-ignore
@@ -0,0 +1,23 @@
+# OpenAPI Generator Ignore
+# Generated by openapi-generator https://github.com/openapitools/openapi-generator
+
+# Use this file to prevent files from being overwritten by the generator.
+# The patterns follow closely to .gitignore or .dockerignore.
+
+# As an example, the C# client generator defines ApiClient.cs.
+# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line:
+#ApiClient.cs
+
+# You can match any string of characters against a directory, file or extension with a single asterisk (*):
+#foo/*/qux
+# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
+
+# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
+#foo/**/qux
+# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
+
+# You can also negate patterns with an exclamation (!).
+# For example, you can ignore all files in a docs folder with the file extension .md:
+#docs/*.md
+# Then explicitly reverse the ignore rule for a single file:
+#!docs/README.md
diff --git a/services/TS29222_CAPIF_Access_Control_Policy_API/.openapi-generator/FILES b/services/TS29222_CAPIF_Access_Control_Policy_API/.openapi-generator/FILES
new file mode 100644
index 0000000000000000000000000000000000000000..9024036c49dbed352a31b1de587254487b3cf568
--- /dev/null
+++ b/services/TS29222_CAPIF_Access_Control_Policy_API/.openapi-generator/FILES
@@ -0,0 +1,28 @@
+.dockerignore
+.gitignore
+.travis.yml
+Dockerfile
+README.md
+git_push.sh
+openapi_server/__init__.py
+openapi_server/__main__.py
+openapi_server/controllers/__init__.py
+openapi_server/controllers/default_controller.py
+openapi_server/controllers/security_controller_.py
+openapi_server/encoder.py
+openapi_server/models/__init__.py
+openapi_server/models/access_control_policy_list.py
+openapi_server/models/api_invoker_policy.py
+openapi_server/models/base_model_.py
+openapi_server/models/invalid_param.py
+openapi_server/models/problem_details.py
+openapi_server/models/time_range_list.py
+openapi_server/openapi/openapi.yaml
+openapi_server/test/__init__.py
+openapi_server/test/test_default_controller.py
+openapi_server/typing_utils.py
+openapi_server/util.py
+requirements.txt
+setup.py
+test-requirements.txt
+tox.ini
diff --git a/services/TS29222_CAPIF_Access_Control_Policy_API/.openapi-generator/VERSION b/services/TS29222_CAPIF_Access_Control_Policy_API/.openapi-generator/VERSION
new file mode 100644
index 0000000000000000000000000000000000000000..4be2c727ad97a7352120a34d6bd4afa3f77e2ff2
--- /dev/null
+++ b/services/TS29222_CAPIF_Access_Control_Policy_API/.openapi-generator/VERSION
@@ -0,0 +1 @@
+6.5.0
\ No newline at end of file
diff --git a/services/TS29222_CAPIF_Access_Control_Policy_API/.travis.yml b/services/TS29222_CAPIF_Access_Control_Policy_API/.travis.yml
new file mode 100644
index 0000000000000000000000000000000000000000..ad71ee5ca083a6923c91104533c5c7b86f297f3f
--- /dev/null
+++ b/services/TS29222_CAPIF_Access_Control_Policy_API/.travis.yml
@@ -0,0 +1,14 @@
+# ref: https://docs.travis-ci.com/user/languages/python
+language: python
+python:
+  - "3.2"
+  - "3.3"
+  - "3.4"
+  - "3.5"
+  - "3.6"
+  - "3.7"
+  - "3.8"
+# command to install dependencies
+install: "pip install -r requirements.txt"
+# command to run tests
+script: nosetests
diff --git a/services/TS29222_CAPIF_Access_Control_Policy_API/Dockerfile b/services/TS29222_CAPIF_Access_Control_Policy_API/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..92dcb338cb2592781871d50a47f69796ab664f41
--- /dev/null
+++ b/services/TS29222_CAPIF_Access_Control_Policy_API/Dockerfile
@@ -0,0 +1,16 @@
+FROM public.ecr.aws/o2v4a8t6/opencapif/python:3-alpine
+
+RUN mkdir -p /usr/src/app
+WORKDIR /usr/src/app
+
+COPY requirements.txt /usr/src/app/
+
+RUN pip3 install --no-cache-dir -r requirements.txt
+
+COPY . /usr/src/app
+
+EXPOSE 8080
+
+ENTRYPOINT ["python3"]
+
+CMD ["-m", "openapi_server"]
\ No newline at end of file
diff --git a/services/TS29222_CAPIF_Access_Control_Policy_API/README.md b/services/TS29222_CAPIF_Access_Control_Policy_API/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..40feae4be1daaa8b8b1987f5fb318f79e56391b4
--- /dev/null
+++ b/services/TS29222_CAPIF_Access_Control_Policy_API/README.md
@@ -0,0 +1,49 @@
+# OpenAPI generated server
+
+## Overview
+This server was generated by the [OpenAPI Generator](https://openapi-generator.tech) project. By using the
+[OpenAPI-Spec](https://openapis.org) from a remote server, you can easily generate a server stub.  This
+is an example of building a OpenAPI-enabled Flask server.
+
+This example uses the [Connexion](https://github.com/zalando/connexion) library on top of Flask.
+
+## Requirements
+Python 3.5.2+
+
+## Usage
+To run the server, please execute the following from the root directory:
+
+```
+pip3 install -r requirements.txt
+python3 -m openapi_server
+```
+
+and open your browser to here:
+
+```
+http://localhost:8080/access-control-policy/v1/ui/
+```
+
+Your OpenAPI definition lives here:
+
+```
+http://localhost:8080/access-control-policy/v1/openapi.json
+```
+
+To launch the integration tests, use tox:
+```
+sudo pip install tox
+tox
+```
+
+## Running with Docker
+
+To run the server on a Docker container, please execute the following from the root directory:
+
+```bash
+# building the image
+docker build -t openapi_server .
+
+# starting up a container
+docker run -p 8080:8080 openapi_server
+```
\ No newline at end of file
diff --git a/services/TS29222_CAPIF_Access_Control_Policy_API/config.yaml b/services/TS29222_CAPIF_Access_Control_Policy_API/config.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..148cbfef629057d0c3f0b1f705e6a711fe5263ad
--- /dev/null
+++ b/services/TS29222_CAPIF_Access_Control_Policy_API/config.yaml
@@ -0,0 +1,30 @@
+mongo: {
+  'user': 'root',
+  'password': 'example',
+  'db': 'capif',
+  'col': 'acls',
+  'host': 'mongo',
+  'port': "27017"
+}
+
+redis: {
+  'host': 'redis',
+  'port': 6379,
+  'db': 0
+}
+
+invocations: {
+  'total': 5,
+  'perSecond': 10
+}
+
+monitoring: {
+  "fluent_bit_host": fluent-bit,
+  "fluent_bit_port": 24224,
+  "opentelemetry_url": "otel-collector",
+  "opentelemetry_port": "55680",
+  "opentelemetry_max_queue_size": 8192,
+  "opentelemetry_schedule_delay_millis": 20000,
+  "opentelemetry_max_export_batch_size": 2048,
+  "opentelemetry_export_timeout_millis": 60000
+}
diff --git a/services/TS29222_CAPIF_Access_Control_Policy_API/git_push.sh b/services/TS29222_CAPIF_Access_Control_Policy_API/git_push.sh
new file mode 100644
index 0000000000000000000000000000000000000000..f53a75d4fabe760cce49eddfd62fcc702938ea90
--- /dev/null
+++ b/services/TS29222_CAPIF_Access_Control_Policy_API/git_push.sh
@@ -0,0 +1,57 @@
+#!/bin/sh
+# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
+#
+# Usage example: /bin/sh ./git_push.sh wing328 openapi-petstore-perl "minor update" "gitlab.com"
+
+git_user_id=$1
+git_repo_id=$2
+release_note=$3
+git_host=$4
+
+if [ "$git_host" = "" ]; then
+    git_host="github.com"
+    echo "[INFO] No command line input provided. Set \$git_host to $git_host"
+fi
+
+if [ "$git_user_id" = "" ]; then
+    git_user_id="GIT_USER_ID"
+    echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id"
+fi
+
+if [ "$git_repo_id" = "" ]; then
+    git_repo_id="GIT_REPO_ID"
+    echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id"
+fi
+
+if [ "$release_note" = "" ]; then
+    release_note="Minor update"
+    echo "[INFO] No command line input provided. Set \$release_note to $release_note"
+fi
+
+# Initialize the local directory as a Git repository
+git init
+
+# Adds the files in the local repository and stages them for commit.
+git add .
+
+# Commits the tracked changes and prepares them to be pushed to a remote repository.
+git commit -m "$release_note"
+
+# Sets the new remote
+git_remote=$(git remote)
+if [ "$git_remote" = "" ]; then # git remote not defined
+
+    if [ "$GIT_TOKEN" = "" ]; then
+        echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git credential in your environment."
+        git remote add origin https://${git_host}/${git_user_id}/${git_repo_id}.git
+    else
+        git remote add origin https://${git_user_id}:"${GIT_TOKEN}"@${git_host}/${git_user_id}/${git_repo_id}.git
+    fi
+
+fi
+
+git pull origin master
+
+# Pushes (Forces) the changes in the local repository up to the remote repository
+echo "Git pushing to https://${git_host}/${git_user_id}/${git_repo_id}.git"
+git push origin master 2>&1 | grep -v 'To https'
diff --git a/services/TS29222_CAPIF_Access_Control_Policy_API/openapi_server/__init__.py b/services/TS29222_CAPIF_Access_Control_Policy_API/openapi_server/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/services/TS29222_CAPIF_Access_Control_Policy_API/openapi_server/__main__.py b/services/TS29222_CAPIF_Access_Control_Policy_API/openapi_server/__main__.py
new file mode 100644
index 0000000000000000000000000000000000000000..215e85efe43a80a28bd8ac8bb3875498ced1bcd0
--- /dev/null
+++ b/services/TS29222_CAPIF_Access_Control_Policy_API/openapi_server/__main__.py
@@ -0,0 +1,149 @@
+#!/usr/bin/env python3
+
+import connexion
+
+from openapi_server import encoder
+
+import logging
+
+from flask import Flask, jsonify, request
+from flask_jwt_extended import JWTManager, jwt_required, create_access_token
+from pymongo import MongoClient
+from logging.handlers import RotatingFileHandler
+from .config import Config
+from datetime import datetime
+import os
+from fluent import sender
+from .core.consumer_messager import Subscriber
+from flask_executor import Executor
+from flask_apscheduler import APScheduler
+from opentelemetry.instrumentation.flask import FlaskInstrumentor
+from opentelemetry import trace
+from opentelemetry.exporter.otlp.proto.grpc.trace_exporter import OTLPSpanExporter
+from opentelemetry.trace.propagation.tracecontext import TraceContextTextMapPropagator
+from opentelemetry.sdk.resources import Resource
+from opentelemetry.sdk.trace import TracerProvider
+from opentelemetry.sdk.trace.export import BatchSpanProcessor
+from opentelemetry.instrumentation.redis import RedisInstrumentor
+
+NAME = "Acl-Service"
+
+def configure_monitoring(app, config):
+
+    resource = Resource(attributes={"service.name": NAME})
+
+    fluent_bit_host = config['monitoring']['fluent_bit_host']
+    fluent_bit_port = config['monitoring']['fluent_bit_port']
+    fluent_bit_sender = sender.FluentSender('Acl-Service', host=fluent_bit_host, port=fluent_bit_port)
+    propagator = TraceContextTextMapPropagator()
+
+    tracer_provider = TracerProvider(resource=resource)
+    trace.set_tracer_provider(tracer_provider)
+    exporter = OTLPSpanExporter(endpoint=f"http://{config['monitoring']['opentelemetry_url']}:{config['monitoring']['opentelemetry_port']}", insecure=True)
+    span_processor = BatchSpanProcessor(
+        exporter,
+        max_queue_size=config['monitoring']['opentelemetry_max_queue_size'],
+        schedule_delay_millis=config['monitoring']['opentelemetry_schedule_delay_millis'],
+        max_export_batch_size=config['monitoring']['opentelemetry_max_export_batch_size'],
+        export_timeout_millis=config['monitoring']['opentelemetry_export_timeout_millis'],
+    )
+
+    trace.get_tracer_provider().add_span_processor(span_processor)
+
+    FlaskInstrumentor().instrument_app(app)
+
+    RedisInstrumentor().instrument()
+
+    class FluentBitHandler(logging.Handler):
+
+        def __init__(self):
+            logging.Handler.__init__(self)
+
+        def emit(self, record):
+            log_entry = self.format(record)
+            log_data = {
+                'message': log_entry,
+                'level': record.levelname,
+                'timestamp': record.created,
+                'logger': record.name,
+                'function': record.funcName,
+                'line': record.lineno,
+                'container_name': os.environ.get('CONTAINER_NAME', ''),
+            }
+
+            # # Obtener el trace ID actual
+            current_context = trace.get_current_span().get_span_context()
+
+            trace_id = current_context.trace_id
+            traceparent_id = current_context.span_id
+            log_data['traceID'] = hex(trace_id)[2:]
+            if traceparent_id != None:
+                log_data['traceparent'] = hex(traceparent_id)[2:]
+            fluent_bit_sender.emit('Acl-Service', log_data)
+    
+    loggers = [app.logger, ]
+    for l in loggers:
+         l.addHandler(FluentBitHandler())
+
+
+def configure_logging(app):
+    del app.logger.handlers[:]
+    loggers = [app.logger, ]
+    handlers = []
+    console_handler = logging.StreamHandler()
+    console_handler.setLevel(logging.DEBUG)
+    console_handler.setFormatter(verbose_formatter())
+    file_handler = RotatingFileHandler(filename="acl_logs.log", maxBytes=1024 * 1024 * 100, backupCount=20)
+    file_handler.setLevel(logging.DEBUG)
+    file_handler.setFormatter(verbose_formatter())
+    handlers.append(console_handler)
+    handlers.append(file_handler)
+
+    for l in loggers:
+        for handler in handlers:
+            l.addHandler(handler)
+        l.propagate = False
+        l.setLevel(logging.DEBUG)
+
+def verbose_formatter():
+    return logging.Formatter(
+        '{"timestamp": "%(asctime)s", "level": "%(levelname)s", "logger": "%(name)s", "function": "%(funcName)s", "line": %(lineno)d, "message": %(message)s}',
+        datefmt='%d/%m/%Y %H:%M:%S'
+    )
+
+app = connexion.App(__name__, specification_dir='./openapi/')
+app.app.json_encoder = encoder.JSONEncoder
+app.add_api('openapi.yaml',
+            arguments={'title': 'CAPIF_Access_Control_policy_API'},
+            pythonic_params=True)
+
+
+config = Config()
+
+
+
+jwt = JWTManager(app.app)
+configure_logging(app.app)
+
+
+if eval(os.environ.get("MONITORING").lower().capitalize()):
+    configure_monitoring(app.app, config.get_config())
+
+app.app.config["invocations"]=config.get_config()["invocations"]
+
+executor = Executor(app.app)
+subscriber = Subscriber()
+
+
+scheduler = APScheduler()
+scheduler.api_enabled = True
+scheduler.init_app(app.app)
+
+@scheduler.task('date', id='listener', next_run_time=datetime.now())
+def up_listener():
+    with scheduler.app.app_context():
+        executor.submit(subscriber.listen())
+
+if __name__ == '__main__':
+    scheduler.start()
+    app.run(debug=True,port=8080, use_reloader=False)
diff --git a/services/TS29222_CAPIF_Access_Control_Policy_API/openapi_server/config.py b/services/TS29222_CAPIF_Access_Control_Policy_API/openapi_server/config.py
new file mode 100644
index 0000000000000000000000000000000000000000..11e1c4f3626d7440c6cd999ed118afb3c93caa2e
--- /dev/null
+++ b/services/TS29222_CAPIF_Access_Control_Policy_API/openapi_server/config.py
@@ -0,0 +1,21 @@
+import yaml
+import os
+
+#Config class to get config
+class Config:
+	def __init__(self):
+		self.cached = 0
+		self.file="./config.yaml"
+		self.my_config = {}
+
+		stamp = os.stat(self.file).st_mtime
+		if stamp != self.cached:
+			self.cached = stamp
+			f = open(self.file)
+			self.my_config = yaml.safe_load(f)
+			f.close()
+
+	def get_config(self):
+		return self.my_config
+
+
diff --git a/services/TS29222_CAPIF_Access_Control_Policy_API/openapi_server/controllers/__init__.py b/services/TS29222_CAPIF_Access_Control_Policy_API/openapi_server/controllers/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/services/TS29222_CAPIF_Access_Control_Policy_API/openapi_server/controllers/default_controller.py b/services/TS29222_CAPIF_Access_Control_Policy_API/openapi_server/controllers/default_controller.py
new file mode 100644
index 0000000000000000000000000000000000000000..c17e19585710f78c4374eb50e1cafa2070973432
--- /dev/null
+++ b/services/TS29222_CAPIF_Access_Control_Policy_API/openapi_server/controllers/default_controller.py
@@ -0,0 +1,46 @@
+from typing import Dict
+from functools import wraps
+from flask import request, current_app
+from cryptography import x509
+from cryptography.hazmat.backends import default_backend
+
+from ..core.accesscontrolpolicyapi import accessControlPolicyApi
+
+def cert_validation():
+    def _cert_validation(f):
+        @wraps(f)
+        def __cert_validation(*args, **kwargs):
+
+            args = request.view_args
+            cert_tmp = request.headers['X-Ssl-Client-Cert']
+            cert_raw = cert_tmp.replace('\t', '')
+
+            cert = x509.load_pem_x509_certificate(str.encode(cert_raw), default_backend())
+
+
+            result = f(**kwargs)
+            return result
+        return __cert_validation
+    return _cert_validation
+
+
+@cert_validation()
+def access_control_policy_list_service_api_id_get(service_api_id, aef_id, api_invoker_id=None, supported_features=None):  # noqa: E501
+    """access_control_policy_list_service_api_id_get
+
+    Retrieves the access control policy list. # noqa: E501
+
+    :param service_api_id: Identifier of a published service API
+    :type service_api_id: str
+    :param aef_id: Identifier of the AEF
+    :type aef_id: str
+    :param api_invoker_id: Identifier of the API invoker
+    :type api_invoker_id: str
+    :param supported_features: To filter irrelevant responses related to unsupported features
+    :type supported_features: str
+
+    :rtype: Union[AccessControlPolicyList, Tuple[AccessControlPolicyList, int], Tuple[AccessControlPolicyList, int, Dict[str, str]]
+    """
+    current_app.logger.debug("Obtaining service ACLs")
+    #current_app.logger.debug(f"AEF-id: {service_api_id}")
+    return accessControlPolicyApi().get_acl(service_api_id, aef_id, api_invoker_id, supported_features)
diff --git a/services/TS29222_CAPIF_Access_Control_Policy_API/openapi_server/controllers/security_controller_.py b/services/TS29222_CAPIF_Access_Control_Policy_API/openapi_server/controllers/security_controller_.py
new file mode 100644
index 0000000000000000000000000000000000000000..6d294ffd6df1a26a469dbb4e72533b01503468dd
--- /dev/null
+++ b/services/TS29222_CAPIF_Access_Control_Policy_API/openapi_server/controllers/security_controller_.py
@@ -0,0 +1,2 @@
+from typing import List
+
diff --git a/services/TS29222_CAPIF_Access_Control_Policy_API/openapi_server/core/accesscontrolpolicyapi.py b/services/TS29222_CAPIF_Access_Control_Policy_API/openapi_server/core/accesscontrolpolicyapi.py
new file mode 100644
index 0000000000000000000000000000000000000000..fd14e80dc86e5754e79f66e251e2bda2212266b8
--- /dev/null
+++ b/services/TS29222_CAPIF_Access_Control_Policy_API/openapi_server/core/accesscontrolpolicyapi.py
@@ -0,0 +1,54 @@
+from ..core.resources import Resource
+from flask import current_app
+from .responses import make_response, not_found_error, internal_server_error
+from ..models.access_control_policy_list import AccessControlPolicyList
+from ..util import dict_to_camel_case, clean_empty
+
+class accessControlPolicyApi(Resource):
+    def get_acl(self, service_api_id, aef_id, api_invoker_id, supported_features):
+
+        mycol = self.db.get_col_by_name(self.db.acls)
+
+        try:
+            # api-invoker-id and supported-features are optional.
+            # service-api-id and aef-id are mandatory parameters
+            query={
+                "service_id": service_api_id,
+                "aef_id": aef_id
+
+            }
+            projection = {"_id":0}
+
+            if api_invoker_id is not None:
+                query['apiInvokerPolicies.api_invoker_id'] = api_invoker_id
+                projection['apiInvokerPolicies.$'] = 1
+            if supported_features is not None:
+                current_app.logger.debug(f"SupportedFeatures present on query with value {supported_features}, but currently not used")
+            
+            current_app.logger.info(f"Looking for ACLs of service: {service_api_id}, aef_id: {aef_id}, invoker: {api_invoker_id} and supportedFeatures: {supported_features}")
+            policies_cursor = mycol.find(query,projection)
+            policies = list(policies_cursor)
+            if not policies:
+                current_app.logger.info(f"No ACLs found for the requested service: {service_api_id}, aef_id: {aef_id}, invoker: {api_invoker_id} and supportedFeatures: {supported_features}")
+                #Not found error
+                return not_found_error(f"No ACLs found for the requested service: {service_api_id}, aef_id: {aef_id}, invoker: {api_invoker_id} and supportedFeatures: {supported_features}", "Wrong id")
+            
+            current_app.logger.debug(f"Returning ACL for service: {service_api_id}, aef_id: {aef_id}, invoker: {api_invoker_id} and supportedFeatures: {supported_features}")
+
+            current_app.logger.debug(policies)
+
+            api_invoker_policies = policies[0]['apiInvokerPolicies']
+            current_app.logger.debug(f"apiinvokerPolicies: {api_invoker_policies}")
+            if not api_invoker_policies:
+                current_app.logger.info(f"ACLs list is present but empty, then no ACLs found for the requested service: {service_api_id}, aef_id: {aef_id}, invoker: {api_invoker_id} and supportedFeatures: {supported_features}")
+                #Not found error
+                return not_found_error(f"No ACLs found for the requested service: {service_api_id}, aef_id: {aef_id}, invoker: {api_invoker_id} and supportedFeatures: {supported_features}", "Wrong id")
+            acl = AccessControlPolicyList(api_invoker_policies)
+
+            response = acl.to_dict()
+            return make_response(object=dict_to_camel_case(response), status=200)
+        
+        except Exception as e:
+            exception = "An exception occurred in get acl"
+            current_app.logger.error(exception + "::" + str(e))
+            return internal_server_error(detail=exception, cause=str(e))
\ No newline at end of file
diff --git a/services/TS29222_CAPIF_Access_Control_Policy_API/openapi_server/core/consumer_messager.py b/services/TS29222_CAPIF_Access_Control_Policy_API/openapi_server/core/consumer_messager.py
new file mode 100644
index 0000000000000000000000000000000000000000..72c51eeacdbf45668cde55141e17a4ad87db0e09
--- /dev/null
+++ b/services/TS29222_CAPIF_Access_Control_Policy_API/openapi_server/core/consumer_messager.py
@@ -0,0 +1,37 @@
+# subscriber.py
+import redis
+from ..config import Config
+from .internal_service_ops import InternalServiceOps
+from flask import current_app
+
+class Subscriber():
+
+    def __init__(self):
+        self.config = Config().get_config()
+        #set this params using config params
+        self.r = redis.Redis(host=self.config["redis"]["host"], port=self.config["redis"]["port"], db=self.config["redis"]["db"])
+        self.acls_ops = InternalServiceOps()
+        self.p = self.r.pubsub()
+        self.p.subscribe("acls-messages", "internal-messages")
+
+    def listen(self):
+        for raw_message in self.p.listen():
+            if raw_message["type"] == "message" and raw_message["channel"].decode('utf-8') == "acls-messages":
+                current_app.logger.info("acls-messages recived")
+                message, *ids = raw_message["data"].decode('utf-8').split(":")
+                if message == "create-acl" and len(ids)==3:
+                    self.acls_ops.create_acl(ids[0], ids[1], ids[2])
+                if message == "remove-acl" and len(ids)==3:
+                    self.acls_ops.remove_acl(ids[0], ids[1], ids[2])
+                if message == "remove-acl" and len(ids)==1:
+                    self.acls_ops.remove_invoker_acl(ids[0])
+            if raw_message["type"] == "message" and raw_message["channel"].decode('utf-8') == "internal-messages":
+                message, *ids = raw_message["data"].decode('utf-8').split(":")
+                if message == "invoker-removed" and len(ids)>0:
+                    self.acls_ops.remove_invoker_acl(ids[0])
+                if message == "provider-removed" or message == "service-removed" and len(ids) > 0:
+                    self.acls_ops.remove_provider_acls(ids[0])
+            
+
+
+
diff --git a/services/TS29222_CAPIF_Access_Control_Policy_API/openapi_server/core/internal_service_ops.py b/services/TS29222_CAPIF_Access_Control_Policy_API/openapi_server/core/internal_service_ops.py
new file mode 100644
index 0000000000000000000000000000000000000000..e10986adc4d84cec60374c8a21ddb04c149971ad
--- /dev/null
+++ b/services/TS29222_CAPIF_Access_Control_Policy_API/openapi_server/core/internal_service_ops.py
@@ -0,0 +1,85 @@
+
+from flask import current_app
+from .resources import Resource
+from ..models.api_invoker_policy import ApiInvokerPolicy
+from ..models.time_range_list import TimeRangeList
+from datetime import datetime, timedelta
+from ..core.publisher import Publisher
+
+publisher_ops = Publisher()
+class InternalServiceOps(Resource):
+        
+    def create_acl(self, invoker_id, service_id, aef_id):
+
+        current_app.logger.info(f"Creating ACL for invoker: {invoker_id}")
+
+        if "acls" not in self.db.db.list_collection_names():
+            self.db.db.create_collection("acls")
+        
+        mycol = self.db.get_col_by_name(self.db.acls)
+
+        res = mycol.find_one({"service_id": service_id, "aef_id":aef_id}, {"_id":0})
+        
+        if res:
+            current_app.logger.info(f"Adding invoker ACL for invoker {invoker_id}")
+            range_list = [TimeRangeList(datetime.utcnow(), datetime.utcnow()+timedelta(days=365))]
+            invoker_acl = ApiInvokerPolicy(invoker_id, current_app.config["invocations"]["total"], current_app.config["invocations"]["perSecond"], range_list)
+            r = mycol.find_one({"service_id": service_id, "aef_id":aef_id, "apiInvokerPolicies.api_invoker_id": invoker_id}, {"_id":0})
+            if r is None:
+                mycol.update_one({"service_id": service_id, "aef_id":aef_id }, {"$push":{"apiInvokerPolicies":invoker_acl.to_dict()}})
+        else:
+            current_app.logger.info(f"Creating service ACLs for service: {service_id}")
+            range_list = [TimeRangeList(datetime.utcnow(), datetime.utcnow()+timedelta(days=365))]
+            invoker_acl = ApiInvokerPolicy(invoker_id, current_app.config["invocations"]["total"], current_app.config["invocations"]["perSecond"], range_list)
+            
+            
+
+            service_acls = {
+                "service_id": service_id,
+                "aef_id": aef_id,
+                "apiInvokerPolicies": [invoker_acl.to_dict()]
+            }
+            mycol.insert_one(service_acls)
+            publisher_ops.publish_message("events", "ACCESS_CONTROL_POLICY_UPDATE")
+        
+        current_app.logger.info(f"Invoker ACL added for invoker: {invoker_id} for service: {service_id}")
+    
+    def remove_acl(self, invoker_id, service_id, aef_id):
+
+        current_app.logger.info(f"Removing ACL for invoker: {invoker_id}")
+        
+        mycol = self.db.get_col_by_name(self.db.acls)
+
+        res = mycol.find_one({"service_id": service_id, "aef_id":aef_id}, {"_id":0})
+        
+        if res:
+           mycol.update_many({"service_id": service_id, "aef_id":aef_id},
+                           {"$pull":{ "apiInvokerPolicies": { "api_invoker_id": invoker_id }}}
+                           )
+        else:
+            current_app.logger.info(f"Not found: {service_id} for api : {service_id}")
+        
+        publisher_ops.publish_message("events", "ACCESS_CONTROL_POLICY_UNAVAILABLE")
+            
+        current_app.logger.info(f"Invoker ACL removed for invoker: {invoker_id} for service: {service_id}")
+    
+    def remove_invoker_acl(self, invoker_id):
+
+        current_app.logger.info(f"Removing ACLs for invoker: {invoker_id}")
+        mycol = self.db.get_col_by_name(self.db.acls)
+        
+        mycol.update_many({"apiInvokerPolicies.api_invoker_id": invoker_id},
+                           {"$pull":{ "apiInvokerPolicies": { "api_invoker_id": invoker_id }}}
+                           )
+        publisher_ops.publish_message("events", "ACCESS_CONTROL_POLICY_UNAVAILABLE")
+        current_app.logger.info(f"ACLs for invoker: {invoker_id} removed")
+    
+    def remove_provider_acls(self, id):
+
+        current_app.logger.info(f"Removing ACLs for provider/service: {id}")
+        mycol = self.db.get_col_by_name(self.db.acls)
+        
+        mycol.delete_many({"$or":[{"service_id":id}, {"aef_id":id}]}
+                           )
+        publisher_ops.publish_message("events", "ACCESS_CONTROL_POLICY_UNAVAILABLE")
+        current_app.logger.info(f"ACLs for provider/service: {id} removed")
\ No newline at end of file
diff --git a/services/TS29222_CAPIF_Access_Control_Policy_API/openapi_server/core/publisher.py b/services/TS29222_CAPIF_Access_Control_Policy_API/openapi_server/core/publisher.py
new file mode 100644
index 0000000000000000000000000000000000000000..3898c4b8309b14a05f8b5de89626fac8ebea4fc4
--- /dev/null
+++ b/services/TS29222_CAPIF_Access_Control_Policy_API/openapi_server/core/publisher.py
@@ -0,0 +1,11 @@
+import redis
+import sys
+from flask import current_app
+
+class Publisher():
+
+    def __init__(self):
+        self. r = redis.Redis(host='redis', port=6379, db=0)
+
+    def publish_message(self, channel, message):
+        self.r.publish(channel, message)
diff --git a/services/TS29222_CAPIF_Access_Control_Policy_API/openapi_server/core/resources.py b/services/TS29222_CAPIF_Access_Control_Policy_API/openapi_server/core/resources.py
new file mode 100644
index 0000000000000000000000000000000000000000..94e29ec07359c93a78d520f24fa91c88971d65c4
--- /dev/null
+++ b/services/TS29222_CAPIF_Access_Control_Policy_API/openapi_server/core/resources.py
@@ -0,0 +1,7 @@
+from abc import ABC, abstractmethod
+from ..db.db import MongoDatabse
+
+class Resource(ABC):
+
+    def __init__(self):
+        self.db = MongoDatabse()
\ No newline at end of file
diff --git a/services/TS29222_CAPIF_Access_Control_Policy_API/openapi_server/core/responses.py b/services/TS29222_CAPIF_Access_Control_Policy_API/openapi_server/core/responses.py
new file mode 100644
index 0000000000000000000000000000000000000000..962c4b6dd6ae07bce79dc8e810f10a507d526663
--- /dev/null
+++ b/services/TS29222_CAPIF_Access_Control_Policy_API/openapi_server/core/responses.py
@@ -0,0 +1,31 @@
+from ..models.problem_details import ProblemDetails
+from ..encoder import JSONEncoder
+from flask import Response
+import json
+
+mimetype = "application/json"
+
+def make_response(object, status):
+    res = Response(json.dumps(object, cls=JSONEncoder), status=status, mimetype=mimetype)
+
+    return res
+
+def internal_server_error(detail, cause):
+    prob = ProblemDetails(title="Internal Server Error", status=500, detail=detail, cause=cause)
+
+    return Response(json.dumps(prob, cls=JSONEncoder), status=500, mimetype=mimetype)
+
+def forbidden_error(detail, cause):
+    prob = ProblemDetails(title="Forbidden", status=403, detail=detail, cause=cause)
+
+    return Response(json.dumps(prob, cls=JSONEncoder), status=403, mimetype=mimetype)
+
+def bad_request_error(detail, cause, invalid_params):
+    prob = ProblemDetails(title="Bad Request", status=400, detail=detail, cause=cause, invalid_params=invalid_params)
+
+    return Response(json.dumps(prob, cls=JSONEncoder), status=400, mimetype=cause)
+
+def not_found_error(detail, cause):
+    prob = ProblemDetails(title="Not Found", status=404, detail=detail, cause=cause)
+
+    return Response(json.dumps(prob, cls=JSONEncoder), status=404, mimetype=mimetype)
\ No newline at end of file
diff --git a/services/TS29222_CAPIF_Access_Control_Policy_API/openapi_server/db/db.py b/services/TS29222_CAPIF_Access_Control_Policy_API/openapi_server/db/db.py
new file mode 100644
index 0000000000000000000000000000000000000000..b25c794b7699a6a904946e15810795825edb5ff5
--- /dev/null
+++ b/services/TS29222_CAPIF_Access_Control_Policy_API/openapi_server/db/db.py
@@ -0,0 +1,46 @@
+import atexit
+import time
+from pymongo import MongoClient
+from pymongo.errors import AutoReconnect
+from ..config import Config
+from bson.codec_options import CodecOptions
+import os
+from opentelemetry.instrumentation.pymongo import PymongoInstrumentor
+
+if eval(os.environ.get("MONITORING").lower().capitalize()):
+    PymongoInstrumentor().instrument()
+
+class MongoDatabse():
+
+    def __init__(self):
+        self.config = Config().get_config()
+        self.db = self.__connect()
+        self.acls = self.config['mongo']['col']
+
+
+    def get_col_by_name(self, name):
+        return self.db[name].with_options(codec_options=CodecOptions(tz_aware=True))
+
+    def __connect(self, max_retries=3, retry_delay=1):
+
+        retries = 0
+
+        while retries < max_retries:
+            try:
+                uri = f"mongodb://{self.config['mongo']['user']}:{self.config['mongo']['password']}@" \
+                      f"{self.config['mongo']['host']}:{self.config['mongo']['port']}"
+
+                
+                client = MongoClient(uri)
+                mydb = client[self.config['mongo']['db']]
+                mydb.command("ping")
+                return mydb
+            except AutoReconnect:
+                retries += 1
+                print(f"Reconnecting... Retry {retries} of {max_retries}")
+                time.sleep(retry_delay)
+        return None
+
+    def close_connection(self):
+        if self.db.client:
+            self.db.client.close()
diff --git a/services/TS29222_CAPIF_Access_Control_Policy_API/openapi_server/encoder.py b/services/TS29222_CAPIF_Access_Control_Policy_API/openapi_server/encoder.py
new file mode 100644
index 0000000000000000000000000000000000000000..3bbef854f3b83dc985aea885756fd7147fa00001
--- /dev/null
+++ b/services/TS29222_CAPIF_Access_Control_Policy_API/openapi_server/encoder.py
@@ -0,0 +1,20 @@
+from connexion.apps.flask_app import FlaskJSONEncoder
+import six
+
+from openapi_server.models.base_model_ import Model
+
+
+class JSONEncoder(FlaskJSONEncoder):
+    include_nulls = False
+
+    def default(self, o):
+        if isinstance(o, Model):
+            dikt = {}
+            for attr, _ in six.iteritems(o.openapi_types):
+                value = getattr(o, attr)
+                if value is None and not self.include_nulls:
+                    continue
+                attr = o.attribute_map[attr]
+                dikt[attr] = value
+            return dikt
+        return FlaskJSONEncoder.default(self, o)
diff --git a/services/TS29222_CAPIF_Access_Control_Policy_API/openapi_server/models/__init__.py b/services/TS29222_CAPIF_Access_Control_Policy_API/openapi_server/models/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..a4269de2a23336ebf21fb6fe2813f1bc573459d0
--- /dev/null
+++ b/services/TS29222_CAPIF_Access_Control_Policy_API/openapi_server/models/__init__.py
@@ -0,0 +1,10 @@
+# coding: utf-8
+
+# flake8: noqa
+from __future__ import absolute_import
+# import models into model package
+from openapi_server.models.access_control_policy_list import AccessControlPolicyList
+from openapi_server.models.api_invoker_policy import ApiInvokerPolicy
+from openapi_server.models.invalid_param import InvalidParam
+from openapi_server.models.problem_details import ProblemDetails
+from openapi_server.models.time_range_list import TimeRangeList
diff --git a/services/TS29222_CAPIF_Access_Control_Policy_API/openapi_server/models/access_control_policy_list.py b/services/TS29222_CAPIF_Access_Control_Policy_API/openapi_server/models/access_control_policy_list.py
new file mode 100644
index 0000000000000000000000000000000000000000..98f3fc122323f37a2868acd21375c3a6870b6970
--- /dev/null
+++ b/services/TS29222_CAPIF_Access_Control_Policy_API/openapi_server/models/access_control_policy_list.py
@@ -0,0 +1,70 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from openapi_server.models.base_model_ import Model
+from openapi_server.models.api_invoker_policy import ApiInvokerPolicy
+from openapi_server import util
+
+from openapi_server.models.api_invoker_policy import ApiInvokerPolicy  # noqa: E501
+
+class AccessControlPolicyList(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, api_invoker_policies=None):  # noqa: E501
+        """AccessControlPolicyList - a model defined in OpenAPI
+
+        :param api_invoker_policies: The api_invoker_policies of this AccessControlPolicyList.  # noqa: E501
+        :type api_invoker_policies: List[ApiInvokerPolicy]
+        """
+        self.openapi_types = {
+            'api_invoker_policies': List[ApiInvokerPolicy]
+        }
+
+        self.attribute_map = {
+            'api_invoker_policies': 'apiInvokerPolicies'
+        }
+
+        self._api_invoker_policies = api_invoker_policies
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'AccessControlPolicyList':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The AccessControlPolicyList of this AccessControlPolicyList.  # noqa: E501
+        :rtype: AccessControlPolicyList
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def api_invoker_policies(self):
+        """Gets the api_invoker_policies of this AccessControlPolicyList.
+
+        Policy of each API invoker.  # noqa: E501
+
+        :return: The api_invoker_policies of this AccessControlPolicyList.
+        :rtype: List[ApiInvokerPolicy]
+        """
+        return self._api_invoker_policies
+
+    @api_invoker_policies.setter
+    def api_invoker_policies(self, api_invoker_policies):
+        """Sets the api_invoker_policies of this AccessControlPolicyList.
+
+        Policy of each API invoker.  # noqa: E501
+
+        :param api_invoker_policies: The api_invoker_policies of this AccessControlPolicyList.
+        :type api_invoker_policies: List[ApiInvokerPolicy]
+        """
+        if api_invoker_policies is not None and len(api_invoker_policies) < 0:
+            raise ValueError("Invalid value for `api_invoker_policies`, number of items must be greater than or equal to `0`")  # noqa: E501
+
+        self._api_invoker_policies = api_invoker_policies
diff --git a/services/TS29222_CAPIF_Access_Control_Policy_API/openapi_server/models/api_invoker_policy.py b/services/TS29222_CAPIF_Access_Control_Policy_API/openapi_server/models/api_invoker_policy.py
new file mode 100644
index 0000000000000000000000000000000000000000..a5f1b477c384bd485981ea49ab09ffb793796b1d
--- /dev/null
+++ b/services/TS29222_CAPIF_Access_Control_Policy_API/openapi_server/models/api_invoker_policy.py
@@ -0,0 +1,156 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from openapi_server.models.base_model_ import Model
+from openapi_server.models.time_range_list import TimeRangeList
+from openapi_server import util
+
+from openapi_server.models.time_range_list import TimeRangeList  # noqa: E501
+
+class ApiInvokerPolicy(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, api_invoker_id=None, allowed_total_invocations=None, allowed_invocations_per_second=None, allowed_invocation_time_range_list=None):  # noqa: E501
+        """ApiInvokerPolicy - a model defined in OpenAPI
+
+        :param api_invoker_id: The api_invoker_id of this ApiInvokerPolicy.  # noqa: E501
+        :type api_invoker_id: str
+        :param allowed_total_invocations: The allowed_total_invocations of this ApiInvokerPolicy.  # noqa: E501
+        :type allowed_total_invocations: int
+        :param allowed_invocations_per_second: The allowed_invocations_per_second of this ApiInvokerPolicy.  # noqa: E501
+        :type allowed_invocations_per_second: int
+        :param allowed_invocation_time_range_list: The allowed_invocation_time_range_list of this ApiInvokerPolicy.  # noqa: E501
+        :type allowed_invocation_time_range_list: List[TimeRangeList]
+        """
+        self.openapi_types = {
+            'api_invoker_id': str,
+            'allowed_total_invocations': int,
+            'allowed_invocations_per_second': int,
+            'allowed_invocation_time_range_list': List[TimeRangeList]
+        }
+
+        self.attribute_map = {
+            'api_invoker_id': 'apiInvokerId',
+            'allowed_total_invocations': 'allowedTotalInvocations',
+            'allowed_invocations_per_second': 'allowedInvocationsPerSecond',
+            'allowed_invocation_time_range_list': 'allowedInvocationTimeRangeList'
+        }
+
+        self._api_invoker_id = api_invoker_id
+        self._allowed_total_invocations = allowed_total_invocations
+        self._allowed_invocations_per_second = allowed_invocations_per_second
+        self._allowed_invocation_time_range_list = allowed_invocation_time_range_list
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'ApiInvokerPolicy':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The ApiInvokerPolicy of this ApiInvokerPolicy.  # noqa: E501
+        :rtype: ApiInvokerPolicy
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def api_invoker_id(self):
+        """Gets the api_invoker_id of this ApiInvokerPolicy.
+
+        API invoker ID assigned by the CAPIF core function  # noqa: E501
+
+        :return: The api_invoker_id of this ApiInvokerPolicy.
+        :rtype: str
+        """
+        return self._api_invoker_id
+
+    @api_invoker_id.setter
+    def api_invoker_id(self, api_invoker_id):
+        """Sets the api_invoker_id of this ApiInvokerPolicy.
+
+        API invoker ID assigned by the CAPIF core function  # noqa: E501
+
+        :param api_invoker_id: The api_invoker_id of this ApiInvokerPolicy.
+        :type api_invoker_id: str
+        """
+        if api_invoker_id is None:
+            raise ValueError("Invalid value for `api_invoker_id`, must not be `None`")  # noqa: E501
+
+        self._api_invoker_id = api_invoker_id
+
+    @property
+    def allowed_total_invocations(self):
+        """Gets the allowed_total_invocations of this ApiInvokerPolicy.
+
+        Total number of invocations allowed on the service API by the API invoker.  # noqa: E501
+
+        :return: The allowed_total_invocations of this ApiInvokerPolicy.
+        :rtype: int
+        """
+        return self._allowed_total_invocations
+
+    @allowed_total_invocations.setter
+    def allowed_total_invocations(self, allowed_total_invocations):
+        """Sets the allowed_total_invocations of this ApiInvokerPolicy.
+
+        Total number of invocations allowed on the service API by the API invoker.  # noqa: E501
+
+        :param allowed_total_invocations: The allowed_total_invocations of this ApiInvokerPolicy.
+        :type allowed_total_invocations: int
+        """
+
+        self._allowed_total_invocations = allowed_total_invocations
+
+    @property
+    def allowed_invocations_per_second(self):
+        """Gets the allowed_invocations_per_second of this ApiInvokerPolicy.
+
+        Invocations per second allowed on the service API by the API invoker.  # noqa: E501
+
+        :return: The allowed_invocations_per_second of this ApiInvokerPolicy.
+        :rtype: int
+        """
+        return self._allowed_invocations_per_second
+
+    @allowed_invocations_per_second.setter
+    def allowed_invocations_per_second(self, allowed_invocations_per_second):
+        """Sets the allowed_invocations_per_second of this ApiInvokerPolicy.
+
+        Invocations per second allowed on the service API by the API invoker.  # noqa: E501
+
+        :param allowed_invocations_per_second: The allowed_invocations_per_second of this ApiInvokerPolicy.
+        :type allowed_invocations_per_second: int
+        """
+
+        self._allowed_invocations_per_second = allowed_invocations_per_second
+
+    @property
+    def allowed_invocation_time_range_list(self):
+        """Gets the allowed_invocation_time_range_list of this ApiInvokerPolicy.
+
+        The time ranges during which the invocations are allowed on the service API by the API invoker.   # noqa: E501
+
+        :return: The allowed_invocation_time_range_list of this ApiInvokerPolicy.
+        :rtype: List[TimeRangeList]
+        """
+        return self._allowed_invocation_time_range_list
+
+    @allowed_invocation_time_range_list.setter
+    def allowed_invocation_time_range_list(self, allowed_invocation_time_range_list):
+        """Sets the allowed_invocation_time_range_list of this ApiInvokerPolicy.
+
+        The time ranges during which the invocations are allowed on the service API by the API invoker.   # noqa: E501
+
+        :param allowed_invocation_time_range_list: The allowed_invocation_time_range_list of this ApiInvokerPolicy.
+        :type allowed_invocation_time_range_list: List[TimeRangeList]
+        """
+        if allowed_invocation_time_range_list is not None and len(allowed_invocation_time_range_list) < 0:
+            raise ValueError("Invalid value for `allowed_invocation_time_range_list`, number of items must be greater than or equal to `0`")  # noqa: E501
+
+        self._allowed_invocation_time_range_list = allowed_invocation_time_range_list
diff --git a/services/TS29222_CAPIF_Access_Control_Policy_API/openapi_server/models/base_model_.py b/services/TS29222_CAPIF_Access_Control_Policy_API/openapi_server/models/base_model_.py
new file mode 100644
index 0000000000000000000000000000000000000000..916e582ec27f19e7dbbb65885786760d5e7e4e98
--- /dev/null
+++ b/services/TS29222_CAPIF_Access_Control_Policy_API/openapi_server/models/base_model_.py
@@ -0,0 +1,69 @@
+import pprint
+
+import six
+import typing
+
+from openapi_server import util
+
+T = typing.TypeVar('T')
+
+
+class Model(object):
+    # openapiTypes: The key is attribute name and the
+    # value is attribute type.
+    openapi_types: typing.Dict[str, type] = {}
+
+    # attributeMap: The key is attribute name and the
+    # value is json key in definition.
+    attribute_map: typing.Dict[str, str] = {}
+
+    @classmethod
+    def from_dict(cls: typing.Type[T], dikt) -> T:
+        """Returns the dict as a model"""
+        return util.deserialize_model(dikt, cls)
+
+    def to_dict(self):
+        """Returns the model properties as a dict
+
+        :rtype: dict
+        """
+        result = {}
+
+        for attr, _ in six.iteritems(self.openapi_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model
+
+        :rtype: str
+        """
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/services/TS29222_CAPIF_Access_Control_Policy_API/openapi_server/models/invalid_param.py b/services/TS29222_CAPIF_Access_Control_Policy_API/openapi_server/models/invalid_param.py
new file mode 100644
index 0000000000000000000000000000000000000000..8d91e6c3f6dfe46c67a864916c0f8cd282d41f81
--- /dev/null
+++ b/services/TS29222_CAPIF_Access_Control_Policy_API/openapi_server/models/invalid_param.py
@@ -0,0 +1,96 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from openapi_server.models.base_model_ import Model
+from openapi_server import util
+
+
+class InvalidParam(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, param=None, reason=None):  # noqa: E501
+        """InvalidParam - a model defined in OpenAPI
+
+        :param param: The param of this InvalidParam.  # noqa: E501
+        :type param: str
+        :param reason: The reason of this InvalidParam.  # noqa: E501
+        :type reason: str
+        """
+        self.openapi_types = {
+            'param': str,
+            'reason': str
+        }
+
+        self.attribute_map = {
+            'param': 'param',
+            'reason': 'reason'
+        }
+
+        self._param = param
+        self._reason = reason
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'InvalidParam':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The InvalidParam of this InvalidParam.  # noqa: E501
+        :rtype: InvalidParam
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def param(self):
+        """Gets the param of this InvalidParam.
+
+        Attribute's name encoded as a JSON Pointer, or header's name.  # noqa: E501
+
+        :return: The param of this InvalidParam.
+        :rtype: str
+        """
+        return self._param
+
+    @param.setter
+    def param(self, param):
+        """Sets the param of this InvalidParam.
+
+        Attribute's name encoded as a JSON Pointer, or header's name.  # noqa: E501
+
+        :param param: The param of this InvalidParam.
+        :type param: str
+        """
+        if param is None:
+            raise ValueError("Invalid value for `param`, must not be `None`")  # noqa: E501
+
+        self._param = param
+
+    @property
+    def reason(self):
+        """Gets the reason of this InvalidParam.
+
+        A human-readable reason, e.g. \"must be a positive integer\".  # noqa: E501
+
+        :return: The reason of this InvalidParam.
+        :rtype: str
+        """
+        return self._reason
+
+    @reason.setter
+    def reason(self, reason):
+        """Sets the reason of this InvalidParam.
+
+        A human-readable reason, e.g. \"must be a positive integer\".  # noqa: E501
+
+        :param reason: The reason of this InvalidParam.
+        :type reason: str
+        """
+
+        self._reason = reason
diff --git a/services/TS29222_CAPIF_Access_Control_Policy_API/openapi_server/models/problem_details.py b/services/TS29222_CAPIF_Access_Control_Policy_API/openapi_server/models/problem_details.py
new file mode 100644
index 0000000000000000000000000000000000000000..08f2908c2964db647b8f890d2931f08dfceafeff
--- /dev/null
+++ b/services/TS29222_CAPIF_Access_Control_Policy_API/openapi_server/models/problem_details.py
@@ -0,0 +1,270 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from openapi_server.models.base_model_ import Model
+from openapi_server.models.invalid_param import InvalidParam
+import re
+from openapi_server import util
+
+from openapi_server.models.invalid_param import InvalidParam  # noqa: E501
+import re  # noqa: E501
+
+class ProblemDetails(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, type=None, title=None, status=None, detail=None, instance=None, cause=None, invalid_params=None, supported_features=None):  # noqa: E501
+        """ProblemDetails - a model defined in OpenAPI
+
+        :param type: The type of this ProblemDetails.  # noqa: E501
+        :type type: str
+        :param title: The title of this ProblemDetails.  # noqa: E501
+        :type title: str
+        :param status: The status of this ProblemDetails.  # noqa: E501
+        :type status: int
+        :param detail: The detail of this ProblemDetails.  # noqa: E501
+        :type detail: str
+        :param instance: The instance of this ProblemDetails.  # noqa: E501
+        :type instance: str
+        :param cause: The cause of this ProblemDetails.  # noqa: E501
+        :type cause: str
+        :param invalid_params: The invalid_params of this ProblemDetails.  # noqa: E501
+        :type invalid_params: List[InvalidParam]
+        :param supported_features: The supported_features of this ProblemDetails.  # noqa: E501
+        :type supported_features: str
+        """
+        self.openapi_types = {
+            'type': str,
+            'title': str,
+            'status': int,
+            'detail': str,
+            'instance': str,
+            'cause': str,
+            'invalid_params': List[InvalidParam],
+            'supported_features': str
+        }
+
+        self.attribute_map = {
+            'type': 'type',
+            'title': 'title',
+            'status': 'status',
+            'detail': 'detail',
+            'instance': 'instance',
+            'cause': 'cause',
+            'invalid_params': 'invalidParams',
+            'supported_features': 'supportedFeatures'
+        }
+
+        self._type = type
+        self._title = title
+        self._status = status
+        self._detail = detail
+        self._instance = instance
+        self._cause = cause
+        self._invalid_params = invalid_params
+        self._supported_features = supported_features
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'ProblemDetails':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The ProblemDetails of this ProblemDetails.  # noqa: E501
+        :rtype: ProblemDetails
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def type(self):
+        """Gets the type of this ProblemDetails.
+
+        string providing an URI formatted according to IETF RFC 3986.  # noqa: E501
+
+        :return: The type of this ProblemDetails.
+        :rtype: str
+        """
+        return self._type
+
+    @type.setter
+    def type(self, type):
+        """Sets the type of this ProblemDetails.
+
+        string providing an URI formatted according to IETF RFC 3986.  # noqa: E501
+
+        :param type: The type of this ProblemDetails.
+        :type type: str
+        """
+
+        self._type = type
+
+    @property
+    def title(self):
+        """Gets the title of this ProblemDetails.
+
+        A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem.  # noqa: E501
+
+        :return: The title of this ProblemDetails.
+        :rtype: str
+        """
+        return self._title
+
+    @title.setter
+    def title(self, title):
+        """Sets the title of this ProblemDetails.
+
+        A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem.  # noqa: E501
+
+        :param title: The title of this ProblemDetails.
+        :type title: str
+        """
+
+        self._title = title
+
+    @property
+    def status(self):
+        """Gets the status of this ProblemDetails.
+
+        The HTTP status code for this occurrence of the problem.  # noqa: E501
+
+        :return: The status of this ProblemDetails.
+        :rtype: int
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """Sets the status of this ProblemDetails.
+
+        The HTTP status code for this occurrence of the problem.  # noqa: E501
+
+        :param status: The status of this ProblemDetails.
+        :type status: int
+        """
+
+        self._status = status
+
+    @property
+    def detail(self):
+        """Gets the detail of this ProblemDetails.
+
+        A human-readable explanation specific to this occurrence of the problem.  # noqa: E501
+
+        :return: The detail of this ProblemDetails.
+        :rtype: str
+        """
+        return self._detail
+
+    @detail.setter
+    def detail(self, detail):
+        """Sets the detail of this ProblemDetails.
+
+        A human-readable explanation specific to this occurrence of the problem.  # noqa: E501
+
+        :param detail: The detail of this ProblemDetails.
+        :type detail: str
+        """
+
+        self._detail = detail
+
+    @property
+    def instance(self):
+        """Gets the instance of this ProblemDetails.
+
+        string providing an URI formatted according to IETF RFC 3986.  # noqa: E501
+
+        :return: The instance of this ProblemDetails.
+        :rtype: str
+        """
+        return self._instance
+
+    @instance.setter
+    def instance(self, instance):
+        """Sets the instance of this ProblemDetails.
+
+        string providing an URI formatted according to IETF RFC 3986.  # noqa: E501
+
+        :param instance: The instance of this ProblemDetails.
+        :type instance: str
+        """
+
+        self._instance = instance
+
+    @property
+    def cause(self):
+        """Gets the cause of this ProblemDetails.
+
+        A machine-readable application error cause specific to this occurrence of the problem. This IE should be present and provide application-related error information, if available.  # noqa: E501
+
+        :return: The cause of this ProblemDetails.
+        :rtype: str
+        """
+        return self._cause
+
+    @cause.setter
+    def cause(self, cause):
+        """Sets the cause of this ProblemDetails.
+
+        A machine-readable application error cause specific to this occurrence of the problem. This IE should be present and provide application-related error information, if available.  # noqa: E501
+
+        :param cause: The cause of this ProblemDetails.
+        :type cause: str
+        """
+
+        self._cause = cause
+
+    @property
+    def invalid_params(self):
+        """Gets the invalid_params of this ProblemDetails.
+
+        Description of invalid parameters, for a request rejected due to invalid parameters.  # noqa: E501
+
+        :return: The invalid_params of this ProblemDetails.
+        :rtype: List[InvalidParam]
+        """
+        return self._invalid_params
+
+    @invalid_params.setter
+    def invalid_params(self, invalid_params):
+        """Sets the invalid_params of this ProblemDetails.
+
+        Description of invalid parameters, for a request rejected due to invalid parameters.  # noqa: E501
+
+        :param invalid_params: The invalid_params of this ProblemDetails.
+        :type invalid_params: List[InvalidParam]
+        """
+        if invalid_params is not None and len(invalid_params) < 1:
+            raise ValueError("Invalid value for `invalid_params`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._invalid_params = invalid_params
+
+    @property
+    def supported_features(self):
+        """Gets the supported_features of this ProblemDetails.
+
+        A string used to indicate the features supported by an API that is used as defined in clause  6.6 in 3GPP TS 29.500. The string shall contain a bitmask indicating supported features in  hexadecimal representation Each character in the string shall take a value of \"0\" to \"9\",  \"a\" to \"f\" or \"A\" to \"F\" and shall represent the support of 4 features as described in  table 5.2.2-3. The most significant character representing the highest-numbered features shall  appear first in the string, and the character representing features 1 to 4 shall appear last  in the string. The list of features and their numbering (starting with 1) are defined  separately for each API. If the string contains a lower number of characters than there are  defined features for an API, all features that would be represented by characters that are not  present in the string are not supported.   # noqa: E501
+
+        :return: The supported_features of this ProblemDetails.
+        :rtype: str
+        """
+        return self._supported_features
+
+    @supported_features.setter
+    def supported_features(self, supported_features):
+        """Sets the supported_features of this ProblemDetails.
+
+        A string used to indicate the features supported by an API that is used as defined in clause  6.6 in 3GPP TS 29.500. The string shall contain a bitmask indicating supported features in  hexadecimal representation Each character in the string shall take a value of \"0\" to \"9\",  \"a\" to \"f\" or \"A\" to \"F\" and shall represent the support of 4 features as described in  table 5.2.2-3. The most significant character representing the highest-numbered features shall  appear first in the string, and the character representing features 1 to 4 shall appear last  in the string. The list of features and their numbering (starting with 1) are defined  separately for each API. If the string contains a lower number of characters than there are  defined features for an API, all features that would be represented by characters that are not  present in the string are not supported.   # noqa: E501
+
+        :param supported_features: The supported_features of this ProblemDetails.
+        :type supported_features: str
+        """
+        if supported_features is not None and not re.search(r'^[A-Fa-f0-9]*$', supported_features):  # noqa: E501
+            raise ValueError("Invalid value for `supported_features`, must be a follow pattern or equal to `/^[A-Fa-f0-9]*$/`")  # noqa: E501
+
+        self._supported_features = supported_features
diff --git a/services/TS29222_CAPIF_Access_Control_Policy_API/openapi_server/models/time_range_list.py b/services/TS29222_CAPIF_Access_Control_Policy_API/openapi_server/models/time_range_list.py
new file mode 100644
index 0000000000000000000000000000000000000000..eb18a7ed915166f82490460850cf108c384397c8
--- /dev/null
+++ b/services/TS29222_CAPIF_Access_Control_Policy_API/openapi_server/models/time_range_list.py
@@ -0,0 +1,94 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from openapi_server.models.base_model_ import Model
+from openapi_server import util
+
+
+class TimeRangeList(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, start_time=None, stop_time=None):  # noqa: E501
+        """TimeRangeList - a model defined in OpenAPI
+
+        :param start_time: The start_time of this TimeRangeList.  # noqa: E501
+        :type start_time: datetime
+        :param stop_time: The stop_time of this TimeRangeList.  # noqa: E501
+        :type stop_time: datetime
+        """
+        self.openapi_types = {
+            'start_time': datetime,
+            'stop_time': datetime
+        }
+
+        self.attribute_map = {
+            'start_time': 'startTime',
+            'stop_time': 'stopTime'
+        }
+
+        self._start_time = start_time
+        self._stop_time = stop_time
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'TimeRangeList':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The TimeRangeList of this TimeRangeList.  # noqa: E501
+        :rtype: TimeRangeList
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def start_time(self):
+        """Gets the start_time of this TimeRangeList.
+
+        string with format \"date-time\" as defined in OpenAPI.  # noqa: E501
+
+        :return: The start_time of this TimeRangeList.
+        :rtype: datetime
+        """
+        return self._start_time
+
+    @start_time.setter
+    def start_time(self, start_time):
+        """Sets the start_time of this TimeRangeList.
+
+        string with format \"date-time\" as defined in OpenAPI.  # noqa: E501
+
+        :param start_time: The start_time of this TimeRangeList.
+        :type start_time: datetime
+        """
+
+        self._start_time = start_time
+
+    @property
+    def stop_time(self):
+        """Gets the stop_time of this TimeRangeList.
+
+        string with format \"date-time\" as defined in OpenAPI.  # noqa: E501
+
+        :return: The stop_time of this TimeRangeList.
+        :rtype: datetime
+        """
+        return self._stop_time
+
+    @stop_time.setter
+    def stop_time(self, stop_time):
+        """Sets the stop_time of this TimeRangeList.
+
+        string with format \"date-time\" as defined in OpenAPI.  # noqa: E501
+
+        :param stop_time: The stop_time of this TimeRangeList.
+        :type stop_time: datetime
+        """
+
+        self._stop_time = stop_time
diff --git a/services/TS29222_CAPIF_Access_Control_Policy_API/openapi_server/openapi/openapi.yaml b/services/TS29222_CAPIF_Access_Control_Policy_API/openapi_server/openapi/openapi.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..6f8c99d300bdb9b5224f8164f2c38e160c513699
--- /dev/null
+++ b/services/TS29222_CAPIF_Access_Control_Policy_API/openapi_server/openapi/openapi.yaml
@@ -0,0 +1,375 @@
+openapi: 3.0.0
+info:
+  description: "API for access control policy.  \n© 2022, 3GPP Organizational Partners\
+    \ (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).  \nAll rights reserved.\n"
+  title: CAPIF_Access_Control_Policy_API
+  version: 1.3.0-alpha.1
+externalDocs:
+  description: 3GPP TS 29.222 V18.0.0 Common API Framework for 3GPP Northbound APIs
+  url: https://www.3gpp.org/ftp/Specs/archive/29_series/29.222/
+servers:
+- url: "{apiRoot}/access-control-policy/v1"
+  variables:
+    apiRoot:
+      default: https://example.com
+      description: apiRoot as defined in clause 7.5 of 3GPP TS 29.222
+paths:
+  /accessControlPolicyList/{serviceApiId}:
+    get:
+      description: Retrieves the access control policy list.
+      operationId: access_control_policy_list_service_api_id_get
+      parameters:
+      - description: Identifier of a published service API
+        explode: false
+        in: path
+        name: serviceApiId
+        required: true
+        schema:
+          type: string
+        style: simple
+      - description: Identifier of the AEF
+        explode: true
+        in: query
+        name: aef-id
+        required: true
+        schema:
+          type: string
+        style: form
+      - description: Identifier of the API invoker
+        explode: true
+        in: query
+        name: api-invoker-id
+        required: false
+        schema:
+          type: string
+        style: form
+      - description: To filter irrelevant responses related to unsupported features
+        explode: true
+        in: query
+        name: supported-features
+        required: false
+        schema:
+          $ref: '#/components/schemas/SupportedFeatures'
+        style: form
+      responses:
+        "200":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/AccessControlPolicyList'
+          description: OK.
+        "307":
+          description: Temporary Redirect
+          headers:
+            Location:
+              description: An alternative URI of the resource.
+              required: true
+              schema:
+                type: string
+        "308":
+          description: Permanent Redirect
+          headers:
+            Location:
+              description: An alternative URI of the resource.
+              required: true
+              schema:
+                type: string
+        "400":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Bad request
+        "401":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Unauthorized
+        "403":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Forbidden
+        "404":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Not Found
+        "406":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Not Acceptable
+        "414":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: URI Too Long
+        "429":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Too Many Requests
+        "500":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Internal Server Error
+        "503":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Service Unavailable
+        default:
+          description: Generic Error
+      x-openapi-router-controller: openapi_server.controllers.default_controller
+components:
+  responses:
+    "307":
+      description: Temporary Redirect
+      headers:
+        Location:
+          description: An alternative URI of the resource.
+          required: true
+          schema:
+            type: string
+    "308":
+      description: Permanent Redirect
+      headers:
+        Location:
+          description: An alternative URI of the resource.
+          required: true
+          schema:
+            type: string
+    "400":
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/ProblemDetails'
+      description: Bad request
+    "401":
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/ProblemDetails'
+      description: Unauthorized
+    "403":
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/ProblemDetails'
+      description: Forbidden
+    "404":
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/ProblemDetails'
+      description: Not Found
+    "406":
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/ProblemDetails'
+      description: Not Acceptable
+    "414":
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/ProblemDetails'
+      description: URI Too Long
+    "429":
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/ProblemDetails'
+      description: Too Many Requests
+    "500":
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/ProblemDetails'
+      description: Internal Server Error
+    "503":
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/ProblemDetails'
+      description: Service Unavailable
+    default:
+      description: Generic Error
+  schemas:
+    AccessControlPolicyList:
+      description: Represents the access control policy list for a published service
+        API.
+      example:
+        apiInvokerPolicies:
+        - apiInvokerId: apiInvokerId
+          allowedTotalInvocations: 0
+          allowedInvocationTimeRangeList:
+          - startTime: 2000-01-23T04:56:07.000+00:00
+            stopTime: 2000-01-23T04:56:07.000+00:00
+          - startTime: 2000-01-23T04:56:07.000+00:00
+            stopTime: 2000-01-23T04:56:07.000+00:00
+          allowedInvocationsPerSecond: 6
+        - apiInvokerId: apiInvokerId
+          allowedTotalInvocations: 0
+          allowedInvocationTimeRangeList:
+          - startTime: 2000-01-23T04:56:07.000+00:00
+            stopTime: 2000-01-23T04:56:07.000+00:00
+          - startTime: 2000-01-23T04:56:07.000+00:00
+            stopTime: 2000-01-23T04:56:07.000+00:00
+          allowedInvocationsPerSecond: 6
+      properties:
+        apiInvokerPolicies:
+          description: Policy of each API invoker.
+          items:
+            $ref: '#/components/schemas/ApiInvokerPolicy'
+          minItems: 0
+          title: apiInvokerPolicies
+          type: array
+      title: AccessControlPolicyList
+      type: object
+    ApiInvokerPolicy:
+      description: Represents the policy of an API Invoker.
+      example:
+        apiInvokerId: apiInvokerId
+        allowedTotalInvocations: 0
+        allowedInvocationTimeRangeList:
+        - startTime: 2000-01-23T04:56:07.000+00:00
+          stopTime: 2000-01-23T04:56:07.000+00:00
+        - startTime: 2000-01-23T04:56:07.000+00:00
+          stopTime: 2000-01-23T04:56:07.000+00:00
+        allowedInvocationsPerSecond: 6
+      properties:
+        apiInvokerId:
+          description: API invoker ID assigned by the CAPIF core function
+          title: apiInvokerId
+          type: string
+        allowedTotalInvocations:
+          description: Total number of invocations allowed on the service API by the
+            API invoker.
+          title: allowedTotalInvocations
+          type: integer
+        allowedInvocationsPerSecond:
+          description: Invocations per second allowed on the service API by the API
+            invoker.
+          title: allowedInvocationsPerSecond
+          type: integer
+        allowedInvocationTimeRangeList:
+          description: |
+            The time ranges during which the invocations are allowed on the service API by the API invoker.
+          items:
+            $ref: '#/components/schemas/TimeRangeList'
+          minItems: 0
+          title: allowedInvocationTimeRangeList
+          type: array
+      required:
+      - apiInvokerId
+      title: ApiInvokerPolicy
+      type: object
+    TimeRangeList:
+      description: |
+        Represents the time range during which the invocation of a service API is allowed by the API invoker.
+      example:
+        startTime: 2000-01-23T04:56:07.000+00:00
+        stopTime: 2000-01-23T04:56:07.000+00:00
+      properties:
+        startTime:
+          description: string with format "date-time" as defined in OpenAPI.
+          format: date-time
+          title: DateTime
+          type: string
+        stopTime:
+          description: string with format "date-time" as defined in OpenAPI.
+          format: date-time
+          title: DateTime
+          type: string
+      title: TimeRangeList
+      type: object
+    SupportedFeatures:
+      description: |
+        A string used to indicate the features supported by an API that is used as defined in clause  6.6 in 3GPP TS 29.500. The string shall contain a bitmask indicating supported features in  hexadecimal representation Each character in the string shall take a value of "0" to "9",  "a" to "f" or "A" to "F" and shall represent the support of 4 features as described in  table 5.2.2-3. The most significant character representing the highest-numbered features shall  appear first in the string, and the character representing features 1 to 4 shall appear last  in the string. The list of features and their numbering (starting with 1) are defined  separately for each API. If the string contains a lower number of characters than there are  defined features for an API, all features that would be represented by characters that are not  present in the string are not supported.
+      pattern: "^[A-Fa-f0-9]*$"
+      title: supportedFeatures
+      type: string
+    ProblemDetails:
+      description: Represents additional information and details on an error response.
+      properties:
+        type:
+          description: string providing an URI formatted according to IETF RFC 3986.
+          title: type
+          type: string
+        title:
+          description: "A short, human-readable summary of the problem type. It should\
+            \ not change from occurrence to occurrence of the problem."
+          title: title
+          type: string
+        status:
+          description: The HTTP status code for this occurrence of the problem.
+          title: status
+          type: integer
+        detail:
+          description: A human-readable explanation specific to this occurrence of
+            the problem.
+          title: detail
+          type: string
+        instance:
+          description: string providing an URI formatted according to IETF RFC 3986.
+          title: type
+          type: string
+        cause:
+          description: "A machine-readable application error cause specific to this\
+            \ occurrence of the problem. This IE should be present and provide application-related\
+            \ error information, if available."
+          title: cause
+          type: string
+        invalidParams:
+          description: "Description of invalid parameters, for a request rejected\
+            \ due to invalid parameters."
+          items:
+            $ref: '#/components/schemas/InvalidParam'
+          minItems: 1
+          title: invalidParams
+          type: array
+        supportedFeatures:
+          description: |
+            A string used to indicate the features supported by an API that is used as defined in clause  6.6 in 3GPP TS 29.500. The string shall contain a bitmask indicating supported features in  hexadecimal representation Each character in the string shall take a value of "0" to "9",  "a" to "f" or "A" to "F" and shall represent the support of 4 features as described in  table 5.2.2-3. The most significant character representing the highest-numbered features shall  appear first in the string, and the character representing features 1 to 4 shall appear last  in the string. The list of features and their numbering (starting with 1) are defined  separately for each API. If the string contains a lower number of characters than there are  defined features for an API, all features that would be represented by characters that are not  present in the string are not supported.
+          pattern: "^[A-Fa-f0-9]*$"
+          title: supportedFeatures
+          type: string
+      title: ProblemDetails
+      type: object
+    Uri:
+      description: string providing an URI formatted according to IETF RFC 3986.
+      title: type
+      type: string
+    InvalidParam:
+      description: "Represents the description of invalid parameters, for a request\
+        \ rejected due to invalid parameters."
+      properties:
+        param:
+          description: "Attribute's name encoded as a JSON Pointer, or header's name."
+          title: param
+          type: string
+        reason:
+          description: "A human-readable reason, e.g. \"must be a positive integer\"\
+            ."
+          title: reason
+          type: string
+      required:
+      - param
+      title: InvalidParam
+      type: object
+    DateTime:
+      description: string with format "date-time" as defined in OpenAPI.
+      format: date-time
+      title: DateTime
+      type: string
diff --git a/services/TS29222_CAPIF_Access_Control_Policy_API/openapi_server/test/__init__.py b/services/TS29222_CAPIF_Access_Control_Policy_API/openapi_server/test/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..364aba9fbf880b8a6d2d011380bd092f2e5d973a
--- /dev/null
+++ b/services/TS29222_CAPIF_Access_Control_Policy_API/openapi_server/test/__init__.py
@@ -0,0 +1,16 @@
+import logging
+
+import connexion
+from flask_testing import TestCase
+
+from openapi_server.encoder import JSONEncoder
+
+
+class BaseTestCase(TestCase):
+
+    def create_app(self):
+        logging.getLogger('connexion.operation').setLevel('ERROR')
+        app = connexion.App(__name__, specification_dir='../openapi/')
+        app.app.json_encoder = JSONEncoder
+        app.add_api('openapi.yaml', pythonic_params=True)
+        return app.app
diff --git a/services/TS29222_CAPIF_Access_Control_Policy_API/openapi_server/test/test_default_controller.py b/services/TS29222_CAPIF_Access_Control_Policy_API/openapi_server/test/test_default_controller.py
new file mode 100644
index 0000000000000000000000000000000000000000..c850757e5ca3b3f1d5aa5ed6349b8ce22fb4186d
--- /dev/null
+++ b/services/TS29222_CAPIF_Access_Control_Policy_API/openapi_server/test/test_default_controller.py
@@ -0,0 +1,38 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+import unittest
+
+from flask import json
+from six import BytesIO
+
+from openapi_server.models.access_control_policy_list import AccessControlPolicyList  # noqa: E501
+from openapi_server.models.problem_details import ProblemDetails  # noqa: E501
+from openapi_server.test import BaseTestCase
+
+
+class TestDefaultController(BaseTestCase):
+    """DefaultController integration test stubs"""
+
+    def test_access_control_policy_list_service_api_id_get(self):
+        """Test case for access_control_policy_list_service_api_id_get
+
+        
+        """
+        query_string = [('aef-id', 'aef_id_example'),
+                        ('api-invoker-id', 'api_invoker_id_example'),
+                        ('supported-features', 'supported_features_example')]
+        headers = { 
+            'Accept': 'application/json',
+        }
+        response = self.client.open(
+            '/access-control-policy/v1/accessControlPolicyList/{service_api_id}'.format(service_api_id='service_api_id_example'),
+            method='GET',
+            headers=headers,
+            query_string=query_string)
+        self.assert200(response,
+                       'Response body is : ' + response.data.decode('utf-8'))
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/services/TS29222_CAPIF_Access_Control_Policy_API/openapi_server/typing_utils.py b/services/TS29222_CAPIF_Access_Control_Policy_API/openapi_server/typing_utils.py
new file mode 100644
index 0000000000000000000000000000000000000000..0563f81fd5345282a33705038dfa77fdcaa15872
--- /dev/null
+++ b/services/TS29222_CAPIF_Access_Control_Policy_API/openapi_server/typing_utils.py
@@ -0,0 +1,32 @@
+# coding: utf-8
+
+import sys
+
+if sys.version_info < (3, 7):
+    import typing
+
+    def is_generic(klass):
+        """ Determine whether klass is a generic class """
+        return type(klass) == typing.GenericMeta
+
+    def is_dict(klass):
+        """ Determine whether klass is a Dict """
+        return klass.__extra__ == dict
+
+    def is_list(klass):
+        """ Determine whether klass is a List """
+        return klass.__extra__ == list
+
+else:
+
+    def is_generic(klass):
+        """ Determine whether klass is a generic class """
+        return hasattr(klass, '__origin__')
+
+    def is_dict(klass):
+        """ Determine whether klass is a Dict """
+        return klass.__origin__ == dict
+
+    def is_list(klass):
+        """ Determine whether klass is a List """
+        return klass.__origin__ == list
diff --git a/services/TS29222_CAPIF_Access_Control_Policy_API/openapi_server/util.py b/services/TS29222_CAPIF_Access_Control_Policy_API/openapi_server/util.py
new file mode 100644
index 0000000000000000000000000000000000000000..672406d079a400d7d50956c018539f2d5c95e370
--- /dev/null
+++ b/services/TS29222_CAPIF_Access_Control_Policy_API/openapi_server/util.py
@@ -0,0 +1,186 @@
+import datetime
+
+import six
+import typing
+from openapi_server import typing_utils
+
+def clean_empty(d):
+    if isinstance(d, dict):
+        return {
+            k: v
+            for k, v in ((k, clean_empty(v)) for k, v in d.items())
+            if v
+        }
+    if isinstance(d, list):
+        return [v for v in map(clean_empty, d) if v]
+    return d
+
+def dict_to_camel_case(my_dict):
+
+
+        result = {}
+
+        for attr, value in my_dict.items():
+
+            my_key = ''.join(word.title() for word in attr.split('_'))
+            my_key= ''.join([my_key[0].lower(), my_key[1:]])
+
+            if isinstance(value, list):
+                result[my_key] = list(map(
+                    lambda x: dict_to_camel_case(x) if isinstance(x, dict) else x, value ))
+
+            elif hasattr(value, "to_dict"):
+                result[my_key] = dict_to_camel_case(value)
+
+            elif isinstance(value, dict):
+                value = dict_to_camel_case(value)
+                result[my_key] = value
+            else:
+                result[my_key] = value
+
+        return result
+
+
+
+
+def _deserialize(data, klass):
+    """Deserializes dict, list, str into an object.
+
+    :param data: dict, list or str.
+    :param klass: class literal, or string of class name.
+
+    :return: object.
+    """
+    if data is None:
+        return None
+
+    if klass in six.integer_types or klass in (float, str, bool, bytearray):
+        return _deserialize_primitive(data, klass)
+    elif klass == object:
+        return _deserialize_object(data)
+    elif klass == datetime.date:
+        return deserialize_date(data)
+    elif klass == datetime.datetime:
+        return deserialize_datetime(data)
+    elif typing_utils.is_generic(klass):
+        if typing_utils.is_list(klass):
+            return _deserialize_list(data, klass.__args__[0])
+        if typing_utils.is_dict(klass):
+            return _deserialize_dict(data, klass.__args__[1])
+    else:
+        return deserialize_model(data, klass)
+
+
+def _deserialize_primitive(data, klass):
+    """Deserializes to primitive type.
+
+    :param data: data to deserialize.
+    :param klass: class literal.
+
+    :return: int, long, float, str, bool.
+    :rtype: int | long | float | str | bool
+    """
+    try:
+        value = klass(data)
+    except UnicodeEncodeError:
+        value = six.u(data)
+    except TypeError:
+        value = data
+    return value
+
+
+def _deserialize_object(value):
+    """Return an original value.
+
+    :return: object.
+    """
+    return value
+
+
+def deserialize_date(string):
+    """Deserializes string to date.
+
+    :param string: str.
+    :type string: str
+    :return: date.
+    :rtype: date
+    """
+    if string is None:
+      return None
+    
+    try:
+        from dateutil.parser import parse
+        return parse(string).date()
+    except ImportError:
+        return string
+
+
+def deserialize_datetime(string):
+    """Deserializes string to datetime.
+
+    The string should be in iso8601 datetime format.
+
+    :param string: str.
+    :type string: str
+    :return: datetime.
+    :rtype: datetime
+    """
+    if string is None:
+      return None
+    
+    try:
+        from dateutil.parser import parse
+        return parse(string)
+    except ImportError:
+        return string
+
+
+def deserialize_model(data, klass):
+    """Deserializes list or dict to model.
+
+    :param data: dict, list.
+    :type data: dict | list
+    :param klass: class literal.
+    :return: model object.
+    """
+    instance = klass()
+
+    if not instance.openapi_types:
+        return data
+
+    for attr, attr_type in six.iteritems(instance.openapi_types):
+        if data is not None \
+                and instance.attribute_map[attr] in data \
+                and isinstance(data, (list, dict)):
+            value = data[instance.attribute_map[attr]]
+            setattr(instance, attr, _deserialize(value, attr_type))
+
+    return instance
+
+
+def _deserialize_list(data, boxed_type):
+    """Deserializes a list and its elements.
+
+    :param data: list to deserialize.
+    :type data: list
+    :param boxed_type: class literal.
+
+    :return: deserialized list.
+    :rtype: list
+    """
+    return [_deserialize(sub_data, boxed_type)
+            for sub_data in data]
+
+
+def _deserialize_dict(data, boxed_type):
+    """Deserializes a dict and its elements.
+
+    :param data: dict to deserialize.
+    :type data: dict
+    :param boxed_type: class literal.
+
+    :return: deserialized dict.
+    :rtype: dict
+    """
+    return {k: _deserialize(v, boxed_type)
+            for k, v in six.iteritems(data)}
diff --git a/services/TS29222_CAPIF_Access_Control_Policy_API/requirements.txt b/services/TS29222_CAPIF_Access_Control_Policy_API/requirements.txt
new file mode 100644
index 0000000000000000000000000000000000000000..03d8aafa8f87a0cfeeeddc14cb5ccc8a81c7ea83
--- /dev/null
+++ b/services/TS29222_CAPIF_Access_Control_Policy_API/requirements.txt
@@ -0,0 +1,29 @@
+connexion[swagger-ui] == 2.14.2; python_version>="3.6"
+# 2.3 is the last version that supports python 3.4-3.5
+connexion[swagger-ui] <= 2.3.0; python_version=="3.5" or python_version=="3.4"
+# connexion requires werkzeug but connexion < 2.4.0 does not install werkzeug
+# we must peg werkzeug versions below to fix connexion
+# https://github.com/zalando/connexion/pull/1044
+werkzeug == 0.16.1; python_version=="3.5" or python_version=="3.4"
+swagger-ui-bundle >= 0.0.2
+python_dateutil >= 2.6.0
+setuptools >= 21.0.0
+Flask == 2.1.1
+pymongo == 4.3.3
+flask_jwt_extended == 4.4.4
+opentelemetry-instrumentation == 0.38b0
+opentelemetry-instrumentation-flask == 0.38b0
+opentelemetry-instrumentation-redis == 0.38b0
+opentelemetry-instrumentation-pymongo == 0.38b0
+opentelemetry-exporter-otlp == 1.17.0
+opentelemetry-exporter-jaeger==1.17.0
+fluent == 0.10.0
+fluent-logger == 0.10.0
+opentelemetry-api == 1.17.0
+opentelemetry-sdk == 1.17.0
+flask_executor == 1.0.0
+pyopenssl == 23.0.0
+redis ==  4.5.4
+flask_executor == 1.0.0
+Flask-APScheduler == 1.12.4
+Flask-Script == 2.0.6
diff --git a/services/TS29222_CAPIF_Access_Control_Policy_API/setup.py b/services/TS29222_CAPIF_Access_Control_Policy_API/setup.py
new file mode 100644
index 0000000000000000000000000000000000000000..275b7b6b91de3bcb6cb8228baf5ab704cee59c7e
--- /dev/null
+++ b/services/TS29222_CAPIF_Access_Control_Policy_API/setup.py
@@ -0,0 +1,39 @@
+# coding: utf-8
+
+import sys
+from setuptools import setup, find_packages
+
+NAME = "openapi_server"
+VERSION = "1.0.0"
+
+# To install the library, run the following
+#
+# python setup.py install
+#
+# prerequisite: setuptools
+# http://pypi.python.org/pypi/setuptools
+
+REQUIRES = [
+    "connexion>=2.0.2",
+    "swagger-ui-bundle>=0.0.2",
+    "python_dateutil>=2.6.0"
+]
+
+setup(
+    name=NAME,
+    version=VERSION,
+    description="CAPIF_Access_Control_Policy_API",
+    author_email="",
+    url="",
+    keywords=["OpenAPI", "CAPIF_Access_Control_Policy_API"],
+    install_requires=REQUIRES,
+    packages=find_packages(),
+    package_data={'': ['openapi/openapi.yaml']},
+    include_package_data=True,
+    entry_points={
+        'console_scripts': ['openapi_server=openapi_server.__main__:main']},
+    long_description="""\
+    API for access control policy.   © 2022, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).   All rights reserved. 
+    """
+)
+
diff --git a/services/TS29222_CAPIF_Access_Control_Policy_API/test-requirements.txt b/services/TS29222_CAPIF_Access_Control_Policy_API/test-requirements.txt
new file mode 100644
index 0000000000000000000000000000000000000000..58f51d6a00272d7515a20e3618f345b73c68afa0
--- /dev/null
+++ b/services/TS29222_CAPIF_Access_Control_Policy_API/test-requirements.txt
@@ -0,0 +1,4 @@
+pytest~=7.1.0
+pytest-cov>=2.8.1
+pytest-randomly>=1.2.3
+Flask-Testing==0.8.1
diff --git a/services/TS29222_CAPIF_Access_Control_Policy_API/tox.ini b/services/TS29222_CAPIF_Access_Control_Policy_API/tox.ini
new file mode 100644
index 0000000000000000000000000000000000000000..f66b2d84cdaa91cec100c23e86388924a071a451
--- /dev/null
+++ b/services/TS29222_CAPIF_Access_Control_Policy_API/tox.ini
@@ -0,0 +1,11 @@
+[tox]
+envlist = py3
+skipsdist=True
+
+[testenv]
+deps=-r{toxinidir}/requirements.txt
+     -r{toxinidir}/test-requirements.txt
+	 {toxinidir}
+
+commands=
+   pytest --cov=openapi_server
diff --git a/services/TS29222_CAPIF_Auditing_API/.dockerignore b/services/TS29222_CAPIF_Auditing_API/.dockerignore
new file mode 100644
index 0000000000000000000000000000000000000000..f9619601908b43d5d90c9befea5aa6ef6a732fa9
--- /dev/null
+++ b/services/TS29222_CAPIF_Auditing_API/.dockerignore
@@ -0,0 +1,72 @@
+.travis.yaml
+.openapi-generator-ignore
+README.md
+tox.ini
+git_push.sh
+test-requirements.txt
+setup.py
+
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+env/
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*,cover
+.hypothesis/
+venv/
+.python-version
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+#Ipython Notebook
+.ipynb_checkpoints
diff --git a/services/TS29222_CAPIF_Auditing_API/.gitignore b/services/TS29222_CAPIF_Auditing_API/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..43995bd42fa23bbc4c3a59d5fb9da99042fcf139
--- /dev/null
+++ b/services/TS29222_CAPIF_Auditing_API/.gitignore
@@ -0,0 +1,66 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+env/
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*,cover
+.hypothesis/
+venv/
+.venv/
+.python-version
+.pytest_cache
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+#Ipython Notebook
+.ipynb_checkpoints
diff --git a/services/TS29222_CAPIF_Auditing_API/.openapi-generator-ignore b/services/TS29222_CAPIF_Auditing_API/.openapi-generator-ignore
new file mode 100644
index 0000000000000000000000000000000000000000..7484ee590a3894506cf063799b885428f95a71be
--- /dev/null
+++ b/services/TS29222_CAPIF_Auditing_API/.openapi-generator-ignore
@@ -0,0 +1,23 @@
+# OpenAPI Generator Ignore
+# Generated by openapi-generator https://github.com/openapitools/openapi-generator
+
+# Use this file to prevent files from being overwritten by the generator.
+# The patterns follow closely to .gitignore or .dockerignore.
+
+# As an example, the C# client generator defines ApiClient.cs.
+# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line:
+#ApiClient.cs
+
+# You can match any string of characters against a directory, file or extension with a single asterisk (*):
+#foo/*/qux
+# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
+
+# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
+#foo/**/qux
+# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
+
+# You can also negate patterns with an exclamation (!).
+# For example, you can ignore all files in a docs folder with the file extension .md:
+#docs/*.md
+# Then explicitly reverse the ignore rule for a single file:
+#!docs/README.md
diff --git a/services/TS29222_CAPIF_Auditing_API/.openapi-generator/FILES b/services/TS29222_CAPIF_Auditing_API/.openapi-generator/FILES
new file mode 100644
index 0000000000000000000000000000000000000000..f5bc02fc12670684750f50376d9d5d04a59ff38c
--- /dev/null
+++ b/services/TS29222_CAPIF_Auditing_API/.openapi-generator/FILES
@@ -0,0 +1,33 @@
+.dockerignore
+.gitignore
+.travis.yml
+Dockerfile
+README.md
+git_push.sh
+logs/__init__.py
+logs/__main__.py
+logs/controllers/__init__.py
+logs/controllers/default_controller.py
+logs/controllers/security_controller_.py
+logs/encoder.py
+logs/models/__init__.py
+logs/models/base_model_.py
+logs/models/interface_description.py
+logs/models/invalid_param.py
+logs/models/invocation_log.py
+logs/models/log.py
+logs/models/operation.py
+logs/models/operation_any_of.py
+logs/models/problem_details.py
+logs/models/protocol.py
+logs/models/protocol_any_of.py
+logs/models/security_method.py
+logs/models/security_method_any_of.py
+logs/openapi/openapi.yaml
+logs/test/__init__.py
+logs/typing_utils.py
+logs/util.py
+requirements.txt
+setup.py
+test-requirements.txt
+tox.ini
diff --git a/services/TS29222_CAPIF_Auditing_API/.openapi-generator/VERSION b/services/TS29222_CAPIF_Auditing_API/.openapi-generator/VERSION
new file mode 100644
index 0000000000000000000000000000000000000000..4b448de535c7dd619da0df6d8221995dbd5d118a
--- /dev/null
+++ b/services/TS29222_CAPIF_Auditing_API/.openapi-generator/VERSION
@@ -0,0 +1 @@
+5.3.0-SNAPSHOT
\ No newline at end of file
diff --git a/services/TS29222_CAPIF_Auditing_API/.travis.yml b/services/TS29222_CAPIF_Auditing_API/.travis.yml
new file mode 100644
index 0000000000000000000000000000000000000000..ad71ee5ca083a6923c91104533c5c7b86f297f3f
--- /dev/null
+++ b/services/TS29222_CAPIF_Auditing_API/.travis.yml
@@ -0,0 +1,14 @@
+# ref: https://docs.travis-ci.com/user/languages/python
+language: python
+python:
+  - "3.2"
+  - "3.3"
+  - "3.4"
+  - "3.5"
+  - "3.6"
+  - "3.7"
+  - "3.8"
+# command to install dependencies
+install: "pip install -r requirements.txt"
+# command to run tests
+script: nosetests
diff --git a/services/TS29222_CAPIF_Auditing_API/Dockerfile b/services/TS29222_CAPIF_Auditing_API/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..d7030b67013b0e43402f59ff7374a52c099a6b9d
--- /dev/null
+++ b/services/TS29222_CAPIF_Auditing_API/Dockerfile
@@ -0,0 +1,17 @@
+FROM public.ecr.aws/o2v4a8t6/opencapif/python:3-alpine
+
+RUN mkdir -p /usr/src/app
+WORKDIR /usr/src/app
+
+COPY requirements.txt /usr/src/app/requirements.txt
+
+RUN apk add -U --no-cache gcc build-base linux-headers ca-certificates libffi-dev libressl-dev libxslt-dev
+RUN pip3 install --no-cache-dir -r requirements.txt
+
+COPY . /usr/src/app
+
+EXPOSE 8080
+
+ENTRYPOINT ["python3"]
+
+CMD ["-m", "logs"]
\ No newline at end of file
diff --git a/services/TS29222_CAPIF_Auditing_API/README.md b/services/TS29222_CAPIF_Auditing_API/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..17eb857e7f965899d1e251d68f3bf66c55d18bcd
--- /dev/null
+++ b/services/TS29222_CAPIF_Auditing_API/README.md
@@ -0,0 +1,49 @@
+# OpenAPI generated server
+
+## Overview
+This server was generated by the [OpenAPI Generator](https://openapi-generator.tech) project. By using the
+[OpenAPI-Spec](https://openapis.org) from a remote server, you can easily generate a server stub.  This
+is an example of building a OpenAPI-enabled Flask server.
+
+This example uses the [Connexion](https://github.com/zalando/connexion) library on top of Flask.
+
+## Requirements
+Python 3.5.2+
+
+## Usage
+To run the server, please execute the following from the root directory:
+
+```
+pip3 install -r requirements.txt
+python3 -m logs
+```
+
+and open your browser to here:
+
+```
+http://localhost:8080/logs/v1/ui/
+```
+
+Your OpenAPI definition lives here:
+
+```
+http://localhost:8080/logs/v1/openapi.json
+```
+
+To launch the integration tests, use tox:
+```
+sudo pip install tox
+tox
+```
+
+## Running with Docker
+
+To run the server on a Docker container, please execute the following from the root directory:
+
+```bash
+# building the image
+docker build -t logs .
+
+# starting up a container
+docker run -p 8080:8080 logs
+```
\ No newline at end of file
diff --git a/services/TS29222_CAPIF_Auditing_API/config.yaml b/services/TS29222_CAPIF_Auditing_API/config.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..6943b30350583619fc33cb6c7fc4da415d281da0
--- /dev/null
+++ b/services/TS29222_CAPIF_Auditing_API/config.yaml
@@ -0,0 +1,20 @@
+mongo: {
+  'user': 'root',
+  'password': 'example',
+  'db': 'capif',
+  'logs_col': 'invocationlogs',
+  'capif_users_col': "user",
+  'host': 'mongo',
+  'port': "27017"
+}
+
+monitoring: {
+  "fluent_bit_host": fluent-bit,
+  "fluent_bit_port": 24224,
+  "opentelemetry_url": "otel-collector",
+  "opentelemetry_port": "55680",
+  "opentelemetry_max_queue_size": 8192,
+  "opentelemetry_schedule_delay_millis": 20000,
+  "opentelemetry_max_export_batch_size": 2048,
+  "opentelemetry_export_timeout_millis": 60000
+}
diff --git a/services/TS29222_CAPIF_Auditing_API/git_push.sh b/services/TS29222_CAPIF_Auditing_API/git_push.sh
new file mode 100644
index 0000000000000000000000000000000000000000..9405f72e950cdb8ca24c3cf4d15cee7eac62fde7
--- /dev/null
+++ b/services/TS29222_CAPIF_Auditing_API/git_push.sh
@@ -0,0 +1,57 @@
+#!/bin/sh
+# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
+#
+# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl "minor update" "gitlab.com"
+
+git_user_id=$1
+git_repo_id=$2
+release_note=$3
+git_host=$4
+
+if [ "$git_host" = "" ]; then
+    git_host="github.com"
+    echo "[INFO] No command line input provided. Set \$git_host to $git_host"
+fi
+
+if [ "$git_user_id" = "" ]; then
+    git_user_id="GIT_USER_ID"
+    echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id"
+fi
+
+if [ "$git_repo_id" = "" ]; then
+    git_repo_id="GIT_REPO_ID"
+    echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id"
+fi
+
+if [ "$release_note" = "" ]; then
+    release_note="Minor update"
+    echo "[INFO] No command line input provided. Set \$release_note to $release_note"
+fi
+
+# Initialize the local directory as a Git repository
+git init
+
+# Adds the files in the local repository and stages them for commit.
+git add .
+
+# Commits the tracked changes and prepares them to be pushed to a remote repository.
+git commit -m "$release_note"
+
+# Sets the new remote
+git_remote=`git remote`
+if [ "$git_remote" = "" ]; then # git remote not defined
+
+    if [ "$GIT_TOKEN" = "" ]; then
+        echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git credential in your environment."
+        git remote add origin https://${git_host}/${git_user_id}/${git_repo_id}.git
+    else
+        git remote add origin https://${git_user_id}:${GIT_TOKEN}@${git_host}/${git_user_id}/${git_repo_id}.git
+    fi
+
+fi
+
+git pull origin master
+
+# Pushes (Forces) the changes in the local repository up to the remote repository
+echo "Git pushing to https://${git_host}/${git_user_id}/${git_repo_id}.git"
+git push origin master 2>&1 | grep -v 'To https'
diff --git a/services/TS29222_CAPIF_Auditing_API/logs/__init__.py b/services/TS29222_CAPIF_Auditing_API/logs/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/services/TS29222_CAPIF_Auditing_API/logs/__main__.py b/services/TS29222_CAPIF_Auditing_API/logs/__main__.py
new file mode 100644
index 0000000000000000000000000000000000000000..385f0b589919612de7fc19c5315fea86f73d6e05
--- /dev/null
+++ b/services/TS29222_CAPIF_Auditing_API/logs/__main__.py
@@ -0,0 +1,116 @@
+#!/usr/bin/env python3
+
+import connexion
+import logging
+from logging.handlers import RotatingFileHandler
+from logs import encoder
+from .config import Config
+import os
+from fluent import sender
+from opentelemetry.instrumentation.flask import FlaskInstrumentor
+from opentelemetry import trace
+from opentelemetry.exporter.otlp.proto.grpc.trace_exporter import OTLPSpanExporter
+from opentelemetry.trace.propagation.tracecontext import TraceContextTextMapPropagator
+from opentelemetry.sdk.resources import Resource
+from opentelemetry.sdk.trace import TracerProvider
+from opentelemetry.sdk.trace.export import BatchSpanProcessor
+
+
+NAME = "Logs-Service"
+
+def configure_monitoring(app, config):
+
+    resource = Resource(attributes={"service.name": NAME})
+
+    fluent_bit_host = config['monitoring']['fluent_bit_host']
+    fluent_bit_port = config['monitoring']['fluent_bit_port']
+    fluent_bit_sender = sender.FluentSender('Logs-Service', host=fluent_bit_host, port=fluent_bit_port)
+    propagator = TraceContextTextMapPropagator()
+
+    tracer_provider = TracerProvider(resource=resource)
+    trace.set_tracer_provider(tracer_provider)
+    exporter = OTLPSpanExporter(endpoint=f"http://{config['monitoring']['opentelemetry_url']}:{config['monitoring']['opentelemetry_port']}", insecure=True)
+    span_processor = BatchSpanProcessor(
+        exporter,
+        max_queue_size=config['monitoring']['opentelemetry_max_queue_size'],
+        schedule_delay_millis=config['monitoring']['opentelemetry_schedule_delay_millis'],
+        max_export_batch_size=config['monitoring']['opentelemetry_max_export_batch_size'],
+        export_timeout_millis=config['monitoring']['opentelemetry_export_timeout_millis'],
+    )
+
+    trace.get_tracer_provider().add_span_processor(span_processor)
+
+    FlaskInstrumentor().instrument_app(app)
+
+    class FluentBitHandler(logging.Handler):
+
+        def __init__(self):
+            logging.Handler.__init__(self)
+
+        def emit(self, record):
+            log_entry = self.format(record)
+            log_data = {
+                'message': log_entry,
+                'level': record.levelname,
+                'timestamp': record.created,
+                'logger': record.name,
+                'function': record.funcName,
+                'line': record.lineno,
+                'container_name': os.environ.get('CONTAINER_NAME', ''),
+            }
+
+            # # Obtener el trace ID actual
+            current_context = trace.get_current_span().get_span_context()
+
+            trace_id = current_context.trace_id
+            traceparent_id = current_context.span_id
+            log_data['traceID'] = hex(trace_id)[2:]
+            if traceparent_id != None:
+                log_data['traceparent'] = hex(traceparent_id)[2:]
+            fluent_bit_sender.emit('Logs-Service', log_data)
+
+    loggers = [app.logger, ]
+    for l in loggers:
+         l.addHandler(FluentBitHandler())
+
+
+def configure_logging(app):
+    del app.logger.handlers[:]
+    loggers = [app.logger, ]
+    handlers = []
+    console_handler = logging.StreamHandler()
+    console_handler.setLevel(logging.DEBUG)
+    console_handler.setFormatter(verbose_formatter())
+    file_handler = RotatingFileHandler(filename="service_logs.log", maxBytes=1024 * 1024 * 100, backupCount=20)
+    file_handler.setLevel(logging.DEBUG)
+    file_handler.setFormatter(verbose_formatter())
+    handlers.append(console_handler)
+    handlers.append(file_handler)
+   
+    for l in loggers:
+        for handler in handlers:
+            l.addHandler(handler)
+        l.propagate = False
+        l.setLevel(logging.DEBUG)
+
+def verbose_formatter():
+    return logging.Formatter(
+        '{"timestamp": "%(asctime)s", "level": "%(levelname)s", "logger": "%(name)s", "function": "%(funcName)s", "line": %(lineno)d, "message": %(message)s}',
+        datefmt='%d/%m/%Y %H:%M:%S'
+    )
+
+
+app = connexion.App(__name__, specification_dir='./openapi/')
+app.app.json_encoder = encoder.JSONEncoder
+app.add_api('openapi.yaml',
+            arguments={'title': 'CAPIF_Auditing_API'},
+            pythonic_params=True)
+
+configure_logging(app.app)
+
+config = Config()
+if eval(os.environ.get("MONITORING").lower().capitalize()):
+    configure_monitoring(app.app, config.get_config())
+
+if __name__ == '__main__':
+    app.run(port=8080)
diff --git a/services/TS29222_CAPIF_Auditing_API/logs/config.py b/services/TS29222_CAPIF_Auditing_API/logs/config.py
new file mode 100644
index 0000000000000000000000000000000000000000..d04bd1acd87603f491b09f464d8db1d6cdc52ad7
--- /dev/null
+++ b/services/TS29222_CAPIF_Auditing_API/logs/config.py
@@ -0,0 +1,20 @@
+import yaml
+import os
+
+#Config class to get config
+class Config:
+	def __init__(self):
+		self.cached = 0
+		self.file="./config.yaml"
+		self.my_config = {}
+
+		stamp = os.stat(self.file).st_mtime
+		if stamp != self.cached:
+			self.cached = stamp
+			f = open(self.file)
+			self.my_config = yaml.safe_load(f)
+			f.close()
+
+	def get_config(self):
+		return self.my_config
+
diff --git a/services/TS29222_CAPIF_Auditing_API/logs/controllers/__init__.py b/services/TS29222_CAPIF_Auditing_API/logs/controllers/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/services/TS29222_CAPIF_Auditing_API/logs/controllers/default_controller.py b/services/TS29222_CAPIF_Auditing_API/logs/controllers/default_controller.py
new file mode 100644
index 0000000000000000000000000000000000000000..c330f47dcf64184d10590cbf343373a19c255099
--- /dev/null
+++ b/services/TS29222_CAPIF_Auditing_API/logs/controllers/default_controller.py
@@ -0,0 +1,88 @@
+import connexion
+import six
+import sys
+
+from logs.models.interface_description import InterfaceDescription  # noqa: E501
+from logs.models.invocation_log import InvocationLog  # noqa: E501
+from logs.models.operation import Operation  # noqa: E501
+from logs.models.problem_details import ProblemDetails  # noqa: E501
+from logs.models.protocol import Protocol  # noqa: E501
+from logs import util
+
+from ..core.auditoperations import AuditOperations
+import json
+from flask import Response, request, current_app
+from ..encoder import JSONEncoder
+from cryptography import x509
+from cryptography.hazmat.backends import default_backend
+import pymongo
+from ..core.responses import bad_request_error
+
+audit_operations = AuditOperations()
+
+
+def api_invocation_logs_get(aef_id=None, api_invoker_id=None, time_range_start=None, time_range_end=None, api_id=None, api_name=None, api_version=None, protocol=None, operation=None, result=None, resource_name=None, src_interface=None, dest_interface=None, supported_features=None):  # noqa: E501
+    """api_invocation_logs_get
+
+    Query and retrieve service API invocation logs stored on the CAPIF core function. # noqa: E501
+
+    :param aef_id: String identifying the API exposing function.
+    :type aef_id: str
+    :param api_invoker_id: String identifying the API invoker which invoked the service API.
+    :type api_invoker_id: str
+    :param time_range_start: Start time of the invocation time range.
+    :type time_range_start: str
+    :param time_range_end: End time of the invocation time range.
+    :type time_range_end: str
+    :param api_id: String identifying the API invoked.
+    :type api_id: str
+    :param api_name: API name, it is set as {apiName} part of the URI structure as defined in subclause 4.4 of 3GPP TS 29.501.
+    :type api_name: str
+    :param api_version: Version of the API which was invoked.
+    :type api_version: str
+    :param protocol: Protocol invoked.
+    :type protocol: dict | bytes
+    :param operation: Operation that was invoked on the API.
+    :type operation: dict | bytes
+    :param result: Result or output of the invocation.
+    :type result: str
+    :param resource_name: Name of the specific resource invoked.
+    :type resource_name: str
+    :param src_interface: Interface description of the API invoker.
+    :type src_interface: str
+    :param dest_interface: Interface description of the API invoked.
+    :type dest_interface: str
+    :param supported_features: To filter irrelevant responses related to unsupported features
+    :type supported_features: str
+
+    :rtype: InvocationLog
+    """
+
+    current_app.logger.info("Audit logs")
+
+    if aef_id is None or api_invoker_id is None:
+        return bad_request_error(detail="aef_id and api_invoker_id parameters are mandatory",
+                                 cause="Mandatory parameters missing", invalid_params=[
+                {"param": "aef_id or api_invoker_id", "reason": "missing"}])
+
+    time_range_start = util.deserialize_datetime(time_range_start)
+    time_range_end = util.deserialize_datetime(time_range_end)
+
+    query_params = {"aef_id": aef_id,
+                    "api_invoker_id": api_invoker_id,
+                    "time_range_start": time_range_start,
+                    "time_range_end": time_range_end,
+                    "api_id": api_id,
+                    "api_name": api_name,
+                    "api_version": api_version,
+                    "protocol": protocol,
+                    "operation": operation,
+                    "result": result,
+                    "resource_name": resource_name,
+                    "src_interface": src_interface,
+                    "dest_interface": dest_interface,
+                    "supported_features": supported_features
+                    }
+
+    response = audit_operations.get_logs(query_params)
+    return response
diff --git a/services/TS29222_CAPIF_Auditing_API/logs/controllers/security_controller_.py b/services/TS29222_CAPIF_Auditing_API/logs/controllers/security_controller_.py
new file mode 100644
index 0000000000000000000000000000000000000000..6d294ffd6df1a26a469dbb4e72533b01503468dd
--- /dev/null
+++ b/services/TS29222_CAPIF_Auditing_API/logs/controllers/security_controller_.py
@@ -0,0 +1,2 @@
+from typing import List
+
diff --git a/services/TS29222_CAPIF_Auditing_API/logs/core/auditoperations.py b/services/TS29222_CAPIF_Auditing_API/logs/core/auditoperations.py
new file mode 100644
index 0000000000000000000000000000000000000000..ac83701ce453c122e8445e41d808b9d658fd3928
--- /dev/null
+++ b/services/TS29222_CAPIF_Auditing_API/logs/core/auditoperations.py
@@ -0,0 +1,71 @@
+import sys
+
+from flask import current_app, Flask, Response
+import json
+import sys
+from datetime import datetime
+from .resources import Resource
+from bson import json_util
+from ..util import dict_to_camel_case, clean_empty
+from .responses import bad_request_error, not_found_error, forbidden_error, internal_server_error, make_response
+from ..models.invocation_log import InvocationLog
+
+
+class AuditOperations (Resource):
+
+    def get_logs(self, query_parameters):
+
+        mycol = self.db.get_col_by_name(self.db.invocation_logs)
+
+        current_app.logger.debug("Find invocation logs")
+
+        try:
+            result = mycol.find_one({'aef_id': query_parameters['aef_id'], 'api_invoker_id': query_parameters['api_invoker_id']}, {"_id": 0})
+
+            if result is None:
+                return not_found_error(detail="aefId or/and apiInvokerId do not match any InvocationLogs", cause="No log invocations found")
+
+            logs = result['logs'].copy()
+
+            query_params = dict((k,v) for k,v in query_parameters.items() if v is not None and k != 'aef_id' and k != 'api_invoker_id')
+
+            for log in logs:
+
+                for param in query_params:
+                    if param == 'time_range_start':
+                        if query_params[param] > log['invocation_time'].astimezone(query_params[param].tzinfo):
+                            result['logs'].remove(log)
+                            break
+                    elif param == 'time_range_end':
+                        if query_params[param] < log['invocation_time'].astimezone(query_params[param].tzinfo):
+                            result['logs'].remove(log)
+                            break
+                    elif param == 'src_interface' or param == 'dest_interface':
+                        interface = json.loads(query_params[param])
+                        if 'security_methods' not in interface:
+                            return bad_request_error(detail="security_methods is mandatory",
+                                                     cause="security_methods parameter missing", invalid_params=[
+                                    {"param": "security_methods", "reason": "missing"}])
+                        for key in interface:
+                            if log[param][key] != interface[key]:
+                                result['logs'].remove(log)
+                                break
+                    elif log[param] != query_params[param]:
+                        result['logs'].remove(log)
+                        break
+
+            if not result['logs']:
+                return not_found_error(detail="Parameters do not match any log entry", cause="No logs found")
+
+
+            result = dict_to_camel_case(clean_empty(result))
+            invocation_log = InvocationLog(result['aefId'], result['apiInvokerId'], result['logs'],
+                                           result['supportedFeatures'])
+            res = make_response(object=invocation_log, status=200)
+            current_app.logger.debug("Found invocation logs")
+            return res
+
+        except Exception as e:
+            exception = "An exception occurred in audit"
+            return internal_server_error(detail=exception, cause=str(e))
+
diff --git a/services/TS29222_CAPIF_Auditing_API/logs/core/resources.py b/services/TS29222_CAPIF_Auditing_API/logs/core/resources.py
new file mode 100644
index 0000000000000000000000000000000000000000..d55b30c74cf87bf22eec115dfc1bd0e6d413a018
--- /dev/null
+++ b/services/TS29222_CAPIF_Auditing_API/logs/core/resources.py
@@ -0,0 +1,8 @@
+from abc import ABC, abstractmethod
+from ..db.db import MongoDatabse
+
+
+class Resource(ABC):
+
+    def __init__(self):
+        self.db = MongoDatabse()
\ No newline at end of file
diff --git a/services/TS29222_CAPIF_Auditing_API/logs/core/responses.py b/services/TS29222_CAPIF_Auditing_API/logs/core/responses.py
new file mode 100644
index 0000000000000000000000000000000000000000..5986c5000910cc9c0f0d579051db9477f5943c17
--- /dev/null
+++ b/services/TS29222_CAPIF_Auditing_API/logs/core/responses.py
@@ -0,0 +1,36 @@
+from ..models.problem_details import ProblemDetails
+from ..encoder import JSONEncoder
+from flask import Response
+import json
+
+mimetype = "application/json"
+
+
+def make_response(object, status):
+    res = Response(json.dumps(object, cls=JSONEncoder), status=status, mimetype=mimetype)
+
+    return res
+
+
+def internal_server_error(detail, cause):
+    prob = ProblemDetails(title="Internal Server Error", status=500, detail=detail, cause=cause)
+
+    return Response(json.dumps(prob, cls=JSONEncoder), status=500, mimetype=mimetype)
+
+
+def forbidden_error(detail, cause):
+    prob = ProblemDetails(title="Forbidden", status=403, detail=detail, cause=cause)
+
+    return Response(json.dumps(prob, cls=JSONEncoder), status=403, mimetype=mimetype)
+
+
+def bad_request_error(detail, cause, invalid_params):
+    prob = ProblemDetails(title="Bad Request", status=400, detail=detail, cause=cause, invalid_params=invalid_params)
+
+    return Response(json.dumps(prob, cls=JSONEncoder), status=400, mimetype=cause)
+
+
+def not_found_error(detail, cause):
+    prob = ProblemDetails(title="Not Found", status=404, detail=detail, cause=cause)
+
+    return Response(json.dumps(prob, cls=JSONEncoder), status=404, mimetype=mimetype)
\ No newline at end of file
diff --git a/services/TS29222_CAPIF_Auditing_API/logs/db/db.py b/services/TS29222_CAPIF_Auditing_API/logs/db/db.py
new file mode 100644
index 0000000000000000000000000000000000000000..f3286d22125674dd3cbd9cc5b8dccc2dba73f25c
--- /dev/null
+++ b/services/TS29222_CAPIF_Auditing_API/logs/db/db.py
@@ -0,0 +1,43 @@
+import atexit
+import time
+from pymongo import MongoClient
+from pymongo.errors import AutoReconnect
+from ..config import Config
+from bson.codec_options import CodecOptions
+import os
+from opentelemetry.instrumentation.pymongo import PymongoInstrumentor
+
+if eval(os.environ.get("MONITORING").lower().capitalize()):
+    PymongoInstrumentor().instrument()
+
+
+class MongoDatabse():
+
+    def __init__(self):
+        self.config = Config().get_config()
+        self.db = self.__connect()
+        self.invocation_logs = self.config['mongo']['logs_col']
+        self.capif_users = self.config['mongo']['capif_users_col']
+
+    def get_col_by_name(self, name):
+        return self.db[name]
+
+    def __connect(self, max_retries=3, retry_delay=1):
+        retries = 0
+        while retries < max_retries:
+            try:
+                uri = f"mongodb://{self.config['mongo']['user']}:{self.config['mongo']['password']}@" \
+                      f"{self.config['mongo']['host']}:{self.config['mongo']['port']}"
+                client = MongoClient(uri)
+                mydb = client[self.config['mongo']['db']]
+                mydb.command("ping")
+                return mydb
+            except AutoReconnect:
+                retries += 1
+                print(f"Reconnecting... Retry {retries} of {max_retries}")
+                time.sleep(retry_delay)
+        return None
+
+    def close_connection(self):
+        if self.db.client:
+            self.db.client.close()
diff --git a/services/TS29222_CAPIF_Auditing_API/logs/encoder.py b/services/TS29222_CAPIF_Auditing_API/logs/encoder.py
new file mode 100644
index 0000000000000000000000000000000000000000..55259f5fafc566e72cad147c9f1fada83c2d5130
--- /dev/null
+++ b/services/TS29222_CAPIF_Auditing_API/logs/encoder.py
@@ -0,0 +1,20 @@
+from connexion.apps.flask_app import FlaskJSONEncoder
+import six
+
+from logs.models.base_model_ import Model
+
+
+class JSONEncoder(FlaskJSONEncoder):
+    include_nulls = False
+
+    def default(self, o):
+        if isinstance(o, Model):
+            dikt = {}
+            for attr, _ in six.iteritems(o.openapi_types):
+                value = getattr(o, attr)
+                if value is None and not self.include_nulls:
+                    continue
+                attr = o.attribute_map[attr]
+                dikt[attr] = value
+            return dikt
+        return FlaskJSONEncoder.default(self, o)
diff --git a/services/TS29222_CAPIF_Auditing_API/logs/models/__init__.py b/services/TS29222_CAPIF_Auditing_API/logs/models/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..d8b2550fa7ec4c195af937a7e39decc6fbacec60
--- /dev/null
+++ b/services/TS29222_CAPIF_Auditing_API/logs/models/__init__.py
@@ -0,0 +1,16 @@
+# coding: utf-8
+
+# flake8: noqa
+from __future__ import absolute_import
+# import models into model package
+from logs.models.interface_description import InterfaceDescription
+from logs.models.invalid_param import InvalidParam
+from logs.models.invocation_log import InvocationLog
+from logs.models.log import Log
+from logs.models.operation import Operation
+from logs.models.operation_any_of import OperationAnyOf
+from logs.models.problem_details import ProblemDetails
+from logs.models.protocol import Protocol
+from logs.models.protocol_any_of import ProtocolAnyOf
+from logs.models.security_method import SecurityMethod
+from logs.models.security_method_any_of import SecurityMethodAnyOf
diff --git a/services/TS29222_CAPIF_Auditing_API/logs/models/base_model_.py b/services/TS29222_CAPIF_Auditing_API/logs/models/base_model_.py
new file mode 100644
index 0000000000000000000000000000000000000000..160eaa04eab544df66e788339368d145184d8fdc
--- /dev/null
+++ b/services/TS29222_CAPIF_Auditing_API/logs/models/base_model_.py
@@ -0,0 +1,69 @@
+import pprint
+
+import six
+import typing
+
+from logs import util
+
+T = typing.TypeVar('T')
+
+
+class Model(object):
+    # openapiTypes: The key is attribute name and the
+    # value is attribute type.
+    openapi_types = {}
+
+    # attributeMap: The key is attribute name and the
+    # value is json key in definition.
+    attribute_map = {}
+
+    @classmethod
+    def from_dict(cls: typing.Type[T], dikt) -> T:
+        """Returns the dict as a model"""
+        return util.deserialize_model(dikt, cls)
+
+    def to_dict(self):
+        """Returns the model properties as a dict
+
+        :rtype: dict
+        """
+        result = {}
+
+        for attr, _ in six.iteritems(self.openapi_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model
+
+        :rtype: str
+        """
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/services/TS29222_CAPIF_Auditing_API/logs/models/interface_description.py b/services/TS29222_CAPIF_Auditing_API/logs/models/interface_description.py
new file mode 100644
index 0000000000000000000000000000000000000000..7a8878e663fd02989c50e2aa4e485daaa4bec01e
--- /dev/null
+++ b/services/TS29222_CAPIF_Auditing_API/logs/models/interface_description.py
@@ -0,0 +1,158 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from logs.models.base_model_ import Model
+from logs.models.security_method import SecurityMethod
+from logs import util
+
+from logs.models.security_method import SecurityMethod  # noqa: E501
+
+class InterfaceDescription(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, ipv4_addr=None, ipv6_addr=None, port=None, security_methods=None):  # noqa: E501
+        """InterfaceDescription - a model defined in OpenAPI
+
+        :param ipv4_addr: The ipv4_addr of this InterfaceDescription.  # noqa: E501
+        :type ipv4_addr: str
+        :param ipv6_addr: The ipv6_addr of this InterfaceDescription.  # noqa: E501
+        :type ipv6_addr: str
+        :param port: The port of this InterfaceDescription.  # noqa: E501
+        :type port: int
+        :param security_methods: The security_methods of this InterfaceDescription.  # noqa: E501
+        :type security_methods: List[SecurityMethod]
+        """
+        self.openapi_types = {
+            'ipv4_addr': str,
+            'ipv6_addr': str,
+            'port': int,
+            'security_methods': List[SecurityMethod]
+        }
+
+        self.attribute_map = {
+            'ipv4_addr': 'ipv4Addr',
+            'ipv6_addr': 'ipv6Addr',
+            'port': 'port',
+            'security_methods': 'securityMethods'
+        }
+
+        self._ipv4_addr = ipv4_addr
+        self._ipv6_addr = ipv6_addr
+        self._port = port
+        self._security_methods = security_methods
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'InterfaceDescription':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The InterfaceDescription of this InterfaceDescription.  # noqa: E501
+        :rtype: InterfaceDescription
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def ipv4_addr(self):
+        """Gets the ipv4_addr of this InterfaceDescription.
+
+        string identifying a Ipv4 address formatted in the \"dotted decimal\" notation as defined in IETF RFC 1166.  # noqa: E501
+
+        :return: The ipv4_addr of this InterfaceDescription.
+        :rtype: str
+        """
+        return self._ipv4_addr
+
+    @ipv4_addr.setter
+    def ipv4_addr(self, ipv4_addr):
+        """Sets the ipv4_addr of this InterfaceDescription.
+
+        string identifying a Ipv4 address formatted in the \"dotted decimal\" notation as defined in IETF RFC 1166.  # noqa: E501
+
+        :param ipv4_addr: The ipv4_addr of this InterfaceDescription.
+        :type ipv4_addr: str
+        """
+
+        self._ipv4_addr = ipv4_addr
+
+    @property
+    def ipv6_addr(self):
+        """Gets the ipv6_addr of this InterfaceDescription.
+
+        string identifying a Ipv6 address formatted according to clause 4 in IETF RFC 5952. The mixed Ipv4 Ipv6 notation according to clause 5 of IETF RFC 5952 shall not be used.  # noqa: E501
+
+        :return: The ipv6_addr of this InterfaceDescription.
+        :rtype: str
+        """
+        return self._ipv6_addr
+
+    @ipv6_addr.setter
+    def ipv6_addr(self, ipv6_addr):
+        """Sets the ipv6_addr of this InterfaceDescription.
+
+        string identifying a Ipv6 address formatted according to clause 4 in IETF RFC 5952. The mixed Ipv4 Ipv6 notation according to clause 5 of IETF RFC 5952 shall not be used.  # noqa: E501
+
+        :param ipv6_addr: The ipv6_addr of this InterfaceDescription.
+        :type ipv6_addr: str
+        """
+
+        self._ipv6_addr = ipv6_addr
+
+    @property
+    def port(self):
+        """Gets the port of this InterfaceDescription.
+
+        Unsigned integer with valid values between 0 and 65535.  # noqa: E501
+
+        :return: The port of this InterfaceDescription.
+        :rtype: int
+        """
+        return self._port
+
+    @port.setter
+    def port(self, port):
+        """Sets the port of this InterfaceDescription.
+
+        Unsigned integer with valid values between 0 and 65535.  # noqa: E501
+
+        :param port: The port of this InterfaceDescription.
+        :type port: int
+        """
+        if port is not None and port > 65535:  # noqa: E501
+            raise ValueError("Invalid value for `port`, must be a value less than or equal to `65535`")  # noqa: E501
+        if port is not None and port < 0:  # noqa: E501
+            raise ValueError("Invalid value for `port`, must be a value greater than or equal to `0`")  # noqa: E501
+
+        self._port = port
+
+    @property
+    def security_methods(self):
+        """Gets the security_methods of this InterfaceDescription.
+
+        Security methods supported by the interface, it take precedence over the security methods provided in AefProfile, for this specific interface.  # noqa: E501
+
+        :return: The security_methods of this InterfaceDescription.
+        :rtype: List[SecurityMethod]
+        """
+        return self._security_methods
+
+    @security_methods.setter
+    def security_methods(self, security_methods):
+        """Sets the security_methods of this InterfaceDescription.
+
+        Security methods supported by the interface, it take precedence over the security methods provided in AefProfile, for this specific interface.  # noqa: E501
+
+        :param security_methods: The security_methods of this InterfaceDescription.
+        :type security_methods: List[SecurityMethod]
+        """
+        if security_methods is not None and len(security_methods) < 1:
+            raise ValueError("Invalid value for `security_methods`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._security_methods = security_methods
diff --git a/services/TS29222_CAPIF_Auditing_API/logs/models/invalid_param.py b/services/TS29222_CAPIF_Auditing_API/logs/models/invalid_param.py
new file mode 100644
index 0000000000000000000000000000000000000000..17b30eb1400949497e5252839e7f64f71036499a
--- /dev/null
+++ b/services/TS29222_CAPIF_Auditing_API/logs/models/invalid_param.py
@@ -0,0 +1,96 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from logs.models.base_model_ import Model
+from logs import util
+
+
+class InvalidParam(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, param=None, reason=None):  # noqa: E501
+        """InvalidParam - a model defined in OpenAPI
+
+        :param param: The param of this InvalidParam.  # noqa: E501
+        :type param: str
+        :param reason: The reason of this InvalidParam.  # noqa: E501
+        :type reason: str
+        """
+        self.openapi_types = {
+            'param': str,
+            'reason': str
+        }
+
+        self.attribute_map = {
+            'param': 'param',
+            'reason': 'reason'
+        }
+
+        self._param = param
+        self._reason = reason
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'InvalidParam':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The InvalidParam of this InvalidParam.  # noqa: E501
+        :rtype: InvalidParam
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def param(self):
+        """Gets the param of this InvalidParam.
+
+        Attribute's name encoded as a JSON Pointer, or header's name.  # noqa: E501
+
+        :return: The param of this InvalidParam.
+        :rtype: str
+        """
+        return self._param
+
+    @param.setter
+    def param(self, param):
+        """Sets the param of this InvalidParam.
+
+        Attribute's name encoded as a JSON Pointer, or header's name.  # noqa: E501
+
+        :param param: The param of this InvalidParam.
+        :type param: str
+        """
+        if param is None:
+            raise ValueError("Invalid value for `param`, must not be `None`")  # noqa: E501
+
+        self._param = param
+
+    @property
+    def reason(self):
+        """Gets the reason of this InvalidParam.
+
+        A human-readable reason, e.g. \"must be a positive integer\".  # noqa: E501
+
+        :return: The reason of this InvalidParam.
+        :rtype: str
+        """
+        return self._reason
+
+    @reason.setter
+    def reason(self, reason):
+        """Sets the reason of this InvalidParam.
+
+        A human-readable reason, e.g. \"must be a positive integer\".  # noqa: E501
+
+        :param reason: The reason of this InvalidParam.
+        :type reason: str
+        """
+
+        self._reason = reason
diff --git a/services/TS29222_CAPIF_Auditing_API/logs/models/invocation_log.py b/services/TS29222_CAPIF_Auditing_API/logs/models/invocation_log.py
new file mode 100644
index 0000000000000000000000000000000000000000..4a0bc019d981720b6ea74ae97a2c8e92cfa67b8c
--- /dev/null
+++ b/services/TS29222_CAPIF_Auditing_API/logs/models/invocation_log.py
@@ -0,0 +1,164 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from logs.models.base_model_ import Model
+from logs.models.log import Log
+import re
+from logs import util
+
+from logs.models.log import Log  # noqa: E501
+import re  # noqa: E501
+
+class InvocationLog(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, aef_id=None, api_invoker_id=None, logs=None, supported_features=None):  # noqa: E501
+        """InvocationLog - a model defined in OpenAPI
+
+        :param aef_id: The aef_id of this InvocationLog.  # noqa: E501
+        :type aef_id: str
+        :param api_invoker_id: The api_invoker_id of this InvocationLog.  # noqa: E501
+        :type api_invoker_id: str
+        :param logs: The logs of this InvocationLog.  # noqa: E501
+        :type logs: List[Log]
+        :param supported_features: The supported_features of this InvocationLog.  # noqa: E501
+        :type supported_features: str
+        """
+        self.openapi_types = {
+            'aef_id': str,
+            'api_invoker_id': str,
+            'logs': List[Log],
+            'supported_features': str
+        }
+
+        self.attribute_map = {
+            'aef_id': 'aefId',
+            'api_invoker_id': 'apiInvokerId',
+            'logs': 'logs',
+            'supported_features': 'supportedFeatures'
+        }
+
+        self._aef_id = aef_id
+        self._api_invoker_id = api_invoker_id
+        self._logs = logs
+        self._supported_features = supported_features
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'InvocationLog':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The InvocationLog of this InvocationLog.  # noqa: E501
+        :rtype: InvocationLog
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def aef_id(self):
+        """Gets the aef_id of this InvocationLog.
+
+        Identity information of the API exposing function requesting logging of service API invocations  # noqa: E501
+
+        :return: The aef_id of this InvocationLog.
+        :rtype: str
+        """
+        return self._aef_id
+
+    @aef_id.setter
+    def aef_id(self, aef_id):
+        """Sets the aef_id of this InvocationLog.
+
+        Identity information of the API exposing function requesting logging of service API invocations  # noqa: E501
+
+        :param aef_id: The aef_id of this InvocationLog.
+        :type aef_id: str
+        """
+        if aef_id is None:
+            raise ValueError("Invalid value for `aef_id`, must not be `None`")  # noqa: E501
+
+        self._aef_id = aef_id
+
+    @property
+    def api_invoker_id(self):
+        """Gets the api_invoker_id of this InvocationLog.
+
+        Identity of the API invoker which invoked the service API  # noqa: E501
+
+        :return: The api_invoker_id of this InvocationLog.
+        :rtype: str
+        """
+        return self._api_invoker_id
+
+    @api_invoker_id.setter
+    def api_invoker_id(self, api_invoker_id):
+        """Sets the api_invoker_id of this InvocationLog.
+
+        Identity of the API invoker which invoked the service API  # noqa: E501
+
+        :param api_invoker_id: The api_invoker_id of this InvocationLog.
+        :type api_invoker_id: str
+        """
+        if api_invoker_id is None:
+            raise ValueError("Invalid value for `api_invoker_id`, must not be `None`")  # noqa: E501
+
+        self._api_invoker_id = api_invoker_id
+
+    @property
+    def logs(self):
+        """Gets the logs of this InvocationLog.
+
+        Service API invocation log  # noqa: E501
+
+        :return: The logs of this InvocationLog.
+        :rtype: List[Log]
+        """
+        return self._logs
+
+    @logs.setter
+    def logs(self, logs):
+        """Sets the logs of this InvocationLog.
+
+        Service API invocation log  # noqa: E501
+
+        :param logs: The logs of this InvocationLog.
+        :type logs: List[Log]
+        """
+        if logs is None:
+            raise ValueError("Invalid value for `logs`, must not be `None`")  # noqa: E501
+        if logs is not None and len(logs) < 1:
+            raise ValueError("Invalid value for `logs`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._logs = logs
+
+    @property
+    def supported_features(self):
+        """Gets the supported_features of this InvocationLog.
+
+        A string used to indicate the features supported by an API that is used as defined in clause 6.6 in 3GPP TS 29.500. The string shall contain a bitmask indicating supported features in hexadecimal representation Each character in the string shall take a value of \"0\" to \"9\", \"a\" to \"f\" or \"A\" to \"F\" and shall represent the support of 4 features as described in table 5.2.2-3. The most significant character representing the highest-numbered features shall appear first in the string, and the character representing features 1 to 4 shall appear last in the string. The list of features and their numbering (starting with 1) are defined separately for each API. If the string contains a lower number of characters than there are defined features for an API, all features that would be represented by characters that are not present in the string are not supported  # noqa: E501
+
+        :return: The supported_features of this InvocationLog.
+        :rtype: str
+        """
+        return self._supported_features
+
+    @supported_features.setter
+    def supported_features(self, supported_features):
+        """Sets the supported_features of this InvocationLog.
+
+        A string used to indicate the features supported by an API that is used as defined in clause 6.6 in 3GPP TS 29.500. The string shall contain a bitmask indicating supported features in hexadecimal representation Each character in the string shall take a value of \"0\" to \"9\", \"a\" to \"f\" or \"A\" to \"F\" and shall represent the support of 4 features as described in table 5.2.2-3. The most significant character representing the highest-numbered features shall appear first in the string, and the character representing features 1 to 4 shall appear last in the string. The list of features and their numbering (starting with 1) are defined separately for each API. If the string contains a lower number of characters than there are defined features for an API, all features that would be represented by characters that are not present in the string are not supported  # noqa: E501
+
+        :param supported_features: The supported_features of this InvocationLog.
+        :type supported_features: str
+        """
+        if supported_features is not None and not re.search(r'^[A-Fa-f0-9]*$', supported_features):  # noqa: E501
+            raise ValueError("Invalid value for `supported_features`, must be a follow pattern or equal to `/^[A-Fa-f0-9]*$/`")  # noqa: E501
+
+        self._supported_features = supported_features
diff --git a/services/TS29222_CAPIF_Auditing_API/logs/models/log.py b/services/TS29222_CAPIF_Auditing_API/logs/models/log.py
new file mode 100644
index 0000000000000000000000000000000000000000..44c50ef1c67f97c4c4f7d65d046da5c11701fc0a
--- /dev/null
+++ b/services/TS29222_CAPIF_Auditing_API/logs/models/log.py
@@ -0,0 +1,470 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from logs.models.base_model_ import Model
+from logs.models.interface_description import InterfaceDescription
+from logs.models.operation import Operation
+from logs.models.protocol import Protocol
+from logs import util
+
+from logs.models.interface_description import InterfaceDescription  # noqa: E501
+from logs.models.operation import Operation  # noqa: E501
+from logs.models.protocol import Protocol  # noqa: E501
+
+class Log(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, api_id=None, api_name=None, api_version=None, resource_name=None, uri=None, protocol=None, operation=None, result=None, invocation_time=None, invocation_latency=None, input_parameters=None, output_parameters=None, src_interface=None, dest_interface=None, fwd_interface=None):  # noqa: E501
+        """Log - a model defined in OpenAPI
+
+        :param api_id: The api_id of this Log.  # noqa: E501
+        :type api_id: str
+        :param api_name: The api_name of this Log.  # noqa: E501
+        :type api_name: str
+        :param api_version: The api_version of this Log.  # noqa: E501
+        :type api_version: str
+        :param resource_name: The resource_name of this Log.  # noqa: E501
+        :type resource_name: str
+        :param uri: The uri of this Log.  # noqa: E501
+        :type uri: str
+        :param protocol: The protocol of this Log.  # noqa: E501
+        :type protocol: Protocol
+        :param operation: The operation of this Log.  # noqa: E501
+        :type operation: Operation
+        :param result: The result of this Log.  # noqa: E501
+        :type result: str
+        :param invocation_time: The invocation_time of this Log.  # noqa: E501
+        :type invocation_time: datetime
+        :param invocation_latency: The invocation_latency of this Log.  # noqa: E501
+        :type invocation_latency: int
+        :param input_parameters: The input_parameters of this Log.  # noqa: E501
+        :type input_parameters: object
+        :param output_parameters: The output_parameters of this Log.  # noqa: E501
+        :type output_parameters: object
+        :param src_interface: The src_interface of this Log.  # noqa: E501
+        :type src_interface: InterfaceDescription
+        :param dest_interface: The dest_interface of this Log.  # noqa: E501
+        :type dest_interface: InterfaceDescription
+        :param fwd_interface: The fwd_interface of this Log.  # noqa: E501
+        :type fwd_interface: str
+        """
+        self.openapi_types = {
+            'api_id': str,
+            'api_name': str,
+            'api_version': str,
+            'resource_name': str,
+            'uri': str,
+            'protocol': Protocol,
+            'operation': Operation,
+            'result': str,
+            'invocation_time': datetime,
+            'invocation_latency': int,
+            'input_parameters': object,
+            'output_parameters': object,
+            'src_interface': InterfaceDescription,
+            'dest_interface': InterfaceDescription,
+            'fwd_interface': str
+        }
+
+        self.attribute_map = {
+            'api_id': 'apiId',
+            'api_name': 'apiName',
+            'api_version': 'apiVersion',
+            'resource_name': 'resourceName',
+            'uri': 'uri',
+            'protocol': 'protocol',
+            'operation': 'operation',
+            'result': 'result',
+            'invocation_time': 'invocationTime',
+            'invocation_latency': 'invocationLatency',
+            'input_parameters': 'inputParameters',
+            'output_parameters': 'outputParameters',
+            'src_interface': 'srcInterface',
+            'dest_interface': 'destInterface',
+            'fwd_interface': 'fwdInterface'
+        }
+
+        self._api_id = api_id
+        self._api_name = api_name
+        self._api_version = api_version
+        self._resource_name = resource_name
+        self._uri = uri
+        self._protocol = protocol
+        self._operation = operation
+        self._result = result
+        self._invocation_time = invocation_time
+        self._invocation_latency = invocation_latency
+        self._input_parameters = input_parameters
+        self._output_parameters = output_parameters
+        self._src_interface = src_interface
+        self._dest_interface = dest_interface
+        self._fwd_interface = fwd_interface
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'Log':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The Log of this Log.  # noqa: E501
+        :rtype: Log
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def api_id(self):
+        """Gets the api_id of this Log.
+
+        String identifying the API invoked.  # noqa: E501
+
+        :return: The api_id of this Log.
+        :rtype: str
+        """
+        return self._api_id
+
+    @api_id.setter
+    def api_id(self, api_id):
+        """Sets the api_id of this Log.
+
+        String identifying the API invoked.  # noqa: E501
+
+        :param api_id: The api_id of this Log.
+        :type api_id: str
+        """
+        if api_id is None:
+            raise ValueError("Invalid value for `api_id`, must not be `None`")  # noqa: E501
+
+        self._api_id = api_id
+
+    @property
+    def api_name(self):
+        """Gets the api_name of this Log.
+
+        Name of the API which was invoked, it is set as {apiName} part of the URI structure as defined in subclause 4.4 of 3GPP TS 29.501.  # noqa: E501
+
+        :return: The api_name of this Log.
+        :rtype: str
+        """
+        return self._api_name
+
+    @api_name.setter
+    def api_name(self, api_name):
+        """Sets the api_name of this Log.
+
+        Name of the API which was invoked, it is set as {apiName} part of the URI structure as defined in subclause 4.4 of 3GPP TS 29.501.  # noqa: E501
+
+        :param api_name: The api_name of this Log.
+        :type api_name: str
+        """
+        if api_name is None:
+            raise ValueError("Invalid value for `api_name`, must not be `None`")  # noqa: E501
+
+        self._api_name = api_name
+
+    @property
+    def api_version(self):
+        """Gets the api_version of this Log.
+
+        Version of the API which was invoked  # noqa: E501
+
+        :return: The api_version of this Log.
+        :rtype: str
+        """
+        return self._api_version
+
+    @api_version.setter
+    def api_version(self, api_version):
+        """Sets the api_version of this Log.
+
+        Version of the API which was invoked  # noqa: E501
+
+        :param api_version: The api_version of this Log.
+        :type api_version: str
+        """
+        if api_version is None:
+            raise ValueError("Invalid value for `api_version`, must not be `None`")  # noqa: E501
+
+        self._api_version = api_version
+
+    @property
+    def resource_name(self):
+        """Gets the resource_name of this Log.
+
+        Name of the specific resource invoked  # noqa: E501
+
+        :return: The resource_name of this Log.
+        :rtype: str
+        """
+        return self._resource_name
+
+    @resource_name.setter
+    def resource_name(self, resource_name):
+        """Sets the resource_name of this Log.
+
+        Name of the specific resource invoked  # noqa: E501
+
+        :param resource_name: The resource_name of this Log.
+        :type resource_name: str
+        """
+        if resource_name is None:
+            raise ValueError("Invalid value for `resource_name`, must not be `None`")  # noqa: E501
+
+        self._resource_name = resource_name
+
+    @property
+    def uri(self):
+        """Gets the uri of this Log.
+
+        string providing an URI formatted according to IETF RFC 3986.  # noqa: E501
+
+        :return: The uri of this Log.
+        :rtype: str
+        """
+        return self._uri
+
+    @uri.setter
+    def uri(self, uri):
+        """Sets the uri of this Log.
+
+        string providing an URI formatted according to IETF RFC 3986.  # noqa: E501
+
+        :param uri: The uri of this Log.
+        :type uri: str
+        """
+
+        self._uri = uri
+
+    @property
+    def protocol(self):
+        """Gets the protocol of this Log.
+
+
+        :return: The protocol of this Log.
+        :rtype: Protocol
+        """
+        return self._protocol
+
+    @protocol.setter
+    def protocol(self, protocol):
+        """Sets the protocol of this Log.
+
+
+        :param protocol: The protocol of this Log.
+        :type protocol: Protocol
+        """
+        if protocol is None:
+            raise ValueError("Invalid value for `protocol`, must not be `None`")  # noqa: E501
+
+        self._protocol = protocol
+
+    @property
+    def operation(self):
+        """Gets the operation of this Log.
+
+
+        :return: The operation of this Log.
+        :rtype: Operation
+        """
+        return self._operation
+
+    @operation.setter
+    def operation(self, operation):
+        """Sets the operation of this Log.
+
+
+        :param operation: The operation of this Log.
+        :type operation: Operation
+        """
+
+        self._operation = operation
+
+    @property
+    def result(self):
+        """Gets the result of this Log.
+
+        For HTTP protocol, it contains HTTP status code of the invocation  # noqa: E501
+
+        :return: The result of this Log.
+        :rtype: str
+        """
+        return self._result
+
+    @result.setter
+    def result(self, result):
+        """Sets the result of this Log.
+
+        For HTTP protocol, it contains HTTP status code of the invocation  # noqa: E501
+
+        :param result: The result of this Log.
+        :type result: str
+        """
+        if result is None:
+            raise ValueError("Invalid value for `result`, must not be `None`")  # noqa: E501
+
+        self._result = result
+
+    @property
+    def invocation_time(self):
+        """Gets the invocation_time of this Log.
+
+        string with format \"date-time\" as defined in OpenAPI.  # noqa: E501
+
+        :return: The invocation_time of this Log.
+        :rtype: datetime
+        """
+        return self._invocation_time
+
+    @invocation_time.setter
+    def invocation_time(self, invocation_time):
+        """Sets the invocation_time of this Log.
+
+        string with format \"date-time\" as defined in OpenAPI.  # noqa: E501
+
+        :param invocation_time: The invocation_time of this Log.
+        :type invocation_time: datetime
+        """
+
+        self._invocation_time = invocation_time
+
+    @property
+    def invocation_latency(self):
+        """Gets the invocation_latency of this Log.
+
+        Unsigned integer identifying a period of time in units of milliseconds.  # noqa: E501
+
+        :return: The invocation_latency of this Log.
+        :rtype: int
+        """
+        return self._invocation_latency
+
+    @invocation_latency.setter
+    def invocation_latency(self, invocation_latency):
+        """Sets the invocation_latency of this Log.
+
+        Unsigned integer identifying a period of time in units of milliseconds.  # noqa: E501
+
+        :param invocation_latency: The invocation_latency of this Log.
+        :type invocation_latency: int
+        """
+        if invocation_latency is not None and invocation_latency < 0:  # noqa: E501
+            raise ValueError("Invalid value for `invocation_latency`, must be a value greater than or equal to `0`")  # noqa: E501
+
+        self._invocation_latency = invocation_latency
+
+    @property
+    def input_parameters(self):
+        """Gets the input_parameters of this Log.
+
+        List of input parameters. Can be any value - string, number, boolean, array or object.  # noqa: E501
+
+        :return: The input_parameters of this Log.
+        :rtype: object
+        """
+        return self._input_parameters
+
+    @input_parameters.setter
+    def input_parameters(self, input_parameters):
+        """Sets the input_parameters of this Log.
+
+        List of input parameters. Can be any value - string, number, boolean, array or object.  # noqa: E501
+
+        :param input_parameters: The input_parameters of this Log.
+        :type input_parameters: object
+        """
+
+        self._input_parameters = input_parameters
+
+    @property
+    def output_parameters(self):
+        """Gets the output_parameters of this Log.
+
+        List of output parameters. Can be any value - string, number, boolean, array or object.  # noqa: E501
+
+        :return: The output_parameters of this Log.
+        :rtype: object
+        """
+        return self._output_parameters
+
+    @output_parameters.setter
+    def output_parameters(self, output_parameters):
+        """Sets the output_parameters of this Log.
+
+        List of output parameters. Can be any value - string, number, boolean, array or object.  # noqa: E501
+
+        :param output_parameters: The output_parameters of this Log.
+        :type output_parameters: object
+        """
+
+        self._output_parameters = output_parameters
+
+    @property
+    def src_interface(self):
+        """Gets the src_interface of this Log.
+
+
+        :return: The src_interface of this Log.
+        :rtype: InterfaceDescription
+        """
+        return self._src_interface
+
+    @src_interface.setter
+    def src_interface(self, src_interface):
+        """Sets the src_interface of this Log.
+
+
+        :param src_interface: The src_interface of this Log.
+        :type src_interface: InterfaceDescription
+        """
+
+        self._src_interface = src_interface
+
+    @property
+    def dest_interface(self):
+        """Gets the dest_interface of this Log.
+
+
+        :return: The dest_interface of this Log.
+        :rtype: InterfaceDescription
+        """
+        return self._dest_interface
+
+    @dest_interface.setter
+    def dest_interface(self, dest_interface):
+        """Sets the dest_interface of this Log.
+
+
+        :param dest_interface: The dest_interface of this Log.
+        :type dest_interface: InterfaceDescription
+        """
+
+        self._dest_interface = dest_interface
+
+    @property
+    def fwd_interface(self):
+        """Gets the fwd_interface of this Log.
+
+        It includes the node identifier (as defined in IETF RFC 7239 of all forwarding entities between the API invoker and the AEF, concatenated with comma and space, e.g. 192.0.2.43:80, unknown:_OBFport, 203.0.113.60  # noqa: E501
+
+        :return: The fwd_interface of this Log.
+        :rtype: str
+        """
+        return self._fwd_interface
+
+    @fwd_interface.setter
+    def fwd_interface(self, fwd_interface):
+        """Sets the fwd_interface of this Log.
+
+        It includes the node identifier (as defined in IETF RFC 7239 of all forwarding entities between the API invoker and the AEF, concatenated with comma and space, e.g. 192.0.2.43:80, unknown:_OBFport, 203.0.113.60  # noqa: E501
+
+        :param fwd_interface: The fwd_interface of this Log.
+        :type fwd_interface: str
+        """
+
+        self._fwd_interface = fwd_interface
diff --git a/services/TS29222_CAPIF_Auditing_API/logs/models/operation.py b/services/TS29222_CAPIF_Auditing_API/logs/models/operation.py
new file mode 100644
index 0000000000000000000000000000000000000000..6e9c9395bf61f32a0b1a23e2d32fc3cc61b8bc7a
--- /dev/null
+++ b/services/TS29222_CAPIF_Auditing_API/logs/models/operation.py
@@ -0,0 +1,45 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from logs.models.base_model_ import Model
+from logs import util
+
+
+class Operation(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    """
+    allowed enum values
+    """
+    GET = "GET"
+    POST = "POST"
+    PUT = "PUT"
+    PATCH = "PATCH"
+    DELETE = "DELETE"
+    def __init__(self):  # noqa: E501
+        """Operation - a model defined in OpenAPI
+
+        """
+        self.openapi_types = {
+        }
+
+        self.attribute_map = {
+        }
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'Operation':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The Operation of this Operation.  # noqa: E501
+        :rtype: Operation
+        """
+        return util.deserialize_model(dikt, cls)
diff --git a/services/TS29222_CAPIF_Auditing_API/logs/models/operation_any_of.py b/services/TS29222_CAPIF_Auditing_API/logs/models/operation_any_of.py
new file mode 100644
index 0000000000000000000000000000000000000000..7d6eb401341f7a586f10cceecee1442eed136d07
--- /dev/null
+++ b/services/TS29222_CAPIF_Auditing_API/logs/models/operation_any_of.py
@@ -0,0 +1,45 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from logs.models.base_model_ import Model
+from logs import util
+
+
+class OperationAnyOf(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    """
+    allowed enum values
+    """
+    GET = "GET"
+    POST = "POST"
+    PUT = "PUT"
+    PATCH = "PATCH"
+    DELETE = "DELETE"
+    def __init__(self):  # noqa: E501
+        """OperationAnyOf - a model defined in OpenAPI
+
+        """
+        self.openapi_types = {
+        }
+
+        self.attribute_map = {
+        }
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'OperationAnyOf':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The Operation_anyOf of this OperationAnyOf.  # noqa: E501
+        :rtype: OperationAnyOf
+        """
+        return util.deserialize_model(dikt, cls)
diff --git a/services/TS29222_CAPIF_Auditing_API/logs/models/problem_details.py b/services/TS29222_CAPIF_Auditing_API/logs/models/problem_details.py
new file mode 100644
index 0000000000000000000000000000000000000000..28d45102e5cb5244a4062cf8199e0f8ae172a309
--- /dev/null
+++ b/services/TS29222_CAPIF_Auditing_API/logs/models/problem_details.py
@@ -0,0 +1,270 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from logs.models.base_model_ import Model
+from logs.models.invalid_param import InvalidParam
+import re
+from logs import util
+
+from logs.models.invalid_param import InvalidParam  # noqa: E501
+import re  # noqa: E501
+
+class ProblemDetails(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, type=None, title=None, status=None, detail=None, instance=None, cause=None, invalid_params=None, supported_features=None):  # noqa: E501
+        """ProblemDetails - a model defined in OpenAPI
+
+        :param type: The type of this ProblemDetails.  # noqa: E501
+        :type type: str
+        :param title: The title of this ProblemDetails.  # noqa: E501
+        :type title: str
+        :param status: The status of this ProblemDetails.  # noqa: E501
+        :type status: int
+        :param detail: The detail of this ProblemDetails.  # noqa: E501
+        :type detail: str
+        :param instance: The instance of this ProblemDetails.  # noqa: E501
+        :type instance: str
+        :param cause: The cause of this ProblemDetails.  # noqa: E501
+        :type cause: str
+        :param invalid_params: The invalid_params of this ProblemDetails.  # noqa: E501
+        :type invalid_params: List[InvalidParam]
+        :param supported_features: The supported_features of this ProblemDetails.  # noqa: E501
+        :type supported_features: str
+        """
+        self.openapi_types = {
+            'type': str,
+            'title': str,
+            'status': int,
+            'detail': str,
+            'instance': str,
+            'cause': str,
+            'invalid_params': List[InvalidParam],
+            'supported_features': str
+        }
+
+        self.attribute_map = {
+            'type': 'type',
+            'title': 'title',
+            'status': 'status',
+            'detail': 'detail',
+            'instance': 'instance',
+            'cause': 'cause',
+            'invalid_params': 'invalidParams',
+            'supported_features': 'supportedFeatures'
+        }
+
+        self._type = type
+        self._title = title
+        self._status = status
+        self._detail = detail
+        self._instance = instance
+        self._cause = cause
+        self._invalid_params = invalid_params
+        self._supported_features = supported_features
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'ProblemDetails':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The ProblemDetails of this ProblemDetails.  # noqa: E501
+        :rtype: ProblemDetails
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def type(self):
+        """Gets the type of this ProblemDetails.
+
+        string providing an URI formatted according to IETF RFC 3986.  # noqa: E501
+
+        :return: The type of this ProblemDetails.
+        :rtype: str
+        """
+        return self._type
+
+    @type.setter
+    def type(self, type):
+        """Sets the type of this ProblemDetails.
+
+        string providing an URI formatted according to IETF RFC 3986.  # noqa: E501
+
+        :param type: The type of this ProblemDetails.
+        :type type: str
+        """
+
+        self._type = type
+
+    @property
+    def title(self):
+        """Gets the title of this ProblemDetails.
+
+        A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem.  # noqa: E501
+
+        :return: The title of this ProblemDetails.
+        :rtype: str
+        """
+        return self._title
+
+    @title.setter
+    def title(self, title):
+        """Sets the title of this ProblemDetails.
+
+        A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem.  # noqa: E501
+
+        :param title: The title of this ProblemDetails.
+        :type title: str
+        """
+
+        self._title = title
+
+    @property
+    def status(self):
+        """Gets the status of this ProblemDetails.
+
+        The HTTP status code for this occurrence of the problem.  # noqa: E501
+
+        :return: The status of this ProblemDetails.
+        :rtype: int
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """Sets the status of this ProblemDetails.
+
+        The HTTP status code for this occurrence of the problem.  # noqa: E501
+
+        :param status: The status of this ProblemDetails.
+        :type status: int
+        """
+
+        self._status = status
+
+    @property
+    def detail(self):
+        """Gets the detail of this ProblemDetails.
+
+        A human-readable explanation specific to this occurrence of the problem.  # noqa: E501
+
+        :return: The detail of this ProblemDetails.
+        :rtype: str
+        """
+        return self._detail
+
+    @detail.setter
+    def detail(self, detail):
+        """Sets the detail of this ProblemDetails.
+
+        A human-readable explanation specific to this occurrence of the problem.  # noqa: E501
+
+        :param detail: The detail of this ProblemDetails.
+        :type detail: str
+        """
+
+        self._detail = detail
+
+    @property
+    def instance(self):
+        """Gets the instance of this ProblemDetails.
+
+        string providing an URI formatted according to IETF RFC 3986.  # noqa: E501
+
+        :return: The instance of this ProblemDetails.
+        :rtype: str
+        """
+        return self._instance
+
+    @instance.setter
+    def instance(self, instance):
+        """Sets the instance of this ProblemDetails.
+
+        string providing an URI formatted according to IETF RFC 3986.  # noqa: E501
+
+        :param instance: The instance of this ProblemDetails.
+        :type instance: str
+        """
+
+        self._instance = instance
+
+    @property
+    def cause(self):
+        """Gets the cause of this ProblemDetails.
+
+        A machine-readable application error cause specific to this occurrence of the problem. This IE should be present and provide application-related error information, if available.  # noqa: E501
+
+        :return: The cause of this ProblemDetails.
+        :rtype: str
+        """
+        return self._cause
+
+    @cause.setter
+    def cause(self, cause):
+        """Sets the cause of this ProblemDetails.
+
+        A machine-readable application error cause specific to this occurrence of the problem. This IE should be present and provide application-related error information, if available.  # noqa: E501
+
+        :param cause: The cause of this ProblemDetails.
+        :type cause: str
+        """
+
+        self._cause = cause
+
+    @property
+    def invalid_params(self):
+        """Gets the invalid_params of this ProblemDetails.
+
+        Description of invalid parameters, for a request rejected due to invalid parameters.  # noqa: E501
+
+        :return: The invalid_params of this ProblemDetails.
+        :rtype: List[InvalidParam]
+        """
+        return self._invalid_params
+
+    @invalid_params.setter
+    def invalid_params(self, invalid_params):
+        """Sets the invalid_params of this ProblemDetails.
+
+        Description of invalid parameters, for a request rejected due to invalid parameters.  # noqa: E501
+
+        :param invalid_params: The invalid_params of this ProblemDetails.
+        :type invalid_params: List[InvalidParam]
+        """
+        if invalid_params is not None and len(invalid_params) < 1:
+            raise ValueError("Invalid value for `invalid_params`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._invalid_params = invalid_params
+
+    @property
+    def supported_features(self):
+        """Gets the supported_features of this ProblemDetails.
+
+        A string used to indicate the features supported by an API that is used as defined in clause 6.6 in 3GPP TS 29.500. The string shall contain a bitmask indicating supported features in hexadecimal representation Each character in the string shall take a value of \"0\" to \"9\", \"a\" to \"f\" or \"A\" to \"F\" and shall represent the support of 4 features as described in table 5.2.2-3. The most significant character representing the highest-numbered features shall appear first in the string, and the character representing features 1 to 4 shall appear last in the string. The list of features and their numbering (starting with 1) are defined separately for each API. If the string contains a lower number of characters than there are defined features for an API, all features that would be represented by characters that are not present in the string are not supported  # noqa: E501
+
+        :return: The supported_features of this ProblemDetails.
+        :rtype: str
+        """
+        return self._supported_features
+
+    @supported_features.setter
+    def supported_features(self, supported_features):
+        """Sets the supported_features of this ProblemDetails.
+
+        A string used to indicate the features supported by an API that is used as defined in clause 6.6 in 3GPP TS 29.500. The string shall contain a bitmask indicating supported features in hexadecimal representation Each character in the string shall take a value of \"0\" to \"9\", \"a\" to \"f\" or \"A\" to \"F\" and shall represent the support of 4 features as described in table 5.2.2-3. The most significant character representing the highest-numbered features shall appear first in the string, and the character representing features 1 to 4 shall appear last in the string. The list of features and their numbering (starting with 1) are defined separately for each API. If the string contains a lower number of characters than there are defined features for an API, all features that would be represented by characters that are not present in the string are not supported  # noqa: E501
+
+        :param supported_features: The supported_features of this ProblemDetails.
+        :type supported_features: str
+        """
+        if supported_features is not None and not re.search(r'^[A-Fa-f0-9]*$', supported_features):  # noqa: E501
+            raise ValueError("Invalid value for `supported_features`, must be a follow pattern or equal to `/^[A-Fa-f0-9]*$/`")  # noqa: E501
+
+        self._supported_features = supported_features
diff --git a/services/TS29222_CAPIF_Auditing_API/logs/models/protocol.py b/services/TS29222_CAPIF_Auditing_API/logs/models/protocol.py
new file mode 100644
index 0000000000000000000000000000000000000000..8016cba0c427be10fbbdd3c5e239abdeb94a0960
--- /dev/null
+++ b/services/TS29222_CAPIF_Auditing_API/logs/models/protocol.py
@@ -0,0 +1,42 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from logs.models.base_model_ import Model
+from logs import util
+
+
+class Protocol(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    """
+    allowed enum values
+    """
+    _1_1 = "HTTP_1_1"
+    _2 = "HTTP_2"
+    def __init__(self):  # noqa: E501
+        """Protocol - a model defined in OpenAPI
+
+        """
+        self.openapi_types = {
+        }
+
+        self.attribute_map = {
+        }
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'Protocol':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The Protocol of this Protocol.  # noqa: E501
+        :rtype: Protocol
+        """
+        return util.deserialize_model(dikt, cls)
diff --git a/services/TS29222_CAPIF_Auditing_API/logs/models/protocol_any_of.py b/services/TS29222_CAPIF_Auditing_API/logs/models/protocol_any_of.py
new file mode 100644
index 0000000000000000000000000000000000000000..c6de47fdece14e9ca95daad84067a1122b02aa4f
--- /dev/null
+++ b/services/TS29222_CAPIF_Auditing_API/logs/models/protocol_any_of.py
@@ -0,0 +1,42 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from logs.models.base_model_ import Model
+from logs import util
+
+
+class ProtocolAnyOf(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    """
+    allowed enum values
+    """
+    _1_1 = "HTTP_1_1"
+    _2 = "HTTP_2"
+    def __init__(self):  # noqa: E501
+        """ProtocolAnyOf - a model defined in OpenAPI
+
+        """
+        self.openapi_types = {
+        }
+
+        self.attribute_map = {
+        }
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'ProtocolAnyOf':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The Protocol_anyOf of this ProtocolAnyOf.  # noqa: E501
+        :rtype: ProtocolAnyOf
+        """
+        return util.deserialize_model(dikt, cls)
diff --git a/services/TS29222_CAPIF_Auditing_API/logs/models/security_method.py b/services/TS29222_CAPIF_Auditing_API/logs/models/security_method.py
new file mode 100644
index 0000000000000000000000000000000000000000..ef1ce82fe6fb49d9a82f87e2a95699fe3d2b8931
--- /dev/null
+++ b/services/TS29222_CAPIF_Auditing_API/logs/models/security_method.py
@@ -0,0 +1,42 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from logs.models.base_model_ import Model
+from logs import util
+
+class SecurityMethod(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    """
+    allowed enum values
+    """
+    PSK = "PSK"
+    PKI = "PKI"
+    OAUTH = "OAUTH"
+    def __init__(self):  # noqa: E501
+        """SecurityMethod - a model defined in OpenAPI
+
+        """
+        self.openapi_types = {
+        }
+
+        self.attribute_map = {
+        }
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'SecurityMethod':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The SecurityMethod of this SecurityMethod.  # noqa: E501
+        :rtype: SecurityMethod
+        """
+        return util.deserialize_model(dikt, cls)
diff --git a/services/TS29222_CAPIF_Auditing_API/logs/models/security_method_any_of.py b/services/TS29222_CAPIF_Auditing_API/logs/models/security_method_any_of.py
new file mode 100644
index 0000000000000000000000000000000000000000..cebc8770598e55b7b637025798e3ed0e3a722fb2
--- /dev/null
+++ b/services/TS29222_CAPIF_Auditing_API/logs/models/security_method_any_of.py
@@ -0,0 +1,43 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from logs.models.base_model_ import Model
+from logs import util
+
+
+class SecurityMethodAnyOf(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    """
+    allowed enum values
+    """
+    PSK = "PSK"
+    PKI = "PKI"
+    OAUTH = "OAUTH"
+    def __init__(self):  # noqa: E501
+        """SecurityMethodAnyOf - a model defined in OpenAPI
+
+        """
+        self.openapi_types = {
+        }
+
+        self.attribute_map = {
+        }
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'SecurityMethodAnyOf':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The SecurityMethod_anyOf of this SecurityMethodAnyOf.  # noqa: E501
+        :rtype: SecurityMethodAnyOf
+        """
+        return util.deserialize_model(dikt, cls)
diff --git a/services/TS29222_CAPIF_Auditing_API/logs/openapi/openapi.yaml b/services/TS29222_CAPIF_Auditing_API/logs/openapi/openapi.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..e619908ddac184867500ad9d38bccd2041fdf018
--- /dev/null
+++ b/services/TS29222_CAPIF_Auditing_API/logs/openapi/openapi.yaml
@@ -0,0 +1,664 @@
+openapi: 3.0.0
+info:
+  description: "API for auditing.  \n© 2022, 3GPP Organizational Partners (ARIB, ATIS,\
+    \ CCSA, ETSI, TSDSI, TTA, TTC).  \nAll rights reserved.\n"
+  title: CAPIF_Auditing_API
+  version: 1.2.1
+externalDocs:
+  description: 3GPP TS 29.222 V17.6.0 Common API Framework for 3GPP Northbound APIs
+  url: https://www.3gpp.org/ftp/Specs/archive/29_series/29.222/
+servers:
+- url: "{apiRoot}/logs/v1"
+  variables:
+    apiRoot:
+      default: https://example.com
+      description: apiRoot as defined in clause 7.5 of 3GPP TS 29.222.
+paths:
+  /apiInvocationLogs:
+    get:
+      description: Query and retrieve service API invocation logs stored on the CAPIF
+        core function.
+      operationId: api_invocation_logs_get
+      parameters:
+      - description: String identifying the API exposing function.
+        explode: true
+        in: query
+        name: aef-id
+        required: false
+        schema:
+          type: string
+        style: form
+      - description: String identifying the API invoker which invoked the service
+          API.
+        explode: true
+        in: query
+        name: api-invoker-id
+        required: false
+        schema:
+          type: string
+        style: form
+      - description: Start time of the invocation time range.
+        explode: true
+        in: query
+        name: time-range-start
+        required: false
+        schema:
+          $ref: '#/components/schemas/DateTime'
+        style: form
+      - description: End time of the invocation time range.
+        explode: true
+        in: query
+        name: time-range-end
+        required: false
+        schema:
+          $ref: '#/components/schemas/DateTime'
+        style: form
+      - description: String identifying the API invoked.
+        explode: true
+        in: query
+        name: api-id
+        required: false
+        schema:
+          type: string
+        style: form
+      - description: |
+          API name, it is set as {apiName} part of the URI structure as defined in clause 5.2.4 of 3GPP TS 29.122.
+        explode: true
+        in: query
+        name: api-name
+        required: false
+        schema:
+          type: string
+        style: form
+      - description: Version of the API which was invoked.
+        explode: true
+        in: query
+        name: api-version
+        required: false
+        schema:
+          type: string
+        style: form
+      - description: Protocol invoked.
+        explode: true
+        in: query
+        name: protocol
+        required: false
+        schema:
+          $ref: '#/components/schemas/Protocol'
+        style: form
+      - description: Operation that was invoked on the API.
+        explode: true
+        in: query
+        name: operation
+        required: false
+        schema:
+          $ref: '#/components/schemas/Operation'
+        style: form
+      - description: Result or output of the invocation.
+        explode: true
+        in: query
+        name: result
+        required: false
+        schema:
+          type: string
+        style: form
+      - description: Name of the specific resource invoked.
+        explode: true
+        in: query
+        name: resource-name
+        required: false
+        schema:
+          type: string
+        style: form
+      - description: Interface description of the API invoker.
+        example: "{\"ipv4Addr\": \"192.168.1.7\",\"port\": 8888,\"securityMethods\"\
+          : [\"OAuth\"]}"
+        explode: true
+        in: query
+        name: src-interface
+        required: false
+        schema:
+          type: string
+        style: form
+      - description: Interface description of the API invoked.
+        example: "{\"ipv4Addr\": \"192.168.1.7\",\"port\": 8888,\"securityMethods\"\
+          : [\"OAuth\"]}"
+        explode: true
+        in: query
+        name: dest-interface
+        required: false
+        schema:
+          type: string
+        style: form
+      - description: To filter irrelevant responses related to unsupported features
+        explode: true
+        in: query
+        name: supported-features
+        required: false
+        schema:
+          $ref: '#/components/schemas/SupportedFeatures'
+        style: form
+      responses:
+        "200":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/InvocationLog'
+          description: |
+            Result of the query operation along with fetched service API invocation log data.
+        "307":
+          description: Temporary Redirect
+          headers:
+            Location:
+              description: An alternative URI of the resource.
+              required: true
+              schema:
+                type: string
+        "308":
+          description: Permanent Redirect
+          headers:
+            Location:
+              description: An alternative URI of the resource.
+              required: true
+              schema:
+                type: string
+        "400":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Bad request
+        "401":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Unauthorized
+        "403":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Forbidden
+        "404":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Not Found
+        "406":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Not Acceptable
+        "414":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: URI Too Long
+        "429":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Too Many Requests
+        "500":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Internal Server Error
+        "503":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Service Unavailable
+        default:
+          description: Generic Error
+      x-openapi-router-controller: logs.controllers.default_controller
+components:
+  responses:
+    "307":
+      description: Temporary Redirect
+      headers:
+        Location:
+          description: An alternative URI of the resource.
+          required: true
+          schema:
+            type: string
+    "308":
+      description: Permanent Redirect
+      headers:
+        Location:
+          description: An alternative URI of the resource.
+          required: true
+          schema:
+            type: string
+    "400":
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/ProblemDetails'
+      description: Bad request
+    "401":
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/ProblemDetails'
+      description: Unauthorized
+    "403":
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/ProblemDetails'
+      description: Forbidden
+    "404":
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/ProblemDetails'
+      description: Not Found
+    "406":
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/ProblemDetails'
+      description: Not Acceptable
+    "414":
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/ProblemDetails'
+      description: URI Too Long
+    "429":
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/ProblemDetails'
+      description: Too Many Requests
+    "500":
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/ProblemDetails'
+      description: Internal Server Error
+    "503":
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/ProblemDetails'
+      description: Service Unavailable
+    default:
+      description: Generic Error
+  schemas:
+    DateTime:
+      description: string with format "date-time" as defined in OpenAPI.
+      format: date-time
+      title: DateTime
+      type: string
+    Protocol:
+      description: |
+        Possible values are:
+        - HTTP_1_1: HTTP version 1.1
+        - HTTP_2: HTTP version 2
+      enum:
+      - HTTP_1_1
+      - HTTP_2
+      title: Protocol
+      type: string
+    Operation:
+      description: |
+        Possible values are:
+        - GET: HTTP GET method
+        - POST: HTTP POST method
+        - PUT: HTTP PUT method
+        - PATCH: HTTP PATCH method
+        - DELETE: HTTP DELETE method
+      enum:
+      - GET
+      - POST
+      - PUT
+      - PATCH
+      - DELETE
+      title: Operation
+      type: string
+    InterfaceDescription:
+      description: Represents the description of an API's interface.
+      example:
+        ipv6Addr: ipv6Addr
+        securityMethods:
+        - null
+        - null
+        port: 39500
+        ipv4Addr: ipv4Addr
+      oneOf:
+      - required:
+        - ipv4Addr
+      - required:
+        - ipv6Addr
+      properties:
+        ipv4Addr:
+          description: string identifying a Ipv4 address formatted in the "dotted
+            decimal" notation as defined in IETF RFC 1166.
+          title: ipv4Addr
+          type: string
+        ipv6Addr:
+          description: string identifying a Ipv6 address formatted according to clause
+            4 in IETF RFC 5952. The mixed Ipv4 Ipv6 notation according to clause 5
+            of IETF RFC 5952 shall not be used.
+          title: ipv6Addr
+          type: string
+        port:
+          description: Unsigned integer with valid values between 0 and 65535.
+          maximum: 65535
+          minimum: 0
+          title: port
+          type: integer
+        securityMethods:
+          description: |
+            Security methods supported by the interface, it take precedence over the security methods provided in AefProfile, for this specific interface.
+          items:
+            $ref: '#/components/schemas/SecurityMethod'
+          minItems: 1
+          title: securityMethods
+          type: array
+      title: InterfaceDescription
+      type: object
+    SecurityMethod:
+      description: |
+        Possible values are:
+        - PSK: Security method 1 (Using TLS-PSK) as described in 3GPP TS 33.122
+        - PKI: Security method 2 (Using PKI) as described in 3GPP TS 33.122
+        - OAUTH: Security method 3 (TLS with OAuth token) as described in 3GPP TS 33.122
+      enum:
+      - PSK
+      - PKI
+      - OAUTH
+      title: SecurityMethod
+      type: string
+    SupportedFeatures:
+      description: |
+        A string used to indicate the features supported by an API that is used as defined in clause  6.6 in 3GPP TS 29.500. The string shall contain a bitmask indicating supported features in  hexadecimal representation Each character in the string shall take a value of "0" to "9",  "a" to "f" or "A" to "F" and shall represent the support of 4 features as described in  table 5.2.2-3. The most significant character representing the highest-numbered features shall  appear first in the string, and the character representing features 1 to 4 shall appear last  in the string. The list of features and their numbering (starting with 1) are defined  separately for each API. If the string contains a lower number of characters than there are  defined features for an API, all features that would be represented by characters that are not  present in the string are not supported.
+      pattern: "^[A-Fa-f0-9]*$"
+      title: supportedFeatures
+      type: string
+    InvocationLog:
+      description: |
+        Represents a set of Service API invocation logs to be stored in a CAPIF core function.
+      example:
+        supportedFeatures: supportedFeatures
+        apiInvokerId: apiInvokerId
+        aefId: aefId
+        logs:
+        - apiName: apiName
+          invocationTime: 2000-01-23T04:56:07.000+00:00
+          srcInterface:
+            ipv6Addr: ipv6Addr
+            securityMethods:
+            - null
+            - null
+            port: 39500
+            ipv4Addr: ipv4Addr
+          fwdInterface: fwdInterface
+          resourceName: resourceName
+          uri: uri
+          inputParameters: ""
+          invocationLatency: 0
+          result: result
+          protocol: null
+          apiVersion: apiVersion
+          destInterface:
+            ipv6Addr: ipv6Addr
+            securityMethods:
+            - null
+            - null
+            port: 39500
+            ipv4Addr: ipv4Addr
+          operation: null
+          apiId: apiId
+          outputParameters: ""
+        - apiName: apiName
+          invocationTime: 2000-01-23T04:56:07.000+00:00
+          srcInterface:
+            ipv6Addr: ipv6Addr
+            securityMethods:
+            - null
+            - null
+            port: 39500
+            ipv4Addr: ipv4Addr
+          fwdInterface: fwdInterface
+          resourceName: resourceName
+          uri: uri
+          inputParameters: ""
+          invocationLatency: 0
+          result: result
+          protocol: null
+          apiVersion: apiVersion
+          destInterface:
+            ipv6Addr: ipv6Addr
+            securityMethods:
+            - null
+            - null
+            port: 39500
+            ipv4Addr: ipv4Addr
+          operation: null
+          apiId: apiId
+          outputParameters: ""
+      properties:
+        aefId:
+          description: |
+            Identity information of the API exposing function requesting logging of service API invocations
+          title: aefId
+          type: string
+        apiInvokerId:
+          description: Identity of the API invoker which invoked the service API
+          title: apiInvokerId
+          type: string
+        logs:
+          description: Service API invocation log
+          items:
+            $ref: '#/components/schemas/Log'
+          minItems: 1
+          title: logs
+          type: array
+        supportedFeatures:
+          description: |
+            A string used to indicate the features supported by an API that is used as defined in clause  6.6 in 3GPP TS 29.500. The string shall contain a bitmask indicating supported features in  hexadecimal representation Each character in the string shall take a value of "0" to "9",  "a" to "f" or "A" to "F" and shall represent the support of 4 features as described in  table 5.2.2-3. The most significant character representing the highest-numbered features shall  appear first in the string, and the character representing features 1 to 4 shall appear last  in the string. The list of features and their numbering (starting with 1) are defined  separately for each API. If the string contains a lower number of characters than there are  defined features for an API, all features that would be represented by characters that are not  present in the string are not supported.
+          pattern: "^[A-Fa-f0-9]*$"
+          title: supportedFeatures
+          type: string
+      required:
+      - aefId
+      - apiInvokerId
+      - logs
+      title: InvocationLog
+      type: object
+    Log:
+      description: Represents an individual service API invocation log entry.
+      example:
+        apiName: apiName
+        invocationTime: 2000-01-23T04:56:07.000+00:00
+        srcInterface:
+          ipv6Addr: ipv6Addr
+          securityMethods:
+          - null
+          - null
+          port: 39500
+          ipv4Addr: ipv4Addr
+        fwdInterface: fwdInterface
+        resourceName: resourceName
+        uri: uri
+        inputParameters: ""
+        invocationLatency: 0
+        result: result
+        protocol: null
+        apiVersion: apiVersion
+        destInterface:
+          ipv6Addr: ipv6Addr
+          securityMethods:
+          - null
+          - null
+          port: 39500
+          ipv4Addr: ipv4Addr
+        operation: null
+        apiId: apiId
+        outputParameters: ""
+      properties:
+        apiId:
+          description: String identifying the API invoked.
+          title: apiId
+          type: string
+        apiName:
+          description: |
+            Name of the API which was invoked, it is set as {apiName} part of the URI structure as defined in clause 5.2.4 of 3GPP TS 29.122.
+          title: apiName
+          type: string
+        apiVersion:
+          description: Version of the API which was invoked
+          title: apiVersion
+          type: string
+        resourceName:
+          description: Name of the specific resource invoked
+          title: resourceName
+          type: string
+        uri:
+          description: string providing an URI formatted according to IETF RFC 3986.
+          title: Uri
+          type: string
+        protocol:
+          $ref: '#/components/schemas/Protocol'
+        operation:
+          $ref: '#/components/schemas/Operation'
+        result:
+          description: "For HTTP protocol, it contains HTTP status code of the invocation"
+          title: result
+          type: string
+        invocationTime:
+          description: string with format "date-time" as defined in OpenAPI.
+          format: date-time
+          title: DateTime
+          type: string
+        invocationLatency:
+          description: Unsigned integer identifying a period of time in units of milliseconds.
+          minimum: 0
+          title: DurationMs
+          type: integer
+        inputParameters:
+          description: |
+            List of input parameters. Can be any value - string, number, boolean, array or object.
+          title: inputParameters
+        outputParameters:
+          description: |
+            List of output parameters. Can be any value - string, number, boolean, array or object.
+          title: outputParameters
+        srcInterface:
+          $ref: '#/components/schemas/InterfaceDescription'
+        destInterface:
+          $ref: '#/components/schemas/InterfaceDescription'
+        fwdInterface:
+          description: |
+            It includes the node identifier (as defined in IETF RFC 7239 of all forwarding entities between the API invoker and the AEF, concatenated with comma and space, e.g. 192.0.2.43:80, unknown:_OBFport, 203.0.113.60
+          title: fwdInterface
+          type: string
+      required:
+      - apiId
+      - apiName
+      - apiVersion
+      - protocol
+      - resourceName
+      - result
+      title: Log
+      type: object
+    DurationMs:
+      description: Unsigned integer identifying a period of time in units of milliseconds.
+      minimum: 0
+      title: DurationMs
+      type: integer
+    ProblemDetails:
+      description: Represents additional information and details on an error response.
+      properties:
+        type:
+          description: string providing an URI formatted according to IETF RFC 3986.
+          title: Uri
+          type: string
+        title:
+          description: "A short, human-readable summary of the problem type. It should\
+            \ not change from occurrence to occurrence of the problem."
+          title: title
+          type: string
+        status:
+          description: The HTTP status code for this occurrence of the problem.
+          title: status
+          type: integer
+        detail:
+          description: A human-readable explanation specific to this occurrence of
+            the problem.
+          title: detail
+          type: string
+        instance:
+          description: string providing an URI formatted according to IETF RFC 3986.
+          title: Uri
+          type: string
+        cause:
+          description: "A machine-readable application error cause specific to this\
+            \ occurrence of the problem. This IE should be present and provide application-related\
+            \ error information, if available."
+          title: cause
+          type: string
+        invalidParams:
+          description: "Description of invalid parameters, for a request rejected\
+            \ due to invalid parameters."
+          items:
+            $ref: '#/components/schemas/InvalidParam'
+          minItems: 1
+          title: invalidParams
+          type: array
+        supportedFeatures:
+          description: |
+            A string used to indicate the features supported by an API that is used as defined in clause  6.6 in 3GPP TS 29.500. The string shall contain a bitmask indicating supported features in  hexadecimal representation Each character in the string shall take a value of "0" to "9",  "a" to "f" or "A" to "F" and shall represent the support of 4 features as described in  table 5.2.2-3. The most significant character representing the highest-numbered features shall  appear first in the string, and the character representing features 1 to 4 shall appear last  in the string. The list of features and their numbering (starting with 1) are defined  separately for each API. If the string contains a lower number of characters than there are  defined features for an API, all features that would be represented by characters that are not  present in the string are not supported.
+          pattern: "^[A-Fa-f0-9]*$"
+          title: supportedFeatures
+          type: string
+      title: ProblemDetails
+      type: object
+    Uri:
+      description: string providing an URI formatted according to IETF RFC 3986.
+      title: Uri
+      type: string
+    InvalidParam:
+      description: "Represents the description of invalid parameters, for a request\
+        \ rejected due to invalid parameters."
+      properties:
+        param:
+          description: "Attribute's name encoded as a JSON Pointer, or header's name."
+          title: param
+          type: string
+        reason:
+          description: "A human-readable reason, e.g. \"must be a positive integer\"\
+            ."
+          title: reason
+          type: string
+      required:
+      - param
+      title: InvalidParam
+      type: object
+    Ipv4Addr:
+      description: string identifying a Ipv4 address formatted in the "dotted decimal"
+        notation as defined in IETF RFC 1166.
+      title: ipv4Addr
+      type: string
+    Ipv6Addr:
+      description: string identifying a Ipv6 address formatted according to clause
+        4 in IETF RFC 5952. The mixed Ipv4 Ipv6 notation according to clause 5 of
+        IETF RFC 5952 shall not be used.
+      title: ipv6Addr
+      type: string
+    Port:
+      description: Unsigned integer with valid values between 0 and 65535.
+      maximum: 65535
+      minimum: 0
+      title: port
+      type: integer
diff --git a/services/TS29222_CAPIF_Auditing_API/logs/typing_utils.py b/services/TS29222_CAPIF_Auditing_API/logs/typing_utils.py
new file mode 100644
index 0000000000000000000000000000000000000000..0563f81fd5345282a33705038dfa77fdcaa15872
--- /dev/null
+++ b/services/TS29222_CAPIF_Auditing_API/logs/typing_utils.py
@@ -0,0 +1,32 @@
+# coding: utf-8
+
+import sys
+
+if sys.version_info < (3, 7):
+    import typing
+
+    def is_generic(klass):
+        """ Determine whether klass is a generic class """
+        return type(klass) == typing.GenericMeta
+
+    def is_dict(klass):
+        """ Determine whether klass is a Dict """
+        return klass.__extra__ == dict
+
+    def is_list(klass):
+        """ Determine whether klass is a List """
+        return klass.__extra__ == list
+
+else:
+
+    def is_generic(klass):
+        """ Determine whether klass is a generic class """
+        return hasattr(klass, '__origin__')
+
+    def is_dict(klass):
+        """ Determine whether klass is a Dict """
+        return klass.__origin__ == dict
+
+    def is_list(klass):
+        """ Determine whether klass is a List """
+        return klass.__origin__ == list
diff --git a/services/TS29222_CAPIF_Auditing_API/logs/util.py b/services/TS29222_CAPIF_Auditing_API/logs/util.py
new file mode 100644
index 0000000000000000000000000000000000000000..ff812577975f62d6488f6ebc71bbed8492b7c0d3
--- /dev/null
+++ b/services/TS29222_CAPIF_Auditing_API/logs/util.py
@@ -0,0 +1,186 @@
+import datetime
+
+import six
+import typing
+from logs import typing_utils
+
+def clean_empty(d):
+    if isinstance(d, dict):
+        return {
+            k: v
+            for k, v in ((k, clean_empty(v)) for k, v in d.items())
+            if v
+        }
+    if isinstance(d, list):
+        return [v for v in map(clean_empty, d) if v]
+    return d
+
+def dict_to_camel_case(my_dict):
+
+
+        result = {}
+
+        for attr, value in my_dict.items():
+
+            my_key = ''.join(word.title() for word in attr.split('_'))
+            my_key= ''.join([my_key[0].lower(), my_key[1:]])
+            if my_key == "serviceApiCategory":
+                my_key = "serviceAPICategory"
+
+            if isinstance(value, list):
+                result[my_key] = list(map(
+                    lambda x: dict_to_camel_case(x) if isinstance(x, dict) else x, value ))
+
+            elif hasattr(value, "to_dict"):
+                result[my_key] = dict_to_camel_case(value)
+
+            elif isinstance(value, dict):
+                value = dict_to_camel_case(value)
+                result[my_key] = value
+            else:
+                result[my_key] = value
+
+        return result
+
+
+def _deserialize(data, klass):
+    """Deserializes dict, list, str into an object.
+
+    :param data: dict, list or str.
+    :param klass: class literal, or string of class name.
+
+    :return: object.
+    """
+    if data is None:
+        return None
+
+    if klass in six.integer_types or klass in (float, str, bool, bytearray):
+        return _deserialize_primitive(data, klass)
+    elif klass == object:
+        return _deserialize_object(data)
+    elif klass == datetime.date:
+        return deserialize_date(data)
+    elif klass == datetime.datetime:
+        return deserialize_datetime(data)
+    elif typing_utils.is_generic(klass):
+        if typing_utils.is_list(klass):
+            return _deserialize_list(data, klass.__args__[0])
+        if typing_utils.is_dict(klass):
+            return _deserialize_dict(data, klass.__args__[1])
+    else:
+        return deserialize_model(data, klass)
+
+
+def _deserialize_primitive(data, klass):
+    """Deserializes to primitive type.
+
+    :param data: data to deserialize.
+    :param klass: class literal.
+
+    :return: int, long, float, str, bool.
+    :rtype: int | long | float | str | bool
+    """
+    try:
+        value = klass(data)
+    except UnicodeEncodeError:
+        value = six.u(data)
+    except TypeError:
+        value = data
+    return value
+
+
+def _deserialize_object(value):
+    """Return an original value.
+
+    :return: object.
+    """
+    return value
+
+
+def deserialize_date(string):
+    """Deserializes string to date.
+
+    :param string: str.
+    :type string: str
+    :return: date.
+    :rtype: date
+    """
+    if string is None:
+      return None
+    
+    try:
+        from dateutil.parser import parse
+        return parse(string).date()
+    except ImportError:
+        return string
+
+
+def deserialize_datetime(string):
+    """Deserializes string to datetime.
+
+    The string should be in iso8601 datetime format.
+
+    :param string: str.
+    :type string: str
+    :return: datetime.
+    :rtype: datetime
+    """
+    if string is None:
+      return None
+    
+    try:
+        from dateutil.parser import parse
+        return parse(string)
+    except ImportError:
+        return string
+
+
+def deserialize_model(data, klass):
+    """Deserializes list or dict to model.
+
+    :param data: dict, list.
+    :type data: dict | list
+    :param klass: class literal.
+    :return: model object.
+    """
+    instance = klass()
+
+    if not instance.openapi_types:
+        return data
+
+    for attr, attr_type in six.iteritems(instance.openapi_types):
+        if data is not None \
+                and instance.attribute_map[attr] in data \
+                and isinstance(data, (list, dict)):
+            value = data[instance.attribute_map[attr]]
+            setattr(instance, attr, _deserialize(value, attr_type))
+
+    return instance
+
+
+def _deserialize_list(data, boxed_type):
+    """Deserializes a list and its elements.
+
+    :param data: list to deserialize.
+    :type data: list
+    :param boxed_type: class literal.
+
+    :return: deserialized list.
+    :rtype: list
+    """
+    return [_deserialize(sub_data, boxed_type)
+            for sub_data in data]
+
+
+def _deserialize_dict(data, boxed_type):
+    """Deserializes a dict and its elements.
+
+    :param data: dict to deserialize.
+    :type data: dict
+    :param boxed_type: class literal.
+
+    :return: deserialized dict.
+    :rtype: dict
+    """
+    return {k: _deserialize(v, boxed_type)
+            for k, v in six.iteritems(data)}
diff --git a/services/TS29222_CAPIF_Auditing_API/requirements.txt b/services/TS29222_CAPIF_Auditing_API/requirements.txt
new file mode 100644
index 0000000000000000000000000000000000000000..197399ff21107a2e3f2edc6519445c38b38de335
--- /dev/null
+++ b/services/TS29222_CAPIF_Auditing_API/requirements.txt
@@ -0,0 +1,20 @@
+connexion[swagger-ui] == 2.14.2; python_version>="3.6"
+swagger-ui-bundle >= 0.0.2
+python_dateutil >= 2.6.0
+setuptools >= 21.0.0
+Flask == 2.0.3
+pymongo == 4.0.1
+elasticsearch == 8.4.3
+flask_jwt_extended == 4.4.4
+opentelemetry-instrumentation == 0.38b0
+opentelemetry-instrumentation-flask == 0.38b0
+opentelemetry-instrumentation-redis == 0.38b0
+opentelemetry-instrumentation-pymongo == 0.38b0
+opentelemetry-exporter-otlp == 1.17.0
+opentelemetry-exporter-jaeger==1.17.0
+fluent == 0.10.0
+fluent-logger == 0.10.0
+opentelemetry-api == 1.17.0
+opentelemetry-sdk == 1.17.0
+flask_executor == 1.0.0
+pyopenssl == 23.0.0
diff --git a/services/TS29222_CAPIF_Auditing_API/setup.py b/services/TS29222_CAPIF_Auditing_API/setup.py
new file mode 100644
index 0000000000000000000000000000000000000000..65778780707cbf453302647c2c222081f01ab422
--- /dev/null
+++ b/services/TS29222_CAPIF_Auditing_API/setup.py
@@ -0,0 +1,39 @@
+# coding: utf-8
+
+import sys
+from setuptools import setup, find_packages
+
+NAME = "logs"
+VERSION = "1.0.0"
+
+# To install the library, run the following
+#
+# python setup.py install
+#
+# prerequisite: setuptools
+# http://pypi.python.org/pypi/setuptools
+
+REQUIRES = [
+    "connexion>=2.0.2",
+    "swagger-ui-bundle>=0.0.2",
+    "python_dateutil>=2.6.0"
+]
+
+setup(
+    name=NAME,
+    version=VERSION,
+    description="CAPIF_Auditing_API",
+    author_email="",
+    url="",
+    keywords=["OpenAPI", "CAPIF_Auditing_API"],
+    install_requires=REQUIRES,
+    packages=find_packages(),
+    package_data={'': ['openapi/openapi.yaml']},
+    include_package_data=True,
+    entry_points={
+        'console_scripts': ['logs=logs.__main__:main']},
+    long_description="""\
+    API for auditing. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. 
+    """
+)
+
diff --git a/services/TS29222_CAPIF_Auditing_API/test-requirements.txt b/services/TS29222_CAPIF_Auditing_API/test-requirements.txt
new file mode 100644
index 0000000000000000000000000000000000000000..0970f28c7c5a344d7fd9b9c893c584e7336df266
--- /dev/null
+++ b/services/TS29222_CAPIF_Auditing_API/test-requirements.txt
@@ -0,0 +1,4 @@
+pytest~=4.6.7 # needed for python 2.7+3.4
+pytest-cov>=2.8.1
+pytest-randomly==1.2.3 # needed for python 2.7+3.4
+Flask-Testing==0.8.0
diff --git a/services/TS29222_CAPIF_Auditing_API/tox.ini b/services/TS29222_CAPIF_Auditing_API/tox.ini
new file mode 100644
index 0000000000000000000000000000000000000000..865c84958eb54cb4c30ea558c1d26f9bc10bd19f
--- /dev/null
+++ b/services/TS29222_CAPIF_Auditing_API/tox.ini
@@ -0,0 +1,11 @@
+[tox]
+envlist = py3
+skipsdist=True
+
+[testenv]
+deps=-r{toxinidir}/requirements.txt
+     -r{toxinidir}/test-requirements.txt
+	 {toxinidir}
+
+commands=
+   pytest --cov=logs
diff --git a/services/TS29222_CAPIF_Discover_Service_API/.dockerignore b/services/TS29222_CAPIF_Discover_Service_API/.dockerignore
new file mode 100644
index 0000000000000000000000000000000000000000..f9619601908b43d5d90c9befea5aa6ef6a732fa9
--- /dev/null
+++ b/services/TS29222_CAPIF_Discover_Service_API/.dockerignore
@@ -0,0 +1,72 @@
+.travis.yaml
+.openapi-generator-ignore
+README.md
+tox.ini
+git_push.sh
+test-requirements.txt
+setup.py
+
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+env/
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*,cover
+.hypothesis/
+venv/
+.python-version
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+#Ipython Notebook
+.ipynb_checkpoints
diff --git a/services/TS29222_CAPIF_Discover_Service_API/.gitignore b/services/TS29222_CAPIF_Discover_Service_API/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..43995bd42fa23bbc4c3a59d5fb9da99042fcf139
--- /dev/null
+++ b/services/TS29222_CAPIF_Discover_Service_API/.gitignore
@@ -0,0 +1,66 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+env/
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*,cover
+.hypothesis/
+venv/
+.venv/
+.python-version
+.pytest_cache
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+#Ipython Notebook
+.ipynb_checkpoints
diff --git a/services/TS29222_CAPIF_Discover_Service_API/.openapi-generator-ignore b/services/TS29222_CAPIF_Discover_Service_API/.openapi-generator-ignore
new file mode 100644
index 0000000000000000000000000000000000000000..7484ee590a3894506cf063799b885428f95a71be
--- /dev/null
+++ b/services/TS29222_CAPIF_Discover_Service_API/.openapi-generator-ignore
@@ -0,0 +1,23 @@
+# OpenAPI Generator Ignore
+# Generated by openapi-generator https://github.com/openapitools/openapi-generator
+
+# Use this file to prevent files from being overwritten by the generator.
+# The patterns follow closely to .gitignore or .dockerignore.
+
+# As an example, the C# client generator defines ApiClient.cs.
+# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line:
+#ApiClient.cs
+
+# You can match any string of characters against a directory, file or extension with a single asterisk (*):
+#foo/*/qux
+# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
+
+# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
+#foo/**/qux
+# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
+
+# You can also negate patterns with an exclamation (!).
+# For example, you can ignore all files in a docs folder with the file extension .md:
+#docs/*.md
+# Then explicitly reverse the ignore rule for a single file:
+#!docs/README.md
diff --git a/services/TS29222_CAPIF_Discover_Service_API/.openapi-generator/FILES b/services/TS29222_CAPIF_Discover_Service_API/.openapi-generator/FILES
new file mode 100644
index 0000000000000000000000000000000000000000..e51407a84d6773ba25fcc8ecfcdd1043458ba25a
--- /dev/null
+++ b/services/TS29222_CAPIF_Discover_Service_API/.openapi-generator/FILES
@@ -0,0 +1,43 @@
+.dockerignore
+.gitignore
+.travis.yml
+Dockerfile
+README.md
+git_push.sh
+requirements.txt
+service_apis/__init__.py
+service_apis/__main__.py
+service_apis/controllers/__init__.py
+service_apis/controllers/default_controller.py
+service_apis/controllers/security_controller_.py
+service_apis/encoder.py
+service_apis/models/__init__.py
+service_apis/models/aef_profile.py
+service_apis/models/base_model_.py
+service_apis/models/communication_type.py
+service_apis/models/communication_type_any_of.py
+service_apis/models/custom_operation.py
+service_apis/models/data_format.py
+service_apis/models/data_format_any_of.py
+service_apis/models/discovered_apis.py
+service_apis/models/interface_description.py
+service_apis/models/invalid_param.py
+service_apis/models/operation.py
+service_apis/models/operation_any_of.py
+service_apis/models/problem_details.py
+service_apis/models/protocol.py
+service_apis/models/protocol_any_of.py
+service_apis/models/published_api_path.py
+service_apis/models/resource.py
+service_apis/models/security_method.py
+service_apis/models/security_method_any_of.py
+service_apis/models/service_api_description.py
+service_apis/models/shareable_information.py
+service_apis/models/version.py
+service_apis/openapi/openapi.yaml
+service_apis/test/__init__.py
+service_apis/typing_utils.py
+service_apis/util.py
+setup.py
+test-requirements.txt
+tox.ini
diff --git a/services/TS29222_CAPIF_Discover_Service_API/.openapi-generator/VERSION b/services/TS29222_CAPIF_Discover_Service_API/.openapi-generator/VERSION
new file mode 100644
index 0000000000000000000000000000000000000000..4b448de535c7dd619da0df6d8221995dbd5d118a
--- /dev/null
+++ b/services/TS29222_CAPIF_Discover_Service_API/.openapi-generator/VERSION
@@ -0,0 +1 @@
+5.3.0-SNAPSHOT
\ No newline at end of file
diff --git a/services/TS29222_CAPIF_Discover_Service_API/.travis.yml b/services/TS29222_CAPIF_Discover_Service_API/.travis.yml
new file mode 100644
index 0000000000000000000000000000000000000000..ad71ee5ca083a6923c91104533c5c7b86f297f3f
--- /dev/null
+++ b/services/TS29222_CAPIF_Discover_Service_API/.travis.yml
@@ -0,0 +1,14 @@
+# ref: https://docs.travis-ci.com/user/languages/python
+language: python
+python:
+  - "3.2"
+  - "3.3"
+  - "3.4"
+  - "3.5"
+  - "3.6"
+  - "3.7"
+  - "3.8"
+# command to install dependencies
+install: "pip install -r requirements.txt"
+# command to run tests
+script: nosetests
diff --git a/services/TS29222_CAPIF_Discover_Service_API/Dockerfile b/services/TS29222_CAPIF_Discover_Service_API/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..efa70c90c56f5e1cb49d14f0c551f2ce04a924e0
--- /dev/null
+++ b/services/TS29222_CAPIF_Discover_Service_API/Dockerfile
@@ -0,0 +1,17 @@
+FROM public.ecr.aws/o2v4a8t6/opencapif/python:3-alpine
+
+RUN mkdir -p /usr/src/app
+WORKDIR /usr/src/app
+
+COPY requirements.txt /usr/src/app/requirements.txt
+
+RUN apk add -U --no-cache gcc build-base linux-headers ca-certificates libffi-dev libressl-dev libxslt-dev
+RUN pip3 install --no-cache-dir -r requirements.txt
+
+COPY . /usr/src/app
+
+EXPOSE 8080
+
+ENTRYPOINT ["python3"]
+
+CMD ["-m", "service_apis"]
\ No newline at end of file
diff --git a/services/TS29222_CAPIF_Discover_Service_API/README.md b/services/TS29222_CAPIF_Discover_Service_API/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..f522a7de8792c85b4b772ac934da91bc1be45fb1
--- /dev/null
+++ b/services/TS29222_CAPIF_Discover_Service_API/README.md
@@ -0,0 +1,49 @@
+# OpenAPI generated server
+
+## Overview
+This server was generated by the [OpenAPI Generator](https://openapi-generator.tech) project. By using the
+[OpenAPI-Spec](https://openapis.org) from a remote server, you can easily generate a server stub.  This
+is an example of building a OpenAPI-enabled Flask server.
+
+This example uses the [Connexion](https://github.com/zalando/connexion) library on top of Flask.
+
+## Requirements
+Python 3.5.2+
+
+## Usage
+To run the server, please execute the following from the root directory:
+
+```
+pip3 install -r requirements.txt
+python3 -m service_apis
+```
+
+and open your browser to here:
+
+```
+http://localhost:8080/service-apis/v1/ui/
+```
+
+Your OpenAPI definition lives here:
+
+```
+http://localhost:8080/service-apis/v1/openapi.json
+```
+
+To launch the integration tests, use tox:
+```
+sudo pip install tox
+tox
+```
+
+## Running with Docker
+
+To run the server on a Docker container, please execute the following from the root directory:
+
+```bash
+# building the image
+docker build -t service_apis .
+
+# starting up a container
+docker run -p 8080:8080 service_apis
+```
\ No newline at end of file
diff --git a/services/TS29222_CAPIF_Discover_Service_API/config.yaml b/services/TS29222_CAPIF_Discover_Service_API/config.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..6257115b4f972041d4b01b50419283f8ce1657a3
--- /dev/null
+++ b/services/TS29222_CAPIF_Discover_Service_API/config.yaml
@@ -0,0 +1,21 @@
+mongo: {
+  'user': 'root',
+  'password': 'example',
+  'db': 'capif',
+  'col': 'serviceapidescriptions',
+  'invokers_col': 'invokerdetails',
+  'capif_users_col': "user",
+  'host': 'mongo',
+  'port': "27017"
+}
+
+monitoring: {
+  "fluent_bit_host": fluent-bit,
+  "fluent_bit_port": 24224,
+  "opentelemetry_url": "otel-collector",
+  "opentelemetry_port": "55680",
+  "opentelemetry_max_queue_size": 8192,
+  "opentelemetry_schedule_delay_millis": 20000,
+  "opentelemetry_max_export_batch_size": 2048,
+  "opentelemetry_export_timeout_millis": 60000
+}
\ No newline at end of file
diff --git a/services/TS29222_CAPIF_Discover_Service_API/git_push.sh b/services/TS29222_CAPIF_Discover_Service_API/git_push.sh
new file mode 100644
index 0000000000000000000000000000000000000000..9405f72e950cdb8ca24c3cf4d15cee7eac62fde7
--- /dev/null
+++ b/services/TS29222_CAPIF_Discover_Service_API/git_push.sh
@@ -0,0 +1,57 @@
+#!/bin/sh
+# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
+#
+# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl "minor update" "gitlab.com"
+
+git_user_id=$1
+git_repo_id=$2
+release_note=$3
+git_host=$4
+
+if [ "$git_host" = "" ]; then
+    git_host="github.com"
+    echo "[INFO] No command line input provided. Set \$git_host to $git_host"
+fi
+
+if [ "$git_user_id" = "" ]; then
+    git_user_id="GIT_USER_ID"
+    echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id"
+fi
+
+if [ "$git_repo_id" = "" ]; then
+    git_repo_id="GIT_REPO_ID"
+    echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id"
+fi
+
+if [ "$release_note" = "" ]; then
+    release_note="Minor update"
+    echo "[INFO] No command line input provided. Set \$release_note to $release_note"
+fi
+
+# Initialize the local directory as a Git repository
+git init
+
+# Adds the files in the local repository and stages them for commit.
+git add .
+
+# Commits the tracked changes and prepares them to be pushed to a remote repository.
+git commit -m "$release_note"
+
+# Sets the new remote
+git_remote=`git remote`
+if [ "$git_remote" = "" ]; then # git remote not defined
+
+    if [ "$GIT_TOKEN" = "" ]; then
+        echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git credential in your environment."
+        git remote add origin https://${git_host}/${git_user_id}/${git_repo_id}.git
+    else
+        git remote add origin https://${git_user_id}:${GIT_TOKEN}@${git_host}/${git_user_id}/${git_repo_id}.git
+    fi
+
+fi
+
+git pull origin master
+
+# Pushes (Forces) the changes in the local repository up to the remote repository
+echo "Git pushing to https://${git_host}/${git_user_id}/${git_repo_id}.git"
+git push origin master 2>&1 | grep -v 'To https'
diff --git a/services/TS29222_CAPIF_Discover_Service_API/requirements.txt b/services/TS29222_CAPIF_Discover_Service_API/requirements.txt
new file mode 100644
index 0000000000000000000000000000000000000000..33a22f4690946e965ae42ce289caff1fb2c707ac
--- /dev/null
+++ b/services/TS29222_CAPIF_Discover_Service_API/requirements.txt
@@ -0,0 +1,22 @@
+connexion[swagger-ui] == 2.14.2; python_version>="3.6"
+swagger-ui-bundle >= 0.0.2
+python_dateutil >= 2.6.0
+setuptools >= 21.0.0
+Flask == 2.0.3
+pymongo == 4.0.1
+flask_jwt_extended == 4.4.4
+pyopenssl == 23.0.0
+rfc3987 == 1.3.8
+redis ==  4.5.4
+opentelemetry-instrumentation == 0.38b0
+opentelemetry-instrumentation-flask == 0.38b0
+opentelemetry-instrumentation-redis == 0.38b0
+opentelemetry-instrumentation-pymongo == 0.38b0
+opentelemetry-exporter-otlp == 1.17.0
+opentelemetry-exporter-jaeger==1.17.0
+fluent == 0.10.0
+fluent-logger == 0.10.0
+opentelemetry-api == 1.17.0
+opentelemetry-sdk == 1.17.0
+flask_executor == 1.0.0
+flask_executor == 1.0.0
\ No newline at end of file
diff --git a/services/TS29222_CAPIF_Discover_Service_API/service_apis/__init__.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/services/TS29222_CAPIF_Discover_Service_API/service_apis/__main__.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/__main__.py
new file mode 100644
index 0000000000000000000000000000000000000000..57326e94c3687e466735d998c4c7da75b64509a8
--- /dev/null
+++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/__main__.py
@@ -0,0 +1,131 @@
+#!/usr/bin/env python3
+
+import connexion
+
+from service_apis import encoder
+
+import pymongo
+import logging
+from flask import Flask, jsonify, request
+from flask_jwt_extended import JWTManager, jwt_required, create_access_token
+from pymongo import MongoClient
+from logging.handlers import RotatingFileHandler
+from .config import Config
+import os
+from fluent import sender
+from flask_executor import Executor
+from opentelemetry.instrumentation.flask import FlaskInstrumentor
+from opentelemetry import trace
+from opentelemetry.exporter.otlp.proto.grpc.trace_exporter import OTLPSpanExporter
+from opentelemetry.trace.propagation.tracecontext import TraceContextTextMapPropagator
+from opentelemetry.sdk.resources import Resource
+from opentelemetry.sdk.trace import TracerProvider
+from opentelemetry.sdk.trace.export import BatchSpanProcessor
+from opentelemetry.instrumentation.redis import RedisInstrumentor
+
+
+
+NAME = "Discover-Service"
+
+def configure_monitoring(app, config):
+
+    resource = Resource(attributes={"service.name": NAME})
+
+    fluent_bit_host = config['monitoring']['fluent_bit_host']
+    fluent_bit_port = config['monitoring']['fluent_bit_port']
+    fluent_bit_sender = sender.FluentSender('Discover-Service', host=fluent_bit_host, port=fluent_bit_port)
+    propagator = TraceContextTextMapPropagator()
+
+    tracer_provider = TracerProvider(resource=resource)
+    trace.set_tracer_provider(tracer_provider)
+    exporter = OTLPSpanExporter(endpoint=f"http://{config['monitoring']['opentelemetry_url']}:{config['monitoring']['opentelemetry_port']}", insecure=True)
+    span_processor = BatchSpanProcessor(
+        exporter,
+        max_queue_size=config['monitoring']['opentelemetry_max_queue_size'],
+        schedule_delay_millis=config['monitoring']['opentelemetry_schedule_delay_millis'],
+        max_export_batch_size=config['monitoring']['opentelemetry_max_export_batch_size'],
+        export_timeout_millis=config['monitoring']['opentelemetry_export_timeout_millis'],
+    )
+
+    trace.get_tracer_provider().add_span_processor(span_processor)
+
+    FlaskInstrumentor().instrument_app(app)
+
+    RedisInstrumentor().instrument()
+
+    class FluentBitHandler(logging.Handler):
+
+        def __init__(self):
+            logging.Handler.__init__(self)
+
+        def emit(self, record):
+            log_entry = self.format(record)
+            log_data = {
+                'message': log_entry,
+                'level': record.levelname,
+                'timestamp': record.created,
+                'logger': record.name,
+                'function': record.funcName,
+                'line': record.lineno,
+                'container_name': os.environ.get('CONTAINER_NAME', ''),
+            }
+
+            # # Obtener el trace ID actual
+            current_context = trace.get_current_span().get_span_context()
+
+            trace_id = current_context.trace_id
+            traceparent_id = current_context.span_id
+            log_data['traceID'] = hex(trace_id)[2:]
+            if traceparent_id != None:
+                log_data['traceparent'] = hex(traceparent_id)[2:]
+            fluent_bit_sender.emit('Discover-Service', log_data)
+
+    loggers = [app.logger, ]
+    for l in loggers:
+         l.addHandler(FluentBitHandler())
+
+
+def configure_logging(app):
+    del app.logger.handlers[:]
+    loggers = [app.logger, ]
+    handlers = []
+    console_handler = logging.StreamHandler()
+    console_handler.setLevel(logging.DEBUG)
+    console_handler.setFormatter(verbose_formatter())
+    file_handler = RotatingFileHandler(filename="discover_logs.log", maxBytes=1024 * 1024 * 100, backupCount=20)
+    file_handler.setLevel(logging.DEBUG)
+    file_handler.setFormatter(verbose_formatter())
+    handlers.append(console_handler)
+    handlers.append(file_handler)
+
+    for l in loggers:
+        for handler in handlers:
+            l.addHandler(handler)
+        l.propagate = False
+        l.setLevel(logging.DEBUG)
+
+def verbose_formatter():
+    return logging.Formatter(
+        '{"timestamp": "%(asctime)s", "level": "%(levelname)s", "logger": "%(name)s", "function": "%(funcName)s", "line": %(lineno)d, "message": %(message)s}',
+        datefmt='%d/%m/%Y %H:%M:%S'
+    )
+
+app = connexion.App(__name__, specification_dir='./openapi/')
+app.app.json_encoder = encoder.JSONEncoder
+app.add_api('openapi.yaml',
+            arguments={'title': 'CAPIF_Discover_Service_API'},
+            pythonic_params=True)
+
+app.app.config["JWT_SECRET_KEY"] = "this-is-secret-key"
+configure_logging(app.app)
+
+config = Config()
+
+if eval(os.environ.get("MONITORING").lower().capitalize()):
+    configure_monitoring(app.app, config.get_config())
+
+jwt = JWTManager(app.app)
+
+
+if __name__ == '__main__':
+    app.run(debug=True, port=8080)
diff --git a/services/TS29222_CAPIF_Discover_Service_API/service_apis/config.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/config.py
new file mode 100644
index 0000000000000000000000000000000000000000..d04bd1acd87603f491b09f464d8db1d6cdc52ad7
--- /dev/null
+++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/config.py
@@ -0,0 +1,20 @@
+import yaml
+import os
+
+#Config class to get config
+class Config:
+	def __init__(self):
+		self.cached = 0
+		self.file="./config.yaml"
+		self.my_config = {}
+
+		stamp = os.stat(self.file).st_mtime
+		if stamp != self.cached:
+			self.cached = stamp
+			f = open(self.file)
+			self.my_config = yaml.safe_load(f)
+			f.close()
+
+	def get_config(self):
+		return self.my_config
+
diff --git a/services/TS29222_CAPIF_Discover_Service_API/service_apis/controllers/__init__.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/controllers/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/services/TS29222_CAPIF_Discover_Service_API/service_apis/controllers/default_controller.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/controllers/default_controller.py
new file mode 100644
index 0000000000000000000000000000000000000000..aef2022efcf54738587431c9a84a38b43a8dcc09
--- /dev/null
+++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/controllers/default_controller.py
@@ -0,0 +1,48 @@
+import sys
+
+from service_apis.core.discoveredapis import DiscoverApisOperations
+import json
+from flask import Response, request, current_app
+from service_apis.encoder import JSONEncoder
+from service_apis.models.problem_details import ProblemDetails
+from cryptography import x509
+from cryptography.hazmat.backends import default_backend
+import pymongo
+
+discover_apis = DiscoverApisOperations()
+
+def all_service_apis_get(api_invoker_id, api_name=None, api_version=None, comm_type=None, protocol=None, aef_id=None, data_format=None, api_cat=None, supported_features=None, api_supported_features=None):  # noqa: E501
+    """all_service_apis_get
+
+    Discover published service APIs and retrieve a collection of APIs according to certain filter criteria. # noqa: E501
+
+    :param api_invoker_id: String identifying the API invoker assigned by the CAPIF core function. It also represents the CCF identifier in the CAPIF-6/6e interface.
+    :type api_invoker_id: str
+    :param api_name: API name, it is set as {apiName} part of the URI structure as defined in subclause 4.4 of 3GPP TS 29.501.
+    :type api_name: str
+    :param api_version: API major version the URI (e.g. v1).
+    :type api_version: str
+    :param comm_type: Communication type used by the API (e.g. REQUEST_RESPONSE).
+    :type comm_type: dict | bytes
+    :param protocol: Protocol used by the API.
+    :type protocol: dict | bytes
+    :param aef_id: AEF identifer.
+    :type aef_id: str
+    :param data_format: Data formats used by the API (e.g. serialization protocol JSON used).
+    :type data_format: dict | bytes
+    :param api_cat: The service API category to which the service API belongs to.
+    :type api_cat: str
+    :param supported_features: Features supported by the NF consumer for the CAPIF Discover Service API.
+    :type supported_features: str
+    :param api_supported_features: Features supported by the discovered service API indicated by api-name parameter. This may only be present if api-name query parameter is present.
+    :type api_supported_features: str
+
+    :rtype: DiscoveredAPIs
+    """
+
+    current_app.logger.info("Discovering service apis")
+    query_params = {"api_name":api_name, "api_version":api_version, "comm_type":comm_type, 
+    "protocol":protocol, "aef_id":aef_id, "data_format":data_format, 
+    "api_cat":api_cat, "supported_features":supported_features, "api_supported_features":api_supported_features}
+    response = discover_apis.get_discoveredapis(api_invoker_id, query_params)
+    return response
diff --git a/services/TS29222_CAPIF_Discover_Service_API/service_apis/controllers/security_controller_.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/controllers/security_controller_.py
new file mode 100644
index 0000000000000000000000000000000000000000..6d294ffd6df1a26a469dbb4e72533b01503468dd
--- /dev/null
+++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/controllers/security_controller_.py
@@ -0,0 +1,2 @@
+from typing import List
+
diff --git a/services/TS29222_CAPIF_Discover_Service_API/service_apis/core/discoveredapis.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/core/discoveredapis.py
new file mode 100644
index 0000000000000000000000000000000000000000..5114c305650370db1ec592f16724e1db7ead0c91
--- /dev/null
+++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/core/discoveredapis.py
@@ -0,0 +1,65 @@
+import sys
+
+import pymongo
+from flask import current_app, Flask, Response
+import json
+from service_apis.core.responses import internal_server_error, forbidden_error ,make_response, not_found_error
+from service_apis.db.db import MongoDatabse
+from service_apis.encoder import JSONEncoder
+from service_apis.models.problem_details import ProblemDetails
+from service_apis.models.service_api_description import ServiceAPIDescription
+from service_apis.models.discovered_apis import DiscoveredAPIs
+from service_apis.util import dict_to_camel_case, clean_empty
+from service_apis.core.resources import Resource
+from bson import json_util
+
+
+
+class DiscoverApisOperations(Resource):
+
+    def get_discoveredapis(self, api_invoker_id, query_params):
+
+        services = self.db.get_col_by_name(self.db.service_api_descriptions)
+        invokers = self.db.get_col_by_name(self.db.invoker_col)
+
+        current_app.logger.debug("Discovering services apis by: " + api_invoker_id)
+
+        try:
+            invoker = invokers.find_one({"api_invoker_id": api_invoker_id})
+            if invoker is None:
+                current_app.logger.error("Api invoker not found in database")
+                return not_found_error(detail="API Invoker does not exist", cause="API Invoker id not found")
+
+            my_params = []
+            my_query = {}
+            quey_params_name = {"api_name":"api_name", "api_version":"aef_profiles.0.versions.0.api_version", "comm_type":"aef_profiles.0.versions.0.resources.0.comm_type", 
+            "protocol":"aef_profiles.0.protocol", "aef_id":"aef_profiles.0.aef_id", "data_format":"aef_profiles.0.data_format", 
+            "api_cat":"service_api_category", "supported_features":"supported_features", "api_supported_features":"api_supp_feats"}
+
+            for param in query_params:
+                if query_params[param] is not None:
+                    my_params.append({quey_params_name[param]: query_params[param]})
+
+            if my_params:
+                my_query = {"$and": my_params}
+
+            discoved_apis = services.find(my_query, {"_id":0, "apf_id":0})
+            json_docs = []
+            for discoved_api in discoved_apis:
+                my_api = dict_to_camel_case(discoved_api)
+                my_api = clean_empty(my_api)
+                json_docs.append(my_api)
+
+            if len(json_docs) == 0:
+                return not_found_error(detail="API Invoker " + api_invoker_id + " has no API Published that accomplish filter conditions", cause="No API Published accomplish filter conditions")
+
+            apis_discoveres = DiscoveredAPIs(service_api_descriptions=json_docs)
+            res = make_response(object=apis_discoveres, status=200)
+            current_app.logger.debug("Discovered APIs by: " + api_invoker_id)
+            return res
+
+        except Exception as e:
+            exception = "An exception occurred in discover services"
+            current_app.logger.error(exception + "::" + str(e))
+            return internal_server_error(detail=exception, cause=str(e))
+
diff --git a/services/TS29222_CAPIF_Discover_Service_API/service_apis/core/resources.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/core/resources.py
new file mode 100644
index 0000000000000000000000000000000000000000..94e29ec07359c93a78d520f24fa91c88971d65c4
--- /dev/null
+++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/core/resources.py
@@ -0,0 +1,7 @@
+from abc import ABC, abstractmethod
+from ..db.db import MongoDatabse
+
+class Resource(ABC):
+
+    def __init__(self):
+        self.db = MongoDatabse()
\ No newline at end of file
diff --git a/services/TS29222_CAPIF_Discover_Service_API/service_apis/core/responses.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/core/responses.py
new file mode 100644
index 0000000000000000000000000000000000000000..4f035781f68629246ade764083b620e3df3c72ae
--- /dev/null
+++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/core/responses.py
@@ -0,0 +1,32 @@
+from ..models.problem_details import ProblemDetails
+from ..encoder import JSONEncoder
+from flask import Response
+from bson import json_util
+import json
+
+mimetype = "application/json"
+
+def make_response(object, status):
+    res = Response(json.dumps(object,  cls=JSONEncoder), status=status, mimetype=mimetype)
+
+    return res
+
+def internal_server_error(detail, cause):
+    prob = ProblemDetails(title="Internal Server Error", status=500, detail=detail, cause=cause)
+
+    return Response(json.dumps(prob, cls=JSONEncoder), status=500, mimetype=mimetype)
+
+def forbidden_error(detail, cause):
+    prob = ProblemDetails(title="Forbidden", status=403, detail=detail, cause=cause)
+
+    return Response(json.dumps(prob, cls=JSONEncoder), status=403, mimetype=mimetype)
+
+def bad_request_error(detail, cause, invalid_params):
+    prob = ProblemDetails(title="Bad Request", status=400, detail=detail, cause=cause, invalid_params=invalid_params)
+
+    return Response(json.dumps(prob, cls=JSONEncoder), status=400, mimetype=cause)
+
+def not_found_error(detail, cause):
+    prob = ProblemDetails(title="Not Found", status=404, detail=detail, cause=cause)
+
+    return Response(json.dumps(prob, cls=JSONEncoder), status=404, mimetype=mimetype)
\ No newline at end of file
diff --git a/services/TS29222_CAPIF_Discover_Service_API/service_apis/db/db.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/db/db.py
new file mode 100644
index 0000000000000000000000000000000000000000..544545555ff393d3c2b43e825f3595af7df97bfd
--- /dev/null
+++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/db/db.py
@@ -0,0 +1,44 @@
+import atexit
+import time
+from pymongo import MongoClient
+from pymongo.errors import AutoReconnect
+from ..config import Config
+from bson.codec_options import CodecOptions
+import os
+from opentelemetry.instrumentation.pymongo import PymongoInstrumentor
+
+if eval(os.environ.get("MONITORING").lower().capitalize()):
+    PymongoInstrumentor().instrument()
+
+class MongoDatabse():
+
+    def __init__(self):
+        self.config = Config().get_config()
+        self.db = self.__connect()
+        self.invoker_col = self.config['mongo']['invokers_col']
+        self.service_api_descriptions = self.config['mongo']['col']
+        self.capif_users = self.config['mongo']['capif_users_col']
+
+
+    def get_col_by_name(self, name):
+        return self.db[name].with_options(codec_options=CodecOptions(tz_aware=True))
+
+    def __connect(self, max_retries=3, retry_delay=1):
+        retries = 0
+        while retries < max_retries:
+            try:
+                uri = f"mongodb://{self.config['mongo']['user']}:{self.config['mongo']['password']}@" \
+                      f"{self.config['mongo']['host']}:{self.config['mongo']['port']}"
+                client = MongoClient(uri)
+                mydb = client[self.config['mongo']['db']]
+                mydb.command("ping")
+                return mydb
+            except AutoReconnect:
+                retries += 1
+                print(f"Reconnecting... Retry {retries} of {max_retries}")
+                time.sleep(retry_delay)
+        return None
+
+    def close_connection(self):
+        if self.db.client:
+            self.db.client.close()
diff --git a/services/TS29222_CAPIF_Discover_Service_API/service_apis/encoder.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/encoder.py
new file mode 100644
index 0000000000000000000000000000000000000000..c02675977bb308223c728bfbb3a393fb99c5a588
--- /dev/null
+++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/encoder.py
@@ -0,0 +1,20 @@
+from connexion.apps.flask_app import FlaskJSONEncoder
+import six
+
+from service_apis.models.base_model_ import Model
+
+
+class JSONEncoder(FlaskJSONEncoder):
+    include_nulls = False
+
+    def default(self, o):
+        if isinstance(o, Model):
+            dikt = {}
+            for attr, _ in six.iteritems(o.openapi_types):
+                value = getattr(o, attr)
+                if value is None and not self.include_nulls:
+                    continue
+                attr = o.attribute_map[attr]
+                dikt[attr] = value
+            return dikt
+        return FlaskJSONEncoder.default(self, o)
diff --git a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/__init__.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..f340ca4cbe53761655055bedcf5a80432fba729a
--- /dev/null
+++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/__init__.py
@@ -0,0 +1,26 @@
+# coding: utf-8
+
+# flake8: noqa
+from __future__ import absolute_import
+# import models into model package
+from service_apis.models.aef_profile import AefProfile
+from service_apis.models.communication_type import CommunicationType
+from service_apis.models.communication_type_any_of import CommunicationTypeAnyOf
+from service_apis.models.custom_operation import CustomOperation
+from service_apis.models.data_format import DataFormat
+from service_apis.models.data_format_any_of import DataFormatAnyOf
+from service_apis.models.discovered_apis import DiscoveredAPIs
+from service_apis.models.interface_description import InterfaceDescription
+from service_apis.models.invalid_param import InvalidParam
+from service_apis.models.operation import Operation
+from service_apis.models.operation_any_of import OperationAnyOf
+from service_apis.models.problem_details import ProblemDetails
+from service_apis.models.protocol import Protocol
+from service_apis.models.protocol_any_of import ProtocolAnyOf
+from service_apis.models.published_api_path import PublishedApiPath
+from service_apis.models.resource import Resource
+from service_apis.models.security_method import SecurityMethod
+from service_apis.models.security_method_any_of import SecurityMethodAnyOf
+from service_apis.models.service_api_description import ServiceAPIDescription
+from service_apis.models.shareable_information import ShareableInformation
+from service_apis.models.version import Version
diff --git a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/aef_profile.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/aef_profile.py
new file mode 100644
index 0000000000000000000000000000000000000000..03ed0fd9dd6d5071e907bb311d2f241a2bc8effe
--- /dev/null
+++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/aef_profile.py
@@ -0,0 +1,250 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from service_apis.models.base_model_ import Model
+from service_apis.models.data_format import DataFormat
+from service_apis.models.interface_description import InterfaceDescription
+from service_apis.models.protocol import Protocol
+from service_apis.models.security_method import SecurityMethod
+from service_apis.models.version import Version
+from service_apis import util
+
+from service_apis.models.data_format import DataFormat  # noqa: E501
+from service_apis.models.interface_description import InterfaceDescription  # noqa: E501
+from service_apis.models.protocol import Protocol  # noqa: E501
+from service_apis.models.security_method import SecurityMethod  # noqa: E501
+from service_apis.models.version import Version  # noqa: E501
+
+class AefProfile(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, aef_id=None, versions=None, protocol=None, data_format=None, security_methods=None, domain_name=None, interface_descriptions=None):  # noqa: E501
+        """AefProfile - a model defined in OpenAPI
+
+        :param aef_id: The aef_id of this AefProfile.  # noqa: E501
+        :type aef_id: str
+        :param versions: The versions of this AefProfile.  # noqa: E501
+        :type versions: List[Version]
+        :param protocol: The protocol of this AefProfile.  # noqa: E501
+        :type protocol: Protocol
+        :param data_format: The data_format of this AefProfile.  # noqa: E501
+        :type data_format: DataFormat
+        :param security_methods: The security_methods of this AefProfile.  # noqa: E501
+        :type security_methods: List[SecurityMethod]
+        :param domain_name: The domain_name of this AefProfile.  # noqa: E501
+        :type domain_name: str
+        :param interface_descriptions: The interface_descriptions of this AefProfile.  # noqa: E501
+        :type interface_descriptions: List[InterfaceDescription]
+        """
+        self.openapi_types = {
+            'aef_id': str,
+            'versions': List[Version],
+            'protocol': Protocol,
+            'data_format': DataFormat,
+            'security_methods': List[SecurityMethod],
+            'domain_name': str,
+            'interface_descriptions': List[InterfaceDescription]
+        }
+
+        self.attribute_map = {
+            'aef_id': 'aefId',
+            'versions': 'versions',
+            'protocol': 'protocol',
+            'data_format': 'dataFormat',
+            'security_methods': 'securityMethods',
+            'domain_name': 'domainName',
+            'interface_descriptions': 'interfaceDescriptions'
+        }
+
+        self._aef_id = aef_id
+        self._versions = versions
+        self._protocol = protocol
+        self._data_format = data_format
+        self._security_methods = security_methods
+        self._domain_name = domain_name
+        self._interface_descriptions = interface_descriptions
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'AefProfile':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The AefProfile of this AefProfile.  # noqa: E501
+        :rtype: AefProfile
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def aef_id(self):
+        """Gets the aef_id of this AefProfile.
+
+        Identifier of the API exposing function  # noqa: E501
+
+        :return: The aef_id of this AefProfile.
+        :rtype: str
+        """
+        return self._aef_id
+
+    @aef_id.setter
+    def aef_id(self, aef_id):
+        """Sets the aef_id of this AefProfile.
+
+        Identifier of the API exposing function  # noqa: E501
+
+        :param aef_id: The aef_id of this AefProfile.
+        :type aef_id: str
+        """
+        if aef_id is None:
+            raise ValueError("Invalid value for `aef_id`, must not be `None`")  # noqa: E501
+
+        self._aef_id = aef_id
+
+    @property
+    def versions(self):
+        """Gets the versions of this AefProfile.
+
+        API version  # noqa: E501
+
+        :return: The versions of this AefProfile.
+        :rtype: List[Version]
+        """
+        return self._versions
+
+    @versions.setter
+    def versions(self, versions):
+        """Sets the versions of this AefProfile.
+
+        API version  # noqa: E501
+
+        :param versions: The versions of this AefProfile.
+        :type versions: List[Version]
+        """
+        if versions is None:
+            raise ValueError("Invalid value for `versions`, must not be `None`")  # noqa: E501
+        if versions is not None and len(versions) < 1:
+            raise ValueError("Invalid value for `versions`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._versions = versions
+
+    @property
+    def protocol(self):
+        """Gets the protocol of this AefProfile.
+
+
+        :return: The protocol of this AefProfile.
+        :rtype: Protocol
+        """
+        return self._protocol
+
+    @protocol.setter
+    def protocol(self, protocol):
+        """Sets the protocol of this AefProfile.
+
+
+        :param protocol: The protocol of this AefProfile.
+        :type protocol: Protocol
+        """
+
+        self._protocol = protocol
+
+    @property
+    def data_format(self):
+        """Gets the data_format of this AefProfile.
+
+
+        :return: The data_format of this AefProfile.
+        :rtype: DataFormat
+        """
+        return self._data_format
+
+    @data_format.setter
+    def data_format(self, data_format):
+        """Sets the data_format of this AefProfile.
+
+
+        :param data_format: The data_format of this AefProfile.
+        :type data_format: DataFormat
+        """
+
+        self._data_format = data_format
+
+    @property
+    def security_methods(self):
+        """Gets the security_methods of this AefProfile.
+
+        Security methods supported by the AEF  # noqa: E501
+
+        :return: The security_methods of this AefProfile.
+        :rtype: List[SecurityMethod]
+        """
+        return self._security_methods
+
+    @security_methods.setter
+    def security_methods(self, security_methods):
+        """Sets the security_methods of this AefProfile.
+
+        Security methods supported by the AEF  # noqa: E501
+
+        :param security_methods: The security_methods of this AefProfile.
+        :type security_methods: List[SecurityMethod]
+        """
+        if security_methods is not None and len(security_methods) < 1:
+            raise ValueError("Invalid value for `security_methods`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._security_methods = security_methods
+
+    @property
+    def domain_name(self):
+        """Gets the domain_name of this AefProfile.
+
+        Domain to which API belongs to  # noqa: E501
+
+        :return: The domain_name of this AefProfile.
+        :rtype: str
+        """
+        return self._domain_name
+
+    @domain_name.setter
+    def domain_name(self, domain_name):
+        """Sets the domain_name of this AefProfile.
+
+        Domain to which API belongs to  # noqa: E501
+
+        :param domain_name: The domain_name of this AefProfile.
+        :type domain_name: str
+        """
+
+        self._domain_name = domain_name
+
+    @property
+    def interface_descriptions(self):
+        """Gets the interface_descriptions of this AefProfile.
+
+        Interface details  # noqa: E501
+
+        :return: The interface_descriptions of this AefProfile.
+        :rtype: List[InterfaceDescription]
+        """
+        return self._interface_descriptions
+
+    @interface_descriptions.setter
+    def interface_descriptions(self, interface_descriptions):
+        """Sets the interface_descriptions of this AefProfile.
+
+        Interface details  # noqa: E501
+
+        :param interface_descriptions: The interface_descriptions of this AefProfile.
+        :type interface_descriptions: List[InterfaceDescription]
+        """
+        if interface_descriptions is not None and len(interface_descriptions) < 1:
+            raise ValueError("Invalid value for `interface_descriptions`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._interface_descriptions = interface_descriptions
diff --git a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/base_model_.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/base_model_.py
new file mode 100644
index 0000000000000000000000000000000000000000..c9cf2aeb94fdc98e52cc5b2fc92580dcfbdb9a0f
--- /dev/null
+++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/base_model_.py
@@ -0,0 +1,69 @@
+import pprint
+
+import six
+import typing
+
+from service_apis import util
+
+T = typing.TypeVar('T')
+
+
+class Model(object):
+    # openapiTypes: The key is attribute name and the
+    # value is attribute type.
+    openapi_types = {}
+
+    # attributeMap: The key is attribute name and the
+    # value is json key in definition.
+    attribute_map = {}
+
+    @classmethod
+    def from_dict(cls: typing.Type[T], dikt) -> T:
+        """Returns the dict as a model"""
+        return util.deserialize_model(dikt, cls)
+
+    def to_dict(self):
+        """Returns the model properties as a dict
+
+        :rtype: dict
+        """
+        result = {}
+
+        for attr, _ in six.iteritems(self.openapi_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model
+
+        :rtype: str
+        """
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/communication_type.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/communication_type.py
new file mode 100644
index 0000000000000000000000000000000000000000..793701c97c65291a6a2b5963d9ce036d72620e3f
--- /dev/null
+++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/communication_type.py
@@ -0,0 +1,39 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from service_apis.models.base_model_ import Model
+from service_apis.models.communication_type_any_of import CommunicationTypeAnyOf
+from service_apis import util
+
+from service_apis.models.communication_type_any_of import CommunicationTypeAnyOf  # noqa: E501
+
+class CommunicationType(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self):  # noqa: E501
+        """CommunicationType - a model defined in OpenAPI
+
+        """
+        self.openapi_types = {
+        }
+
+        self.attribute_map = {
+        }
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'CommunicationType':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The CommunicationType of this CommunicationType.  # noqa: E501
+        :rtype: CommunicationType
+        """
+        return util.deserialize_model(dikt, cls)
diff --git a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/communication_type_any_of.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/communication_type_any_of.py
new file mode 100644
index 0000000000000000000000000000000000000000..72b1a5399542f280e37398e67b0e521aaeaf8354
--- /dev/null
+++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/communication_type_any_of.py
@@ -0,0 +1,42 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from service_apis.models.base_model_ import Model
+from service_apis import util
+
+
+class CommunicationTypeAnyOf(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    """
+    allowed enum values
+    """
+    REQUEST_RESPONSE = "REQUEST_RESPONSE"
+    SUBSCRIBE_NOTIFY = "SUBSCRIBE_NOTIFY"
+    def __init__(self):  # noqa: E501
+        """CommunicationTypeAnyOf - a model defined in OpenAPI
+
+        """
+        self.openapi_types = {
+        }
+
+        self.attribute_map = {
+        }
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'CommunicationTypeAnyOf':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The CommunicationType_anyOf of this CommunicationTypeAnyOf.  # noqa: E501
+        :rtype: CommunicationTypeAnyOf
+        """
+        return util.deserialize_model(dikt, cls)
diff --git a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/custom_operation.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/custom_operation.py
new file mode 100644
index 0000000000000000000000000000000000000000..fdbb2cb3ff1727caa48cde4530c4297be28f3528
--- /dev/null
+++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/custom_operation.py
@@ -0,0 +1,158 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from service_apis.models.base_model_ import Model
+from service_apis.models.communication_type import CommunicationType
+from service_apis.models.operation import Operation
+from service_apis import util
+
+from service_apis.models.communication_type import CommunicationType  # noqa: E501
+from service_apis.models.operation import Operation  # noqa: E501
+
+class CustomOperation(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, comm_type=None, cust_op_name=None, operations=None, description=None):  # noqa: E501
+        """CustomOperation - a model defined in OpenAPI
+
+        :param comm_type: The comm_type of this CustomOperation.  # noqa: E501
+        :type comm_type: CommunicationType
+        :param cust_op_name: The cust_op_name of this CustomOperation.  # noqa: E501
+        :type cust_op_name: str
+        :param operations: The operations of this CustomOperation.  # noqa: E501
+        :type operations: List[Operation]
+        :param description: The description of this CustomOperation.  # noqa: E501
+        :type description: str
+        """
+        self.openapi_types = {
+            'comm_type': CommunicationType,
+            'cust_op_name': str,
+            'operations': List[Operation],
+            'description': str
+        }
+
+        self.attribute_map = {
+            'comm_type': 'commType',
+            'cust_op_name': 'custOpName',
+            'operations': 'operations',
+            'description': 'description'
+        }
+
+        self._comm_type = comm_type
+        self._cust_op_name = cust_op_name
+        self._operations = operations
+        self._description = description
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'CustomOperation':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The CustomOperation of this CustomOperation.  # noqa: E501
+        :rtype: CustomOperation
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def comm_type(self):
+        """Gets the comm_type of this CustomOperation.
+
+
+        :return: The comm_type of this CustomOperation.
+        :rtype: CommunicationType
+        """
+        return self._comm_type
+
+    @comm_type.setter
+    def comm_type(self, comm_type):
+        """Sets the comm_type of this CustomOperation.
+
+
+        :param comm_type: The comm_type of this CustomOperation.
+        :type comm_type: CommunicationType
+        """
+        if comm_type is None:
+            raise ValueError("Invalid value for `comm_type`, must not be `None`")  # noqa: E501
+
+        self._comm_type = comm_type
+
+    @property
+    def cust_op_name(self):
+        """Gets the cust_op_name of this CustomOperation.
+
+        it is set as {custOpName} part of the URI structure for a custom operation without resource association as defined in subclause 4.4 of 3GPP TS 29.501.  # noqa: E501
+
+        :return: The cust_op_name of this CustomOperation.
+        :rtype: str
+        """
+        return self._cust_op_name
+
+    @cust_op_name.setter
+    def cust_op_name(self, cust_op_name):
+        """Sets the cust_op_name of this CustomOperation.
+
+        it is set as {custOpName} part of the URI structure for a custom operation without resource association as defined in subclause 4.4 of 3GPP TS 29.501.  # noqa: E501
+
+        :param cust_op_name: The cust_op_name of this CustomOperation.
+        :type cust_op_name: str
+        """
+        if cust_op_name is None:
+            raise ValueError("Invalid value for `cust_op_name`, must not be `None`")  # noqa: E501
+
+        self._cust_op_name = cust_op_name
+
+    @property
+    def operations(self):
+        """Gets the operations of this CustomOperation.
+
+        Supported HTTP methods for the API resource. Only applicable when the protocol in AefProfile indicates HTTP.  # noqa: E501
+
+        :return: The operations of this CustomOperation.
+        :rtype: List[Operation]
+        """
+        return self._operations
+
+    @operations.setter
+    def operations(self, operations):
+        """Sets the operations of this CustomOperation.
+
+        Supported HTTP methods for the API resource. Only applicable when the protocol in AefProfile indicates HTTP.  # noqa: E501
+
+        :param operations: The operations of this CustomOperation.
+        :type operations: List[Operation]
+        """
+        if operations is not None and len(operations) < 1:
+            raise ValueError("Invalid value for `operations`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._operations = operations
+
+    @property
+    def description(self):
+        """Gets the description of this CustomOperation.
+
+        Text description of the custom operation  # noqa: E501
+
+        :return: The description of this CustomOperation.
+        :rtype: str
+        """
+        return self._description
+
+    @description.setter
+    def description(self, description):
+        """Sets the description of this CustomOperation.
+
+        Text description of the custom operation  # noqa: E501
+
+        :param description: The description of this CustomOperation.
+        :type description: str
+        """
+
+        self._description = description
diff --git a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/data_format.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/data_format.py
new file mode 100644
index 0000000000000000000000000000000000000000..7fcf16131a48c558994eceeee671bd198a26280a
--- /dev/null
+++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/data_format.py
@@ -0,0 +1,39 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from service_apis.models.base_model_ import Model
+from service_apis.models.data_format_any_of import DataFormatAnyOf
+from service_apis import util
+
+from service_apis.models.data_format_any_of import DataFormatAnyOf  # noqa: E501
+
+class DataFormat(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self):  # noqa: E501
+        """DataFormat - a model defined in OpenAPI
+
+        """
+        self.openapi_types = {
+        }
+
+        self.attribute_map = {
+        }
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'DataFormat':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The DataFormat of this DataFormat.  # noqa: E501
+        :rtype: DataFormat
+        """
+        return util.deserialize_model(dikt, cls)
diff --git a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/data_format_any_of.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/data_format_any_of.py
new file mode 100644
index 0000000000000000000000000000000000000000..1c78b7cb57cad8fe2536540efe7db3c38edb22a1
--- /dev/null
+++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/data_format_any_of.py
@@ -0,0 +1,41 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from service_apis.models.base_model_ import Model
+from service_apis import util
+
+
+class DataFormatAnyOf(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    """
+    allowed enum values
+    """
+    JSON = "JSON"
+    def __init__(self):  # noqa: E501
+        """DataFormatAnyOf - a model defined in OpenAPI
+
+        """
+        self.openapi_types = {
+        }
+
+        self.attribute_map = {
+        }
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'DataFormatAnyOf':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The DataFormat_anyOf of this DataFormatAnyOf.  # noqa: E501
+        :rtype: DataFormatAnyOf
+        """
+        return util.deserialize_model(dikt, cls)
diff --git a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/discovered_apis.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/discovered_apis.py
new file mode 100644
index 0000000000000000000000000000000000000000..10eca4993c19ef144c5dbea121ed312248a7ea20
--- /dev/null
+++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/discovered_apis.py
@@ -0,0 +1,70 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from service_apis.models.base_model_ import Model
+from service_apis.models.service_api_description import ServiceAPIDescription
+from service_apis import util
+
+from service_apis.models.service_api_description import ServiceAPIDescription  # noqa: E501
+
+class DiscoveredAPIs(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, service_api_descriptions=None):  # noqa: E501
+        """DiscoveredAPIs - a model defined in OpenAPI
+
+        :param service_api_descriptions: The service_api_descriptions of this DiscoveredAPIs.  # noqa: E501
+        :type service_api_descriptions: List[ServiceAPIDescription]
+        """
+        self.openapi_types = {
+            'service_api_descriptions': List[ServiceAPIDescription]
+        }
+
+        self.attribute_map = {
+            'service_api_descriptions': 'serviceAPIDescriptions'
+        }
+
+        self._service_api_descriptions = service_api_descriptions
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'DiscoveredAPIs':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The DiscoveredAPIs of this DiscoveredAPIs.  # noqa: E501
+        :rtype: DiscoveredAPIs
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def service_api_descriptions(self):
+        """Gets the service_api_descriptions of this DiscoveredAPIs.
+
+        Description of the service API as published by the service. Each service API description shall include AEF profiles matching the filter criteria.  # noqa: E501
+
+        :return: The service_api_descriptions of this DiscoveredAPIs.
+        :rtype: List[ServiceAPIDescription]
+        """
+        return self._service_api_descriptions
+
+    @service_api_descriptions.setter
+    def service_api_descriptions(self, service_api_descriptions):
+        """Sets the service_api_descriptions of this DiscoveredAPIs.
+
+        Description of the service API as published by the service. Each service API description shall include AEF profiles matching the filter criteria.  # noqa: E501
+
+        :param service_api_descriptions: The service_api_descriptions of this DiscoveredAPIs.
+        :type service_api_descriptions: List[ServiceAPIDescription]
+        """
+        if service_api_descriptions is not None and len(service_api_descriptions) < 1:
+            raise ValueError("Invalid value for `service_api_descriptions`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._service_api_descriptions = service_api_descriptions
diff --git a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/interface_description.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/interface_description.py
new file mode 100644
index 0000000000000000000000000000000000000000..a51d99038c10e2ee7e69d760e1ed3edb87b81890
--- /dev/null
+++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/interface_description.py
@@ -0,0 +1,158 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from service_apis.models.base_model_ import Model
+from service_apis.models.security_method import SecurityMethod
+from service_apis import util
+
+from service_apis.models.security_method import SecurityMethod  # noqa: E501
+
+class InterfaceDescription(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, ipv4_addr=None, ipv6_addr=None, port=None, security_methods=None):  # noqa: E501
+        """InterfaceDescription - a model defined in OpenAPI
+
+        :param ipv4_addr: The ipv4_addr of this InterfaceDescription.  # noqa: E501
+        :type ipv4_addr: str
+        :param ipv6_addr: The ipv6_addr of this InterfaceDescription.  # noqa: E501
+        :type ipv6_addr: str
+        :param port: The port of this InterfaceDescription.  # noqa: E501
+        :type port: int
+        :param security_methods: The security_methods of this InterfaceDescription.  # noqa: E501
+        :type security_methods: List[SecurityMethod]
+        """
+        self.openapi_types = {
+            'ipv4_addr': str,
+            'ipv6_addr': str,
+            'port': int,
+            'security_methods': List[SecurityMethod]
+        }
+
+        self.attribute_map = {
+            'ipv4_addr': 'ipv4Addr',
+            'ipv6_addr': 'ipv6Addr',
+            'port': 'port',
+            'security_methods': 'securityMethods'
+        }
+
+        self._ipv4_addr = ipv4_addr
+        self._ipv6_addr = ipv6_addr
+        self._port = port
+        self._security_methods = security_methods
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'InterfaceDescription':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The InterfaceDescription of this InterfaceDescription.  # noqa: E501
+        :rtype: InterfaceDescription
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def ipv4_addr(self):
+        """Gets the ipv4_addr of this InterfaceDescription.
+
+        string identifying a Ipv4 address formatted in the \"dotted decimal\" notation as defined in IETF RFC 1166.  # noqa: E501
+
+        :return: The ipv4_addr of this InterfaceDescription.
+        :rtype: str
+        """
+        return self._ipv4_addr
+
+    @ipv4_addr.setter
+    def ipv4_addr(self, ipv4_addr):
+        """Sets the ipv4_addr of this InterfaceDescription.
+
+        string identifying a Ipv4 address formatted in the \"dotted decimal\" notation as defined in IETF RFC 1166.  # noqa: E501
+
+        :param ipv4_addr: The ipv4_addr of this InterfaceDescription.
+        :type ipv4_addr: str
+        """
+
+        self._ipv4_addr = ipv4_addr
+
+    @property
+    def ipv6_addr(self):
+        """Gets the ipv6_addr of this InterfaceDescription.
+
+        string identifying a Ipv6 address formatted according to clause 4 in IETF RFC 5952. The mixed Ipv4 Ipv6 notation according to clause 5 of IETF RFC 5952 shall not be used.  # noqa: E501
+
+        :return: The ipv6_addr of this InterfaceDescription.
+        :rtype: str
+        """
+        return self._ipv6_addr
+
+    @ipv6_addr.setter
+    def ipv6_addr(self, ipv6_addr):
+        """Sets the ipv6_addr of this InterfaceDescription.
+
+        string identifying a Ipv6 address formatted according to clause 4 in IETF RFC 5952. The mixed Ipv4 Ipv6 notation according to clause 5 of IETF RFC 5952 shall not be used.  # noqa: E501
+
+        :param ipv6_addr: The ipv6_addr of this InterfaceDescription.
+        :type ipv6_addr: str
+        """
+
+        self._ipv6_addr = ipv6_addr
+
+    @property
+    def port(self):
+        """Gets the port of this InterfaceDescription.
+
+        Unsigned integer with valid values between 0 and 65535.  # noqa: E501
+
+        :return: The port of this InterfaceDescription.
+        :rtype: int
+        """
+        return self._port
+
+    @port.setter
+    def port(self, port):
+        """Sets the port of this InterfaceDescription.
+
+        Unsigned integer with valid values between 0 and 65535.  # noqa: E501
+
+        :param port: The port of this InterfaceDescription.
+        :type port: int
+        """
+        if port is not None and port > 65535:  # noqa: E501
+            raise ValueError("Invalid value for `port`, must be a value less than or equal to `65535`")  # noqa: E501
+        if port is not None and port < 0:  # noqa: E501
+            raise ValueError("Invalid value for `port`, must be a value greater than or equal to `0`")  # noqa: E501
+
+        self._port = port
+
+    @property
+    def security_methods(self):
+        """Gets the security_methods of this InterfaceDescription.
+
+        Security methods supported by the interface, it take precedence over the security methods provided in AefProfile, for this specific interface.  # noqa: E501
+
+        :return: The security_methods of this InterfaceDescription.
+        :rtype: List[SecurityMethod]
+        """
+        return self._security_methods
+
+    @security_methods.setter
+    def security_methods(self, security_methods):
+        """Sets the security_methods of this InterfaceDescription.
+
+        Security methods supported by the interface, it take precedence over the security methods provided in AefProfile, for this specific interface.  # noqa: E501
+
+        :param security_methods: The security_methods of this InterfaceDescription.
+        :type security_methods: List[SecurityMethod]
+        """
+        if security_methods is not None and len(security_methods) < 1:
+            raise ValueError("Invalid value for `security_methods`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._security_methods = security_methods
diff --git a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/invalid_param.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/invalid_param.py
new file mode 100644
index 0000000000000000000000000000000000000000..7e3d8d7b3df0a628cc251ff89cc72c228c40bfef
--- /dev/null
+++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/invalid_param.py
@@ -0,0 +1,96 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from service_apis.models.base_model_ import Model
+from service_apis import util
+
+
+class InvalidParam(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, param=None, reason=None):  # noqa: E501
+        """InvalidParam - a model defined in OpenAPI
+
+        :param param: The param of this InvalidParam.  # noqa: E501
+        :type param: str
+        :param reason: The reason of this InvalidParam.  # noqa: E501
+        :type reason: str
+        """
+        self.openapi_types = {
+            'param': str,
+            'reason': str
+        }
+
+        self.attribute_map = {
+            'param': 'param',
+            'reason': 'reason'
+        }
+
+        self._param = param
+        self._reason = reason
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'InvalidParam':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The InvalidParam of this InvalidParam.  # noqa: E501
+        :rtype: InvalidParam
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def param(self):
+        """Gets the param of this InvalidParam.
+
+        Attribute's name encoded as a JSON Pointer, or header's name.  # noqa: E501
+
+        :return: The param of this InvalidParam.
+        :rtype: str
+        """
+        return self._param
+
+    @param.setter
+    def param(self, param):
+        """Sets the param of this InvalidParam.
+
+        Attribute's name encoded as a JSON Pointer, or header's name.  # noqa: E501
+
+        :param param: The param of this InvalidParam.
+        :type param: str
+        """
+        if param is None:
+            raise ValueError("Invalid value for `param`, must not be `None`")  # noqa: E501
+
+        self._param = param
+
+    @property
+    def reason(self):
+        """Gets the reason of this InvalidParam.
+
+        A human-readable reason, e.g. \"must be a positive integer\".  # noqa: E501
+
+        :return: The reason of this InvalidParam.
+        :rtype: str
+        """
+        return self._reason
+
+    @reason.setter
+    def reason(self, reason):
+        """Sets the reason of this InvalidParam.
+
+        A human-readable reason, e.g. \"must be a positive integer\".  # noqa: E501
+
+        :param reason: The reason of this InvalidParam.
+        :type reason: str
+        """
+
+        self._reason = reason
diff --git a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/operation.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/operation.py
new file mode 100644
index 0000000000000000000000000000000000000000..96d3ead2bb94c623601aa05c482024dc3541b6a5
--- /dev/null
+++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/operation.py
@@ -0,0 +1,39 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from service_apis.models.base_model_ import Model
+from service_apis.models.operation_any_of import OperationAnyOf
+from service_apis import util
+
+from service_apis.models.operation_any_of import OperationAnyOf  # noqa: E501
+
+class Operation(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self):  # noqa: E501
+        """Operation - a model defined in OpenAPI
+
+        """
+        self.openapi_types = {
+        }
+
+        self.attribute_map = {
+        }
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'Operation':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The Operation of this Operation.  # noqa: E501
+        :rtype: Operation
+        """
+        return util.deserialize_model(dikt, cls)
diff --git a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/operation_any_of.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/operation_any_of.py
new file mode 100644
index 0000000000000000000000000000000000000000..d69836bd47b4a6ba49ef1eae04c792a36b05221e
--- /dev/null
+++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/operation_any_of.py
@@ -0,0 +1,45 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from service_apis.models.base_model_ import Model
+from service_apis import util
+
+
+class OperationAnyOf(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    """
+    allowed enum values
+    """
+    GET = "GET"
+    POST = "POST"
+    PUT = "PUT"
+    PATCH = "PATCH"
+    DELETE = "DELETE"
+    def __init__(self):  # noqa: E501
+        """OperationAnyOf - a model defined in OpenAPI
+
+        """
+        self.openapi_types = {
+        }
+
+        self.attribute_map = {
+        }
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'OperationAnyOf':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The Operation_anyOf of this OperationAnyOf.  # noqa: E501
+        :rtype: OperationAnyOf
+        """
+        return util.deserialize_model(dikt, cls)
diff --git a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/problem_details.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/problem_details.py
new file mode 100644
index 0000000000000000000000000000000000000000..c9e028d410cd69cf4ca8e152c47f803e630b5f17
--- /dev/null
+++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/problem_details.py
@@ -0,0 +1,270 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from service_apis.models.base_model_ import Model
+from service_apis.models.invalid_param import InvalidParam
+import re
+from service_apis import util
+
+from service_apis.models.invalid_param import InvalidParam  # noqa: E501
+import re  # noqa: E501
+
+class ProblemDetails(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, type=None, title=None, status=None, detail=None, instance=None, cause=None, invalid_params=None, supported_features=None):  # noqa: E501
+        """ProblemDetails - a model defined in OpenAPI
+
+        :param type: The type of this ProblemDetails.  # noqa: E501
+        :type type: str
+        :param title: The title of this ProblemDetails.  # noqa: E501
+        :type title: str
+        :param status: The status of this ProblemDetails.  # noqa: E501
+        :type status: int
+        :param detail: The detail of this ProblemDetails.  # noqa: E501
+        :type detail: str
+        :param instance: The instance of this ProblemDetails.  # noqa: E501
+        :type instance: str
+        :param cause: The cause of this ProblemDetails.  # noqa: E501
+        :type cause: str
+        :param invalid_params: The invalid_params of this ProblemDetails.  # noqa: E501
+        :type invalid_params: List[InvalidParam]
+        :param supported_features: The supported_features of this ProblemDetails.  # noqa: E501
+        :type supported_features: str
+        """
+        self.openapi_types = {
+            'type': str,
+            'title': str,
+            'status': int,
+            'detail': str,
+            'instance': str,
+            'cause': str,
+            'invalid_params': List[InvalidParam],
+            'supported_features': str
+        }
+
+        self.attribute_map = {
+            'type': 'type',
+            'title': 'title',
+            'status': 'status',
+            'detail': 'detail',
+            'instance': 'instance',
+            'cause': 'cause',
+            'invalid_params': 'invalidParams',
+            'supported_features': 'supportedFeatures'
+        }
+
+        self._type = type
+        self._title = title
+        self._status = status
+        self._detail = detail
+        self._instance = instance
+        self._cause = cause
+        self._invalid_params = invalid_params
+        self._supported_features = supported_features
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'ProblemDetails':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The ProblemDetails of this ProblemDetails.  # noqa: E501
+        :rtype: ProblemDetails
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def type(self):
+        """Gets the type of this ProblemDetails.
+
+        string providing an URI formatted according to IETF RFC 3986.  # noqa: E501
+
+        :return: The type of this ProblemDetails.
+        :rtype: str
+        """
+        return self._type
+
+    @type.setter
+    def type(self, type):
+        """Sets the type of this ProblemDetails.
+
+        string providing an URI formatted according to IETF RFC 3986.  # noqa: E501
+
+        :param type: The type of this ProblemDetails.
+        :type type: str
+        """
+
+        self._type = type
+
+    @property
+    def title(self):
+        """Gets the title of this ProblemDetails.
+
+        A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem.  # noqa: E501
+
+        :return: The title of this ProblemDetails.
+        :rtype: str
+        """
+        return self._title
+
+    @title.setter
+    def title(self, title):
+        """Sets the title of this ProblemDetails.
+
+        A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem.  # noqa: E501
+
+        :param title: The title of this ProblemDetails.
+        :type title: str
+        """
+
+        self._title = title
+
+    @property
+    def status(self):
+        """Gets the status of this ProblemDetails.
+
+        The HTTP status code for this occurrence of the problem.  # noqa: E501
+
+        :return: The status of this ProblemDetails.
+        :rtype: int
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """Sets the status of this ProblemDetails.
+
+        The HTTP status code for this occurrence of the problem.  # noqa: E501
+
+        :param status: The status of this ProblemDetails.
+        :type status: int
+        """
+
+        self._status = status
+
+    @property
+    def detail(self):
+        """Gets the detail of this ProblemDetails.
+
+        A human-readable explanation specific to this occurrence of the problem.  # noqa: E501
+
+        :return: The detail of this ProblemDetails.
+        :rtype: str
+        """
+        return self._detail
+
+    @detail.setter
+    def detail(self, detail):
+        """Sets the detail of this ProblemDetails.
+
+        A human-readable explanation specific to this occurrence of the problem.  # noqa: E501
+
+        :param detail: The detail of this ProblemDetails.
+        :type detail: str
+        """
+
+        self._detail = detail
+
+    @property
+    def instance(self):
+        """Gets the instance of this ProblemDetails.
+
+        string providing an URI formatted according to IETF RFC 3986.  # noqa: E501
+
+        :return: The instance of this ProblemDetails.
+        :rtype: str
+        """
+        return self._instance
+
+    @instance.setter
+    def instance(self, instance):
+        """Sets the instance of this ProblemDetails.
+
+        string providing an URI formatted according to IETF RFC 3986.  # noqa: E501
+
+        :param instance: The instance of this ProblemDetails.
+        :type instance: str
+        """
+
+        self._instance = instance
+
+    @property
+    def cause(self):
+        """Gets the cause of this ProblemDetails.
+
+        A machine-readable application error cause specific to this occurrence of the problem. This IE should be present and provide application-related error information, if available.  # noqa: E501
+
+        :return: The cause of this ProblemDetails.
+        :rtype: str
+        """
+        return self._cause
+
+    @cause.setter
+    def cause(self, cause):
+        """Sets the cause of this ProblemDetails.
+
+        A machine-readable application error cause specific to this occurrence of the problem. This IE should be present and provide application-related error information, if available.  # noqa: E501
+
+        :param cause: The cause of this ProblemDetails.
+        :type cause: str
+        """
+
+        self._cause = cause
+
+    @property
+    def invalid_params(self):
+        """Gets the invalid_params of this ProblemDetails.
+
+        Description of invalid parameters, for a request rejected due to invalid parameters.  # noqa: E501
+
+        :return: The invalid_params of this ProblemDetails.
+        :rtype: List[InvalidParam]
+        """
+        return self._invalid_params
+
+    @invalid_params.setter
+    def invalid_params(self, invalid_params):
+        """Sets the invalid_params of this ProblemDetails.
+
+        Description of invalid parameters, for a request rejected due to invalid parameters.  # noqa: E501
+
+        :param invalid_params: The invalid_params of this ProblemDetails.
+        :type invalid_params: List[InvalidParam]
+        """
+        if invalid_params is not None and len(invalid_params) < 1:
+            raise ValueError("Invalid value for `invalid_params`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._invalid_params = invalid_params
+
+    @property
+    def supported_features(self):
+        """Gets the supported_features of this ProblemDetails.
+
+        A string used to indicate the features supported by an API that is used as defined in clause 6.6 in 3GPP TS 29.500. The string shall contain a bitmask indicating supported features in hexadecimal representation Each character in the string shall take a value of \"0\" to \"9\", \"a\" to \"f\" or \"A\" to \"F\" and shall represent the support of 4 features as described in table 5.2.2-3. The most significant character representing the highest-numbered features shall appear first in the string, and the character representing features 1 to 4 shall appear last in the string. The list of features and their numbering (starting with 1) are defined separately for each API. If the string contains a lower number of characters than there are defined features for an API, all features that would be represented by characters that are not present in the string are not supported  # noqa: E501
+
+        :return: The supported_features of this ProblemDetails.
+        :rtype: str
+        """
+        return self._supported_features
+
+    @supported_features.setter
+    def supported_features(self, supported_features):
+        """Sets the supported_features of this ProblemDetails.
+
+        A string used to indicate the features supported by an API that is used as defined in clause 6.6 in 3GPP TS 29.500. The string shall contain a bitmask indicating supported features in hexadecimal representation Each character in the string shall take a value of \"0\" to \"9\", \"a\" to \"f\" or \"A\" to \"F\" and shall represent the support of 4 features as described in table 5.2.2-3. The most significant character representing the highest-numbered features shall appear first in the string, and the character representing features 1 to 4 shall appear last in the string. The list of features and their numbering (starting with 1) are defined separately for each API. If the string contains a lower number of characters than there are defined features for an API, all features that would be represented by characters that are not present in the string are not supported  # noqa: E501
+
+        :param supported_features: The supported_features of this ProblemDetails.
+        :type supported_features: str
+        """
+        if supported_features is not None and not re.search(r'^[A-Fa-f0-9]*$', supported_features):  # noqa: E501
+            raise ValueError("Invalid value for `supported_features`, must be a follow pattern or equal to `/^[A-Fa-f0-9]*$/`")  # noqa: E501
+
+        self._supported_features = supported_features
diff --git a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/protocol.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/protocol.py
new file mode 100644
index 0000000000000000000000000000000000000000..311b8e855bc31c12f57ad6c4e9b285fb092fc30c
--- /dev/null
+++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/protocol.py
@@ -0,0 +1,39 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from service_apis.models.base_model_ import Model
+from service_apis.models.protocol_any_of import ProtocolAnyOf
+from service_apis import util
+
+from service_apis.models.protocol_any_of import ProtocolAnyOf  # noqa: E501
+
+class Protocol(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self):  # noqa: E501
+        """Protocol - a model defined in OpenAPI
+
+        """
+        self.openapi_types = {
+        }
+
+        self.attribute_map = {
+        }
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'Protocol':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The Protocol of this Protocol.  # noqa: E501
+        :rtype: Protocol
+        """
+        return util.deserialize_model(dikt, cls)
diff --git a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/protocol_any_of.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/protocol_any_of.py
new file mode 100644
index 0000000000000000000000000000000000000000..a75ee92e976340df042d7f70cb2276acdb703c08
--- /dev/null
+++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/protocol_any_of.py
@@ -0,0 +1,42 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from service_apis.models.base_model_ import Model
+from service_apis import util
+
+
+class ProtocolAnyOf(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    """
+    allowed enum values
+    """
+    _1_1 = "HTTP_1_1"
+    _2 = "HTTP_2"
+    def __init__(self):  # noqa: E501
+        """ProtocolAnyOf - a model defined in OpenAPI
+
+        """
+        self.openapi_types = {
+        }
+
+        self.attribute_map = {
+        }
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'ProtocolAnyOf':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The Protocol_anyOf of this ProtocolAnyOf.  # noqa: E501
+        :rtype: ProtocolAnyOf
+        """
+        return util.deserialize_model(dikt, cls)
diff --git a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/published_api_path.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/published_api_path.py
new file mode 100644
index 0000000000000000000000000000000000000000..959ae6edc13e8815094174a13eea315c68dcbd0f
--- /dev/null
+++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/published_api_path.py
@@ -0,0 +1,68 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from service_apis.models.base_model_ import Model
+from service_apis import util
+
+
+class PublishedApiPath(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, ccf_ids=None):  # noqa: E501
+        """PublishedApiPath - a model defined in OpenAPI
+
+        :param ccf_ids: The ccf_ids of this PublishedApiPath.  # noqa: E501
+        :type ccf_ids: List[str]
+        """
+        self.openapi_types = {
+            'ccf_ids': List[str]
+        }
+
+        self.attribute_map = {
+            'ccf_ids': 'ccfIds'
+        }
+
+        self._ccf_ids = ccf_ids
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'PublishedApiPath':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The PublishedApiPath of this PublishedApiPath.  # noqa: E501
+        :rtype: PublishedApiPath
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def ccf_ids(self):
+        """Gets the ccf_ids of this PublishedApiPath.
+
+        A list of CCF identifiers where the service API is already published.  # noqa: E501
+
+        :return: The ccf_ids of this PublishedApiPath.
+        :rtype: List[str]
+        """
+        return self._ccf_ids
+
+    @ccf_ids.setter
+    def ccf_ids(self, ccf_ids):
+        """Sets the ccf_ids of this PublishedApiPath.
+
+        A list of CCF identifiers where the service API is already published.  # noqa: E501
+
+        :param ccf_ids: The ccf_ids of this PublishedApiPath.
+        :type ccf_ids: List[str]
+        """
+        if ccf_ids is not None and len(ccf_ids) < 1:
+            raise ValueError("Invalid value for `ccf_ids`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._ccf_ids = ccf_ids
diff --git a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/resource.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/resource.py
new file mode 100644
index 0000000000000000000000000000000000000000..c78abb0e4bdba4f1fb50915e74d24c42f6e408e6
--- /dev/null
+++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/resource.py
@@ -0,0 +1,216 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from service_apis.models.base_model_ import Model
+from service_apis.models.communication_type import CommunicationType
+from service_apis.models.operation import Operation
+from service_apis import util
+
+from service_apis.models.communication_type import CommunicationType  # noqa: E501
+from service_apis.models.operation import Operation  # noqa: E501
+
+class Resource(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, resource_name=None, comm_type=None, uri=None, cust_op_name=None, operations=None, description=None):  # noqa: E501
+        """Resource - a model defined in OpenAPI
+
+        :param resource_name: The resource_name of this Resource.  # noqa: E501
+        :type resource_name: str
+        :param comm_type: The comm_type of this Resource.  # noqa: E501
+        :type comm_type: CommunicationType
+        :param uri: The uri of this Resource.  # noqa: E501
+        :type uri: str
+        :param cust_op_name: The cust_op_name of this Resource.  # noqa: E501
+        :type cust_op_name: str
+        :param operations: The operations of this Resource.  # noqa: E501
+        :type operations: List[Operation]
+        :param description: The description of this Resource.  # noqa: E501
+        :type description: str
+        """
+        self.openapi_types = {
+            'resource_name': str,
+            'comm_type': CommunicationType,
+            'uri': str,
+            'cust_op_name': str,
+            'operations': List[Operation],
+            'description': str
+        }
+
+        self.attribute_map = {
+            'resource_name': 'resourceName',
+            'comm_type': 'commType',
+            'uri': 'uri',
+            'cust_op_name': 'custOpName',
+            'operations': 'operations',
+            'description': 'description'
+        }
+
+        self._resource_name = resource_name
+        self._comm_type = comm_type
+        self._uri = uri
+        self._cust_op_name = cust_op_name
+        self._operations = operations
+        self._description = description
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'Resource':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The Resource of this Resource.  # noqa: E501
+        :rtype: Resource
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def resource_name(self):
+        """Gets the resource_name of this Resource.
+
+        Resource name  # noqa: E501
+
+        :return: The resource_name of this Resource.
+        :rtype: str
+        """
+        return self._resource_name
+
+    @resource_name.setter
+    def resource_name(self, resource_name):
+        """Sets the resource_name of this Resource.
+
+        Resource name  # noqa: E501
+
+        :param resource_name: The resource_name of this Resource.
+        :type resource_name: str
+        """
+        if resource_name is None:
+            raise ValueError("Invalid value for `resource_name`, must not be `None`")  # noqa: E501
+
+        self._resource_name = resource_name
+
+    @property
+    def comm_type(self):
+        """Gets the comm_type of this Resource.
+
+
+        :return: The comm_type of this Resource.
+        :rtype: CommunicationType
+        """
+        return self._comm_type
+
+    @comm_type.setter
+    def comm_type(self, comm_type):
+        """Sets the comm_type of this Resource.
+
+
+        :param comm_type: The comm_type of this Resource.
+        :type comm_type: CommunicationType
+        """
+        if comm_type is None:
+            raise ValueError("Invalid value for `comm_type`, must not be `None`")  # noqa: E501
+
+        self._comm_type = comm_type
+
+    @property
+    def uri(self):
+        """Gets the uri of this Resource.
+
+        Relative URI of the API resource, it is set as {apiSpecificResourceUriPart} part of the URI structure as defined in subclause 4.4 of 3GPP TS 29.501.  # noqa: E501
+
+        :return: The uri of this Resource.
+        :rtype: str
+        """
+        return self._uri
+
+    @uri.setter
+    def uri(self, uri):
+        """Sets the uri of this Resource.
+
+        Relative URI of the API resource, it is set as {apiSpecificResourceUriPart} part of the URI structure as defined in subclause 4.4 of 3GPP TS 29.501.  # noqa: E501
+
+        :param uri: The uri of this Resource.
+        :type uri: str
+        """
+        if uri is None:
+            raise ValueError("Invalid value for `uri`, must not be `None`")  # noqa: E501
+
+        self._uri = uri
+
+    @property
+    def cust_op_name(self):
+        """Gets the cust_op_name of this Resource.
+
+        it is set as {custOpName} part of the URI structure for a custom operation associated with a resource as defined in subclause 4.4 of 3GPP TS 29.501.  # noqa: E501
+
+        :return: The cust_op_name of this Resource.
+        :rtype: str
+        """
+        return self._cust_op_name
+
+    @cust_op_name.setter
+    def cust_op_name(self, cust_op_name):
+        """Sets the cust_op_name of this Resource.
+
+        it is set as {custOpName} part of the URI structure for a custom operation associated with a resource as defined in subclause 4.4 of 3GPP TS 29.501.  # noqa: E501
+
+        :param cust_op_name: The cust_op_name of this Resource.
+        :type cust_op_name: str
+        """
+
+        self._cust_op_name = cust_op_name
+
+    @property
+    def operations(self):
+        """Gets the operations of this Resource.
+
+        Supported HTTP methods for the API resource. Only applicable when the protocol in AefProfile indicates HTTP.  # noqa: E501
+
+        :return: The operations of this Resource.
+        :rtype: List[Operation]
+        """
+        return self._operations
+
+    @operations.setter
+    def operations(self, operations):
+        """Sets the operations of this Resource.
+
+        Supported HTTP methods for the API resource. Only applicable when the protocol in AefProfile indicates HTTP.  # noqa: E501
+
+        :param operations: The operations of this Resource.
+        :type operations: List[Operation]
+        """
+        if operations is not None and len(operations) < 1:
+            raise ValueError("Invalid value for `operations`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._operations = operations
+
+    @property
+    def description(self):
+        """Gets the description of this Resource.
+
+        Text description of the API resource  # noqa: E501
+
+        :return: The description of this Resource.
+        :rtype: str
+        """
+        return self._description
+
+    @description.setter
+    def description(self, description):
+        """Sets the description of this Resource.
+
+        Text description of the API resource  # noqa: E501
+
+        :param description: The description of this Resource.
+        :type description: str
+        """
+
+        self._description = description
diff --git a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/security_method.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/security_method.py
new file mode 100644
index 0000000000000000000000000000000000000000..aa5a6a867110291e085122708f079f3f06b45a32
--- /dev/null
+++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/security_method.py
@@ -0,0 +1,39 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from service_apis.models.base_model_ import Model
+from service_apis.models.security_method_any_of import SecurityMethodAnyOf
+from service_apis import util
+
+from service_apis.models.security_method_any_of import SecurityMethodAnyOf  # noqa: E501
+
+class SecurityMethod(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self):  # noqa: E501
+        """SecurityMethod - a model defined in OpenAPI
+
+        """
+        self.openapi_types = {
+        }
+
+        self.attribute_map = {
+        }
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'SecurityMethod':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The SecurityMethod of this SecurityMethod.  # noqa: E501
+        :rtype: SecurityMethod
+        """
+        return util.deserialize_model(dikt, cls)
diff --git a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/security_method_any_of.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/security_method_any_of.py
new file mode 100644
index 0000000000000000000000000000000000000000..15ad9efd5cf4ee7283136d4d812fac45c45c3143
--- /dev/null
+++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/security_method_any_of.py
@@ -0,0 +1,43 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from service_apis.models.base_model_ import Model
+from service_apis import util
+
+
+class SecurityMethodAnyOf(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    """
+    allowed enum values
+    """
+    PSK = "PSK"
+    PKI = "PKI"
+    OAUTH = "OAUTH"
+    def __init__(self):  # noqa: E501
+        """SecurityMethodAnyOf - a model defined in OpenAPI
+
+        """
+        self.openapi_types = {
+        }
+
+        self.attribute_map = {
+        }
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'SecurityMethodAnyOf':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The SecurityMethod_anyOf of this SecurityMethodAnyOf.  # noqa: E501
+        :rtype: SecurityMethodAnyOf
+        """
+        return util.deserialize_model(dikt, cls)
diff --git a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/service_api_description.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/service_api_description.py
new file mode 100644
index 0000000000000000000000000000000000000000..2941555999fae509abe236fe233ec6a16beb214f
--- /dev/null
+++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/service_api_description.py
@@ -0,0 +1,328 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from service_apis.models.base_model_ import Model
+from service_apis.models.aef_profile import AefProfile
+from service_apis.models.published_api_path import PublishedApiPath
+from service_apis.models.shareable_information import ShareableInformation
+import re
+from service_apis import util
+
+from service_apis.models.aef_profile import AefProfile  # noqa: E501
+from service_apis.models.published_api_path import PublishedApiPath  # noqa: E501
+from service_apis.models.shareable_information import ShareableInformation  # noqa: E501
+import re  # noqa: E501
+
+class ServiceAPIDescription(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, api_name=None, api_id=None, aef_profiles=None, description=None, supported_features=None, shareable_info=None, service_api_category=None, api_supp_feats=None, pub_api_path=None, ccf_id=None):  # noqa: E501
+        """ServiceAPIDescription - a model defined in OpenAPI
+
+        :param api_name: The api_name of this ServiceAPIDescription.  # noqa: E501
+        :type api_name: str
+        :param api_id: The api_id of this ServiceAPIDescription.  # noqa: E501
+        :type api_id: str
+        :param aef_profiles: The aef_profiles of this ServiceAPIDescription.  # noqa: E501
+        :type aef_profiles: List[AefProfile]
+        :param description: The description of this ServiceAPIDescription.  # noqa: E501
+        :type description: str
+        :param supported_features: The supported_features of this ServiceAPIDescription.  # noqa: E501
+        :type supported_features: str
+        :param shareable_info: The shareable_info of this ServiceAPIDescription.  # noqa: E501
+        :type shareable_info: ShareableInformation
+        :param service_api_category: The service_api_category of this ServiceAPIDescription.  # noqa: E501
+        :type service_api_category: str
+        :param api_supp_feats: The api_supp_feats of this ServiceAPIDescription.  # noqa: E501
+        :type api_supp_feats: str
+        :param pub_api_path: The pub_api_path of this ServiceAPIDescription.  # noqa: E501
+        :type pub_api_path: PublishedApiPath
+        :param ccf_id: The ccf_id of this ServiceAPIDescription.  # noqa: E501
+        :type ccf_id: str
+        """
+        self.openapi_types = {
+            'api_name': str,
+            'api_id': str,
+            'aef_profiles': List[AefProfile],
+            'description': str,
+            'supported_features': str,
+            'shareable_info': ShareableInformation,
+            'service_api_category': str,
+            'api_supp_feats': str,
+            'pub_api_path': PublishedApiPath,
+            'ccf_id': str
+        }
+
+        self.attribute_map = {
+            'api_name': 'apiName',
+            'api_id': 'apiId',
+            'aef_profiles': 'aefProfiles',
+            'description': 'description',
+            'supported_features': 'supportedFeatures',
+            'shareable_info': 'shareableInfo',
+            'service_api_category': 'serviceAPICategory',
+            'api_supp_feats': 'apiSuppFeats',
+            'pub_api_path': 'pubApiPath',
+            'ccf_id': 'ccfId'
+        }
+
+        self._api_name = api_name
+        self._api_id = api_id
+        self._aef_profiles = aef_profiles
+        self._description = description
+        self._supported_features = supported_features
+        self._shareable_info = shareable_info
+        self._service_api_category = service_api_category
+        self._api_supp_feats = api_supp_feats
+        self._pub_api_path = pub_api_path
+        self._ccf_id = ccf_id
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'ServiceAPIDescription':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The ServiceAPIDescription of this ServiceAPIDescription.  # noqa: E501
+        :rtype: ServiceAPIDescription
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def api_name(self):
+        """Gets the api_name of this ServiceAPIDescription.
+
+        API name, it is set as {apiName} part of the URI structure as defined in subclause 4.4 of 3GPP TS 29.501.  # noqa: E501
+
+        :return: The api_name of this ServiceAPIDescription.
+        :rtype: str
+        """
+        return self._api_name
+
+    @api_name.setter
+    def api_name(self, api_name):
+        """Sets the api_name of this ServiceAPIDescription.
+
+        API name, it is set as {apiName} part of the URI structure as defined in subclause 4.4 of 3GPP TS 29.501.  # noqa: E501
+
+        :param api_name: The api_name of this ServiceAPIDescription.
+        :type api_name: str
+        """
+        if api_name is None:
+            raise ValueError("Invalid value for `api_name`, must not be `None`")  # noqa: E501
+
+        self._api_name = api_name
+
+    @property
+    def api_id(self):
+        """Gets the api_id of this ServiceAPIDescription.
+
+        API identifier assigned by the CAPIF core function to the published service API. Shall not be present in the HTTP POST request from the API publishing function to the CAPIF core function. Shall be present in the HTTP POST response from the CAPIF core function to the API publishing function and in the HTTP GET response from the CAPIF core function to the API invoker (discovery API).  # noqa: E501
+
+        :return: The api_id of this ServiceAPIDescription.
+        :rtype: str
+        """
+        return self._api_id
+
+    @api_id.setter
+    def api_id(self, api_id):
+        """Sets the api_id of this ServiceAPIDescription.
+
+        API identifier assigned by the CAPIF core function to the published service API. Shall not be present in the HTTP POST request from the API publishing function to the CAPIF core function. Shall be present in the HTTP POST response from the CAPIF core function to the API publishing function and in the HTTP GET response from the CAPIF core function to the API invoker (discovery API).  # noqa: E501
+
+        :param api_id: The api_id of this ServiceAPIDescription.
+        :type api_id: str
+        """
+
+        self._api_id = api_id
+
+    @property
+    def aef_profiles(self):
+        """Gets the aef_profiles of this ServiceAPIDescription.
+
+        AEF profile information, which includes the exposed API details (e.g. protocol).  # noqa: E501
+
+        :return: The aef_profiles of this ServiceAPIDescription.
+        :rtype: List[AefProfile]
+        """
+        return self._aef_profiles
+
+    @aef_profiles.setter
+    def aef_profiles(self, aef_profiles):
+        """Sets the aef_profiles of this ServiceAPIDescription.
+
+        AEF profile information, which includes the exposed API details (e.g. protocol).  # noqa: E501
+
+        :param aef_profiles: The aef_profiles of this ServiceAPIDescription.
+        :type aef_profiles: List[AefProfile]
+        """
+        if aef_profiles is not None and len(aef_profiles) < 1:
+            raise ValueError("Invalid value for `aef_profiles`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._aef_profiles = aef_profiles
+
+    @property
+    def description(self):
+        """Gets the description of this ServiceAPIDescription.
+
+        Text description of the API  # noqa: E501
+
+        :return: The description of this ServiceAPIDescription.
+        :rtype: str
+        """
+        return self._description
+
+    @description.setter
+    def description(self, description):
+        """Sets the description of this ServiceAPIDescription.
+
+        Text description of the API  # noqa: E501
+
+        :param description: The description of this ServiceAPIDescription.
+        :type description: str
+        """
+
+        self._description = description
+
+    @property
+    def supported_features(self):
+        """Gets the supported_features of this ServiceAPIDescription.
+
+        A string used to indicate the features supported by an API that is used as defined in clause 6.6 in 3GPP TS 29.500. The string shall contain a bitmask indicating supported features in hexadecimal representation Each character in the string shall take a value of \"0\" to \"9\", \"a\" to \"f\" or \"A\" to \"F\" and shall represent the support of 4 features as described in table 5.2.2-3. The most significant character representing the highest-numbered features shall appear first in the string, and the character representing features 1 to 4 shall appear last in the string. The list of features and their numbering (starting with 1) are defined separately for each API. If the string contains a lower number of characters than there are defined features for an API, all features that would be represented by characters that are not present in the string are not supported  # noqa: E501
+
+        :return: The supported_features of this ServiceAPIDescription.
+        :rtype: str
+        """
+        return self._supported_features
+
+    @supported_features.setter
+    def supported_features(self, supported_features):
+        """Sets the supported_features of this ServiceAPIDescription.
+
+        A string used to indicate the features supported by an API that is used as defined in clause 6.6 in 3GPP TS 29.500. The string shall contain a bitmask indicating supported features in hexadecimal representation Each character in the string shall take a value of \"0\" to \"9\", \"a\" to \"f\" or \"A\" to \"F\" and shall represent the support of 4 features as described in table 5.2.2-3. The most significant character representing the highest-numbered features shall appear first in the string, and the character representing features 1 to 4 shall appear last in the string. The list of features and their numbering (starting with 1) are defined separately for each API. If the string contains a lower number of characters than there are defined features for an API, all features that would be represented by characters that are not present in the string are not supported  # noqa: E501
+
+        :param supported_features: The supported_features of this ServiceAPIDescription.
+        :type supported_features: str
+        """
+        if supported_features is not None and not re.search(r'^[A-Fa-f0-9]*$', supported_features):  # noqa: E501
+            raise ValueError("Invalid value for `supported_features`, must be a follow pattern or equal to `/^[A-Fa-f0-9]*$/`")  # noqa: E501
+
+        self._supported_features = supported_features
+
+    @property
+    def shareable_info(self):
+        """Gets the shareable_info of this ServiceAPIDescription.
+
+
+        :return: The shareable_info of this ServiceAPIDescription.
+        :rtype: ShareableInformation
+        """
+        return self._shareable_info
+
+    @shareable_info.setter
+    def shareable_info(self, shareable_info):
+        """Sets the shareable_info of this ServiceAPIDescription.
+
+
+        :param shareable_info: The shareable_info of this ServiceAPIDescription.
+        :type shareable_info: ShareableInformation
+        """
+
+        self._shareable_info = shareable_info
+
+    @property
+    def service_api_category(self):
+        """Gets the service_api_category of this ServiceAPIDescription.
+
+
+        :return: The service_api_category of this ServiceAPIDescription.
+        :rtype: str
+        """
+        return self._service_api_category
+
+    @service_api_category.setter
+    def service_api_category(self, service_api_category):
+        """Sets the service_api_category of this ServiceAPIDescription.
+
+
+        :param service_api_category: The service_api_category of this ServiceAPIDescription.
+        :type service_api_category: str
+        """
+
+        self._service_api_category = service_api_category
+
+    @property
+    def api_supp_feats(self):
+        """Gets the api_supp_feats of this ServiceAPIDescription.
+
+        A string used to indicate the features supported by an API that is used as defined in clause 6.6 in 3GPP TS 29.500. The string shall contain a bitmask indicating supported features in hexadecimal representation Each character in the string shall take a value of \"0\" to \"9\", \"a\" to \"f\" or \"A\" to \"F\" and shall represent the support of 4 features as described in table 5.2.2-3. The most significant character representing the highest-numbered features shall appear first in the string, and the character representing features 1 to 4 shall appear last in the string. The list of features and their numbering (starting with 1) are defined separately for each API. If the string contains a lower number of characters than there are defined features for an API, all features that would be represented by characters that are not present in the string are not supported  # noqa: E501
+
+        :return: The api_supp_feats of this ServiceAPIDescription.
+        :rtype: str
+        """
+        return self._api_supp_feats
+
+    @api_supp_feats.setter
+    def api_supp_feats(self, api_supp_feats):
+        """Sets the api_supp_feats of this ServiceAPIDescription.
+
+        A string used to indicate the features supported by an API that is used as defined in clause 6.6 in 3GPP TS 29.500. The string shall contain a bitmask indicating supported features in hexadecimal representation Each character in the string shall take a value of \"0\" to \"9\", \"a\" to \"f\" or \"A\" to \"F\" and shall represent the support of 4 features as described in table 5.2.2-3. The most significant character representing the highest-numbered features shall appear first in the string, and the character representing features 1 to 4 shall appear last in the string. The list of features and their numbering (starting with 1) are defined separately for each API. If the string contains a lower number of characters than there are defined features for an API, all features that would be represented by characters that are not present in the string are not supported  # noqa: E501
+
+        :param api_supp_feats: The api_supp_feats of this ServiceAPIDescription.
+        :type api_supp_feats: str
+        """
+        if api_supp_feats is not None and not re.search(r'^[A-Fa-f0-9]*$', api_supp_feats):  # noqa: E501
+            raise ValueError("Invalid value for `api_supp_feats`, must be a follow pattern or equal to `/^[A-Fa-f0-9]*$/`")  # noqa: E501
+
+        self._api_supp_feats = api_supp_feats
+
+    @property
+    def pub_api_path(self):
+        """Gets the pub_api_path of this ServiceAPIDescription.
+
+
+        :return: The pub_api_path of this ServiceAPIDescription.
+        :rtype: PublishedApiPath
+        """
+        return self._pub_api_path
+
+    @pub_api_path.setter
+    def pub_api_path(self, pub_api_path):
+        """Sets the pub_api_path of this ServiceAPIDescription.
+
+
+        :param pub_api_path: The pub_api_path of this ServiceAPIDescription.
+        :type pub_api_path: PublishedApiPath
+        """
+
+        self._pub_api_path = pub_api_path
+
+    @property
+    def ccf_id(self):
+        """Gets the ccf_id of this ServiceAPIDescription.
+
+        CAPIF core function identifier.  # noqa: E501
+
+        :return: The ccf_id of this ServiceAPIDescription.
+        :rtype: str
+        """
+        return self._ccf_id
+
+    @ccf_id.setter
+    def ccf_id(self, ccf_id):
+        """Sets the ccf_id of this ServiceAPIDescription.
+
+        CAPIF core function identifier.  # noqa: E501
+
+        :param ccf_id: The ccf_id of this ServiceAPIDescription.
+        :type ccf_id: str
+        """
+
+        self._ccf_id = ccf_id
diff --git a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/shareable_information.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/shareable_information.py
new file mode 100644
index 0000000000000000000000000000000000000000..ed04a4b3ae9bf3bb10cd9e0ae8044af699cc5c86
--- /dev/null
+++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/shareable_information.py
@@ -0,0 +1,98 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from service_apis.models.base_model_ import Model
+from service_apis import util
+
+
+class ShareableInformation(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, is_shareable=None, capif_prov_doms=None):  # noqa: E501
+        """ShareableInformation - a model defined in OpenAPI
+
+        :param is_shareable: The is_shareable of this ShareableInformation.  # noqa: E501
+        :type is_shareable: bool
+        :param capif_prov_doms: The capif_prov_doms of this ShareableInformation.  # noqa: E501
+        :type capif_prov_doms: List[str]
+        """
+        self.openapi_types = {
+            'is_shareable': bool,
+            'capif_prov_doms': List[str]
+        }
+
+        self.attribute_map = {
+            'is_shareable': 'isShareable',
+            'capif_prov_doms': 'capifProvDoms'
+        }
+
+        self._is_shareable = is_shareable
+        self._capif_prov_doms = capif_prov_doms
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'ShareableInformation':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The ShareableInformation of this ShareableInformation.  # noqa: E501
+        :rtype: ShareableInformation
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def is_shareable(self):
+        """Gets the is_shareable of this ShareableInformation.
+
+        Set to \"true\" indicates that the service API and/or the service API category can be shared to the list of CAPIF provider domain information. Otherwise set to \"false\".  # noqa: E501
+
+        :return: The is_shareable of this ShareableInformation.
+        :rtype: bool
+        """
+        return self._is_shareable
+
+    @is_shareable.setter
+    def is_shareable(self, is_shareable):
+        """Sets the is_shareable of this ShareableInformation.
+
+        Set to \"true\" indicates that the service API and/or the service API category can be shared to the list of CAPIF provider domain information. Otherwise set to \"false\".  # noqa: E501
+
+        :param is_shareable: The is_shareable of this ShareableInformation.
+        :type is_shareable: bool
+        """
+        if is_shareable is None:
+            raise ValueError("Invalid value for `is_shareable`, must not be `None`")  # noqa: E501
+
+        self._is_shareable = is_shareable
+
+    @property
+    def capif_prov_doms(self):
+        """Gets the capif_prov_doms of this ShareableInformation.
+
+        List of CAPIF provider domains to which the service API information to be shared.  # noqa: E501
+
+        :return: The capif_prov_doms of this ShareableInformation.
+        :rtype: List[str]
+        """
+        return self._capif_prov_doms
+
+    @capif_prov_doms.setter
+    def capif_prov_doms(self, capif_prov_doms):
+        """Sets the capif_prov_doms of this ShareableInformation.
+
+        List of CAPIF provider domains to which the service API information to be shared.  # noqa: E501
+
+        :param capif_prov_doms: The capif_prov_doms of this ShareableInformation.
+        :type capif_prov_doms: List[str]
+        """
+        if capif_prov_doms is not None and len(capif_prov_doms) < 1:
+            raise ValueError("Invalid value for `capif_prov_doms`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._capif_prov_doms = capif_prov_doms
diff --git a/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/version.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/version.py
new file mode 100644
index 0000000000000000000000000000000000000000..8f395e7fc7a5822da6c2caa6b6c8295c7b2129ae
--- /dev/null
+++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/models/version.py
@@ -0,0 +1,160 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from service_apis.models.base_model_ import Model
+from service_apis.models.custom_operation import CustomOperation
+from service_apis.models.resource import Resource
+from service_apis import util
+
+from service_apis.models.custom_operation import CustomOperation  # noqa: E501
+from service_apis.models.resource import Resource  # noqa: E501
+
+class Version(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, api_version=None, expiry=None, resources=None, cust_operations=None):  # noqa: E501
+        """Version - a model defined in OpenAPI
+
+        :param api_version: The api_version of this Version.  # noqa: E501
+        :type api_version: str
+        :param expiry: The expiry of this Version.  # noqa: E501
+        :type expiry: datetime
+        :param resources: The resources of this Version.  # noqa: E501
+        :type resources: List[Resource]
+        :param cust_operations: The cust_operations of this Version.  # noqa: E501
+        :type cust_operations: List[CustomOperation]
+        """
+        self.openapi_types = {
+            'api_version': str,
+            'expiry': datetime,
+            'resources': List[Resource],
+            'cust_operations': List[CustomOperation]
+        }
+
+        self.attribute_map = {
+            'api_version': 'apiVersion',
+            'expiry': 'expiry',
+            'resources': 'resources',
+            'cust_operations': 'custOperations'
+        }
+
+        self._api_version = api_version
+        self._expiry = expiry
+        self._resources = resources
+        self._cust_operations = cust_operations
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'Version':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The Version of this Version.  # noqa: E501
+        :rtype: Version
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def api_version(self):
+        """Gets the api_version of this Version.
+
+        API major version in URI (e.g. v1)  # noqa: E501
+
+        :return: The api_version of this Version.
+        :rtype: str
+        """
+        return self._api_version
+
+    @api_version.setter
+    def api_version(self, api_version):
+        """Sets the api_version of this Version.
+
+        API major version in URI (e.g. v1)  # noqa: E501
+
+        :param api_version: The api_version of this Version.
+        :type api_version: str
+        """
+        if api_version is None:
+            raise ValueError("Invalid value for `api_version`, must not be `None`")  # noqa: E501
+
+        self._api_version = api_version
+
+    @property
+    def expiry(self):
+        """Gets the expiry of this Version.
+
+        string with format \"date-time\" as defined in OpenAPI.  # noqa: E501
+
+        :return: The expiry of this Version.
+        :rtype: datetime
+        """
+        return self._expiry
+
+    @expiry.setter
+    def expiry(self, expiry):
+        """Sets the expiry of this Version.
+
+        string with format \"date-time\" as defined in OpenAPI.  # noqa: E501
+
+        :param expiry: The expiry of this Version.
+        :type expiry: datetime
+        """
+
+        self._expiry = expiry
+
+    @property
+    def resources(self):
+        """Gets the resources of this Version.
+
+        Resources supported by the API.  # noqa: E501
+
+        :return: The resources of this Version.
+        :rtype: List[Resource]
+        """
+        return self._resources
+
+    @resources.setter
+    def resources(self, resources):
+        """Sets the resources of this Version.
+
+        Resources supported by the API.  # noqa: E501
+
+        :param resources: The resources of this Version.
+        :type resources: List[Resource]
+        """
+        if resources is not None and len(resources) < 1:
+            raise ValueError("Invalid value for `resources`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._resources = resources
+
+    @property
+    def cust_operations(self):
+        """Gets the cust_operations of this Version.
+
+        Custom operations without resource association.  # noqa: E501
+
+        :return: The cust_operations of this Version.
+        :rtype: List[CustomOperation]
+        """
+        return self._cust_operations
+
+    @cust_operations.setter
+    def cust_operations(self, cust_operations):
+        """Sets the cust_operations of this Version.
+
+        Custom operations without resource association.  # noqa: E501
+
+        :param cust_operations: The cust_operations of this Version.
+        :type cust_operations: List[CustomOperation]
+        """
+        if cust_operations is not None and len(cust_operations) < 1:
+            raise ValueError("Invalid value for `cust_operations`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._cust_operations = cust_operations
diff --git a/services/TS29222_CAPIF_Discover_Service_API/service_apis/openapi/openapi.yaml b/services/TS29222_CAPIF_Discover_Service_API/service_apis/openapi/openapi.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..748f74a56266bc7e67d278d125971b45d0d95f3b
--- /dev/null
+++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/openapi/openapi.yaml
@@ -0,0 +1,1330 @@
+openapi: 3.0.0
+info:
+  description: |
+    API for discovering service APIs.
+    © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
+    All rights reserved.
+  title: CAPIF_Discover_Service_API
+  version: 1.2.0-alpha.1
+externalDocs:
+  description: 3GPP TS 29.222 V17.1.0 Common API Framework for 3GPP Northbound APIs
+  url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.222/
+servers:
+- url: '{apiRoot}/service-apis/v1'
+  variables:
+    apiRoot:
+      default: https://example.com
+      description: apiRoot as defined in subclause 7.5 of 3GPP TS 29.222.
+paths:
+  /allServiceAPIs:
+    get:
+      description: Discover published service APIs and retrieve a collection of APIs
+        according to certain filter criteria.
+      operationId: all_service_apis_get
+      parameters:
+      - description: String identifying the API invoker assigned by the CAPIF core
+          function. It also represents the CCF identifier in the CAPIF-6/6e interface.
+        explode: true
+        in: query
+        name: api-invoker-id
+        required: true
+        schema:
+          type: string
+        style: form
+      - description: API name, it is set as {apiName} part of the URI structure as
+          defined in subclause 4.4 of 3GPP TS 29.501.
+        explode: true
+        in: query
+        name: api-name
+        required: false
+        schema:
+          type: string
+        style: form
+      - description: API major version the URI (e.g. v1).
+        explode: true
+        in: query
+        name: api-version
+        required: false
+        schema:
+          type: string
+        style: form
+      - description: Communication type used by the API (e.g. REQUEST_RESPONSE).
+        explode: true
+        in: query
+        name: comm-type
+        required: false
+        schema:
+          $ref: '#/components/schemas/CommunicationType'
+        style: form
+      - description: Protocol used by the API.
+        explode: true
+        in: query
+        name: protocol
+        required: false
+        schema:
+          $ref: '#/components/schemas/Protocol'
+        style: form
+      - description: AEF identifer.
+        explode: true
+        in: query
+        name: aef-id
+        required: false
+        schema:
+          type: string
+        style: form
+      - description: Data formats used by the API (e.g. serialization protocol JSON
+          used).
+        explode: true
+        in: query
+        name: data-format
+        required: false
+        schema:
+          $ref: '#/components/schemas/DataFormat'
+        style: form
+      - description: The service API category to which the service API belongs to.
+        explode: true
+        in: query
+        name: api-cat
+        required: false
+        schema:
+          type: string
+        style: form
+      - description: Features supported by the NF consumer for the CAPIF Discover
+          Service API.
+        explode: true
+        in: query
+        name: supported-features
+        required: false
+        schema:
+          $ref: '#/components/schemas/SupportedFeatures'
+        style: form
+      - description: Features supported by the discovered service API indicated by
+          api-name parameter. This may only be present if api-name query parameter
+          is present.
+        explode: true
+        in: query
+        name: api-supported-features
+        required: false
+        schema:
+          $ref: '#/components/schemas/SupportedFeatures'
+        style: form
+      responses:
+        "200":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/DiscoveredAPIs'
+          description: The response body contains the result of the search over the
+            list of registered APIs.
+        "307":
+          description: Temporary Redirect
+          headers:
+            Location:
+              description: An alternative URI of the resource.
+              required: true
+              schema:
+                type: string
+        "308":
+          description: Permanent Redirect
+          headers:
+            Location:
+              description: An alternative URI of the resource.
+              required: true
+              schema:
+                type: string
+        "400":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Bad request
+        "401":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Unauthorized
+        "403":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Forbidden
+        "404":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Not Found
+        "406":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Not Acceptable
+        "414":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: URI Too Long
+        "429":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Too Many Requests
+        "500":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Internal Server Error
+        "503":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Service Unavailable
+        default:
+          description: Generic Error
+      x-openapi-router-controller: service_apis.controllers.default_controller
+components:
+  schemas:
+    DiscoveredAPIs:
+      description: Represents a list of APIs currently registered in the CAPIF core
+        function and satisfying a number of filter criteria provided by the API consumer.
+      example:
+        serviceAPIDescriptions:
+        - serviceAPICategory: serviceAPICategory
+          ccfId: ccfId
+          apiName: apiName
+          shareableInfo:
+            capifProvDoms:
+            - capifProvDoms
+            - capifProvDoms
+            isShareable: true
+          supportedFeatures: supportedFeatures
+          description: description
+          apiSuppFeats: apiSuppFeats
+          apiId: apiId
+          aefProfiles:
+          - securityMethods:
+            - null
+            - null
+            versions:
+            - apiVersion: apiVersion
+              resources:
+              - operations:
+                - null
+                - null
+                description: description
+                resourceName: resourceName
+                custOpName: custOpName
+                uri: uri
+              - operations:
+                - null
+                - null
+                description: description
+                resourceName: resourceName
+                custOpName: custOpName
+                uri: uri
+              custOperations:
+              - operations:
+                - null
+                - null
+                description: description
+                custOpName: custOpName
+              - operations:
+                - null
+                - null
+                description: description
+                custOpName: custOpName
+              expiry: 2000-01-23T04:56:07.000+00:00
+            - apiVersion: apiVersion
+              resources:
+              - operations:
+                - null
+                - null
+                description: description
+                resourceName: resourceName
+                custOpName: custOpName
+                uri: uri
+              - operations:
+                - null
+                - null
+                description: description
+                resourceName: resourceName
+                custOpName: custOpName
+                uri: uri
+              custOperations:
+              - operations:
+                - null
+                - null
+                description: description
+                custOpName: custOpName
+              - operations:
+                - null
+                - null
+                description: description
+                custOpName: custOpName
+              expiry: 2000-01-23T04:56:07.000+00:00
+            domainName: domainName
+            aefId: aefId
+            interfaceDescriptions:
+            - ipv6Addr: ipv6Addr
+              securityMethods:
+              - null
+              - null
+              port: 5248
+              ipv4Addr: ipv4Addr
+            - ipv6Addr: ipv6Addr
+              securityMethods:
+              - null
+              - null
+              port: 5248
+              ipv4Addr: ipv4Addr
+          - securityMethods:
+            - null
+            - null
+            versions:
+            - apiVersion: apiVersion
+              resources:
+              - operations:
+                - null
+                - null
+                description: description
+                resourceName: resourceName
+                custOpName: custOpName
+                uri: uri
+              - operations:
+                - null
+                - null
+                description: description
+                resourceName: resourceName
+                custOpName: custOpName
+                uri: uri
+              custOperations:
+              - operations:
+                - null
+                - null
+                description: description
+                custOpName: custOpName
+              - operations:
+                - null
+                - null
+                description: description
+                custOpName: custOpName
+              expiry: 2000-01-23T04:56:07.000+00:00
+            - apiVersion: apiVersion
+              resources:
+              - operations:
+                - null
+                - null
+                description: description
+                resourceName: resourceName
+                custOpName: custOpName
+                uri: uri
+              - operations:
+                - null
+                - null
+                description: description
+                resourceName: resourceName
+                custOpName: custOpName
+                uri: uri
+              custOperations:
+              - operations:
+                - null
+                - null
+                description: description
+                custOpName: custOpName
+              - operations:
+                - null
+                - null
+                description: description
+                custOpName: custOpName
+              expiry: 2000-01-23T04:56:07.000+00:00
+            domainName: domainName
+            aefId: aefId
+            interfaceDescriptions:
+            - ipv6Addr: ipv6Addr
+              securityMethods:
+              - null
+              - null
+              port: 5248
+              ipv4Addr: ipv4Addr
+            - ipv6Addr: ipv6Addr
+              securityMethods:
+              - null
+              - null
+              port: 5248
+              ipv4Addr: ipv4Addr
+          pubApiPath:
+            ccfIds:
+            - ccfIds
+            - ccfIds
+        - serviceAPICategory: serviceAPICategory
+          ccfId: ccfId
+          apiName: apiName
+          shareableInfo:
+            capifProvDoms:
+            - capifProvDoms
+            - capifProvDoms
+            isShareable: true
+          supportedFeatures: supportedFeatures
+          description: description
+          apiSuppFeats: apiSuppFeats
+          apiId: apiId
+          aefProfiles:
+          - securityMethods:
+            - null
+            - null
+            versions:
+            - apiVersion: apiVersion
+              resources:
+              - operations:
+                - null
+                - null
+                description: description
+                resourceName: resourceName
+                custOpName: custOpName
+                uri: uri
+              - operations:
+                - null
+                - null
+                description: description
+                resourceName: resourceName
+                custOpName: custOpName
+                uri: uri
+              custOperations:
+              - operations:
+                - null
+                - null
+                description: description
+                custOpName: custOpName
+              - operations:
+                - null
+                - null
+                description: description
+                custOpName: custOpName
+              expiry: 2000-01-23T04:56:07.000+00:00
+            - apiVersion: apiVersion
+              resources:
+              - operations:
+                - null
+                - null
+                description: description
+                resourceName: resourceName
+                custOpName: custOpName
+                uri: uri
+              - operations:
+                - null
+                - null
+                description: description
+                resourceName: resourceName
+                custOpName: custOpName
+                uri: uri
+              custOperations:
+              - operations:
+                - null
+                - null
+                description: description
+                custOpName: custOpName
+              - operations:
+                - null
+                - null
+                description: description
+                custOpName: custOpName
+              expiry: 2000-01-23T04:56:07.000+00:00
+            domainName: domainName
+            aefId: aefId
+            interfaceDescriptions:
+            - ipv6Addr: ipv6Addr
+              securityMethods:
+              - null
+              - null
+              port: 5248
+              ipv4Addr: ipv4Addr
+            - ipv6Addr: ipv6Addr
+              securityMethods:
+              - null
+              - null
+              port: 5248
+              ipv4Addr: ipv4Addr
+          - securityMethods:
+            - null
+            - null
+            versions:
+            - apiVersion: apiVersion
+              resources:
+              - operations:
+                - null
+                - null
+                description: description
+                resourceName: resourceName
+                custOpName: custOpName
+                uri: uri
+              - operations:
+                - null
+                - null
+                description: description
+                resourceName: resourceName
+                custOpName: custOpName
+                uri: uri
+              custOperations:
+              - operations:
+                - null
+                - null
+                description: description
+                custOpName: custOpName
+              - operations:
+                - null
+                - null
+                description: description
+                custOpName: custOpName
+              expiry: 2000-01-23T04:56:07.000+00:00
+            - apiVersion: apiVersion
+              resources:
+              - operations:
+                - null
+                - null
+                description: description
+                resourceName: resourceName
+                custOpName: custOpName
+                uri: uri
+              - operations:
+                - null
+                - null
+                description: description
+                resourceName: resourceName
+                custOpName: custOpName
+                uri: uri
+              custOperations:
+              - operations:
+                - null
+                - null
+                description: description
+                custOpName: custOpName
+              - operations:
+                - null
+                - null
+                description: description
+                custOpName: custOpName
+              expiry: 2000-01-23T04:56:07.000+00:00
+            domainName: domainName
+            aefId: aefId
+            interfaceDescriptions:
+            - ipv6Addr: ipv6Addr
+              securityMethods:
+              - null
+              - null
+              port: 5248
+              ipv4Addr: ipv4Addr
+            - ipv6Addr: ipv6Addr
+              securityMethods:
+              - null
+              - null
+              port: 5248
+              ipv4Addr: ipv4Addr
+          pubApiPath:
+            ccfIds:
+            - ccfIds
+            - ccfIds
+      properties:
+        serviceAPIDescriptions:
+          description: Description of the service API as published by the service.
+            Each service API description shall include AEF profiles matching the filter
+            criteria.
+          items:
+            $ref: '#/components/schemas/ServiceAPIDescription'
+          minItems: 1
+          title: serviceAPIDescriptions
+          type: array
+      title: DiscoveredAPIs
+      type: object
+    CommunicationType:
+      anyOf:
+      - $ref: '#/components/schemas/CommunicationType_anyOf'
+      - description: |
+          This string provides forward-compatibility with future extensions to the enumeration but is not used to encode content defined in the present version of this API.
+        type: string
+      description: |
+        Possible values are - REQUEST_RESPONSE: The communication is of the type request-response - SUBSCRIBE_NOTIFY: The communication is of the type subscribe-notify
+      title: CommunicationType
+    Protocol:
+      anyOf:
+      - $ref: '#/components/schemas/Protocol_anyOf'
+      - description: |
+          This string provides forward-compatibility with future extensions to the enumeration but is not used to encode content defined in the present version of this API.
+        type: string
+      description: |
+        Possible values are - HTTP_1_1: HTTP version 1.1 - HTTP_2: HTTP version 2
+      title: Protocol
+    DataFormat:
+      anyOf:
+      - $ref: '#/components/schemas/DataFormat_anyOf'
+      - description: |
+          This string provides forward-compatibility with future extensions to the enumeration but is not used to encode content defined in the present version of this API.
+        type: string
+      description: |
+        Possible values are - JSON: JavaScript Object Notation
+      title: DataFormat
+    SupportedFeatures:
+      description: A string used to indicate the features supported by an API that
+        is used as defined in clause 6.6 in 3GPP TS 29.500. The string shall contain
+        a bitmask indicating supported features in hexadecimal representation Each
+        character in the string shall take a value of "0" to "9", "a" to "f" or "A"
+        to "F" and shall represent the support of 4 features as described in table 5.2.2-3.
+        The most significant character representing the highest-numbered features
+        shall appear first in the string, and the character representing features
+        1 to 4 shall appear last in the string. The list of features and their numbering
+        (starting with 1) are defined separately for each API. If the string contains
+        a lower number of characters than there are defined features for an API, all
+        features that would be represented by characters that are not present in the
+        string are not supported
+      pattern: ^[A-Fa-f0-9]*$
+      title: SupportedFeatures
+      type: string
+    ProblemDetails:
+      description: Represents additional information and details on an error response.
+      properties:
+        type:
+          description: string providing an URI formatted according to IETF RFC 3986.
+          title: type
+          type: string
+        title:
+          description: A short, human-readable summary of the problem type. It should
+            not change from occurrence to occurrence of the problem.
+          title: title
+          type: string
+        status:
+          description: The HTTP status code for this occurrence of the problem.
+          title: status
+          type: integer
+        detail:
+          description: A human-readable explanation specific to this occurrence of
+            the problem.
+          title: detail
+          type: string
+        instance:
+          description: string providing an URI formatted according to IETF RFC 3986.
+          title: type
+          type: string
+        cause:
+          description: A machine-readable application error cause specific to this
+            occurrence of the problem. This IE should be present and provide application-related
+            error information, if available.
+          title: cause
+          type: string
+        invalidParams:
+          description: Description of invalid parameters, for a request rejected due
+            to invalid parameters.
+          items:
+            $ref: '#/components/schemas/InvalidParam'
+          minItems: 1
+          title: invalidParams
+          type: array
+        supportedFeatures:
+          description: A string used to indicate the features supported by an API
+            that is used as defined in clause 6.6 in 3GPP TS 29.500. The string shall
+            contain a bitmask indicating supported features in hexadecimal representation
+            Each character in the string shall take a value of "0" to "9", "a" to
+            "f" or "A" to "F" and shall represent the support of 4 features as described
+            in table 5.2.2-3. The most significant character representing the highest-numbered
+            features shall appear first in the string, and the character representing
+            features 1 to 4 shall appear last in the string. The list of features
+            and their numbering (starting with 1) are defined separately for each
+            API. If the string contains a lower number of characters than there are
+            defined features for an API, all features that would be represented by
+            characters that are not present in the string are not supported
+          pattern: ^[A-Fa-f0-9]*$
+          title: SupportedFeatures
+          type: string
+      title: ProblemDetails
+      type: object
+    Uri:
+      description: string providing an URI formatted according to IETF RFC 3986.
+      title: type
+      type: string
+    InvalidParam:
+      description: Represents the description of invalid parameters, for a request
+        rejected due to invalid parameters.
+      properties:
+        param:
+          description: Attribute's name encoded as a JSON Pointer, or header's name.
+          title: param
+          type: string
+        reason:
+          description: A human-readable reason, e.g. "must be a positive integer".
+          title: reason
+          type: string
+      required:
+      - param
+      title: InvalidParam
+      type: object
+    ServiceAPIDescription:
+      description: Represents the description of a service API as published by the
+        APF.
+      example:
+        serviceAPICategory: serviceAPICategory
+        ccfId: ccfId
+        apiName: apiName
+        shareableInfo:
+          capifProvDoms:
+          - capifProvDoms
+          - capifProvDoms
+          isShareable: true
+        supportedFeatures: supportedFeatures
+        description: description
+        apiSuppFeats: apiSuppFeats
+        apiId: apiId
+        aefProfiles:
+        - securityMethods:
+          - null
+          - null
+          versions:
+          - apiVersion: apiVersion
+            resources:
+            - operations:
+              - null
+              - null
+              description: description
+              resourceName: resourceName
+              custOpName: custOpName
+              uri: uri
+            - operations:
+              - null
+              - null
+              description: description
+              resourceName: resourceName
+              custOpName: custOpName
+              uri: uri
+            custOperations:
+            - operations:
+              - null
+              - null
+              description: description
+              custOpName: custOpName
+            - operations:
+              - null
+              - null
+              description: description
+              custOpName: custOpName
+            expiry: 2000-01-23T04:56:07.000+00:00
+          - apiVersion: apiVersion
+            resources:
+            - operations:
+              - null
+              - null
+              description: description
+              resourceName: resourceName
+              custOpName: custOpName
+              uri: uri
+            - operations:
+              - null
+              - null
+              description: description
+              resourceName: resourceName
+              custOpName: custOpName
+              uri: uri
+            custOperations:
+            - operations:
+              - null
+              - null
+              description: description
+              custOpName: custOpName
+            - operations:
+              - null
+              - null
+              description: description
+              custOpName: custOpName
+            expiry: 2000-01-23T04:56:07.000+00:00
+          domainName: domainName
+          aefId: aefId
+          interfaceDescriptions:
+          - ipv6Addr: ipv6Addr
+            securityMethods:
+            - null
+            - null
+            port: 5248
+            ipv4Addr: ipv4Addr
+          - ipv6Addr: ipv6Addr
+            securityMethods:
+            - null
+            - null
+            port: 5248
+            ipv4Addr: ipv4Addr
+        - securityMethods:
+          - null
+          - null
+          versions:
+          - apiVersion: apiVersion
+            resources:
+            - operations:
+              - null
+              - null
+              description: description
+              resourceName: resourceName
+              custOpName: custOpName
+              uri: uri
+            - operations:
+              - null
+              - null
+              description: description
+              resourceName: resourceName
+              custOpName: custOpName
+              uri: uri
+            custOperations:
+            - operations:
+              - null
+              - null
+              description: description
+              custOpName: custOpName
+            - operations:
+              - null
+              - null
+              description: description
+              custOpName: custOpName
+            expiry: 2000-01-23T04:56:07.000+00:00
+          - apiVersion: apiVersion
+            resources:
+            - operations:
+              - null
+              - null
+              description: description
+              resourceName: resourceName
+              custOpName: custOpName
+              uri: uri
+            - operations:
+              - null
+              - null
+              description: description
+              resourceName: resourceName
+              custOpName: custOpName
+              uri: uri
+            custOperations:
+            - operations:
+              - null
+              - null
+              description: description
+              custOpName: custOpName
+            - operations:
+              - null
+              - null
+              description: description
+              custOpName: custOpName
+            expiry: 2000-01-23T04:56:07.000+00:00
+          domainName: domainName
+          aefId: aefId
+          interfaceDescriptions:
+          - ipv6Addr: ipv6Addr
+            securityMethods:
+            - null
+            - null
+            port: 5248
+            ipv4Addr: ipv4Addr
+          - ipv6Addr: ipv6Addr
+            securityMethods:
+            - null
+            - null
+            port: 5248
+            ipv4Addr: ipv4Addr
+        pubApiPath:
+          ccfIds:
+          - ccfIds
+          - ccfIds
+      properties:
+        apiName:
+          description: API name, it is set as {apiName} part of the URI structure
+            as defined in subclause 4.4 of 3GPP TS 29.501.
+          title: apiName
+          type: string
+        apiId:
+          description: API identifier assigned by the CAPIF core function to the published
+            service API. Shall not be present in the HTTP POST request from the API
+            publishing function to the CAPIF core function. Shall be present in the
+            HTTP POST response from the CAPIF core function to the API publishing
+            function and in the HTTP GET response from the CAPIF core function to
+            the API invoker (discovery API).
+          title: apiId
+          type: string
+        aefProfiles:
+          description: AEF profile information, which includes the exposed API details
+            (e.g. protocol).
+          items:
+            $ref: '#/components/schemas/AefProfile'
+          minItems: 1
+          title: aefProfiles
+          type: array
+        description:
+          description: Text description of the API
+          title: description
+          type: string
+        supportedFeatures:
+          description: A string used to indicate the features supported by an API
+            that is used as defined in clause 6.6 in 3GPP TS 29.500. The string shall
+            contain a bitmask indicating supported features in hexadecimal representation
+            Each character in the string shall take a value of "0" to "9", "a" to
+            "f" or "A" to "F" and shall represent the support of 4 features as described
+            in table 5.2.2-3. The most significant character representing the highest-numbered
+            features shall appear first in the string, and the character representing
+            features 1 to 4 shall appear last in the string. The list of features
+            and their numbering (starting with 1) are defined separately for each
+            API. If the string contains a lower number of characters than there are
+            defined features for an API, all features that would be represented by
+            characters that are not present in the string are not supported
+          pattern: ^[A-Fa-f0-9]*$
+          title: SupportedFeatures
+          type: string
+        shareableInfo:
+          $ref: '#/components/schemas/ShareableInformation'
+        serviceAPICategory:
+          title: serviceAPICategory
+          type: string
+        apiSuppFeats:
+          description: A string used to indicate the features supported by an API
+            that is used as defined in clause 6.6 in 3GPP TS 29.500. The string shall
+            contain a bitmask indicating supported features in hexadecimal representation
+            Each character in the string shall take a value of "0" to "9", "a" to
+            "f" or "A" to "F" and shall represent the support of 4 features as described
+            in table 5.2.2-3. The most significant character representing the highest-numbered
+            features shall appear first in the string, and the character representing
+            features 1 to 4 shall appear last in the string. The list of features
+            and their numbering (starting with 1) are defined separately for each
+            API. If the string contains a lower number of characters than there are
+            defined features for an API, all features that would be represented by
+            characters that are not present in the string are not supported
+          pattern: ^[A-Fa-f0-9]*$
+          title: SupportedFeatures
+          type: string
+        pubApiPath:
+          $ref: '#/components/schemas/PublishedApiPath'
+        ccfId:
+          description: CAPIF core function identifier.
+          title: ccfId
+          type: string
+      required:
+      - apiName
+      title: ServiceAPIDescription
+      type: object
+    AefProfile:
+      description: Represents the AEF profile data.
+      example:
+        securityMethods:
+        - null
+        - null
+        versions:
+        - apiVersion: apiVersion
+          resources:
+          - operations:
+            - null
+            - null
+            description: description
+            resourceName: resourceName
+            custOpName: custOpName
+            uri: uri
+          - operations:
+            - null
+            - null
+            description: description
+            resourceName: resourceName
+            custOpName: custOpName
+            uri: uri
+          custOperations:
+          - operations:
+            - null
+            - null
+            description: description
+            custOpName: custOpName
+          - operations:
+            - null
+            - null
+            description: description
+            custOpName: custOpName
+          expiry: 2000-01-23T04:56:07.000+00:00
+        - apiVersion: apiVersion
+          resources:
+          - operations:
+            - null
+            - null
+            description: description
+            resourceName: resourceName
+            custOpName: custOpName
+            uri: uri
+          - operations:
+            - null
+            - null
+            description: description
+            resourceName: resourceName
+            custOpName: custOpName
+            uri: uri
+          custOperations:
+          - operations:
+            - null
+            - null
+            description: description
+            custOpName: custOpName
+          - operations:
+            - null
+            - null
+            description: description
+            custOpName: custOpName
+          expiry: 2000-01-23T04:56:07.000+00:00
+        domainName: domainName
+        aefId: aefId
+        interfaceDescriptions:
+        - ipv6Addr: ipv6Addr
+          securityMethods:
+          - null
+          - null
+          port: 5248
+          ipv4Addr: ipv4Addr
+        - ipv6Addr: ipv6Addr
+          securityMethods:
+          - null
+          - null
+          port: 5248
+          ipv4Addr: ipv4Addr
+      oneOf:
+      - required:
+        - domainName
+      - required:
+        - interfaceDescriptions
+      properties:
+        aefId:
+          description: Identifier of the API exposing function
+          title: aefId
+          type: string
+        versions:
+          description: API version
+          items:
+            $ref: '#/components/schemas/Version'
+          minItems: 1
+          title: versions
+          type: array
+        protocol:
+          $ref: '#/components/schemas/Protocol'
+        dataFormat:
+          $ref: '#/components/schemas/DataFormat'
+        securityMethods:
+          description: Security methods supported by the AEF
+          items:
+            $ref: '#/components/schemas/SecurityMethod'
+          minItems: 1
+          title: securityMethods
+          type: array
+        domainName:
+          description: Domain to which API belongs to
+          title: domainName
+          type: string
+        interfaceDescriptions:
+          description: Interface details
+          items:
+            $ref: '#/components/schemas/InterfaceDescription'
+          minItems: 1
+          title: interfaceDescriptions
+          type: array
+      required:
+      - aefId
+      - versions
+      title: AefProfile
+      type: object
+    Version:
+      description: Represents the API version information.
+      example:
+        apiVersion: apiVersion
+        resources:
+        - operations:
+          - null
+          - null
+          description: description
+          resourceName: resourceName
+          custOpName: custOpName
+          uri: uri
+        - operations:
+          - null
+          - null
+          description: description
+          resourceName: resourceName
+          custOpName: custOpName
+          uri: uri
+        custOperations:
+        - operations:
+          - null
+          - null
+          description: description
+          custOpName: custOpName
+        - operations:
+          - null
+          - null
+          description: description
+          custOpName: custOpName
+        expiry: 2000-01-23T04:56:07.000+00:00
+      properties:
+        apiVersion:
+          description: API major version in URI (e.g. v1)
+          title: apiVersion
+          type: string
+        expiry:
+          description: string with format "date-time" as defined in OpenAPI.
+          format: date-time
+          title: DateTime
+          type: string
+        resources:
+          description: Resources supported by the API.
+          items:
+            $ref: '#/components/schemas/Resource'
+          minItems: 1
+          title: resources
+          type: array
+        custOperations:
+          description: Custom operations without resource association.
+          items:
+            $ref: '#/components/schemas/CustomOperation'
+          minItems: 1
+          title: custOperations
+          type: array
+      required:
+      - apiVersion
+      title: Version
+      type: object
+    Resource:
+      description: Represents the API resource data.
+      example:
+        operations:
+        - null
+        - null
+        description: description
+        resourceName: resourceName
+        custOpName: custOpName
+        uri: uri
+      properties:
+        resourceName:
+          description: Resource name
+          title: resourceName
+          type: string
+        commType:
+          $ref: '#/components/schemas/CommunicationType'
+        uri:
+          description: Relative URI of the API resource, it is set as {apiSpecificResourceUriPart}
+            part of the URI structure as defined in subclause 4.4 of 3GPP TS 29.501.
+          title: uri
+          type: string
+        custOpName:
+          description: it is set as {custOpName} part of the URI structure for a custom
+            operation associated with a resource as defined in subclause 4.4 of 3GPP
+            TS 29.501.
+          title: custOpName
+          type: string
+        operations:
+          description: Supported HTTP methods for the API resource. Only applicable
+            when the protocol in AefProfile indicates HTTP.
+          items:
+            $ref: '#/components/schemas/Operation'
+          minItems: 1
+          title: operations
+          type: array
+        description:
+          description: Text description of the API resource
+          title: description
+          type: string
+      required:
+      - commType
+      - resourceName
+      - uri
+      title: Resource
+      type: object
+    Operation:
+      anyOf:
+      - $ref: '#/components/schemas/Operation_anyOf'
+      - description: |
+          This string provides forward-compatibility with future extensions to the enumeration but is not used to encode content defined in the present version of this API.
+        type: string
+      description: |
+        Possible values are - GET: HTTP GET method - POST: HTTP POST method - PUT: HTTP PUT method - PATCH: HTTP PATCH method - DELETE: HTTP DELETE method
+      title: Operation
+    CustomOperation:
+      description: Represents the description of a custom operation.
+      example:
+        operations:
+        - null
+        - null
+        description: description
+        custOpName: custOpName
+      properties:
+        commType:
+          $ref: '#/components/schemas/CommunicationType'
+        custOpName:
+          description: it is set as {custOpName} part of the URI structure for a custom
+            operation without resource association as defined in subclause 4.4 of
+            3GPP TS 29.501.
+          title: custOpName
+          type: string
+        operations:
+          description: Supported HTTP methods for the API resource. Only applicable
+            when the protocol in AefProfile indicates HTTP.
+          items:
+            $ref: '#/components/schemas/Operation'
+          minItems: 1
+          title: operations
+          type: array
+        description:
+          description: Text description of the custom operation
+          title: description
+          type: string
+      required:
+      - commType
+      - custOpName
+      title: CustomOperation
+      type: object
+    SecurityMethod:
+      anyOf:
+      - $ref: '#/components/schemas/SecurityMethod_anyOf'
+      - description: |
+          This string provides forward-compatibility with future extensions to the enumeration but is not used to encode content defined in the present version of this API.
+        type: string
+      description: |
+        Possible values are - PSK: Security method 1 (Using TLS-PSK) as described in 3GPP TS 33.122 - PKI: Security method 2 (Using PKI) as described in 3GPP TS 33.122 - OAUTH: Security method 3 (TLS with OAuth token) as described in 3GPP TS 33.122
+      title: SecurityMethod
+    InterfaceDescription:
+      description: Represents the description of an API's interface.
+      example:
+        ipv6Addr: ipv6Addr
+        securityMethods:
+        - null
+        - null
+        port: 5248
+        ipv4Addr: ipv4Addr
+      oneOf:
+      - required:
+        - ipv4Addr
+      - required:
+        - ipv6Addr
+      properties:
+        ipv4Addr:
+          description: string identifying a Ipv4 address formatted in the "dotted
+            decimal" notation as defined in IETF RFC 1166.
+          title: Ipv4Addr
+          type: string
+        ipv6Addr:
+          description: string identifying a Ipv6 address formatted according to clause
+            4 in IETF RFC 5952. The mixed Ipv4 Ipv6 notation according to clause 5
+            of IETF RFC 5952 shall not be used.
+          title: Ipv6Addr
+          type: string
+        port:
+          description: Unsigned integer with valid values between 0 and 65535.
+          maximum: 65535
+          minimum: 0
+          title: Port
+          type: integer
+        securityMethods:
+          description: Security methods supported by the interface, it take precedence
+            over the security methods provided in AefProfile, for this specific interface.
+          items:
+            $ref: '#/components/schemas/SecurityMethod'
+          minItems: 1
+          title: securityMethods
+          type: array
+      title: InterfaceDescription
+      type: object
+    ShareableInformation:
+      description: Indicates whether the service API and/or the service API category
+        can be shared to the list of CAPIF provider domains.
+      example:
+        capifProvDoms:
+        - capifProvDoms
+        - capifProvDoms
+        isShareable: true
+      properties:
+        isShareable:
+          description: Set to "true" indicates that the service API and/or the service
+            API category can be shared to the list of CAPIF provider domain information.
+            Otherwise set to "false".
+          title: isShareable
+          type: boolean
+        capifProvDoms:
+          description: List of CAPIF provider domains to which the service API information
+            to be shared.
+          items:
+            type: string
+          minItems: 1
+          title: capifProvDoms
+          type: array
+      required:
+      - isShareable
+      title: ShareableInformation
+      type: object
+    PublishedApiPath:
+      description: Represents the published API path within the same CAPIF provider
+        domain.
+      example:
+        ccfIds:
+        - ccfIds
+        - ccfIds
+      properties:
+        ccfIds:
+          description: A list of CCF identifiers where the service API is already
+            published.
+          items:
+            type: string
+          minItems: 1
+          title: ccfIds
+          type: array
+      title: PublishedApiPath
+      type: object
+    DateTime:
+      description: string with format "date-time" as defined in OpenAPI.
+      format: date-time
+      title: DateTime
+      type: string
+    Ipv4Addr:
+      description: string identifying a Ipv4 address formatted in the "dotted decimal"
+        notation as defined in IETF RFC 1166.
+      title: Ipv4Addr
+      type: string
+    Ipv6Addr:
+      description: string identifying a Ipv6 address formatted according to clause
+        4 in IETF RFC 5952. The mixed Ipv4 Ipv6 notation according to clause 5 of
+        IETF RFC 5952 shall not be used.
+      title: Ipv6Addr
+      type: string
+    Port:
+      description: Unsigned integer with valid values between 0 and 65535.
+      maximum: 65535
+      minimum: 0
+      title: Port
+      type: integer
+    CommunicationType_anyOf:
+      enum:
+      - REQUEST_RESPONSE
+      - SUBSCRIBE_NOTIFY
+      title: CommunicationType_anyOf
+      type: string
+    Protocol_anyOf:
+      enum:
+      - HTTP_1_1
+      - HTTP_2
+      title: Protocol_anyOf
+      type: string
+    DataFormat_anyOf:
+      enum:
+      - JSON
+      title: DataFormat_anyOf
+      type: string
+    Operation_anyOf:
+      enum:
+      - GET
+      - POST
+      - PUT
+      - PATCH
+      - DELETE
+      title: Operation_anyOf
+      type: string
+    SecurityMethod_anyOf:
+      enum:
+      - PSK
+      - PKI
+      - OAUTH
+      title: SecurityMethod_anyOf
+      type: string
diff --git a/services/TS29222_CAPIF_Discover_Service_API/service_apis/typing_utils.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/typing_utils.py
new file mode 100644
index 0000000000000000000000000000000000000000..0563f81fd5345282a33705038dfa77fdcaa15872
--- /dev/null
+++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/typing_utils.py
@@ -0,0 +1,32 @@
+# coding: utf-8
+
+import sys
+
+if sys.version_info < (3, 7):
+    import typing
+
+    def is_generic(klass):
+        """ Determine whether klass is a generic class """
+        return type(klass) == typing.GenericMeta
+
+    def is_dict(klass):
+        """ Determine whether klass is a Dict """
+        return klass.__extra__ == dict
+
+    def is_list(klass):
+        """ Determine whether klass is a List """
+        return klass.__extra__ == list
+
+else:
+
+    def is_generic(klass):
+        """ Determine whether klass is a generic class """
+        return hasattr(klass, '__origin__')
+
+    def is_dict(klass):
+        """ Determine whether klass is a Dict """
+        return klass.__origin__ == dict
+
+    def is_list(klass):
+        """ Determine whether klass is a List """
+        return klass.__origin__ == list
diff --git a/services/TS29222_CAPIF_Discover_Service_API/service_apis/util.py b/services/TS29222_CAPIF_Discover_Service_API/service_apis/util.py
new file mode 100644
index 0000000000000000000000000000000000000000..b3f89d7add5037cf33a17d3c717e8295080d8a8b
--- /dev/null
+++ b/services/TS29222_CAPIF_Discover_Service_API/service_apis/util.py
@@ -0,0 +1,190 @@
+import datetime
+
+import sys
+import six
+import typing
+from service_apis import typing_utils
+
+def clean_empty(d):
+    if isinstance(d, dict):
+        return {
+            k: v
+            for k, v in ((k, clean_empty(v)) for k, v in d.items())
+            if v
+        }
+    if isinstance(d, list):
+        return [v for v in map(clean_empty, d) if v]
+    return d
+
+def dict_to_camel_case(my_dict):
+
+
+        result = {}
+
+        for attr, value in my_dict.items():
+
+            my_key = ''.join(word.title() for word in attr.split('_'))
+            my_key= ''.join([my_key[0].lower(), my_key[1:]])
+            if my_key == "serviceApiCategory":
+                my_key = "serviceAPICategory"
+
+            if isinstance(value, list):
+                result[my_key] = list(map(
+                    lambda x: dict_to_camel_case(x) if isinstance(x, dict) else x, value ))
+
+            elif hasattr(value, "to_dict"):
+                result[my_key] = dict_to_camel_case(value)
+
+            elif isinstance(value, dict):
+                value = dict_to_camel_case(value)
+                result[my_key] = value
+            else:
+                result[my_key] = value
+
+        return result
+
+
+def _deserialize(data, klass):
+    """Deserializes dict, list, str into an object.
+
+    :param data: dict, list or str.
+    :param klass: class literal, or string of class name.
+
+    :return: object.
+    """
+
+    if data is None:
+        return None
+
+    if klass in six.integer_types or klass in (float, str, bool, bytearray):
+        return _deserialize_primitive(data, klass)
+    elif klass == object:
+        return _deserialize_object(data)
+    elif klass == datetime.date:
+        return deserialize_date(data)
+    elif klass == datetime.datetime:
+        return deserialize_datetime(data)
+    elif typing_utils.is_generic(klass):
+        if typing_utils.is_list(klass):
+            return _deserialize_list(data, klass.__args__[0])
+        if typing_utils.is_dict(klass):
+            return _deserialize_dict(data, klass.__args__[1])
+    else:
+        return deserialize_model(data, klass)
+
+
+def _deserialize_primitive(data, klass):
+    """Deserializes to primitive type.
+
+    :param data: data to deserialize.
+    :param klass: class literal.
+
+    :return: int, long, float, str, bool.
+    :rtype: int | long | float | str | bool
+    """
+    try:
+        value = klass(data)
+    except UnicodeEncodeError:
+        value = six.u(data)
+    except TypeError:
+        value = data
+    return value
+
+
+def _deserialize_object(value):
+    """Return an original value.
+
+    :return: object.
+    """
+    return value
+
+
+def deserialize_date(string):
+    """Deserializes string to date.
+
+    :param string: str.
+    :type string: str
+    :return: date.
+    :rtype: date
+    """
+
+    if string is None:
+      return None
+
+    try:
+        from dateutil.parser import parse
+        return parse(string).date()
+    except ImportError:
+        return string
+
+
+def deserialize_datetime(string):
+    """Deserializes string to datetime.
+
+    The string should be in iso8601 datetime format.
+
+    :param string: str.
+    :type string: str
+    :return: datetime.
+    :rtype: datetime
+    """
+
+    if string is None:
+      return None
+
+    try:
+        from dateutil.parser import parse
+        return parse(string)
+    except ImportError:
+        return string
+
+
+def deserialize_model(data, klass):
+    """Deserializes list or dict to model.
+
+    :param data: dict, list.
+    :type data: dict | list
+    :param klass: class literal.
+    :return: model object.
+    """
+    instance = klass()
+
+    if not instance.openapi_types:
+        return data
+
+    for attr, attr_type in six.iteritems(instance.openapi_types):
+        if data is not None \
+                and instance.attribute_map[attr] in data \
+                and isinstance(data, (list, dict)):
+            value = data[instance.attribute_map[attr]]
+            setattr(instance, attr, _deserialize(value, attr_type))
+
+    return instance
+
+
+def _deserialize_list(data, boxed_type):
+    """Deserializes a list and its elements.
+
+    :param data: list to deserialize.
+    :type data: list
+    :param boxed_type: class literal.
+
+    :return: deserialized list.
+    :rtype: list
+    """
+    return [_deserialize(sub_data, boxed_type)
+            for sub_data in data]
+
+
+def _deserialize_dict(data, boxed_type):
+    """Deserializes a dict and its elements.
+
+    :param data: dict to deserialize.
+    :type data: dict
+    :param boxed_type: class literal.
+
+    :return: deserialized dict.
+    :rtype: dict
+    """
+    return {k: _deserialize(v, boxed_type)
+            for k, v in six.iteritems(data)}
diff --git a/services/TS29222_CAPIF_Discover_Service_API/setup.py b/services/TS29222_CAPIF_Discover_Service_API/setup.py
new file mode 100644
index 0000000000000000000000000000000000000000..53dcb2501e8828c616f4d246378110a4d0cca99f
--- /dev/null
+++ b/services/TS29222_CAPIF_Discover_Service_API/setup.py
@@ -0,0 +1,39 @@
+# coding: utf-8
+
+import sys
+from setuptools import setup, find_packages
+
+NAME = "service_apis"
+VERSION = "1.0.0"
+
+# To install the library, run the following
+#
+# python setup.py install
+#
+# prerequisite: setuptools
+# http://pypi.python.org/pypi/setuptools
+
+REQUIRES = [
+    "connexion>=2.0.2",
+    "swagger-ui-bundle>=0.0.2",
+    "python_dateutil>=2.6.0"
+]
+
+setup(
+    name=NAME,
+    version=VERSION,
+    description="CAPIF_Discover_Service_API",
+    author_email="",
+    url="",
+    keywords=["OpenAPI", "CAPIF_Discover_Service_API"],
+    install_requires=REQUIRES,
+    packages=find_packages(),
+    package_data={'': ['openapi/openapi.yaml']},
+    include_package_data=True,
+    entry_points={
+        'console_scripts': ['service_apis=service_apis.__main__:main']},
+    long_description="""\
+    API for discovering service APIs. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. 
+    """
+)
+
diff --git a/services/TS29222_CAPIF_Discover_Service_API/test-requirements.txt b/services/TS29222_CAPIF_Discover_Service_API/test-requirements.txt
new file mode 100644
index 0000000000000000000000000000000000000000..0970f28c7c5a344d7fd9b9c893c584e7336df266
--- /dev/null
+++ b/services/TS29222_CAPIF_Discover_Service_API/test-requirements.txt
@@ -0,0 +1,4 @@
+pytest~=4.6.7 # needed for python 2.7+3.4
+pytest-cov>=2.8.1
+pytest-randomly==1.2.3 # needed for python 2.7+3.4
+Flask-Testing==0.8.0
diff --git a/services/TS29222_CAPIF_Discover_Service_API/tox.ini b/services/TS29222_CAPIF_Discover_Service_API/tox.ini
new file mode 100644
index 0000000000000000000000000000000000000000..bfe39a403a24c73d4db2bce74d66d25fa4b48f1f
--- /dev/null
+++ b/services/TS29222_CAPIF_Discover_Service_API/tox.ini
@@ -0,0 +1,11 @@
+[tox]
+envlist = py3
+skipsdist=True
+
+[testenv]
+deps=-r{toxinidir}/requirements.txt
+     -r{toxinidir}/test-requirements.txt
+	 {toxinidir}
+
+commands=
+   pytest --cov=service_apis
diff --git a/services/TS29222_CAPIF_Events_API/.dockerignore b/services/TS29222_CAPIF_Events_API/.dockerignore
new file mode 100644
index 0000000000000000000000000000000000000000..f9619601908b43d5d90c9befea5aa6ef6a732fa9
--- /dev/null
+++ b/services/TS29222_CAPIF_Events_API/.dockerignore
@@ -0,0 +1,72 @@
+.travis.yaml
+.openapi-generator-ignore
+README.md
+tox.ini
+git_push.sh
+test-requirements.txt
+setup.py
+
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+env/
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*,cover
+.hypothesis/
+venv/
+.python-version
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+#Ipython Notebook
+.ipynb_checkpoints
diff --git a/services/TS29222_CAPIF_Events_API/.gitignore b/services/TS29222_CAPIF_Events_API/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..43995bd42fa23bbc4c3a59d5fb9da99042fcf139
--- /dev/null
+++ b/services/TS29222_CAPIF_Events_API/.gitignore
@@ -0,0 +1,66 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+env/
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*,cover
+.hypothesis/
+venv/
+.venv/
+.python-version
+.pytest_cache
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+#Ipython Notebook
+.ipynb_checkpoints
diff --git a/services/TS29222_CAPIF_Events_API/.openapi-generator-ignore b/services/TS29222_CAPIF_Events_API/.openapi-generator-ignore
new file mode 100644
index 0000000000000000000000000000000000000000..7484ee590a3894506cf063799b885428f95a71be
--- /dev/null
+++ b/services/TS29222_CAPIF_Events_API/.openapi-generator-ignore
@@ -0,0 +1,23 @@
+# OpenAPI Generator Ignore
+# Generated by openapi-generator https://github.com/openapitools/openapi-generator
+
+# Use this file to prevent files from being overwritten by the generator.
+# The patterns follow closely to .gitignore or .dockerignore.
+
+# As an example, the C# client generator defines ApiClient.cs.
+# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line:
+#ApiClient.cs
+
+# You can match any string of characters against a directory, file or extension with a single asterisk (*):
+#foo/*/qux
+# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
+
+# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
+#foo/**/qux
+# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
+
+# You can also negate patterns with an exclamation (!).
+# For example, you can ignore all files in a docs folder with the file extension .md:
+#docs/*.md
+# Then explicitly reverse the ignore rule for a single file:
+#!docs/README.md
diff --git a/services/TS29222_CAPIF_Events_API/.openapi-generator/FILES b/services/TS29222_CAPIF_Events_API/.openapi-generator/FILES
new file mode 100644
index 0000000000000000000000000000000000000000..edfb88675128a3f43b3e824f52f4e10b09cf0b5b
--- /dev/null
+++ b/services/TS29222_CAPIF_Events_API/.openapi-generator/FILES
@@ -0,0 +1,67 @@
+.dockerignore
+.gitignore
+.travis.yml
+Dockerfile
+README.md
+capif_events/__init__.py
+capif_events/__main__.py
+capif_events/controllers/__init__.py
+capif_events/controllers/default_controller.py
+capif_events/controllers/security_controller_.py
+capif_events/encoder.py
+capif_events/models/__init__.py
+capif_events/models/access_control_policy_list.py
+capif_events/models/access_control_policy_list_ext.py
+capif_events/models/access_control_policy_list_ext_all_of.py
+capif_events/models/aef_profile.py
+capif_events/models/api_invoker_policy.py
+capif_events/models/base_model_.py
+capif_events/models/capif_event.py
+capif_events/models/capif_event_any_of.py
+capif_events/models/capif_event_detail.py
+capif_events/models/capif_event_filter.py
+capif_events/models/communication_type.py
+capif_events/models/communication_type_any_of.py
+capif_events/models/custom_operation.py
+capif_events/models/data_format.py
+capif_events/models/data_format_any_of.py
+capif_events/models/event_notification.py
+capif_events/models/event_subscription.py
+capif_events/models/interface_description.py
+capif_events/models/invalid_param.py
+capif_events/models/invocation_log.py
+capif_events/models/ipv4_address_range.py
+capif_events/models/ipv6_address_range.py
+capif_events/models/log.py
+capif_events/models/notification_flag.py
+capif_events/models/notification_flag_any_of.py
+capif_events/models/notification_method.py
+capif_events/models/notification_method_any_of.py
+capif_events/models/operation.py
+capif_events/models/operation_any_of.py
+capif_events/models/partitioning_criteria.py
+capif_events/models/partitioning_criteria_any_of.py
+capif_events/models/problem_details.py
+capif_events/models/protocol.py
+capif_events/models/protocol_any_of.py
+capif_events/models/published_api_path.py
+capif_events/models/reporting_information.py
+capif_events/models/resource.py
+capif_events/models/routing_rule.py
+capif_events/models/security_method.py
+capif_events/models/security_method_any_of.py
+capif_events/models/service_api_description.py
+capif_events/models/shareable_information.py
+capif_events/models/time_range_list.py
+capif_events/models/topology_hiding.py
+capif_events/models/version.py
+capif_events/models/websock_notif_config.py
+capif_events/openapi/openapi.yaml
+capif_events/test/__init__.py
+capif_events/typing_utils.py
+capif_events/util.py
+git_push.sh
+requirements.txt
+setup.py
+test-requirements.txt
+tox.ini
diff --git a/services/TS29222_CAPIF_Events_API/.openapi-generator/VERSION b/services/TS29222_CAPIF_Events_API/.openapi-generator/VERSION
new file mode 100644
index 0000000000000000000000000000000000000000..4b448de535c7dd619da0df6d8221995dbd5d118a
--- /dev/null
+++ b/services/TS29222_CAPIF_Events_API/.openapi-generator/VERSION
@@ -0,0 +1 @@
+5.3.0-SNAPSHOT
\ No newline at end of file
diff --git a/services/TS29222_CAPIF_Events_API/.travis.yml b/services/TS29222_CAPIF_Events_API/.travis.yml
new file mode 100644
index 0000000000000000000000000000000000000000..ad71ee5ca083a6923c91104533c5c7b86f297f3f
--- /dev/null
+++ b/services/TS29222_CAPIF_Events_API/.travis.yml
@@ -0,0 +1,14 @@
+# ref: https://docs.travis-ci.com/user/languages/python
+language: python
+python:
+  - "3.2"
+  - "3.3"
+  - "3.4"
+  - "3.5"
+  - "3.6"
+  - "3.7"
+  - "3.8"
+# command to install dependencies
+install: "pip install -r requirements.txt"
+# command to run tests
+script: nosetests
diff --git a/services/TS29222_CAPIF_Events_API/Dockerfile b/services/TS29222_CAPIF_Events_API/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..ddcf2da935752d7eb90aa1dd59c2eb5811eaf5e0
--- /dev/null
+++ b/services/TS29222_CAPIF_Events_API/Dockerfile
@@ -0,0 +1,18 @@
+FROM public.ecr.aws/o2v4a8t6/opencapif/python:3-alpine
+
+RUN mkdir -p /usr/src/app
+WORKDIR /usr/src/app
+
+COPY requirements.txt /usr/src/app/requirements.txt
+COPY config.yaml /usr/src/app/config.yaml
+
+RUN apk add -U --no-cache gcc build-base linux-headers ca-certificates libffi-dev libressl-dev libxslt-dev
+RUN pip3 install --no-cache-dir -r requirements.txt
+
+COPY . /usr/src/app
+
+EXPOSE 8080
+
+ENTRYPOINT ["python3"]
+
+CMD ["-m", "capif_events"]
\ No newline at end of file
diff --git a/services/TS29222_CAPIF_Events_API/README.md b/services/TS29222_CAPIF_Events_API/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..9f89fecda371a76b63bfccae48159dc22eb216da
--- /dev/null
+++ b/services/TS29222_CAPIF_Events_API/README.md
@@ -0,0 +1,49 @@
+# OpenAPI generated server
+
+## Overview
+This server was generated by the [OpenAPI Generator](https://openapi-generator.tech) project. By using the
+[OpenAPI-Spec](https://openapis.org) from a remote server, you can easily generate a server stub.  This
+is an example of building a OpenAPI-enabled Flask server.
+
+This example uses the [Connexion](https://github.com/zalando/connexion) library on top of Flask.
+
+## Requirements
+Python 3.5.2+
+
+## Usage
+To run the server, please execute the following from the root directory:
+
+```
+pip3 install -r requirements.txt
+python3 -m capif_events
+```
+
+and open your browser to here:
+
+```
+http://localhost:8080/capif-events/v1/ui/
+```
+
+Your OpenAPI definition lives here:
+
+```
+http://localhost:8080/capif-events/v1/openapi.json
+```
+
+To launch the integration tests, use tox:
+```
+sudo pip install tox
+tox
+```
+
+## Running with Docker
+
+To run the server on a Docker container, please execute the following from the root directory:
+
+```bash
+# building the image
+docker build -t capif_events .
+
+# starting up a container
+docker run -p 8080:8080 capif_events
+```
\ No newline at end of file
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/__init__.py b/services/TS29222_CAPIF_Events_API/capif_events/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/__main__.py b/services/TS29222_CAPIF_Events_API/capif_events/__main__.py
new file mode 100644
index 0000000000000000000000000000000000000000..1e602ef80d3468f980ce3c9b19d455cfeee1f285
--- /dev/null
+++ b/services/TS29222_CAPIF_Events_API/capif_events/__main__.py
@@ -0,0 +1,151 @@
+#!/usr/bin/env python3
+
+import connexion
+import sys
+import logging
+
+from capif_events import encoder
+
+
+from flask import Flask, jsonify, request
+from flask_jwt_extended import JWTManager, jwt_required, create_access_token
+from pymongo import MongoClient
+from .config import Config
+from .core.notifications import Notifications
+from .core.consumer_messager import Subscriber
+from multiprocessing import Process
+from threading import Thread
+from flask_executor import Executor
+from flask_apscheduler import APScheduler
+from logging.handlers import RotatingFileHandler
+from .config import Config
+import os
+from fluent import sender
+from flask_executor import Executor
+from opentelemetry.instrumentation.flask import FlaskInstrumentor
+from opentelemetry import trace
+from opentelemetry.exporter.otlp.proto.grpc.trace_exporter import OTLPSpanExporter
+from opentelemetry.trace.propagation.tracecontext import TraceContextTextMapPropagator
+from opentelemetry.sdk.resources import Resource
+from opentelemetry.sdk.trace import TracerProvider
+from opentelemetry.sdk.trace.export import BatchSpanProcessor
+from opentelemetry.instrumentation.redis import RedisInstrumentor
+
+
+
+NAME = "Events-Service"
+
+def configure_monitoring(app, config):
+
+    resource = Resource(attributes={"service.name": NAME})
+
+    fluent_bit_host = config['monitoring']['fluent_bit_host']
+    fluent_bit_port = config['monitoring']['fluent_bit_port']
+    fluent_bit_sender = sender.FluentSender('Events-Service', host=fluent_bit_host, port=fluent_bit_port)
+    propagator = TraceContextTextMapPropagator()
+
+    tracer_provider = TracerProvider(resource=resource)
+    trace.set_tracer_provider(tracer_provider)
+    exporter = OTLPSpanExporter(endpoint=f"http://{config['monitoring']['opentelemetry_url']}:{config['monitoring']['opentelemetry_port']}", insecure=True)
+    span_processor = BatchSpanProcessor(
+        exporter,
+        max_queue_size=config['monitoring']['opentelemetry_max_queue_size'],
+        schedule_delay_millis=config['monitoring']['opentelemetry_schedule_delay_millis'],
+        max_export_batch_size=config['monitoring']['opentelemetry_max_export_batch_size'],
+        export_timeout_millis=config['monitoring']['opentelemetry_export_timeout_millis'],
+    )
+
+    trace.get_tracer_provider().add_span_processor(span_processor)
+
+    FlaskInstrumentor().instrument_app(app)
+
+    RedisInstrumentor().instrument()
+
+    class FluentBitHandler(logging.Handler):
+
+        def __init__(self):
+            logging.Handler.__init__(self)
+
+        def emit(self, record):
+            log_entry = self.format(record)
+            log_data = {
+                'message': log_entry,
+                'level': record.levelname,
+                'timestamp': record.created,
+                'logger': record.name,
+                'function': record.funcName,
+                'line': record.lineno,
+                'container_name': os.environ.get('CONTAINER_NAME', ''),
+            }
+
+            # # Obtener el trace ID actual
+            current_context = trace.get_current_span().get_span_context()
+
+            trace_id = current_context.trace_id
+            traceparent_id = current_context.span_id
+            log_data['traceID'] = hex(trace_id)[2:]
+            if traceparent_id != None:
+                log_data['traceparent'] = hex(traceparent_id)[2:]
+            fluent_bit_sender.emit('Events-Service', log_data)
+
+    loggers = [app.logger, ]
+    for l in loggers:
+         l.addHandler(FluentBitHandler())
+
+
+def configure_logging(app):
+    del app.logger.handlers[:]
+    loggers = [app.logger, ]
+    handlers = []
+    console_handler = logging.StreamHandler()
+    console_handler.setLevel(logging.DEBUG)
+    console_handler.setFormatter(verbose_formatter())
+    file_handler = RotatingFileHandler(filename="events_logs.log", maxBytes=1024 * 1024 * 100, backupCount=20)
+    file_handler.setLevel(logging.DEBUG)
+    file_handler.setFormatter(verbose_formatter())
+    handlers.append(console_handler)
+    handlers.append(file_handler)
+
+    for l in loggers:
+        for handler in handlers:
+            l.addHandler(handler)
+        l.propagate = False
+        l.setLevel(logging.DEBUG)
+
+
+
+def verbose_formatter():
+    return logging.Formatter(
+        '{"timestamp": "%(asctime)s", "level": "%(levelname)s", "logger": "%(name)s", "function": "%(funcName)s", "line": %(lineno)d, "message": %(message)s}',
+        datefmt='%d/%m/%Y %H:%M:%S'
+    )
+
+app = connexion.App(__name__, specification_dir='./openapi/')
+app.app.json_encoder = encoder.JSONEncoder
+app.add_api('openapi.yaml',
+            arguments={'title': 'CAPIF_Events_API'},
+            pythonic_params=True)
+
+
+
+config = Config()
+
+notifications = Notifications()
+jwt = JWTManager(app.app)
+configure_logging(app.app)
+
+if eval(os.environ.get("MONITORING").lower().capitalize()):
+    configure_monitoring(app.app, config.get_config())
+
+config = Config()
+executor = Executor(app.app)
+subscriber = Subscriber()
+# scheduler = APScheduler()
+# scheduler.init_app(app.app)
+
+@app.app.before_first_request
+def create_listener_message():
+    executor.submit(subscriber.listen)
+
+if __name__ == '__main__':
+    app.run(debug=True, port=8080)
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/config.py b/services/TS29222_CAPIF_Events_API/capif_events/config.py
new file mode 100644
index 0000000000000000000000000000000000000000..377b14f8c368cebf98409223d089fc31326d1987
--- /dev/null
+++ b/services/TS29222_CAPIF_Events_API/capif_events/config.py
@@ -0,0 +1,18 @@
+import yaml
+import os
+
+#Config class to get config
+class Config:
+	def __init__(self):
+		self.cached = 0
+		self.file="./config.yaml"
+		self.my_config = {}
+		stamp = os.stat(self.file).st_mtime
+		if stamp != self.cached:
+			self.cached = stamp
+			f = open(self.file)
+			self.my_config = yaml.safe_load(f)
+			f.close()
+
+	def get_config(self):
+		return self.my_config
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/controllers/__init__.py b/services/TS29222_CAPIF_Events_API/capif_events/controllers/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/controllers/default_controller.py b/services/TS29222_CAPIF_Events_API/capif_events/controllers/default_controller.py
new file mode 100644
index 0000000000000000000000000000000000000000..839f0b0db7934b586d6369160da6f4a930e965c5
--- /dev/null
+++ b/services/TS29222_CAPIF_Events_API/capif_events/controllers/default_controller.py
@@ -0,0 +1,82 @@
+import connexion
+from capif_events.models.event_subscription import EventSubscription  # noqa: E501
+from ..core.events_apis import EventSubscriptionsOperations
+import json
+from flask import Response, request, current_app
+from flask_jwt_extended import jwt_required, get_jwt_identity
+from ..encoder import JSONEncoder
+from ..models.problem_details import ProblemDetails
+from cryptography import x509
+from cryptography.hazmat.backends import default_backend
+from ..core.validate_user import ControlAccess
+from functools import wraps
+import pymongo
+
+events_ops = EventSubscriptionsOperations()
+valid_user = ControlAccess()
+
+def cert_validation():
+    def _cert_validation(f):
+        @wraps(f)
+        def __cert_validation(*args, **kwargs):
+
+            args = request.view_args
+            cert_tmp = request.headers['X-Ssl-Client-Cert']
+            cert_raw = cert_tmp.replace('\t', '')
+
+            cert = x509.load_pem_x509_certificate(str.encode(cert_raw), default_backend())
+
+            cn = cert.subject.get_attributes_for_oid(x509.OID_COMMON_NAME)[0].value.strip()
+
+            if cn != "superadmin":
+                cert_signature = cert.signature.hex()
+                result = valid_user.validate_user_cert(args["subscriptionId"], args["subscriberId"], cert_signature)
+
+                if result is not None:
+                    return result
+
+            result = f(**kwargs)
+            return result
+        return __cert_validation
+    return _cert_validation
+
+def subscriber_id_subscriptions_post(subscriber_id, body):  # noqa: E501
+    """subscriber_id_subscriptions_post
+
+    Creates a new individual CAPIF Event Subscription. # noqa: E501
+
+    :param subscriber_id: Identifier of the Subscriber
+    :type subscriber_id: str
+    :param event_subscription: 
+    :type event_subscription: dict | bytes
+
+    :rtype: EventSubscription
+    """
+
+    current_app.logger.info("Creating event subscription")
+    if connexion.request.is_json:
+        body = EventSubscription.from_dict(connexion.request.get_json())  # noqa: E501
+
+    res = events_ops.create_event(subscriber_id, body)
+
+    return res
+
+@cert_validation()
+def subscriber_id_subscriptions_subscription_id_delete(subscriber_id, subscription_id):  # noqa: E501
+    """subscriber_id_subscriptions_subscription_id_delete
+
+    Deletes an individual CAPIF Event Subscription. # noqa: E501
+
+    :param subscriber_id: Identifier of the Subscriber
+    :type subscriber_id: str
+    :param subscription_id: Identifier of an individual Events Subscription
+    :type subscription_id: str
+
+    :rtype: None
+    """
+
+    current_app.logger.info("Removing event subscription")
+
+    res = events_ops.delete_event(subscriber_id, subscription_id)
+
+    return res
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/controllers/security_controller_.py b/services/TS29222_CAPIF_Events_API/capif_events/controllers/security_controller_.py
new file mode 100644
index 0000000000000000000000000000000000000000..6d294ffd6df1a26a469dbb4e72533b01503468dd
--- /dev/null
+++ b/services/TS29222_CAPIF_Events_API/capif_events/controllers/security_controller_.py
@@ -0,0 +1,2 @@
+from typing import List
+
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/core/auth_manager.py b/services/TS29222_CAPIF_Events_API/capif_events/core/auth_manager.py
new file mode 100644
index 0000000000000000000000000000000000000000..7a5fb82f886af2a6cfbdc80bdf0953ac63a7c3ab
--- /dev/null
+++ b/services/TS29222_CAPIF_Events_API/capif_events/core/auth_manager.py
@@ -0,0 +1,63 @@
+
+from flask import current_app
+from cryptography import x509
+from cryptography.hazmat.backends import default_backend
+from .resources import Resource
+
+
+class AuthManager(Resource):
+
+    def add_auth_event(self, event_id, subscriber_id):
+
+        try:
+
+            cert_col = self.db.get_col_by_name(self.db.certs_col)
+
+            auth_context = cert_col.find_one({"id":subscriber_id})
+
+            if "event_subscriptions" in auth_context["resources"]:
+                if event_id not in auth_context["resources"]["event_subscriptions"]:
+                    auth_context["resources"]["event_subscriptions"].append(event_id)
+            else:
+                auth_context["resources"]["event_subscriptions"] = [event_id]
+
+            cert_col.find_one_and_update({"id":subscriber_id}, {"$set":auth_context})
+
+        except Exception as e:
+            current_app.logger.error(f"Something wrong in add auth resources: {e}")
+
+
+    def remove_auth_event(self, event_id, subscriber_id):
+
+        try:
+
+            cert_col = self.db.get_col_by_name(self.db.certs_col)
+
+            auth_context = cert_col.find_one({"id":subscriber_id})
+
+            if auth_context != None and cert_col != None:
+                if "event_subscriptions" in auth_context["resources"]:
+                    if event_id in auth_context["resources"]["event_subscriptions"]:
+                        auth_context["resources"]["event_subscriptions"].remove(event_id)
+
+                cert_col.find_one_and_update({"id":subscriber_id}, {"$set":auth_context})
+
+        except Exception as e:
+            current_app.logger.info(f"Something wrong in remove auth resources: {e}")
+
+    def remove_auth_all_event(self, subscriber_id):
+
+        try:
+            cert_col = self.db.get_col_by_name(self.db.certs_col)
+
+            auth_context = cert_col.find_one({"id":subscriber_id})
+
+            if auth_context != None and cert_col != None:
+                if "event_subscriptions" in auth_context["resources"]:
+                    auth_context["resources"]["event_subscriptions"] = []
+
+                cert_col.find_one_and_update({"id":subscriber_id}, {"$set":auth_context})
+
+        except Exception as e:
+            current_app.logger.error(f"Something wrong in remove all auth resources: {e}")
+
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/core/consumer_messager.py b/services/TS29222_CAPIF_Events_API/capif_events/core/consumer_messager.py
new file mode 100644
index 0000000000000000000000000000000000000000..0f9fa6ab3653ba97701c3f0e034809c69d6b5a08
--- /dev/null
+++ b/services/TS29222_CAPIF_Events_API/capif_events/core/consumer_messager.py
@@ -0,0 +1,33 @@
+# subscriber.py
+import redis
+import time
+import sys
+import json
+import asyncio
+from threading import Thread
+from .notifications import Notifications
+from .internal_event_ops import InternalEventOperations
+from flask import current_app
+
+class Subscriber():
+
+    def __init__(self):
+        self.r = redis.Redis(host='redis', port=6379, db=0)
+        self.notification = Notifications()
+        self.event_ops = InternalEventOperations()
+        self.p = self.r.pubsub()
+        self.p.subscribe("events", "internal-messages")
+
+    def listen(self):
+        for raw_message in self.p.listen():
+            if raw_message["type"] == "message" and raw_message["channel"].decode('utf-8') == "events":
+                current_app.logger.info("Event received")
+                self.notification.send_notifications(raw_message["data"].decode('utf-8'))
+
+            elif raw_message["type"] == "message" and raw_message["channel"].decode('utf-8') == "internal-messages":
+                message, *invoker_id = raw_message["data"].decode('utf-8').split(":")
+                if message == "invoker-removed" and len(invoker_id)>0:
+                    self.event_ops.delete_all_events(invoker_id[0])
+
+
+
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/core/events_apis.py b/services/TS29222_CAPIF_Events_API/capif_events/core/events_apis.py
new file mode 100644
index 0000000000000000000000000000000000000000..1ece644c124fcf17b47f8aaea59ab4c67c1b0e86
--- /dev/null
+++ b/services/TS29222_CAPIF_Events_API/capif_events/core/events_apis.py
@@ -0,0 +1,121 @@
+import sys
+
+import rfc3987
+import pymongo
+import secrets
+import re
+from flask import current_app, Flask, Response
+import json
+from ..encoder import JSONEncoder
+from ..models.problem_details import ProblemDetails
+from .resources import Resource
+from bson import json_util
+from .responses import internal_server_error, not_found_error, make_response, bad_request_error
+from ..db.db import MongoDatabse
+from ..util import dict_to_camel_case
+from .auth_manager import AuthManager
+
+class EventSubscriptionsOperations(Resource):
+
+    def __check_subscriber_id(self, subscriber_id):
+        mycol_invoker= self.db.get_col_by_name(self.db.invoker_collection)
+        mycol_provider= self.db.get_col_by_name(self.db.provider_collection)
+
+        current_app.logger.debug("Cheking subscriber id")
+
+        invoker_query = {"api_invoker_id":subscriber_id}
+
+        invoker = mycol_invoker.find_one(invoker_query)
+
+        provider_query = {"api_prov_funcs.api_prov_func_id":subscriber_id}
+
+        provider = mycol_provider.find_one(provider_query)
+
+        if invoker is None and provider is None:
+            current_app.logger.error("Not found invoker or provider with this subscriber id")
+            return not_found_error(detail="Invoker or APF or AEF or AMF Not found", cause="Subscriber Not Found")
+
+        return None
+
+    def __init__(self):
+        Resource.__init__(self)
+        self.auth_manager = AuthManager()
+
+    def create_event(self, subscriber_id, event_subscription):
+
+        try:
+            mycol = self.db.get_col_by_name(self.db.event_collection)
+
+            current_app.logger.debug("Creating event")
+
+            if rfc3987.match(event_subscription.notification_destination, rule="URI") is None:
+                current_app.logger.error("Bad url format")
+                return bad_request_error(detail="Bad Param", cause = "Detected Bad formar of param", invalid_params=[{"param": "notificationDestination", "reason": "Not valid URL format"}])
+
+            ## Verify that this subscriberID exist in publishers or invokers
+
+            result = self.__check_subscriber_id(subscriber_id)
+
+
+            if  isinstance(result, Response):
+
+                return result
+
+            # Generate subscriptionID
+            subscription_id = secrets.token_hex(15)
+            evnt = dict()
+            evnt["subscriber_id"] = subscriber_id
+            evnt["subscription_id"] = subscription_id
+            evnt.update(event_subscription.to_dict())
+            mycol.insert_one(evnt)
+
+            current_app.logger.debug("Event Subscription inserted in database")
+
+            self.auth_manager.add_auth_event(subscription_id, subscriber_id)
+
+            res = make_response(object=event_subscription, status=201)
+            res.headers['Location'] = "http://localhost:8080/capif-events/v1/" + \
+                str(subscriber_id) + "/subscriptions/" + str(subscription_id)
+
+            return res
+
+        except Exception as e:
+            exception = "An exception occurred in create event"
+            current_app.logger.error(exception + "::" + str(e))
+            return internal_server_error(detail=exception, cause=str(e))
+
+    def delete_event(self, subscriber_id, subscription_id):
+
+        try:
+            mycol = self.db.get_col_by_name(self.db.event_collection)
+
+            current_app.logger.debug("Removing event subscription")
+
+            result = self.__check_subscriber_id(subscriber_id)
+
+
+            if  isinstance(result, Response):
+                return result
+
+            my_query = {'subscriber_id': subscriber_id,
+                    'subscription_id': subscription_id}
+            eventdescription = mycol.find_one(my_query)
+
+            if eventdescription is None:
+                current_app.logger.error("Event subscription not found")
+                return not_found_error(detail="Event subscription not exist", cause="Event API subscription id not found")
+
+            mycol.delete_one(my_query)
+            current_app.logger.debug("Event subscription removed from database")
+
+            self.auth_manager.remove_auth_event(subscription_id, subscriber_id)
+
+            out =  "The event matching subscriptionId  " + subscription_id + " was deleted."
+            return make_response(out, status=204)
+
+        except Exception as e:
+            exception= "An exception occurred in delete event"
+            current_app.logger.error(exception + "::" + str(e))
+            return internal_server_error(detail=exception, cause=str(e))
+
+
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/core/internal_event_ops.py b/services/TS29222_CAPIF_Events_API/capif_events/core/internal_event_ops.py
new file mode 100644
index 0000000000000000000000000000000000000000..3f4fc6a7274e9eddbfa51cf630f779d31bf18bfb
--- /dev/null
+++ b/services/TS29222_CAPIF_Events_API/capif_events/core/internal_event_ops.py
@@ -0,0 +1,59 @@
+from flask import current_app
+from .resources import Resource
+from .auth_manager import AuthManager
+
+class InternalEventOperations(Resource):
+
+    def __init__(self):
+        Resource.__init__(self)
+        self.auth_manager = AuthManager()
+
+    def delete_all_events(self, subscriber_id):
+
+        mycol = self.db.get_col_by_name(self.db.event_collection)
+        my_query = {'subscriber_id': subscriber_id}
+        mycol.delete_many(my_query)
+
+        current_app.logger.info(f"Removed events for this subscriber: {subscriber_id}")
+
+        #We dont need remove all auth events, becase when invoker is removed, remove auth entry
+        #self.auth_manager.remove_auth_all_event(subscriber_id)
+
+    def get_event_subscriptions(self, event):
+        try:
+            mycol = self.db.get_col_by_name(self.db.event_collection)
+
+            query= {'events':event}
+            subscriptions = mycol.find(query)
+
+            if  subscriptions is None:
+                current_app.logger.error("Not found event subscriptions")
+
+            else:
+                json_docs=[]
+                for subscription in subscriptions:
+                    json_docs.append(subscription)
+
+                return json_docs
+
+        except Exception as e:
+            current_app.logger.error("An exception occurred ::" + str(e))
+            return False
+    
+    # def get_acls(self, service_id):
+    #     try:
+    #         mycol = self.db.get_col_by_name(self.db.acls_col)
+
+    #         query= {'api_id': service_id}
+    #         acls = mycol.find(query)
+
+    #         if  acls is None:
+    #             current_app.logger.error("Not found event subscriptions")
+
+    #         else:
+
+    #             return acls
+
+    #     except Exception as e:
+    #         current_app.logger.error("An exception occurred ::" + str(e))
+    #         return False
\ No newline at end of file
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/core/notifications.py b/services/TS29222_CAPIF_Events_API/capif_events/core/notifications.py
new file mode 100644
index 0000000000000000000000000000000000000000..a02f0abee8a4fa60a8405ea5175e20f3a33236c8
--- /dev/null
+++ b/services/TS29222_CAPIF_Events_API/capif_events/core/notifications.py
@@ -0,0 +1,43 @@
+#import concurrent
+import requests
+from .internal_event_ops import InternalEventOperations
+from ..models.event_notification import EventNotification
+from ..models.access_control_policy_list_ext import AccessControlPolicyListExt
+from ..models.capif_event_detail import CAPIFEventDetail
+from ..encoder import JSONEncoder
+import sys
+import json
+from flask import current_app
+
+class Notifications():
+
+    def __init__(self):
+        self.events_ops = InternalEventOperations()
+
+    def send_notifications(self, event):
+        current_app.logger.info("Received event, sending notifications")
+        subscriptions = self.events_ops.get_event_subscriptions(event)
+        # message, *ids = event.split(":")
+
+        try:
+            for sub in subscriptions:
+                url = sub["notification_destination"]
+                data = EventNotification(sub["subscription_id"], events=event)
+                # details = CAPIFEventDetail()
+                # if message == "ACCESS_CONTROL_POLICY_UPDATE":
+                #     current_app.logger.info("event: ACCESS_CONTROL_POLICY_UPDATE")
+                #     acls = self.events_ops.get_acls(ids[0])
+                #     details.acc_ctrl_pol_list = AccessControlPolicyListExt(api_id=acls['service_id'], api_invoker_policies=acls['apiInvokerPolicies'])
+
+                # data.event_detail=details
+                self.request_post(url, data)
+                #current_app.logger.info("notification sended")
+
+        except Exception as e:
+            current_app.logger.error("An exception occurred ::" + str(e))
+            return False
+
+    def request_post(self, url, data):
+        headers = {'content-type': 'application/json'}
+        return requests.post(url, json={'text': str(data.to_str())}, headers=headers)
+
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/core/resources.py b/services/TS29222_CAPIF_Events_API/capif_events/core/resources.py
new file mode 100644
index 0000000000000000000000000000000000000000..94e29ec07359c93a78d520f24fa91c88971d65c4
--- /dev/null
+++ b/services/TS29222_CAPIF_Events_API/capif_events/core/resources.py
@@ -0,0 +1,7 @@
+from abc import ABC, abstractmethod
+from ..db.db import MongoDatabse
+
+class Resource(ABC):
+
+    def __init__(self):
+        self.db = MongoDatabse()
\ No newline at end of file
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/core/responses.py b/services/TS29222_CAPIF_Events_API/capif_events/core/responses.py
new file mode 100644
index 0000000000000000000000000000000000000000..962c4b6dd6ae07bce79dc8e810f10a507d526663
--- /dev/null
+++ b/services/TS29222_CAPIF_Events_API/capif_events/core/responses.py
@@ -0,0 +1,31 @@
+from ..models.problem_details import ProblemDetails
+from ..encoder import JSONEncoder
+from flask import Response
+import json
+
+mimetype = "application/json"
+
+def make_response(object, status):
+    res = Response(json.dumps(object, cls=JSONEncoder), status=status, mimetype=mimetype)
+
+    return res
+
+def internal_server_error(detail, cause):
+    prob = ProblemDetails(title="Internal Server Error", status=500, detail=detail, cause=cause)
+
+    return Response(json.dumps(prob, cls=JSONEncoder), status=500, mimetype=mimetype)
+
+def forbidden_error(detail, cause):
+    prob = ProblemDetails(title="Forbidden", status=403, detail=detail, cause=cause)
+
+    return Response(json.dumps(prob, cls=JSONEncoder), status=403, mimetype=mimetype)
+
+def bad_request_error(detail, cause, invalid_params):
+    prob = ProblemDetails(title="Bad Request", status=400, detail=detail, cause=cause, invalid_params=invalid_params)
+
+    return Response(json.dumps(prob, cls=JSONEncoder), status=400, mimetype=cause)
+
+def not_found_error(detail, cause):
+    prob = ProblemDetails(title="Not Found", status=404, detail=detail, cause=cause)
+
+    return Response(json.dumps(prob, cls=JSONEncoder), status=404, mimetype=mimetype)
\ No newline at end of file
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/core/validate_user.py b/services/TS29222_CAPIF_Events_API/capif_events/core/validate_user.py
new file mode 100644
index 0000000000000000000000000000000000000000..18d54a2ec108ecd87483cf0c314e52c8eb6fad6c
--- /dev/null
+++ b/services/TS29222_CAPIF_Events_API/capif_events/core/validate_user.py
@@ -0,0 +1,26 @@
+from flask import current_app, Response
+import json
+from ..models.problem_details import ProblemDetails
+from ..encoder import JSONEncoder
+from .resources import Resource
+from .responses import internal_server_error
+
+class ControlAccess(Resource):
+
+    def validate_user_cert(self, event_id, subscriber_id, cert_signature):
+
+        cert_col = self.db.get_col_by_name(self.db.certs_col)
+
+        try:
+            my_query = {'id':subscriber_id}
+            cert_entry = cert_col.find_one(my_query)
+
+            if cert_entry is not None:
+                if cert_entry["cert_signature"] != cert_signature or "event_subscriptions" not in cert_entry["resources"] or event_id not in cert_entry["resources"]["event_subscriptions"]:
+                    prob = ProblemDetails(title="Unauthorized", detail="User not authorized", cause="You are not the owner of this resource")
+                    return Response(json.dumps(prob, cls=JSONEncoder), status=401, mimetype="application/json")
+
+        except Exception as e:
+            exception = "An exception occurred in validate subscriber"
+            current_app.logger.error(exception + "::" + str(e))
+            return internal_server_error(detail=exception, cause=str(e))
\ No newline at end of file
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/db/db.py b/services/TS29222_CAPIF_Events_API/capif_events/db/db.py
new file mode 100644
index 0000000000000000000000000000000000000000..2f4d1190297508fd9b49946fc193ba92b6e2d99e
--- /dev/null
+++ b/services/TS29222_CAPIF_Events_API/capif_events/db/db.py
@@ -0,0 +1,48 @@
+import atexit
+import time
+from pymongo import MongoClient
+from pymongo.errors import AutoReconnect
+from ..config import Config
+from bson.codec_options import CodecOptions
+import os
+from opentelemetry.instrumentation.pymongo import PymongoInstrumentor
+
+if eval(os.environ.get("MONITORING").lower().capitalize()):
+    PymongoInstrumentor().instrument()
+
+
+class MongoDatabse():
+
+    def __init__(self):
+        self.config = Config().get_config()
+        self.db = self.__connect()
+        self.event_collection = self.config['mongo']['col']
+        self.invoker_collection = self.config['mongo']['capif_invokers_col']
+        self.provider_collection = self.config['mongo']['capif_providers_col']
+        self.certs_col = self.config['mongo']['certs_col']
+        # self.acls_col = self.config['mongo']['capif_acls_col']
+
+    def get_col_by_name(self, name):
+        return self.db[name].with_options(codec_options=CodecOptions(tz_aware=True))
+
+    def __connect(self, max_retries=3, retry_delay=1):
+        retries = 0
+        while retries < max_retries:
+            try:
+                uri = f"mongodb://{self.config['mongo']['user']}:{self.config['mongo']['password']}@" \
+                      f"{self.config['mongo']['host']}:{self.config['mongo']['port']}"
+                client = MongoClient(uri)
+                mydb = client[self.config['mongo']['db']]
+                mydb.command("ping")
+                return mydb
+            except AutoReconnect:
+                retries += 1
+                print(f"Reconnecting... Retry {retries} of {max_retries}")
+                time.sleep(retry_delay)
+        return None
+
+    def close_connection(self):
+        if self.db.client:
+            self.db.client.close()
+
+
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/encoder.py b/services/TS29222_CAPIF_Events_API/capif_events/encoder.py
new file mode 100644
index 0000000000000000000000000000000000000000..f6b018f22f8e92eb3c919f4cb4546d61a550fcd0
--- /dev/null
+++ b/services/TS29222_CAPIF_Events_API/capif_events/encoder.py
@@ -0,0 +1,20 @@
+from connexion.apps.flask_app import FlaskJSONEncoder
+import six
+
+from capif_events.models.base_model_ import Model
+
+
+class JSONEncoder(FlaskJSONEncoder):
+    include_nulls = False
+
+    def default(self, o):
+        if isinstance(o, Model):
+            dikt = {}
+            for attr, _ in six.iteritems(o.openapi_types):
+                value = getattr(o, attr)
+                if value is None and not self.include_nulls:
+                    continue
+                attr = o.attribute_map[attr]
+                dikt[attr] = value
+            return dikt
+        return FlaskJSONEncoder.default(self, o)
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/__init__.py b/services/TS29222_CAPIF_Events_API/capif_events/models/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..5628bb7ee9399718f9a40e6847bd4d99a5c88162
--- /dev/null
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/__init__.py
@@ -0,0 +1,50 @@
+# coding: utf-8
+
+# flake8: noqa
+from __future__ import absolute_import
+# import models into model package
+from capif_events.models.access_control_policy_list import AccessControlPolicyList
+from capif_events.models.access_control_policy_list_ext import AccessControlPolicyListExt
+from capif_events.models.access_control_policy_list_ext_all_of import AccessControlPolicyListExtAllOf
+from capif_events.models.aef_profile import AefProfile
+from capif_events.models.api_invoker_policy import ApiInvokerPolicy
+from capif_events.models.capif_event import CAPIFEvent
+from capif_events.models.capif_event_any_of import CAPIFEventAnyOf
+from capif_events.models.capif_event_detail import CAPIFEventDetail
+from capif_events.models.capif_event_filter import CAPIFEventFilter
+from capif_events.models.communication_type import CommunicationType
+from capif_events.models.communication_type_any_of import CommunicationTypeAnyOf
+from capif_events.models.custom_operation import CustomOperation
+from capif_events.models.data_format import DataFormat
+from capif_events.models.data_format_any_of import DataFormatAnyOf
+from capif_events.models.event_notification import EventNotification
+from capif_events.models.event_subscription import EventSubscription
+from capif_events.models.interface_description import InterfaceDescription
+from capif_events.models.invalid_param import InvalidParam
+from capif_events.models.invocation_log import InvocationLog
+from capif_events.models.ipv4_address_range import Ipv4AddressRange
+from capif_events.models.ipv6_address_range import Ipv6AddressRange
+from capif_events.models.log import Log
+from capif_events.models.notification_flag import NotificationFlag
+from capif_events.models.notification_flag_any_of import NotificationFlagAnyOf
+from capif_events.models.notification_method import NotificationMethod
+from capif_events.models.notification_method_any_of import NotificationMethodAnyOf
+from capif_events.models.operation import Operation
+from capif_events.models.operation_any_of import OperationAnyOf
+from capif_events.models.partitioning_criteria import PartitioningCriteria
+from capif_events.models.partitioning_criteria_any_of import PartitioningCriteriaAnyOf
+from capif_events.models.problem_details import ProblemDetails
+from capif_events.models.protocol import Protocol
+from capif_events.models.protocol_any_of import ProtocolAnyOf
+from capif_events.models.published_api_path import PublishedApiPath
+from capif_events.models.reporting_information import ReportingInformation
+from capif_events.models.resource import Resource
+from capif_events.models.routing_rule import RoutingRule
+from capif_events.models.security_method import SecurityMethod
+from capif_events.models.security_method_any_of import SecurityMethodAnyOf
+from capif_events.models.service_api_description import ServiceAPIDescription
+from capif_events.models.shareable_information import ShareableInformation
+from capif_events.models.time_range_list import TimeRangeList
+from capif_events.models.topology_hiding import TopologyHiding
+from capif_events.models.version import Version
+from capif_events.models.websock_notif_config import WebsockNotifConfig
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/access_control_policy_list.py b/services/TS29222_CAPIF_Events_API/capif_events/models/access_control_policy_list.py
new file mode 100644
index 0000000000000000000000000000000000000000..4cca41d86e375c9fd35f583d7d1b94194f34d0c2
--- /dev/null
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/access_control_policy_list.py
@@ -0,0 +1,70 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_events.models.base_model_ import Model
+from capif_events.models.api_invoker_policy import ApiInvokerPolicy
+from capif_events import util
+
+from capif_events.models.api_invoker_policy import ApiInvokerPolicy  # noqa: E501
+
+class AccessControlPolicyList(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, api_invoker_policies=None):  # noqa: E501
+        """AccessControlPolicyList - a model defined in OpenAPI
+
+        :param api_invoker_policies: The api_invoker_policies of this AccessControlPolicyList.  # noqa: E501
+        :type api_invoker_policies: List[ApiInvokerPolicy]
+        """
+        self.openapi_types = {
+            'api_invoker_policies': List[ApiInvokerPolicy]
+        }
+
+        self.attribute_map = {
+            'api_invoker_policies': 'apiInvokerPolicies'
+        }
+
+        self._api_invoker_policies = api_invoker_policies
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'AccessControlPolicyList':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The AccessControlPolicyList of this AccessControlPolicyList.  # noqa: E501
+        :rtype: AccessControlPolicyList
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def api_invoker_policies(self):
+        """Gets the api_invoker_policies of this AccessControlPolicyList.
+
+        Policy of each API invoker.  # noqa: E501
+
+        :return: The api_invoker_policies of this AccessControlPolicyList.
+        :rtype: List[ApiInvokerPolicy]
+        """
+        return self._api_invoker_policies
+
+    @api_invoker_policies.setter
+    def api_invoker_policies(self, api_invoker_policies):
+        """Sets the api_invoker_policies of this AccessControlPolicyList.
+
+        Policy of each API invoker.  # noqa: E501
+
+        :param api_invoker_policies: The api_invoker_policies of this AccessControlPolicyList.
+        :type api_invoker_policies: List[ApiInvokerPolicy]
+        """
+        if api_invoker_policies is not None and len(api_invoker_policies) < 0:
+            raise ValueError("Invalid value for `api_invoker_policies`, number of items must be greater than or equal to `0`")  # noqa: E501
+
+        self._api_invoker_policies = api_invoker_policies
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/access_control_policy_list_ext.py b/services/TS29222_CAPIF_Events_API/capif_events/models/access_control_policy_list_ext.py
new file mode 100644
index 0000000000000000000000000000000000000000..6f5709c1b82bbeb2b7cce48ea99e5d45c1614aec
--- /dev/null
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/access_control_policy_list_ext.py
@@ -0,0 +1,102 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_events.models.base_model_ import Model
+from capif_events.models.access_control_policy_list import AccessControlPolicyList
+from capif_events.models.access_control_policy_list_ext_all_of import AccessControlPolicyListExtAllOf
+from capif_events.models.api_invoker_policy import ApiInvokerPolicy
+from capif_events import util
+
+from capif_events.models.access_control_policy_list import AccessControlPolicyList  # noqa: E501
+from capif_events.models.access_control_policy_list_ext_all_of import AccessControlPolicyListExtAllOf  # noqa: E501
+from capif_events.models.api_invoker_policy import ApiInvokerPolicy  # noqa: E501
+
+class AccessControlPolicyListExt(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, api_invoker_policies=None, api_id=None):  # noqa: E501
+        """AccessControlPolicyListExt - a model defined in OpenAPI
+
+        :param api_invoker_policies: The api_invoker_policies of this AccessControlPolicyListExt.  # noqa: E501
+        :type api_invoker_policies: List[ApiInvokerPolicy]
+        :param api_id: The api_id of this AccessControlPolicyListExt.  # noqa: E501
+        :type api_id: str
+        """
+        self.openapi_types = {
+            'api_invoker_policies': List[ApiInvokerPolicy],
+            'api_id': str
+        }
+
+        self.attribute_map = {
+            'api_invoker_policies': 'apiInvokerPolicies',
+            'api_id': 'apiId'
+        }
+
+        self._api_invoker_policies = api_invoker_policies
+        self._api_id = api_id
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'AccessControlPolicyListExt':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The AccessControlPolicyListExt of this AccessControlPolicyListExt.  # noqa: E501
+        :rtype: AccessControlPolicyListExt
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def api_invoker_policies(self):
+        """Gets the api_invoker_policies of this AccessControlPolicyListExt.
+
+        Policy of each API invoker.  # noqa: E501
+
+        :return: The api_invoker_policies of this AccessControlPolicyListExt.
+        :rtype: List[ApiInvokerPolicy]
+        """
+        return self._api_invoker_policies
+
+    @api_invoker_policies.setter
+    def api_invoker_policies(self, api_invoker_policies):
+        """Sets the api_invoker_policies of this AccessControlPolicyListExt.
+
+        Policy of each API invoker.  # noqa: E501
+
+        :param api_invoker_policies: The api_invoker_policies of this AccessControlPolicyListExt.
+        :type api_invoker_policies: List[ApiInvokerPolicy]
+        """
+        if api_invoker_policies is not None and len(api_invoker_policies) < 0:
+            raise ValueError("Invalid value for `api_invoker_policies`, number of items must be greater than or equal to `0`")  # noqa: E501
+
+        self._api_invoker_policies = api_invoker_policies
+
+    @property
+    def api_id(self):
+        """Gets the api_id of this AccessControlPolicyListExt.
+
+
+        :return: The api_id of this AccessControlPolicyListExt.
+        :rtype: str
+        """
+        return self._api_id
+
+    @api_id.setter
+    def api_id(self, api_id):
+        """Sets the api_id of this AccessControlPolicyListExt.
+
+
+        :param api_id: The api_id of this AccessControlPolicyListExt.
+        :type api_id: str
+        """
+        if api_id is None:
+            raise ValueError("Invalid value for `api_id`, must not be `None`")  # noqa: E501
+
+        self._api_id = api_id
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/access_control_policy_list_ext_all_of.py b/services/TS29222_CAPIF_Events_API/capif_events/models/access_control_policy_list_ext_all_of.py
new file mode 100644
index 0000000000000000000000000000000000000000..cd1dda02bb64e5b79761e3e0dd8b9f5a6354cbcc
--- /dev/null
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/access_control_policy_list_ext_all_of.py
@@ -0,0 +1,64 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_events.models.base_model_ import Model
+from capif_events import util
+
+
+class AccessControlPolicyListExtAllOf(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, api_id=None):  # noqa: E501
+        """AccessControlPolicyListExtAllOf - a model defined in OpenAPI
+
+        :param api_id: The api_id of this AccessControlPolicyListExtAllOf.  # noqa: E501
+        :type api_id: str
+        """
+        self.openapi_types = {
+            'api_id': str
+        }
+
+        self.attribute_map = {
+            'api_id': 'apiId'
+        }
+
+        self._api_id = api_id
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'AccessControlPolicyListExtAllOf':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The AccessControlPolicyListExt_allOf of this AccessControlPolicyListExtAllOf.  # noqa: E501
+        :rtype: AccessControlPolicyListExtAllOf
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def api_id(self):
+        """Gets the api_id of this AccessControlPolicyListExtAllOf.
+
+
+        :return: The api_id of this AccessControlPolicyListExtAllOf.
+        :rtype: str
+        """
+        return self._api_id
+
+    @api_id.setter
+    def api_id(self, api_id):
+        """Sets the api_id of this AccessControlPolicyListExtAllOf.
+
+
+        :param api_id: The api_id of this AccessControlPolicyListExtAllOf.
+        :type api_id: str
+        """
+
+        self._api_id = api_id
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/aef_profile.py b/services/TS29222_CAPIF_Events_API/capif_events/models/aef_profile.py
new file mode 100644
index 0000000000000000000000000000000000000000..ea2ce8bc10d54b812124173e592351edfbcbfef8
--- /dev/null
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/aef_profile.py
@@ -0,0 +1,250 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_events.models.base_model_ import Model
+from capif_events.models.data_format import DataFormat
+from capif_events.models.interface_description import InterfaceDescription
+from capif_events.models.protocol import Protocol
+from capif_events.models.security_method import SecurityMethod
+from capif_events.models.version import Version
+from capif_events import util
+
+from capif_events.models.data_format import DataFormat  # noqa: E501
+from capif_events.models.interface_description import InterfaceDescription  # noqa: E501
+from capif_events.models.protocol import Protocol  # noqa: E501
+from capif_events.models.security_method import SecurityMethod  # noqa: E501
+from capif_events.models.version import Version  # noqa: E501
+
+class AefProfile(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, aef_id=None, versions=None, protocol=None, data_format=None, security_methods=None, domain_name=None, interface_descriptions=None):  # noqa: E501
+        """AefProfile - a model defined in OpenAPI
+
+        :param aef_id: The aef_id of this AefProfile.  # noqa: E501
+        :type aef_id: str
+        :param versions: The versions of this AefProfile.  # noqa: E501
+        :type versions: List[Version]
+        :param protocol: The protocol of this AefProfile.  # noqa: E501
+        :type protocol: Protocol
+        :param data_format: The data_format of this AefProfile.  # noqa: E501
+        :type data_format: DataFormat
+        :param security_methods: The security_methods of this AefProfile.  # noqa: E501
+        :type security_methods: List[SecurityMethod]
+        :param domain_name: The domain_name of this AefProfile.  # noqa: E501
+        :type domain_name: str
+        :param interface_descriptions: The interface_descriptions of this AefProfile.  # noqa: E501
+        :type interface_descriptions: List[InterfaceDescription]
+        """
+        self.openapi_types = {
+            'aef_id': str,
+            'versions': List[Version],
+            'protocol': Protocol,
+            'data_format': DataFormat,
+            'security_methods': List[SecurityMethod],
+            'domain_name': str,
+            'interface_descriptions': List[InterfaceDescription]
+        }
+
+        self.attribute_map = {
+            'aef_id': 'aefId',
+            'versions': 'versions',
+            'protocol': 'protocol',
+            'data_format': 'dataFormat',
+            'security_methods': 'securityMethods',
+            'domain_name': 'domainName',
+            'interface_descriptions': 'interfaceDescriptions'
+        }
+
+        self._aef_id = aef_id
+        self._versions = versions
+        self._protocol = protocol
+        self._data_format = data_format
+        self._security_methods = security_methods
+        self._domain_name = domain_name
+        self._interface_descriptions = interface_descriptions
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'AefProfile':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The AefProfile of this AefProfile.  # noqa: E501
+        :rtype: AefProfile
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def aef_id(self):
+        """Gets the aef_id of this AefProfile.
+
+        Identifier of the API exposing function  # noqa: E501
+
+        :return: The aef_id of this AefProfile.
+        :rtype: str
+        """
+        return self._aef_id
+
+    @aef_id.setter
+    def aef_id(self, aef_id):
+        """Sets the aef_id of this AefProfile.
+
+        Identifier of the API exposing function  # noqa: E501
+
+        :param aef_id: The aef_id of this AefProfile.
+        :type aef_id: str
+        """
+        if aef_id is None:
+            raise ValueError("Invalid value for `aef_id`, must not be `None`")  # noqa: E501
+
+        self._aef_id = aef_id
+
+    @property
+    def versions(self):
+        """Gets the versions of this AefProfile.
+
+        API version  # noqa: E501
+
+        :return: The versions of this AefProfile.
+        :rtype: List[Version]
+        """
+        return self._versions
+
+    @versions.setter
+    def versions(self, versions):
+        """Sets the versions of this AefProfile.
+
+        API version  # noqa: E501
+
+        :param versions: The versions of this AefProfile.
+        :type versions: List[Version]
+        """
+        if versions is None:
+            raise ValueError("Invalid value for `versions`, must not be `None`")  # noqa: E501
+        if versions is not None and len(versions) < 1:
+            raise ValueError("Invalid value for `versions`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._versions = versions
+
+    @property
+    def protocol(self):
+        """Gets the protocol of this AefProfile.
+
+
+        :return: The protocol of this AefProfile.
+        :rtype: Protocol
+        """
+        return self._protocol
+
+    @protocol.setter
+    def protocol(self, protocol):
+        """Sets the protocol of this AefProfile.
+
+
+        :param protocol: The protocol of this AefProfile.
+        :type protocol: Protocol
+        """
+
+        self._protocol = protocol
+
+    @property
+    def data_format(self):
+        """Gets the data_format of this AefProfile.
+
+
+        :return: The data_format of this AefProfile.
+        :rtype: DataFormat
+        """
+        return self._data_format
+
+    @data_format.setter
+    def data_format(self, data_format):
+        """Sets the data_format of this AefProfile.
+
+
+        :param data_format: The data_format of this AefProfile.
+        :type data_format: DataFormat
+        """
+
+        self._data_format = data_format
+
+    @property
+    def security_methods(self):
+        """Gets the security_methods of this AefProfile.
+
+        Security methods supported by the AEF  # noqa: E501
+
+        :return: The security_methods of this AefProfile.
+        :rtype: List[SecurityMethod]
+        """
+        return self._security_methods
+
+    @security_methods.setter
+    def security_methods(self, security_methods):
+        """Sets the security_methods of this AefProfile.
+
+        Security methods supported by the AEF  # noqa: E501
+
+        :param security_methods: The security_methods of this AefProfile.
+        :type security_methods: List[SecurityMethod]
+        """
+        if security_methods is not None and len(security_methods) < 1:
+            raise ValueError("Invalid value for `security_methods`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._security_methods = security_methods
+
+    @property
+    def domain_name(self):
+        """Gets the domain_name of this AefProfile.
+
+        Domain to which API belongs to  # noqa: E501
+
+        :return: The domain_name of this AefProfile.
+        :rtype: str
+        """
+        return self._domain_name
+
+    @domain_name.setter
+    def domain_name(self, domain_name):
+        """Sets the domain_name of this AefProfile.
+
+        Domain to which API belongs to  # noqa: E501
+
+        :param domain_name: The domain_name of this AefProfile.
+        :type domain_name: str
+        """
+
+        self._domain_name = domain_name
+
+    @property
+    def interface_descriptions(self):
+        """Gets the interface_descriptions of this AefProfile.
+
+        Interface details  # noqa: E501
+
+        :return: The interface_descriptions of this AefProfile.
+        :rtype: List[InterfaceDescription]
+        """
+        return self._interface_descriptions
+
+    @interface_descriptions.setter
+    def interface_descriptions(self, interface_descriptions):
+        """Sets the interface_descriptions of this AefProfile.
+
+        Interface details  # noqa: E501
+
+        :param interface_descriptions: The interface_descriptions of this AefProfile.
+        :type interface_descriptions: List[InterfaceDescription]
+        """
+        if interface_descriptions is not None and len(interface_descriptions) < 1:
+            raise ValueError("Invalid value for `interface_descriptions`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._interface_descriptions = interface_descriptions
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/api_invoker_policy.py b/services/TS29222_CAPIF_Events_API/capif_events/models/api_invoker_policy.py
new file mode 100644
index 0000000000000000000000000000000000000000..dbc1d9867c0703f64ee83a82c0fdd29566a2709c
--- /dev/null
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/api_invoker_policy.py
@@ -0,0 +1,156 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_events.models.base_model_ import Model
+from capif_events.models.time_range_list import TimeRangeList
+from capif_events import util
+
+from capif_events.models.time_range_list import TimeRangeList  # noqa: E501
+
+class ApiInvokerPolicy(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, api_invoker_id=None, allowed_total_invocations=None, allowed_invocations_per_second=None, allowed_invocation_time_range_list=None):  # noqa: E501
+        """ApiInvokerPolicy - a model defined in OpenAPI
+
+        :param api_invoker_id: The api_invoker_id of this ApiInvokerPolicy.  # noqa: E501
+        :type api_invoker_id: str
+        :param allowed_total_invocations: The allowed_total_invocations of this ApiInvokerPolicy.  # noqa: E501
+        :type allowed_total_invocations: int
+        :param allowed_invocations_per_second: The allowed_invocations_per_second of this ApiInvokerPolicy.  # noqa: E501
+        :type allowed_invocations_per_second: int
+        :param allowed_invocation_time_range_list: The allowed_invocation_time_range_list of this ApiInvokerPolicy.  # noqa: E501
+        :type allowed_invocation_time_range_list: List[TimeRangeList]
+        """
+        self.openapi_types = {
+            'api_invoker_id': str,
+            'allowed_total_invocations': int,
+            'allowed_invocations_per_second': int,
+            'allowed_invocation_time_range_list': List[TimeRangeList]
+        }
+
+        self.attribute_map = {
+            'api_invoker_id': 'apiInvokerId',
+            'allowed_total_invocations': 'allowedTotalInvocations',
+            'allowed_invocations_per_second': 'allowedInvocationsPerSecond',
+            'allowed_invocation_time_range_list': 'allowedInvocationTimeRangeList'
+        }
+
+        self._api_invoker_id = api_invoker_id
+        self._allowed_total_invocations = allowed_total_invocations
+        self._allowed_invocations_per_second = allowed_invocations_per_second
+        self._allowed_invocation_time_range_list = allowed_invocation_time_range_list
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'ApiInvokerPolicy':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The ApiInvokerPolicy of this ApiInvokerPolicy.  # noqa: E501
+        :rtype: ApiInvokerPolicy
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def api_invoker_id(self):
+        """Gets the api_invoker_id of this ApiInvokerPolicy.
+
+        API invoker ID assigned by the CAPIF core function  # noqa: E501
+
+        :return: The api_invoker_id of this ApiInvokerPolicy.
+        :rtype: str
+        """
+        return self._api_invoker_id
+
+    @api_invoker_id.setter
+    def api_invoker_id(self, api_invoker_id):
+        """Sets the api_invoker_id of this ApiInvokerPolicy.
+
+        API invoker ID assigned by the CAPIF core function  # noqa: E501
+
+        :param api_invoker_id: The api_invoker_id of this ApiInvokerPolicy.
+        :type api_invoker_id: str
+        """
+        if api_invoker_id is None:
+            raise ValueError("Invalid value for `api_invoker_id`, must not be `None`")  # noqa: E501
+
+        self._api_invoker_id = api_invoker_id
+
+    @property
+    def allowed_total_invocations(self):
+        """Gets the allowed_total_invocations of this ApiInvokerPolicy.
+
+        Total number of invocations allowed on the service API by the API invoker.  # noqa: E501
+
+        :return: The allowed_total_invocations of this ApiInvokerPolicy.
+        :rtype: int
+        """
+        return self._allowed_total_invocations
+
+    @allowed_total_invocations.setter
+    def allowed_total_invocations(self, allowed_total_invocations):
+        """Sets the allowed_total_invocations of this ApiInvokerPolicy.
+
+        Total number of invocations allowed on the service API by the API invoker.  # noqa: E501
+
+        :param allowed_total_invocations: The allowed_total_invocations of this ApiInvokerPolicy.
+        :type allowed_total_invocations: int
+        """
+
+        self._allowed_total_invocations = allowed_total_invocations
+
+    @property
+    def allowed_invocations_per_second(self):
+        """Gets the allowed_invocations_per_second of this ApiInvokerPolicy.
+
+        Invocations per second allowed on the service API by the API invoker.  # noqa: E501
+
+        :return: The allowed_invocations_per_second of this ApiInvokerPolicy.
+        :rtype: int
+        """
+        return self._allowed_invocations_per_second
+
+    @allowed_invocations_per_second.setter
+    def allowed_invocations_per_second(self, allowed_invocations_per_second):
+        """Sets the allowed_invocations_per_second of this ApiInvokerPolicy.
+
+        Invocations per second allowed on the service API by the API invoker.  # noqa: E501
+
+        :param allowed_invocations_per_second: The allowed_invocations_per_second of this ApiInvokerPolicy.
+        :type allowed_invocations_per_second: int
+        """
+
+        self._allowed_invocations_per_second = allowed_invocations_per_second
+
+    @property
+    def allowed_invocation_time_range_list(self):
+        """Gets the allowed_invocation_time_range_list of this ApiInvokerPolicy.
+
+        The time ranges during which the invocations are allowed on the service API by the API invoker.  # noqa: E501
+
+        :return: The allowed_invocation_time_range_list of this ApiInvokerPolicy.
+        :rtype: List[TimeRangeList]
+        """
+        return self._allowed_invocation_time_range_list
+
+    @allowed_invocation_time_range_list.setter
+    def allowed_invocation_time_range_list(self, allowed_invocation_time_range_list):
+        """Sets the allowed_invocation_time_range_list of this ApiInvokerPolicy.
+
+        The time ranges during which the invocations are allowed on the service API by the API invoker.  # noqa: E501
+
+        :param allowed_invocation_time_range_list: The allowed_invocation_time_range_list of this ApiInvokerPolicy.
+        :type allowed_invocation_time_range_list: List[TimeRangeList]
+        """
+        if allowed_invocation_time_range_list is not None and len(allowed_invocation_time_range_list) < 0:
+            raise ValueError("Invalid value for `allowed_invocation_time_range_list`, number of items must be greater than or equal to `0`")  # noqa: E501
+
+        self._allowed_invocation_time_range_list = allowed_invocation_time_range_list
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/base_model_.py b/services/TS29222_CAPIF_Events_API/capif_events/models/base_model_.py
new file mode 100644
index 0000000000000000000000000000000000000000..c71e9d080b3a748e674725984adcc9d010740533
--- /dev/null
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/base_model_.py
@@ -0,0 +1,69 @@
+import pprint
+
+import six
+import typing
+
+from capif_events import util
+
+T = typing.TypeVar('T')
+
+
+class Model(object):
+    # openapiTypes: The key is attribute name and the
+    # value is attribute type.
+    openapi_types = {}
+
+    # attributeMap: The key is attribute name and the
+    # value is json key in definition.
+    attribute_map = {}
+
+    @classmethod
+    def from_dict(cls: typing.Type[T], dikt) -> T:
+        """Returns the dict as a model"""
+        return util.deserialize_model(dikt, cls)
+
+    def to_dict(self):
+        """Returns the model properties as a dict
+
+        :rtype: dict
+        """
+        result = {}
+
+        for attr, _ in six.iteritems(self.openapi_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model
+
+        :rtype: str
+        """
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/capif_event.py b/services/TS29222_CAPIF_Events_API/capif_events/models/capif_event.py
new file mode 100644
index 0000000000000000000000000000000000000000..86648b4cfe5e983cf50d582fa32375ea385b050c
--- /dev/null
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/capif_event.py
@@ -0,0 +1,39 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_events.models.base_model_ import Model
+from capif_events.models.capif_event_any_of import CAPIFEventAnyOf
+from capif_events import util
+
+from capif_events.models.capif_event_any_of import CAPIFEventAnyOf  # noqa: E501
+
+class CAPIFEvent(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self):  # noqa: E501
+        """CAPIFEvent - a model defined in OpenAPI
+
+        """
+        self.openapi_types = {
+        }
+
+        self.attribute_map = {
+        }
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'CAPIFEvent':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The CAPIFEvent of this CAPIFEvent.  # noqa: E501
+        :rtype: CAPIFEvent
+        """
+        return util.deserialize_model(dikt, cls)
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/capif_event_any_of.py b/services/TS29222_CAPIF_Events_API/capif_events/models/capif_event_any_of.py
new file mode 100644
index 0000000000000000000000000000000000000000..3b2f4d73d75cd97ca69f819e4342d46cbb0ff79e
--- /dev/null
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/capif_event_any_of.py
@@ -0,0 +1,53 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_events.models.base_model_ import Model
+from capif_events import util
+
+
+class CAPIFEventAnyOf(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    """
+    allowed enum values
+    """
+    SERVICE_API_AVAILABLE = "SERVICE_API_AVAILABLE"
+    SERVICE_API_UNAVAILABLE = "SERVICE_API_UNAVAILABLE"
+    SERVICE_API_UPDATE = "SERVICE_API_UPDATE"
+    API_INVOKER_ONBOARDED = "API_INVOKER_ONBOARDED"
+    API_INVOKER_OFFBOARDED = "API_INVOKER_OFFBOARDED"
+    SERVICE_API_INVOCATION_SUCCESS = "SERVICE_API_INVOCATION_SUCCESS"
+    SERVICE_API_INVOCATION_FAILURE = "SERVICE_API_INVOCATION_FAILURE"
+    ACCESS_CONTROL_POLICY_UPDATE = "ACCESS_CONTROL_POLICY_UPDATE"
+    ACCESS_CONTROL_POLICY_UNAVAILABLE = "ACCESS_CONTROL_POLICY_UNAVAILABLE"
+    API_INVOKER_AUTHORIZATION_REVOKED = "API_INVOKER_AUTHORIZATION_REVOKED"
+    API_INVOKER_UPDATED = "API_INVOKER_UPDATED"
+    API_TOPOLOGY_HIDING_CREATED = "API_TOPOLOGY_HIDING_CREATED"
+    API_TOPOLOGY_HIDING_REVOKED = "API_TOPOLOGY_HIDING_REVOKED"
+    def __init__(self):  # noqa: E501
+        """CAPIFEventAnyOf - a model defined in OpenAPI
+
+        """
+        self.openapi_types = {
+        }
+
+        self.attribute_map = {
+        }
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'CAPIFEventAnyOf':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The CAPIFEvent_anyOf of this CAPIFEventAnyOf.  # noqa: E501
+        :rtype: CAPIFEventAnyOf
+        """
+        return util.deserialize_model(dikt, cls)
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/capif_event_detail.py b/services/TS29222_CAPIF_Events_API/capif_events/models/capif_event_detail.py
new file mode 100644
index 0000000000000000000000000000000000000000..f9c21eb993a9ed6631998a7bd69b38e6e06ba1a4
--- /dev/null
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/capif_event_detail.py
@@ -0,0 +1,218 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_events.models.base_model_ import Model
+from capif_events.models.access_control_policy_list_ext import AccessControlPolicyListExt
+from capif_events.models.invocation_log import InvocationLog
+from capif_events.models.service_api_description import ServiceAPIDescription
+from capif_events.models.topology_hiding import TopologyHiding
+from capif_events import util
+
+from capif_events.models.access_control_policy_list_ext import AccessControlPolicyListExt  # noqa: E501
+from capif_events.models.invocation_log import InvocationLog  # noqa: E501
+from capif_events.models.service_api_description import ServiceAPIDescription  # noqa: E501
+from capif_events.models.topology_hiding import TopologyHiding  # noqa: E501
+
+class CAPIFEventDetail(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, service_api_descriptions=None, api_ids=None, api_invoker_ids=None, acc_ctrl_pol_list=None, invocation_logs=None, api_topo_hide=None):  # noqa: E501
+        """CAPIFEventDetail - a model defined in OpenAPI
+
+        :param service_api_descriptions: The service_api_descriptions of this CAPIFEventDetail.  # noqa: E501
+        :type service_api_descriptions: List[ServiceAPIDescription]
+        :param api_ids: The api_ids of this CAPIFEventDetail.  # noqa: E501
+        :type api_ids: List[str]
+        :param api_invoker_ids: The api_invoker_ids of this CAPIFEventDetail.  # noqa: E501
+        :type api_invoker_ids: List[str]
+        :param acc_ctrl_pol_list: The acc_ctrl_pol_list of this CAPIFEventDetail.  # noqa: E501
+        :type acc_ctrl_pol_list: AccessControlPolicyListExt
+        :param invocation_logs: The invocation_logs of this CAPIFEventDetail.  # noqa: E501
+        :type invocation_logs: List[InvocationLog]
+        :param api_topo_hide: The api_topo_hide of this CAPIFEventDetail.  # noqa: E501
+        :type api_topo_hide: TopologyHiding
+        """
+        self.openapi_types = {
+            'service_api_descriptions': List[ServiceAPIDescription],
+            'api_ids': List[str],
+            'api_invoker_ids': List[str],
+            'acc_ctrl_pol_list': AccessControlPolicyListExt,
+            'invocation_logs': List[InvocationLog],
+            'api_topo_hide': TopologyHiding
+        }
+
+        self.attribute_map = {
+            'service_api_descriptions': 'serviceAPIDescriptions',
+            'api_ids': 'apiIds',
+            'api_invoker_ids': 'apiInvokerIds',
+            'acc_ctrl_pol_list': 'accCtrlPolList',
+            'invocation_logs': 'invocationLogs',
+            'api_topo_hide': 'apiTopoHide'
+        }
+
+        self._service_api_descriptions = service_api_descriptions
+        self._api_ids = api_ids
+        self._api_invoker_ids = api_invoker_ids
+        self._acc_ctrl_pol_list = acc_ctrl_pol_list
+        self._invocation_logs = invocation_logs
+        self._api_topo_hide = api_topo_hide
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'CAPIFEventDetail':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The CAPIFEventDetail of this CAPIFEventDetail.  # noqa: E501
+        :rtype: CAPIFEventDetail
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def service_api_descriptions(self):
+        """Gets the service_api_descriptions of this CAPIFEventDetail.
+
+        Description of the service API as published by the APF.  # noqa: E501
+
+        :return: The service_api_descriptions of this CAPIFEventDetail.
+        :rtype: List[ServiceAPIDescription]
+        """
+        return self._service_api_descriptions
+
+    @service_api_descriptions.setter
+    def service_api_descriptions(self, service_api_descriptions):
+        """Sets the service_api_descriptions of this CAPIFEventDetail.
+
+        Description of the service API as published by the APF.  # noqa: E501
+
+        :param service_api_descriptions: The service_api_descriptions of this CAPIFEventDetail.
+        :type service_api_descriptions: List[ServiceAPIDescription]
+        """
+        if service_api_descriptions is not None and len(service_api_descriptions) < 1:
+            raise ValueError("Invalid value for `service_api_descriptions`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._service_api_descriptions = service_api_descriptions
+
+    @property
+    def api_ids(self):
+        """Gets the api_ids of this CAPIFEventDetail.
+
+        Identifier of the service API  # noqa: E501
+
+        :return: The api_ids of this CAPIFEventDetail.
+        :rtype: List[str]
+        """
+        return self._api_ids
+
+    @api_ids.setter
+    def api_ids(self, api_ids):
+        """Sets the api_ids of this CAPIFEventDetail.
+
+        Identifier of the service API  # noqa: E501
+
+        :param api_ids: The api_ids of this CAPIFEventDetail.
+        :type api_ids: List[str]
+        """
+        if api_ids is not None and len(api_ids) < 1:
+            raise ValueError("Invalid value for `api_ids`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._api_ids = api_ids
+
+    @property
+    def api_invoker_ids(self):
+        """Gets the api_invoker_ids of this CAPIFEventDetail.
+
+        Identity of the API invoker  # noqa: E501
+
+        :return: The api_invoker_ids of this CAPIFEventDetail.
+        :rtype: List[str]
+        """
+        return self._api_invoker_ids
+
+    @api_invoker_ids.setter
+    def api_invoker_ids(self, api_invoker_ids):
+        """Sets the api_invoker_ids of this CAPIFEventDetail.
+
+        Identity of the API invoker  # noqa: E501
+
+        :param api_invoker_ids: The api_invoker_ids of this CAPIFEventDetail.
+        :type api_invoker_ids: List[str]
+        """
+        if api_invoker_ids is not None and len(api_invoker_ids) < 1:
+            raise ValueError("Invalid value for `api_invoker_ids`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._api_invoker_ids = api_invoker_ids
+
+    @property
+    def acc_ctrl_pol_list(self):
+        """Gets the acc_ctrl_pol_list of this CAPIFEventDetail.
+
+
+        :return: The acc_ctrl_pol_list of this CAPIFEventDetail.
+        :rtype: AccessControlPolicyListExt
+        """
+        return self._acc_ctrl_pol_list
+
+    @acc_ctrl_pol_list.setter
+    def acc_ctrl_pol_list(self, acc_ctrl_pol_list):
+        """Sets the acc_ctrl_pol_list of this CAPIFEventDetail.
+
+
+        :param acc_ctrl_pol_list: The acc_ctrl_pol_list of this CAPIFEventDetail.
+        :type acc_ctrl_pol_list: AccessControlPolicyListExt
+        """
+
+        self._acc_ctrl_pol_list = acc_ctrl_pol_list
+
+    @property
+    def invocation_logs(self):
+        """Gets the invocation_logs of this CAPIFEventDetail.
+
+        Invocation logs.  # noqa: E501
+
+        :return: The invocation_logs of this CAPIFEventDetail.
+        :rtype: List[InvocationLog]
+        """
+        return self._invocation_logs
+
+    @invocation_logs.setter
+    def invocation_logs(self, invocation_logs):
+        """Sets the invocation_logs of this CAPIFEventDetail.
+
+        Invocation logs.  # noqa: E501
+
+        :param invocation_logs: The invocation_logs of this CAPIFEventDetail.
+        :type invocation_logs: List[InvocationLog]
+        """
+        if invocation_logs is not None and len(invocation_logs) < 1:
+            raise ValueError("Invalid value for `invocation_logs`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._invocation_logs = invocation_logs
+
+    @property
+    def api_topo_hide(self):
+        """Gets the api_topo_hide of this CAPIFEventDetail.
+
+
+        :return: The api_topo_hide of this CAPIFEventDetail.
+        :rtype: TopologyHiding
+        """
+        return self._api_topo_hide
+
+    @api_topo_hide.setter
+    def api_topo_hide(self, api_topo_hide):
+        """Sets the api_topo_hide of this CAPIFEventDetail.
+
+
+        :param api_topo_hide: The api_topo_hide of this CAPIFEventDetail.
+        :type api_topo_hide: TopologyHiding
+        """
+
+        self._api_topo_hide = api_topo_hide
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/capif_event_filter.py b/services/TS29222_CAPIF_Events_API/capif_events/models/capif_event_filter.py
new file mode 100644
index 0000000000000000000000000000000000000000..19aa9e5b9e9469652084083c195eac0cb8eabc7d
--- /dev/null
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/capif_event_filter.py
@@ -0,0 +1,128 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_events.models.base_model_ import Model
+from capif_events import util
+
+
+class CAPIFEventFilter(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, api_ids=None, api_invoker_ids=None, aef_ids=None):  # noqa: E501
+        """CAPIFEventFilter - a model defined in OpenAPI
+
+        :param api_ids: The api_ids of this CAPIFEventFilter.  # noqa: E501
+        :type api_ids: List[str]
+        :param api_invoker_ids: The api_invoker_ids of this CAPIFEventFilter.  # noqa: E501
+        :type api_invoker_ids: List[str]
+        :param aef_ids: The aef_ids of this CAPIFEventFilter.  # noqa: E501
+        :type aef_ids: List[str]
+        """
+        self.openapi_types = {
+            'api_ids': List[str],
+            'api_invoker_ids': List[str],
+            'aef_ids': List[str]
+        }
+
+        self.attribute_map = {
+            'api_ids': 'apiIds',
+            'api_invoker_ids': 'apiInvokerIds',
+            'aef_ids': 'aefIds'
+        }
+
+        self._api_ids = api_ids
+        self._api_invoker_ids = api_invoker_ids
+        self._aef_ids = aef_ids
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'CAPIFEventFilter':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The CAPIFEventFilter of this CAPIFEventFilter.  # noqa: E501
+        :rtype: CAPIFEventFilter
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def api_ids(self):
+        """Gets the api_ids of this CAPIFEventFilter.
+
+        Identifier of the service API  # noqa: E501
+
+        :return: The api_ids of this CAPIFEventFilter.
+        :rtype: List[str]
+        """
+        return self._api_ids
+
+    @api_ids.setter
+    def api_ids(self, api_ids):
+        """Sets the api_ids of this CAPIFEventFilter.
+
+        Identifier of the service API  # noqa: E501
+
+        :param api_ids: The api_ids of this CAPIFEventFilter.
+        :type api_ids: List[str]
+        """
+        if api_ids is not None and len(api_ids) < 1:
+            raise ValueError("Invalid value for `api_ids`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._api_ids = api_ids
+
+    @property
+    def api_invoker_ids(self):
+        """Gets the api_invoker_ids of this CAPIFEventFilter.
+
+        Identity of the API invoker  # noqa: E501
+
+        :return: The api_invoker_ids of this CAPIFEventFilter.
+        :rtype: List[str]
+        """
+        return self._api_invoker_ids
+
+    @api_invoker_ids.setter
+    def api_invoker_ids(self, api_invoker_ids):
+        """Sets the api_invoker_ids of this CAPIFEventFilter.
+
+        Identity of the API invoker  # noqa: E501
+
+        :param api_invoker_ids: The api_invoker_ids of this CAPIFEventFilter.
+        :type api_invoker_ids: List[str]
+        """
+        if api_invoker_ids is not None and len(api_invoker_ids) < 1:
+            raise ValueError("Invalid value for `api_invoker_ids`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._api_invoker_ids = api_invoker_ids
+
+    @property
+    def aef_ids(self):
+        """Gets the aef_ids of this CAPIFEventFilter.
+
+        Identifier of the API exposing function  # noqa: E501
+
+        :return: The aef_ids of this CAPIFEventFilter.
+        :rtype: List[str]
+        """
+        return self._aef_ids
+
+    @aef_ids.setter
+    def aef_ids(self, aef_ids):
+        """Sets the aef_ids of this CAPIFEventFilter.
+
+        Identifier of the API exposing function  # noqa: E501
+
+        :param aef_ids: The aef_ids of this CAPIFEventFilter.
+        :type aef_ids: List[str]
+        """
+        if aef_ids is not None and len(aef_ids) < 1:
+            raise ValueError("Invalid value for `aef_ids`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._aef_ids = aef_ids
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/communication_type.py b/services/TS29222_CAPIF_Events_API/capif_events/models/communication_type.py
new file mode 100644
index 0000000000000000000000000000000000000000..76054ffcf55261286b24b66e7b6c4ce087005d37
--- /dev/null
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/communication_type.py
@@ -0,0 +1,39 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_events.models.base_model_ import Model
+from capif_events.models.communication_type_any_of import CommunicationTypeAnyOf
+from capif_events import util
+
+from capif_events.models.communication_type_any_of import CommunicationTypeAnyOf  # noqa: E501
+
+class CommunicationType(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self):  # noqa: E501
+        """CommunicationType - a model defined in OpenAPI
+
+        """
+        self.openapi_types = {
+        }
+
+        self.attribute_map = {
+        }
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'CommunicationType':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The CommunicationType of this CommunicationType.  # noqa: E501
+        :rtype: CommunicationType
+        """
+        return util.deserialize_model(dikt, cls)
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/communication_type_any_of.py b/services/TS29222_CAPIF_Events_API/capif_events/models/communication_type_any_of.py
new file mode 100644
index 0000000000000000000000000000000000000000..de71aeaad3e3a4029872cbcbc906e311f9fdf04d
--- /dev/null
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/communication_type_any_of.py
@@ -0,0 +1,42 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_events.models.base_model_ import Model
+from capif_events import util
+
+
+class CommunicationTypeAnyOf(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    """
+    allowed enum values
+    """
+    REQUEST_RESPONSE = "REQUEST_RESPONSE"
+    SUBSCRIBE_NOTIFY = "SUBSCRIBE_NOTIFY"
+    def __init__(self):  # noqa: E501
+        """CommunicationTypeAnyOf - a model defined in OpenAPI
+
+        """
+        self.openapi_types = {
+        }
+
+        self.attribute_map = {
+        }
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'CommunicationTypeAnyOf':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The CommunicationType_anyOf of this CommunicationTypeAnyOf.  # noqa: E501
+        :rtype: CommunicationTypeAnyOf
+        """
+        return util.deserialize_model(dikt, cls)
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/custom_operation.py b/services/TS29222_CAPIF_Events_API/capif_events/models/custom_operation.py
new file mode 100644
index 0000000000000000000000000000000000000000..190dae7102b29ac3d84be23a105a8578928b26ef
--- /dev/null
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/custom_operation.py
@@ -0,0 +1,158 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_events.models.base_model_ import Model
+from capif_events.models.communication_type import CommunicationType
+from capif_events.models.operation import Operation
+from capif_events import util
+
+from capif_events.models.communication_type import CommunicationType  # noqa: E501
+from capif_events.models.operation import Operation  # noqa: E501
+
+class CustomOperation(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, comm_type=None, cust_op_name=None, operations=None, description=None):  # noqa: E501
+        """CustomOperation - a model defined in OpenAPI
+
+        :param comm_type: The comm_type of this CustomOperation.  # noqa: E501
+        :type comm_type: CommunicationType
+        :param cust_op_name: The cust_op_name of this CustomOperation.  # noqa: E501
+        :type cust_op_name: str
+        :param operations: The operations of this CustomOperation.  # noqa: E501
+        :type operations: List[Operation]
+        :param description: The description of this CustomOperation.  # noqa: E501
+        :type description: str
+        """
+        self.openapi_types = {
+            'comm_type': CommunicationType,
+            'cust_op_name': str,
+            'operations': List[Operation],
+            'description': str
+        }
+
+        self.attribute_map = {
+            'comm_type': 'commType',
+            'cust_op_name': 'custOpName',
+            'operations': 'operations',
+            'description': 'description'
+        }
+
+        self._comm_type = comm_type
+        self._cust_op_name = cust_op_name
+        self._operations = operations
+        self._description = description
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'CustomOperation':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The CustomOperation of this CustomOperation.  # noqa: E501
+        :rtype: CustomOperation
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def comm_type(self):
+        """Gets the comm_type of this CustomOperation.
+
+
+        :return: The comm_type of this CustomOperation.
+        :rtype: CommunicationType
+        """
+        return self._comm_type
+
+    @comm_type.setter
+    def comm_type(self, comm_type):
+        """Sets the comm_type of this CustomOperation.
+
+
+        :param comm_type: The comm_type of this CustomOperation.
+        :type comm_type: CommunicationType
+        """
+        if comm_type is None:
+            raise ValueError("Invalid value for `comm_type`, must not be `None`")  # noqa: E501
+
+        self._comm_type = comm_type
+
+    @property
+    def cust_op_name(self):
+        """Gets the cust_op_name of this CustomOperation.
+
+        it is set as {custOpName} part of the URI structure for a custom operation without resource association as defined in subclause 4.4 of 3GPP TS 29.501.  # noqa: E501
+
+        :return: The cust_op_name of this CustomOperation.
+        :rtype: str
+        """
+        return self._cust_op_name
+
+    @cust_op_name.setter
+    def cust_op_name(self, cust_op_name):
+        """Sets the cust_op_name of this CustomOperation.
+
+        it is set as {custOpName} part of the URI structure for a custom operation without resource association as defined in subclause 4.4 of 3GPP TS 29.501.  # noqa: E501
+
+        :param cust_op_name: The cust_op_name of this CustomOperation.
+        :type cust_op_name: str
+        """
+        if cust_op_name is None:
+            raise ValueError("Invalid value for `cust_op_name`, must not be `None`")  # noqa: E501
+
+        self._cust_op_name = cust_op_name
+
+    @property
+    def operations(self):
+        """Gets the operations of this CustomOperation.
+
+        Supported HTTP methods for the API resource. Only applicable when the protocol in AefProfile indicates HTTP.  # noqa: E501
+
+        :return: The operations of this CustomOperation.
+        :rtype: List[Operation]
+        """
+        return self._operations
+
+    @operations.setter
+    def operations(self, operations):
+        """Sets the operations of this CustomOperation.
+
+        Supported HTTP methods for the API resource. Only applicable when the protocol in AefProfile indicates HTTP.  # noqa: E501
+
+        :param operations: The operations of this CustomOperation.
+        :type operations: List[Operation]
+        """
+        if operations is not None and len(operations) < 1:
+            raise ValueError("Invalid value for `operations`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._operations = operations
+
+    @property
+    def description(self):
+        """Gets the description of this CustomOperation.
+
+        Text description of the custom operation  # noqa: E501
+
+        :return: The description of this CustomOperation.
+        :rtype: str
+        """
+        return self._description
+
+    @description.setter
+    def description(self, description):
+        """Sets the description of this CustomOperation.
+
+        Text description of the custom operation  # noqa: E501
+
+        :param description: The description of this CustomOperation.
+        :type description: str
+        """
+
+        self._description = description
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/data_format.py b/services/TS29222_CAPIF_Events_API/capif_events/models/data_format.py
new file mode 100644
index 0000000000000000000000000000000000000000..61f13fea01cb28c6afb98d680c70d2aa8687450a
--- /dev/null
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/data_format.py
@@ -0,0 +1,39 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_events.models.base_model_ import Model
+from capif_events.models.data_format_any_of import DataFormatAnyOf
+from capif_events import util
+
+from capif_events.models.data_format_any_of import DataFormatAnyOf  # noqa: E501
+
+class DataFormat(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self):  # noqa: E501
+        """DataFormat - a model defined in OpenAPI
+
+        """
+        self.openapi_types = {
+        }
+
+        self.attribute_map = {
+        }
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'DataFormat':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The DataFormat of this DataFormat.  # noqa: E501
+        :rtype: DataFormat
+        """
+        return util.deserialize_model(dikt, cls)
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/data_format_any_of.py b/services/TS29222_CAPIF_Events_API/capif_events/models/data_format_any_of.py
new file mode 100644
index 0000000000000000000000000000000000000000..6ccaf763e6c32eb277ffeef2aef4f7072d7e1a84
--- /dev/null
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/data_format_any_of.py
@@ -0,0 +1,41 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_events.models.base_model_ import Model
+from capif_events import util
+
+
+class DataFormatAnyOf(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    """
+    allowed enum values
+    """
+    JSON = "JSON"
+    def __init__(self):  # noqa: E501
+        """DataFormatAnyOf - a model defined in OpenAPI
+
+        """
+        self.openapi_types = {
+        }
+
+        self.attribute_map = {
+        }
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'DataFormatAnyOf':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The DataFormat_anyOf of this DataFormatAnyOf.  # noqa: E501
+        :rtype: DataFormatAnyOf
+        """
+        return util.deserialize_model(dikt, cls)
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/event_notification.py b/services/TS29222_CAPIF_Events_API/capif_events/models/event_notification.py
new file mode 100644
index 0000000000000000000000000000000000000000..633ddcfdc599d6525b3758b8957abf4f43c66627
--- /dev/null
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/event_notification.py
@@ -0,0 +1,126 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_events.models.base_model_ import Model
+from capif_events.models.capif_event import CAPIFEvent
+from capif_events.models.capif_event_detail import CAPIFEventDetail
+from capif_events import util
+
+from capif_events.models.capif_event import CAPIFEvent  # noqa: E501
+from capif_events.models.capif_event_detail import CAPIFEventDetail  # noqa: E501
+
+class EventNotification(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, subscription_id=None, events=None, event_detail=None):  # noqa: E501
+        """EventNotification - a model defined in OpenAPI
+
+        :param subscription_id: The subscription_id of this EventNotification.  # noqa: E501
+        :type subscription_id: str
+        :param events: The events of this EventNotification.  # noqa: E501
+        :type events: CAPIFEvent
+        :param event_detail: The event_detail of this EventNotification.  # noqa: E501
+        :type event_detail: CAPIFEventDetail
+        """
+        self.openapi_types = {
+            'subscription_id': str,
+            'events': CAPIFEvent,
+            'event_detail': CAPIFEventDetail
+        }
+
+        self.attribute_map = {
+            'subscription_id': 'subscriptionId',
+            'events': 'events',
+            'event_detail': 'eventDetail'
+        }
+
+        self._subscription_id = subscription_id
+        self._events = events
+        self._event_detail = event_detail
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'EventNotification':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The EventNotification of this EventNotification.  # noqa: E501
+        :rtype: EventNotification
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def subscription_id(self):
+        """Gets the subscription_id of this EventNotification.
+
+        Identifier of the subscription resource to which the notification is related – CAPIF resource identifier  # noqa: E501
+
+        :return: The subscription_id of this EventNotification.
+        :rtype: str
+        """
+        return self._subscription_id
+
+    @subscription_id.setter
+    def subscription_id(self, subscription_id):
+        """Sets the subscription_id of this EventNotification.
+
+        Identifier of the subscription resource to which the notification is related – CAPIF resource identifier  # noqa: E501
+
+        :param subscription_id: The subscription_id of this EventNotification.
+        :type subscription_id: str
+        """
+        if subscription_id is None:
+            raise ValueError("Invalid value for `subscription_id`, must not be `None`")  # noqa: E501
+
+        self._subscription_id = subscription_id
+
+    @property
+    def events(self):
+        """Gets the events of this EventNotification.
+
+
+        :return: The events of this EventNotification.
+        :rtype: CAPIFEvent
+        """
+        return self._events
+
+    @events.setter
+    def events(self, events):
+        """Sets the events of this EventNotification.
+
+
+        :param events: The events of this EventNotification.
+        :type events: CAPIFEvent
+        """
+        if events is None:
+            raise ValueError("Invalid value for `events`, must not be `None`")  # noqa: E501
+
+        self._events = events
+
+    @property
+    def event_detail(self):
+        """Gets the event_detail of this EventNotification.
+
+
+        :return: The event_detail of this EventNotification.
+        :rtype: CAPIFEventDetail
+        """
+        return self._event_detail
+
+    @event_detail.setter
+    def event_detail(self, event_detail):
+        """Sets the event_detail of this EventNotification.
+
+
+        :param event_detail: The event_detail of this EventNotification.
+        :type event_detail: CAPIFEventDetail
+        """
+
+        self._event_detail = event_detail
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/event_subscription.py b/services/TS29222_CAPIF_Events_API/capif_events/models/event_subscription.py
new file mode 100644
index 0000000000000000000000000000000000000000..c7ae736405e3a607f46350561884b8b9748528b7
--- /dev/null
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/event_subscription.py
@@ -0,0 +1,250 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_events.models.base_model_ import Model
+from capif_events.models.capif_event import CAPIFEvent
+from capif_events.models.capif_event_filter import CAPIFEventFilter
+from capif_events.models.reporting_information import ReportingInformation
+from capif_events.models.websock_notif_config import WebsockNotifConfig
+import re
+from capif_events import util
+
+from capif_events.models.capif_event import CAPIFEvent  # noqa: E501
+from capif_events.models.capif_event_filter import CAPIFEventFilter  # noqa: E501
+from capif_events.models.reporting_information import ReportingInformation  # noqa: E501
+from capif_events.models.websock_notif_config import WebsockNotifConfig  # noqa: E501
+import re  # noqa: E501
+
+class EventSubscription(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, events=None, event_filters=None, event_req=None, notification_destination=None, request_test_notification=None, websock_notif_config=None, supported_features=None):  # noqa: E501
+        """EventSubscription - a model defined in OpenAPI
+
+        :param events: The events of this EventSubscription.  # noqa: E501
+        :type events: List[CAPIFEvent]
+        :param event_filters: The event_filters of this EventSubscription.  # noqa: E501
+        :type event_filters: List[CAPIFEventFilter]
+        :param event_req: The event_req of this EventSubscription.  # noqa: E501
+        :type event_req: ReportingInformation
+        :param notification_destination: The notification_destination of this EventSubscription.  # noqa: E501
+        :type notification_destination: str
+        :param request_test_notification: The request_test_notification of this EventSubscription.  # noqa: E501
+        :type request_test_notification: bool
+        :param websock_notif_config: The websock_notif_config of this EventSubscription.  # noqa: E501
+        :type websock_notif_config: WebsockNotifConfig
+        :param supported_features: The supported_features of this EventSubscription.  # noqa: E501
+        :type supported_features: str
+        """
+        self.openapi_types = {
+            'events': List[CAPIFEvent],
+            'event_filters': List[CAPIFEventFilter],
+            'event_req': ReportingInformation,
+            'notification_destination': str,
+            'request_test_notification': bool,
+            'websock_notif_config': WebsockNotifConfig,
+            'supported_features': str
+        }
+
+        self.attribute_map = {
+            'events': 'events',
+            'event_filters': 'eventFilters',
+            'event_req': 'eventReq',
+            'notification_destination': 'notificationDestination',
+            'request_test_notification': 'requestTestNotification',
+            'websock_notif_config': 'websockNotifConfig',
+            'supported_features': 'supportedFeatures'
+        }
+
+        self._events = events
+        self._event_filters = event_filters
+        self._event_req = event_req
+        self._notification_destination = notification_destination
+        self._request_test_notification = request_test_notification
+        self._websock_notif_config = websock_notif_config
+        self._supported_features = supported_features
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'EventSubscription':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The EventSubscription of this EventSubscription.  # noqa: E501
+        :rtype: EventSubscription
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def events(self):
+        """Gets the events of this EventSubscription.
+
+        Subscribed events  # noqa: E501
+
+        :return: The events of this EventSubscription.
+        :rtype: List[CAPIFEvent]
+        """
+        return self._events
+
+    @events.setter
+    def events(self, events):
+        """Sets the events of this EventSubscription.
+
+        Subscribed events  # noqa: E501
+
+        :param events: The events of this EventSubscription.
+        :type events: List[CAPIFEvent]
+        """
+        if events is None:
+            raise ValueError("Invalid value for `events`, must not be `None`")  # noqa: E501
+        if events is not None and len(events) < 1:
+            raise ValueError("Invalid value for `events`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._events = events
+
+    @property
+    def event_filters(self):
+        """Gets the event_filters of this EventSubscription.
+
+        Subscribed event filters  # noqa: E501
+
+        :return: The event_filters of this EventSubscription.
+        :rtype: List[CAPIFEventFilter]
+        """
+        return self._event_filters
+
+    @event_filters.setter
+    def event_filters(self, event_filters):
+        """Sets the event_filters of this EventSubscription.
+
+        Subscribed event filters  # noqa: E501
+
+        :param event_filters: The event_filters of this EventSubscription.
+        :type event_filters: List[CAPIFEventFilter]
+        """
+        if event_filters is not None and len(event_filters) < 1:
+            raise ValueError("Invalid value for `event_filters`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._event_filters = event_filters
+
+    @property
+    def event_req(self):
+        """Gets the event_req of this EventSubscription.
+
+
+        :return: The event_req of this EventSubscription.
+        :rtype: ReportingInformation
+        """
+        return self._event_req
+
+    @event_req.setter
+    def event_req(self, event_req):
+        """Sets the event_req of this EventSubscription.
+
+
+        :param event_req: The event_req of this EventSubscription.
+        :type event_req: ReportingInformation
+        """
+
+        self._event_req = event_req
+
+    @property
+    def notification_destination(self):
+        """Gets the notification_destination of this EventSubscription.
+
+        string providing an URI formatted according to IETF RFC 3986.  # noqa: E501
+
+        :return: The notification_destination of this EventSubscription.
+        :rtype: str
+        """
+        return self._notification_destination
+
+    @notification_destination.setter
+    def notification_destination(self, notification_destination):
+        """Sets the notification_destination of this EventSubscription.
+
+        string providing an URI formatted according to IETF RFC 3986.  # noqa: E501
+
+        :param notification_destination: The notification_destination of this EventSubscription.
+        :type notification_destination: str
+        """
+        if notification_destination is None:
+            raise ValueError("Invalid value for `notification_destination`, must not be `None`")  # noqa: E501
+
+        self._notification_destination = notification_destination
+
+    @property
+    def request_test_notification(self):
+        """Gets the request_test_notification of this EventSubscription.
+
+        Set to true by Subscriber to request the CAPIF core function to send a test notification as defined in in subclause 7.6. Set to false or omitted otherwise.  # noqa: E501
+
+        :return: The request_test_notification of this EventSubscription.
+        :rtype: bool
+        """
+        return self._request_test_notification
+
+    @request_test_notification.setter
+    def request_test_notification(self, request_test_notification):
+        """Sets the request_test_notification of this EventSubscription.
+
+        Set to true by Subscriber to request the CAPIF core function to send a test notification as defined in in subclause 7.6. Set to false or omitted otherwise.  # noqa: E501
+
+        :param request_test_notification: The request_test_notification of this EventSubscription.
+        :type request_test_notification: bool
+        """
+
+        self._request_test_notification = request_test_notification
+
+    @property
+    def websock_notif_config(self):
+        """Gets the websock_notif_config of this EventSubscription.
+
+
+        :return: The websock_notif_config of this EventSubscription.
+        :rtype: WebsockNotifConfig
+        """
+        return self._websock_notif_config
+
+    @websock_notif_config.setter
+    def websock_notif_config(self, websock_notif_config):
+        """Sets the websock_notif_config of this EventSubscription.
+
+
+        :param websock_notif_config: The websock_notif_config of this EventSubscription.
+        :type websock_notif_config: WebsockNotifConfig
+        """
+
+        self._websock_notif_config = websock_notif_config
+
+    @property
+    def supported_features(self):
+        """Gets the supported_features of this EventSubscription.
+
+        A string used to indicate the features supported by an API that is used as defined in clause 6.6 in 3GPP TS 29.500. The string shall contain a bitmask indicating supported features in hexadecimal representation Each character in the string shall take a value of \"0\" to \"9\", \"a\" to \"f\" or \"A\" to \"F\" and shall represent the support of 4 features as described in table 5.2.2-3. The most significant character representing the highest-numbered features shall appear first in the string, and the character representing features 1 to 4 shall appear last in the string. The list of features and their numbering (starting with 1) are defined separately for each API. If the string contains a lower number of characters than there are defined features for an API, all features that would be represented by characters that are not present in the string are not supported  # noqa: E501
+
+        :return: The supported_features of this EventSubscription.
+        :rtype: str
+        """
+        return self._supported_features
+
+    @supported_features.setter
+    def supported_features(self, supported_features):
+        """Sets the supported_features of this EventSubscription.
+
+        A string used to indicate the features supported by an API that is used as defined in clause 6.6 in 3GPP TS 29.500. The string shall contain a bitmask indicating supported features in hexadecimal representation Each character in the string shall take a value of \"0\" to \"9\", \"a\" to \"f\" or \"A\" to \"F\" and shall represent the support of 4 features as described in table 5.2.2-3. The most significant character representing the highest-numbered features shall appear first in the string, and the character representing features 1 to 4 shall appear last in the string. The list of features and their numbering (starting with 1) are defined separately for each API. If the string contains a lower number of characters than there are defined features for an API, all features that would be represented by characters that are not present in the string are not supported  # noqa: E501
+
+        :param supported_features: The supported_features of this EventSubscription.
+        :type supported_features: str
+        """
+        if supported_features is not None and not re.search(r'^[A-Fa-f0-9]*$', supported_features):  # noqa: E501
+            raise ValueError("Invalid value for `supported_features`, must be a follow pattern or equal to `/^[A-Fa-f0-9]*$/`")  # noqa: E501
+
+        self._supported_features = supported_features
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/interface_description.py b/services/TS29222_CAPIF_Events_API/capif_events/models/interface_description.py
new file mode 100644
index 0000000000000000000000000000000000000000..14b2b5d553d4b09562730ff867a5bc68f310c64c
--- /dev/null
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/interface_description.py
@@ -0,0 +1,158 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_events.models.base_model_ import Model
+from capif_events.models.security_method import SecurityMethod
+from capif_events import util
+
+from capif_events.models.security_method import SecurityMethod  # noqa: E501
+
+class InterfaceDescription(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, ipv4_addr=None, ipv6_addr=None, port=None, security_methods=None):  # noqa: E501
+        """InterfaceDescription - a model defined in OpenAPI
+
+        :param ipv4_addr: The ipv4_addr of this InterfaceDescription.  # noqa: E501
+        :type ipv4_addr: str
+        :param ipv6_addr: The ipv6_addr of this InterfaceDescription.  # noqa: E501
+        :type ipv6_addr: str
+        :param port: The port of this InterfaceDescription.  # noqa: E501
+        :type port: int
+        :param security_methods: The security_methods of this InterfaceDescription.  # noqa: E501
+        :type security_methods: List[SecurityMethod]
+        """
+        self.openapi_types = {
+            'ipv4_addr': str,
+            'ipv6_addr': str,
+            'port': int,
+            'security_methods': List[SecurityMethod]
+        }
+
+        self.attribute_map = {
+            'ipv4_addr': 'ipv4Addr',
+            'ipv6_addr': 'ipv6Addr',
+            'port': 'port',
+            'security_methods': 'securityMethods'
+        }
+
+        self._ipv4_addr = ipv4_addr
+        self._ipv6_addr = ipv6_addr
+        self._port = port
+        self._security_methods = security_methods
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'InterfaceDescription':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The InterfaceDescription of this InterfaceDescription.  # noqa: E501
+        :rtype: InterfaceDescription
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def ipv4_addr(self):
+        """Gets the ipv4_addr of this InterfaceDescription.
+
+        string identifying a Ipv4 address formatted in the \"dotted decimal\" notation as defined in IETF RFC 1166.  # noqa: E501
+
+        :return: The ipv4_addr of this InterfaceDescription.
+        :rtype: str
+        """
+        return self._ipv4_addr
+
+    @ipv4_addr.setter
+    def ipv4_addr(self, ipv4_addr):
+        """Sets the ipv4_addr of this InterfaceDescription.
+
+        string identifying a Ipv4 address formatted in the \"dotted decimal\" notation as defined in IETF RFC 1166.  # noqa: E501
+
+        :param ipv4_addr: The ipv4_addr of this InterfaceDescription.
+        :type ipv4_addr: str
+        """
+
+        self._ipv4_addr = ipv4_addr
+
+    @property
+    def ipv6_addr(self):
+        """Gets the ipv6_addr of this InterfaceDescription.
+
+        string identifying a Ipv6 address formatted according to clause 4 in IETF RFC 5952. The mixed Ipv4 Ipv6 notation according to clause 5 of IETF RFC 5952 shall not be used.  # noqa: E501
+
+        :return: The ipv6_addr of this InterfaceDescription.
+        :rtype: str
+        """
+        return self._ipv6_addr
+
+    @ipv6_addr.setter
+    def ipv6_addr(self, ipv6_addr):
+        """Sets the ipv6_addr of this InterfaceDescription.
+
+        string identifying a Ipv6 address formatted according to clause 4 in IETF RFC 5952. The mixed Ipv4 Ipv6 notation according to clause 5 of IETF RFC 5952 shall not be used.  # noqa: E501
+
+        :param ipv6_addr: The ipv6_addr of this InterfaceDescription.
+        :type ipv6_addr: str
+        """
+
+        self._ipv6_addr = ipv6_addr
+
+    @property
+    def port(self):
+        """Gets the port of this InterfaceDescription.
+
+        Unsigned integer with valid values between 0 and 65535.  # noqa: E501
+
+        :return: The port of this InterfaceDescription.
+        :rtype: int
+        """
+        return self._port
+
+    @port.setter
+    def port(self, port):
+        """Sets the port of this InterfaceDescription.
+
+        Unsigned integer with valid values between 0 and 65535.  # noqa: E501
+
+        :param port: The port of this InterfaceDescription.
+        :type port: int
+        """
+        if port is not None and port > 65535:  # noqa: E501
+            raise ValueError("Invalid value for `port`, must be a value less than or equal to `65535`")  # noqa: E501
+        if port is not None and port < 0:  # noqa: E501
+            raise ValueError("Invalid value for `port`, must be a value greater than or equal to `0`")  # noqa: E501
+
+        self._port = port
+
+    @property
+    def security_methods(self):
+        """Gets the security_methods of this InterfaceDescription.
+
+        Security methods supported by the interface, it take precedence over the security methods provided in AefProfile, for this specific interface.  # noqa: E501
+
+        :return: The security_methods of this InterfaceDescription.
+        :rtype: List[SecurityMethod]
+        """
+        return self._security_methods
+
+    @security_methods.setter
+    def security_methods(self, security_methods):
+        """Sets the security_methods of this InterfaceDescription.
+
+        Security methods supported by the interface, it take precedence over the security methods provided in AefProfile, for this specific interface.  # noqa: E501
+
+        :param security_methods: The security_methods of this InterfaceDescription.
+        :type security_methods: List[SecurityMethod]
+        """
+        if security_methods is not None and len(security_methods) < 1:
+            raise ValueError("Invalid value for `security_methods`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._security_methods = security_methods
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/invalid_param.py b/services/TS29222_CAPIF_Events_API/capif_events/models/invalid_param.py
new file mode 100644
index 0000000000000000000000000000000000000000..e9bc8ca459c4bdef2d67b2aa583fbfc980e4369e
--- /dev/null
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/invalid_param.py
@@ -0,0 +1,96 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_events.models.base_model_ import Model
+from capif_events import util
+
+
+class InvalidParam(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, param=None, reason=None):  # noqa: E501
+        """InvalidParam - a model defined in OpenAPI
+
+        :param param: The param of this InvalidParam.  # noqa: E501
+        :type param: str
+        :param reason: The reason of this InvalidParam.  # noqa: E501
+        :type reason: str
+        """
+        self.openapi_types = {
+            'param': str,
+            'reason': str
+        }
+
+        self.attribute_map = {
+            'param': 'param',
+            'reason': 'reason'
+        }
+
+        self._param = param
+        self._reason = reason
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'InvalidParam':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The InvalidParam of this InvalidParam.  # noqa: E501
+        :rtype: InvalidParam
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def param(self):
+        """Gets the param of this InvalidParam.
+
+        Attribute's name encoded as a JSON Pointer, or header's name.  # noqa: E501
+
+        :return: The param of this InvalidParam.
+        :rtype: str
+        """
+        return self._param
+
+    @param.setter
+    def param(self, param):
+        """Sets the param of this InvalidParam.
+
+        Attribute's name encoded as a JSON Pointer, or header's name.  # noqa: E501
+
+        :param param: The param of this InvalidParam.
+        :type param: str
+        """
+        if param is None:
+            raise ValueError("Invalid value for `param`, must not be `None`")  # noqa: E501
+
+        self._param = param
+
+    @property
+    def reason(self):
+        """Gets the reason of this InvalidParam.
+
+        A human-readable reason, e.g. \"must be a positive integer\".  # noqa: E501
+
+        :return: The reason of this InvalidParam.
+        :rtype: str
+        """
+        return self._reason
+
+    @reason.setter
+    def reason(self, reason):
+        """Sets the reason of this InvalidParam.
+
+        A human-readable reason, e.g. \"must be a positive integer\".  # noqa: E501
+
+        :param reason: The reason of this InvalidParam.
+        :type reason: str
+        """
+
+        self._reason = reason
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/invocation_log.py b/services/TS29222_CAPIF_Events_API/capif_events/models/invocation_log.py
new file mode 100644
index 0000000000000000000000000000000000000000..bbe488649304eb1b44b751124a1f2dcb5d2ce177
--- /dev/null
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/invocation_log.py
@@ -0,0 +1,164 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_events.models.base_model_ import Model
+from capif_events.models.log import Log
+import re
+from capif_events import util
+
+from capif_events.models.log import Log  # noqa: E501
+import re  # noqa: E501
+
+class InvocationLog(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, aef_id=None, api_invoker_id=None, logs=None, supported_features=None):  # noqa: E501
+        """InvocationLog - a model defined in OpenAPI
+
+        :param aef_id: The aef_id of this InvocationLog.  # noqa: E501
+        :type aef_id: str
+        :param api_invoker_id: The api_invoker_id of this InvocationLog.  # noqa: E501
+        :type api_invoker_id: str
+        :param logs: The logs of this InvocationLog.  # noqa: E501
+        :type logs: List[Log]
+        :param supported_features: The supported_features of this InvocationLog.  # noqa: E501
+        :type supported_features: str
+        """
+        self.openapi_types = {
+            'aef_id': str,
+            'api_invoker_id': str,
+            'logs': List[Log],
+            'supported_features': str
+        }
+
+        self.attribute_map = {
+            'aef_id': 'aefId',
+            'api_invoker_id': 'apiInvokerId',
+            'logs': 'logs',
+            'supported_features': 'supportedFeatures'
+        }
+
+        self._aef_id = aef_id
+        self._api_invoker_id = api_invoker_id
+        self._logs = logs
+        self._supported_features = supported_features
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'InvocationLog':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The InvocationLog of this InvocationLog.  # noqa: E501
+        :rtype: InvocationLog
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def aef_id(self):
+        """Gets the aef_id of this InvocationLog.
+
+        Identity information of the API exposing function requesting logging of service API invocations  # noqa: E501
+
+        :return: The aef_id of this InvocationLog.
+        :rtype: str
+        """
+        return self._aef_id
+
+    @aef_id.setter
+    def aef_id(self, aef_id):
+        """Sets the aef_id of this InvocationLog.
+
+        Identity information of the API exposing function requesting logging of service API invocations  # noqa: E501
+
+        :param aef_id: The aef_id of this InvocationLog.
+        :type aef_id: str
+        """
+        if aef_id is None:
+            raise ValueError("Invalid value for `aef_id`, must not be `None`")  # noqa: E501
+
+        self._aef_id = aef_id
+
+    @property
+    def api_invoker_id(self):
+        """Gets the api_invoker_id of this InvocationLog.
+
+        Identity of the API invoker which invoked the service API  # noqa: E501
+
+        :return: The api_invoker_id of this InvocationLog.
+        :rtype: str
+        """
+        return self._api_invoker_id
+
+    @api_invoker_id.setter
+    def api_invoker_id(self, api_invoker_id):
+        """Sets the api_invoker_id of this InvocationLog.
+
+        Identity of the API invoker which invoked the service API  # noqa: E501
+
+        :param api_invoker_id: The api_invoker_id of this InvocationLog.
+        :type api_invoker_id: str
+        """
+        if api_invoker_id is None:
+            raise ValueError("Invalid value for `api_invoker_id`, must not be `None`")  # noqa: E501
+
+        self._api_invoker_id = api_invoker_id
+
+    @property
+    def logs(self):
+        """Gets the logs of this InvocationLog.
+
+        Service API invocation log  # noqa: E501
+
+        :return: The logs of this InvocationLog.
+        :rtype: List[Log]
+        """
+        return self._logs
+
+    @logs.setter
+    def logs(self, logs):
+        """Sets the logs of this InvocationLog.
+
+        Service API invocation log  # noqa: E501
+
+        :param logs: The logs of this InvocationLog.
+        :type logs: List[Log]
+        """
+        if logs is None:
+            raise ValueError("Invalid value for `logs`, must not be `None`")  # noqa: E501
+        if logs is not None and len(logs) < 1:
+            raise ValueError("Invalid value for `logs`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._logs = logs
+
+    @property
+    def supported_features(self):
+        """Gets the supported_features of this InvocationLog.
+
+        A string used to indicate the features supported by an API that is used as defined in clause 6.6 in 3GPP TS 29.500. The string shall contain a bitmask indicating supported features in hexadecimal representation Each character in the string shall take a value of \"0\" to \"9\", \"a\" to \"f\" or \"A\" to \"F\" and shall represent the support of 4 features as described in table 5.2.2-3. The most significant character representing the highest-numbered features shall appear first in the string, and the character representing features 1 to 4 shall appear last in the string. The list of features and their numbering (starting with 1) are defined separately for each API. If the string contains a lower number of characters than there are defined features for an API, all features that would be represented by characters that are not present in the string are not supported  # noqa: E501
+
+        :return: The supported_features of this InvocationLog.
+        :rtype: str
+        """
+        return self._supported_features
+
+    @supported_features.setter
+    def supported_features(self, supported_features):
+        """Sets the supported_features of this InvocationLog.
+
+        A string used to indicate the features supported by an API that is used as defined in clause 6.6 in 3GPP TS 29.500. The string shall contain a bitmask indicating supported features in hexadecimal representation Each character in the string shall take a value of \"0\" to \"9\", \"a\" to \"f\" or \"A\" to \"F\" and shall represent the support of 4 features as described in table 5.2.2-3. The most significant character representing the highest-numbered features shall appear first in the string, and the character representing features 1 to 4 shall appear last in the string. The list of features and their numbering (starting with 1) are defined separately for each API. If the string contains a lower number of characters than there are defined features for an API, all features that would be represented by characters that are not present in the string are not supported  # noqa: E501
+
+        :param supported_features: The supported_features of this InvocationLog.
+        :type supported_features: str
+        """
+        if supported_features is not None and not re.search(r'^[A-Fa-f0-9]*$', supported_features):  # noqa: E501
+            raise ValueError("Invalid value for `supported_features`, must be a follow pattern or equal to `/^[A-Fa-f0-9]*$/`")  # noqa: E501
+
+        self._supported_features = supported_features
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/ipv4_address_range.py b/services/TS29222_CAPIF_Events_API/capif_events/models/ipv4_address_range.py
new file mode 100644
index 0000000000000000000000000000000000000000..2741ca33bef70b79ed5837573a84b5d692c20f4a
--- /dev/null
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/ipv4_address_range.py
@@ -0,0 +1,100 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_events.models.base_model_ import Model
+import re
+from capif_events import util
+
+import re  # noqa: E501
+
+class Ipv4AddressRange(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, start=None, end=None):  # noqa: E501
+        """Ipv4AddressRange - a model defined in OpenAPI
+
+        :param start: The start of this Ipv4AddressRange.  # noqa: E501
+        :type start: str
+        :param end: The end of this Ipv4AddressRange.  # noqa: E501
+        :type end: str
+        """
+        self.openapi_types = {
+            'start': str,
+            'end': str
+        }
+
+        self.attribute_map = {
+            'start': 'start',
+            'end': 'end'
+        }
+
+        self._start = start
+        self._end = end
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'Ipv4AddressRange':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The Ipv4AddressRange of this Ipv4AddressRange.  # noqa: E501
+        :rtype: Ipv4AddressRange
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def start(self):
+        """Gets the start of this Ipv4AddressRange.
+
+        String identifying a IPv4 address formatted in the \"dotted decimal\" notation as defined in RFC 1166.  # noqa: E501
+
+        :return: The start of this Ipv4AddressRange.
+        :rtype: str
+        """
+        return self._start
+
+    @start.setter
+    def start(self, start):
+        """Sets the start of this Ipv4AddressRange.
+
+        String identifying a IPv4 address formatted in the \"dotted decimal\" notation as defined in RFC 1166.  # noqa: E501
+
+        :param start: The start of this Ipv4AddressRange.
+        :type start: str
+        """
+        if start is not None and not re.search(r'^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])$', start):  # noqa: E501
+            raise ValueError("Invalid value for `start`, must be a follow pattern or equal to `/^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])$/`")  # noqa: E501
+
+        self._start = start
+
+    @property
+    def end(self):
+        """Gets the end of this Ipv4AddressRange.
+
+        String identifying a IPv4 address formatted in the \"dotted decimal\" notation as defined in RFC 1166.  # noqa: E501
+
+        :return: The end of this Ipv4AddressRange.
+        :rtype: str
+        """
+        return self._end
+
+    @end.setter
+    def end(self, end):
+        """Sets the end of this Ipv4AddressRange.
+
+        String identifying a IPv4 address formatted in the \"dotted decimal\" notation as defined in RFC 1166.  # noqa: E501
+
+        :param end: The end of this Ipv4AddressRange.
+        :type end: str
+        """
+        if end is not None and not re.search(r'^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])$', end):  # noqa: E501
+            raise ValueError("Invalid value for `end`, must be a follow pattern or equal to `/^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])$/`")  # noqa: E501
+
+        self._end = end
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/ipv6_address_range.py b/services/TS29222_CAPIF_Events_API/capif_events/models/ipv6_address_range.py
new file mode 100644
index 0000000000000000000000000000000000000000..a979db9e1a925ba732d94f8c594255af5b6c65a4
--- /dev/null
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/ipv6_address_range.py
@@ -0,0 +1,98 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_events.models.base_model_ import Model
+from capif_events import util
+
+
+class Ipv6AddressRange(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, start=None, end=None):  # noqa: E501
+        """Ipv6AddressRange - a model defined in OpenAPI
+
+        :param start: The start of this Ipv6AddressRange.  # noqa: E501
+        :type start: str
+        :param end: The end of this Ipv6AddressRange.  # noqa: E501
+        :type end: str
+        """
+        self.openapi_types = {
+            'start': str,
+            'end': str
+        }
+
+        self.attribute_map = {
+            'start': 'start',
+            'end': 'end'
+        }
+
+        self._start = start
+        self._end = end
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'Ipv6AddressRange':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The Ipv6AddressRange of this Ipv6AddressRange.  # noqa: E501
+        :rtype: Ipv6AddressRange
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def start(self):
+        """Gets the start of this Ipv6AddressRange.
+
+        string identifying a Ipv6 address formatted according to clause 4 in IETF RFC 5952. The mixed Ipv4 Ipv6 notation according to clause 5 of IETF RFC 5952 shall not be used.  # noqa: E501
+
+        :return: The start of this Ipv6AddressRange.
+        :rtype: str
+        """
+        return self._start
+
+    @start.setter
+    def start(self, start):
+        """Sets the start of this Ipv6AddressRange.
+
+        string identifying a Ipv6 address formatted according to clause 4 in IETF RFC 5952. The mixed Ipv4 Ipv6 notation according to clause 5 of IETF RFC 5952 shall not be used.  # noqa: E501
+
+        :param start: The start of this Ipv6AddressRange.
+        :type start: str
+        """
+        if start is None:
+            raise ValueError("Invalid value for `start`, must not be `None`")  # noqa: E501
+
+        self._start = start
+
+    @property
+    def end(self):
+        """Gets the end of this Ipv6AddressRange.
+
+        string identifying a Ipv6 address formatted according to clause 4 in IETF RFC 5952. The mixed Ipv4 Ipv6 notation according to clause 5 of IETF RFC 5952 shall not be used.  # noqa: E501
+
+        :return: The end of this Ipv6AddressRange.
+        :rtype: str
+        """
+        return self._end
+
+    @end.setter
+    def end(self, end):
+        """Sets the end of this Ipv6AddressRange.
+
+        string identifying a Ipv6 address formatted according to clause 4 in IETF RFC 5952. The mixed Ipv4 Ipv6 notation according to clause 5 of IETF RFC 5952 shall not be used.  # noqa: E501
+
+        :param end: The end of this Ipv6AddressRange.
+        :type end: str
+        """
+        if end is None:
+            raise ValueError("Invalid value for `end`, must not be `None`")  # noqa: E501
+
+        self._end = end
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/log.py b/services/TS29222_CAPIF_Events_API/capif_events/models/log.py
new file mode 100644
index 0000000000000000000000000000000000000000..1ac69f9d486c68225eb615625cbada67eb9c0388
--- /dev/null
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/log.py
@@ -0,0 +1,470 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_events.models.base_model_ import Model
+from capif_events.models.interface_description import InterfaceDescription
+from capif_events.models.operation import Operation
+from capif_events.models.protocol import Protocol
+from capif_events import util
+
+from capif_events.models.interface_description import InterfaceDescription  # noqa: E501
+from capif_events.models.operation import Operation  # noqa: E501
+from capif_events.models.protocol import Protocol  # noqa: E501
+
+class Log(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, api_id=None, api_name=None, api_version=None, resource_name=None, uri=None, protocol=None, operation=None, result=None, invocation_time=None, invocation_latency=None, input_parameters=None, output_parameters=None, src_interface=None, dest_interface=None, fwd_interface=None):  # noqa: E501
+        """Log - a model defined in OpenAPI
+
+        :param api_id: The api_id of this Log.  # noqa: E501
+        :type api_id: str
+        :param api_name: The api_name of this Log.  # noqa: E501
+        :type api_name: str
+        :param api_version: The api_version of this Log.  # noqa: E501
+        :type api_version: str
+        :param resource_name: The resource_name of this Log.  # noqa: E501
+        :type resource_name: str
+        :param uri: The uri of this Log.  # noqa: E501
+        :type uri: str
+        :param protocol: The protocol of this Log.  # noqa: E501
+        :type protocol: Protocol
+        :param operation: The operation of this Log.  # noqa: E501
+        :type operation: Operation
+        :param result: The result of this Log.  # noqa: E501
+        :type result: str
+        :param invocation_time: The invocation_time of this Log.  # noqa: E501
+        :type invocation_time: datetime
+        :param invocation_latency: The invocation_latency of this Log.  # noqa: E501
+        :type invocation_latency: int
+        :param input_parameters: The input_parameters of this Log.  # noqa: E501
+        :type input_parameters: object
+        :param output_parameters: The output_parameters of this Log.  # noqa: E501
+        :type output_parameters: object
+        :param src_interface: The src_interface of this Log.  # noqa: E501
+        :type src_interface: InterfaceDescription
+        :param dest_interface: The dest_interface of this Log.  # noqa: E501
+        :type dest_interface: InterfaceDescription
+        :param fwd_interface: The fwd_interface of this Log.  # noqa: E501
+        :type fwd_interface: str
+        """
+        self.openapi_types = {
+            'api_id': str,
+            'api_name': str,
+            'api_version': str,
+            'resource_name': str,
+            'uri': str,
+            'protocol': Protocol,
+            'operation': Operation,
+            'result': str,
+            'invocation_time': datetime,
+            'invocation_latency': int,
+            'input_parameters': object,
+            'output_parameters': object,
+            'src_interface': InterfaceDescription,
+            'dest_interface': InterfaceDescription,
+            'fwd_interface': str
+        }
+
+        self.attribute_map = {
+            'api_id': 'apiId',
+            'api_name': 'apiName',
+            'api_version': 'apiVersion',
+            'resource_name': 'resourceName',
+            'uri': 'uri',
+            'protocol': 'protocol',
+            'operation': 'operation',
+            'result': 'result',
+            'invocation_time': 'invocationTime',
+            'invocation_latency': 'invocationLatency',
+            'input_parameters': 'inputParameters',
+            'output_parameters': 'outputParameters',
+            'src_interface': 'srcInterface',
+            'dest_interface': 'destInterface',
+            'fwd_interface': 'fwdInterface'
+        }
+
+        self._api_id = api_id
+        self._api_name = api_name
+        self._api_version = api_version
+        self._resource_name = resource_name
+        self._uri = uri
+        self._protocol = protocol
+        self._operation = operation
+        self._result = result
+        self._invocation_time = invocation_time
+        self._invocation_latency = invocation_latency
+        self._input_parameters = input_parameters
+        self._output_parameters = output_parameters
+        self._src_interface = src_interface
+        self._dest_interface = dest_interface
+        self._fwd_interface = fwd_interface
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'Log':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The Log of this Log.  # noqa: E501
+        :rtype: Log
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def api_id(self):
+        """Gets the api_id of this Log.
+
+        String identifying the API invoked.  # noqa: E501
+
+        :return: The api_id of this Log.
+        :rtype: str
+        """
+        return self._api_id
+
+    @api_id.setter
+    def api_id(self, api_id):
+        """Sets the api_id of this Log.
+
+        String identifying the API invoked.  # noqa: E501
+
+        :param api_id: The api_id of this Log.
+        :type api_id: str
+        """
+        if api_id is None:
+            raise ValueError("Invalid value for `api_id`, must not be `None`")  # noqa: E501
+
+        self._api_id = api_id
+
+    @property
+    def api_name(self):
+        """Gets the api_name of this Log.
+
+        Name of the API which was invoked, it is set as {apiName} part of the URI structure as defined in subclause 4.4 of 3GPP TS 29.501.  # noqa: E501
+
+        :return: The api_name of this Log.
+        :rtype: str
+        """
+        return self._api_name
+
+    @api_name.setter
+    def api_name(self, api_name):
+        """Sets the api_name of this Log.
+
+        Name of the API which was invoked, it is set as {apiName} part of the URI structure as defined in subclause 4.4 of 3GPP TS 29.501.  # noqa: E501
+
+        :param api_name: The api_name of this Log.
+        :type api_name: str
+        """
+        if api_name is None:
+            raise ValueError("Invalid value for `api_name`, must not be `None`")  # noqa: E501
+
+        self._api_name = api_name
+
+    @property
+    def api_version(self):
+        """Gets the api_version of this Log.
+
+        Version of the API which was invoked  # noqa: E501
+
+        :return: The api_version of this Log.
+        :rtype: str
+        """
+        return self._api_version
+
+    @api_version.setter
+    def api_version(self, api_version):
+        """Sets the api_version of this Log.
+
+        Version of the API which was invoked  # noqa: E501
+
+        :param api_version: The api_version of this Log.
+        :type api_version: str
+        """
+        if api_version is None:
+            raise ValueError("Invalid value for `api_version`, must not be `None`")  # noqa: E501
+
+        self._api_version = api_version
+
+    @property
+    def resource_name(self):
+        """Gets the resource_name of this Log.
+
+        Name of the specific resource invoked  # noqa: E501
+
+        :return: The resource_name of this Log.
+        :rtype: str
+        """
+        return self._resource_name
+
+    @resource_name.setter
+    def resource_name(self, resource_name):
+        """Sets the resource_name of this Log.
+
+        Name of the specific resource invoked  # noqa: E501
+
+        :param resource_name: The resource_name of this Log.
+        :type resource_name: str
+        """
+        if resource_name is None:
+            raise ValueError("Invalid value for `resource_name`, must not be `None`")  # noqa: E501
+
+        self._resource_name = resource_name
+
+    @property
+    def uri(self):
+        """Gets the uri of this Log.
+
+        string providing an URI formatted according to IETF RFC 3986.  # noqa: E501
+
+        :return: The uri of this Log.
+        :rtype: str
+        """
+        return self._uri
+
+    @uri.setter
+    def uri(self, uri):
+        """Sets the uri of this Log.
+
+        string providing an URI formatted according to IETF RFC 3986.  # noqa: E501
+
+        :param uri: The uri of this Log.
+        :type uri: str
+        """
+
+        self._uri = uri
+
+    @property
+    def protocol(self):
+        """Gets the protocol of this Log.
+
+
+        :return: The protocol of this Log.
+        :rtype: Protocol
+        """
+        return self._protocol
+
+    @protocol.setter
+    def protocol(self, protocol):
+        """Sets the protocol of this Log.
+
+
+        :param protocol: The protocol of this Log.
+        :type protocol: Protocol
+        """
+        if protocol is None:
+            raise ValueError("Invalid value for `protocol`, must not be `None`")  # noqa: E501
+
+        self._protocol = protocol
+
+    @property
+    def operation(self):
+        """Gets the operation of this Log.
+
+
+        :return: The operation of this Log.
+        :rtype: Operation
+        """
+        return self._operation
+
+    @operation.setter
+    def operation(self, operation):
+        """Sets the operation of this Log.
+
+
+        :param operation: The operation of this Log.
+        :type operation: Operation
+        """
+
+        self._operation = operation
+
+    @property
+    def result(self):
+        """Gets the result of this Log.
+
+        For HTTP protocol, it contains HTTP status code of the invocation  # noqa: E501
+
+        :return: The result of this Log.
+        :rtype: str
+        """
+        return self._result
+
+    @result.setter
+    def result(self, result):
+        """Sets the result of this Log.
+
+        For HTTP protocol, it contains HTTP status code of the invocation  # noqa: E501
+
+        :param result: The result of this Log.
+        :type result: str
+        """
+        if result is None:
+            raise ValueError("Invalid value for `result`, must not be `None`")  # noqa: E501
+
+        self._result = result
+
+    @property
+    def invocation_time(self):
+        """Gets the invocation_time of this Log.
+
+        string with format \"date-time\" as defined in OpenAPI.  # noqa: E501
+
+        :return: The invocation_time of this Log.
+        :rtype: datetime
+        """
+        return self._invocation_time
+
+    @invocation_time.setter
+    def invocation_time(self, invocation_time):
+        """Sets the invocation_time of this Log.
+
+        string with format \"date-time\" as defined in OpenAPI.  # noqa: E501
+
+        :param invocation_time: The invocation_time of this Log.
+        :type invocation_time: datetime
+        """
+
+        self._invocation_time = invocation_time
+
+    @property
+    def invocation_latency(self):
+        """Gets the invocation_latency of this Log.
+
+        Unsigned integer identifying a period of time in units of milliseconds.  # noqa: E501
+
+        :return: The invocation_latency of this Log.
+        :rtype: int
+        """
+        return self._invocation_latency
+
+    @invocation_latency.setter
+    def invocation_latency(self, invocation_latency):
+        """Sets the invocation_latency of this Log.
+
+        Unsigned integer identifying a period of time in units of milliseconds.  # noqa: E501
+
+        :param invocation_latency: The invocation_latency of this Log.
+        :type invocation_latency: int
+        """
+        if invocation_latency is not None and invocation_latency < 0:  # noqa: E501
+            raise ValueError("Invalid value for `invocation_latency`, must be a value greater than or equal to `0`")  # noqa: E501
+
+        self._invocation_latency = invocation_latency
+
+    @property
+    def input_parameters(self):
+        """Gets the input_parameters of this Log.
+
+        List of input parameters. Can be any value - string, number, boolean, array or object.  # noqa: E501
+
+        :return: The input_parameters of this Log.
+        :rtype: object
+        """
+        return self._input_parameters
+
+    @input_parameters.setter
+    def input_parameters(self, input_parameters):
+        """Sets the input_parameters of this Log.
+
+        List of input parameters. Can be any value - string, number, boolean, array or object.  # noqa: E501
+
+        :param input_parameters: The input_parameters of this Log.
+        :type input_parameters: object
+        """
+
+        self._input_parameters = input_parameters
+
+    @property
+    def output_parameters(self):
+        """Gets the output_parameters of this Log.
+
+        List of output parameters. Can be any value - string, number, boolean, array or object.  # noqa: E501
+
+        :return: The output_parameters of this Log.
+        :rtype: object
+        """
+        return self._output_parameters
+
+    @output_parameters.setter
+    def output_parameters(self, output_parameters):
+        """Sets the output_parameters of this Log.
+
+        List of output parameters. Can be any value - string, number, boolean, array or object.  # noqa: E501
+
+        :param output_parameters: The output_parameters of this Log.
+        :type output_parameters: object
+        """
+
+        self._output_parameters = output_parameters
+
+    @property
+    def src_interface(self):
+        """Gets the src_interface of this Log.
+
+
+        :return: The src_interface of this Log.
+        :rtype: InterfaceDescription
+        """
+        return self._src_interface
+
+    @src_interface.setter
+    def src_interface(self, src_interface):
+        """Sets the src_interface of this Log.
+
+
+        :param src_interface: The src_interface of this Log.
+        :type src_interface: InterfaceDescription
+        """
+
+        self._src_interface = src_interface
+
+    @property
+    def dest_interface(self):
+        """Gets the dest_interface of this Log.
+
+
+        :return: The dest_interface of this Log.
+        :rtype: InterfaceDescription
+        """
+        return self._dest_interface
+
+    @dest_interface.setter
+    def dest_interface(self, dest_interface):
+        """Sets the dest_interface of this Log.
+
+
+        :param dest_interface: The dest_interface of this Log.
+        :type dest_interface: InterfaceDescription
+        """
+
+        self._dest_interface = dest_interface
+
+    @property
+    def fwd_interface(self):
+        """Gets the fwd_interface of this Log.
+
+        It includes the node identifier (as defined in IETF RFC 7239 of all forwarding entities between the API invoker and the AEF, concatenated with comma and space, e.g. 192.0.2.43:80, unknown:_OBFport, 203.0.113.60  # noqa: E501
+
+        :return: The fwd_interface of this Log.
+        :rtype: str
+        """
+        return self._fwd_interface
+
+    @fwd_interface.setter
+    def fwd_interface(self, fwd_interface):
+        """Sets the fwd_interface of this Log.
+
+        It includes the node identifier (as defined in IETF RFC 7239 of all forwarding entities between the API invoker and the AEF, concatenated with comma and space, e.g. 192.0.2.43:80, unknown:_OBFport, 203.0.113.60  # noqa: E501
+
+        :param fwd_interface: The fwd_interface of this Log.
+        :type fwd_interface: str
+        """
+
+        self._fwd_interface = fwd_interface
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/notification_flag.py b/services/TS29222_CAPIF_Events_API/capif_events/models/notification_flag.py
new file mode 100644
index 0000000000000000000000000000000000000000..6bc032cef4dbbf28c450390e02cbd2433e47c48d
--- /dev/null
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/notification_flag.py
@@ -0,0 +1,39 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_events.models.base_model_ import Model
+from capif_events.models.notification_flag_any_of import NotificationFlagAnyOf
+from capif_events import util
+
+from capif_events.models.notification_flag_any_of import NotificationFlagAnyOf  # noqa: E501
+
+class NotificationFlag(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self):  # noqa: E501
+        """NotificationFlag - a model defined in OpenAPI
+
+        """
+        self.openapi_types = {
+        }
+
+        self.attribute_map = {
+        }
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'NotificationFlag':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The NotificationFlag of this NotificationFlag.  # noqa: E501
+        :rtype: NotificationFlag
+        """
+        return util.deserialize_model(dikt, cls)
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/notification_flag_any_of.py b/services/TS29222_CAPIF_Events_API/capif_events/models/notification_flag_any_of.py
new file mode 100644
index 0000000000000000000000000000000000000000..f1133b14bf798d662ec0a9979c882d7ff4f2481f
--- /dev/null
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/notification_flag_any_of.py
@@ -0,0 +1,43 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_events.models.base_model_ import Model
+from capif_events import util
+
+
+class NotificationFlagAnyOf(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    """
+    allowed enum values
+    """
+    ACTIVATE = "ACTIVATE"
+    DEACTIVATE = "DEACTIVATE"
+    RETRIEVAL = "RETRIEVAL"
+    def __init__(self):  # noqa: E501
+        """NotificationFlagAnyOf - a model defined in OpenAPI
+
+        """
+        self.openapi_types = {
+        }
+
+        self.attribute_map = {
+        }
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'NotificationFlagAnyOf':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The NotificationFlag_anyOf of this NotificationFlagAnyOf.  # noqa: E501
+        :rtype: NotificationFlagAnyOf
+        """
+        return util.deserialize_model(dikt, cls)
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/notification_method.py b/services/TS29222_CAPIF_Events_API/capif_events/models/notification_method.py
new file mode 100644
index 0000000000000000000000000000000000000000..b8600df3b54d753be33b90d7db30d72b7e5a1c39
--- /dev/null
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/notification_method.py
@@ -0,0 +1,39 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_events.models.base_model_ import Model
+from capif_events.models.notification_method_any_of import NotificationMethodAnyOf
+from capif_events import util
+
+from capif_events.models.notification_method_any_of import NotificationMethodAnyOf  # noqa: E501
+
+class NotificationMethod(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self):  # noqa: E501
+        """NotificationMethod - a model defined in OpenAPI
+
+        """
+        self.openapi_types = {
+        }
+
+        self.attribute_map = {
+        }
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'NotificationMethod':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The NotificationMethod of this NotificationMethod.  # noqa: E501
+        :rtype: NotificationMethod
+        """
+        return util.deserialize_model(dikt, cls)
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/notification_method_any_of.py b/services/TS29222_CAPIF_Events_API/capif_events/models/notification_method_any_of.py
new file mode 100644
index 0000000000000000000000000000000000000000..3bf0f8349fc5cbde49d0aca4c77e278539caa3dd
--- /dev/null
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/notification_method_any_of.py
@@ -0,0 +1,43 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_events.models.base_model_ import Model
+from capif_events import util
+
+
+class NotificationMethodAnyOf(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    """
+    allowed enum values
+    """
+    PERIODIC = "PERIODIC"
+    ONE_TIME = "ONE_TIME"
+    ON_EVENT_DETECTION = "ON_EVENT_DETECTION"
+    def __init__(self):  # noqa: E501
+        """NotificationMethodAnyOf - a model defined in OpenAPI
+
+        """
+        self.openapi_types = {
+        }
+
+        self.attribute_map = {
+        }
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'NotificationMethodAnyOf':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The NotificationMethod_anyOf of this NotificationMethodAnyOf.  # noqa: E501
+        :rtype: NotificationMethodAnyOf
+        """
+        return util.deserialize_model(dikt, cls)
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/operation.py b/services/TS29222_CAPIF_Events_API/capif_events/models/operation.py
new file mode 100644
index 0000000000000000000000000000000000000000..3c85bfbaa73059b4355ba0336f308f6782eb6b07
--- /dev/null
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/operation.py
@@ -0,0 +1,39 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_events.models.base_model_ import Model
+from capif_events.models.operation_any_of import OperationAnyOf
+from capif_events import util
+
+from capif_events.models.operation_any_of import OperationAnyOf  # noqa: E501
+
+class Operation(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self):  # noqa: E501
+        """Operation - a model defined in OpenAPI
+
+        """
+        self.openapi_types = {
+        }
+
+        self.attribute_map = {
+        }
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'Operation':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The Operation of this Operation.  # noqa: E501
+        :rtype: Operation
+        """
+        return util.deserialize_model(dikt, cls)
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/operation_any_of.py b/services/TS29222_CAPIF_Events_API/capif_events/models/operation_any_of.py
new file mode 100644
index 0000000000000000000000000000000000000000..4c6b9094314af69471111dceb0a591f3c4c33644
--- /dev/null
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/operation_any_of.py
@@ -0,0 +1,45 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_events.models.base_model_ import Model
+from capif_events import util
+
+
+class OperationAnyOf(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    """
+    allowed enum values
+    """
+    GET = "GET"
+    POST = "POST"
+    PUT = "PUT"
+    PATCH = "PATCH"
+    DELETE = "DELETE"
+    def __init__(self):  # noqa: E501
+        """OperationAnyOf - a model defined in OpenAPI
+
+        """
+        self.openapi_types = {
+        }
+
+        self.attribute_map = {
+        }
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'OperationAnyOf':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The Operation_anyOf of this OperationAnyOf.  # noqa: E501
+        :rtype: OperationAnyOf
+        """
+        return util.deserialize_model(dikt, cls)
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/partitioning_criteria.py b/services/TS29222_CAPIF_Events_API/capif_events/models/partitioning_criteria.py
new file mode 100644
index 0000000000000000000000000000000000000000..063782b5267ab5f519b692fcecf45b6ea31705bc
--- /dev/null
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/partitioning_criteria.py
@@ -0,0 +1,39 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_events.models.base_model_ import Model
+from capif_events.models.partitioning_criteria_any_of import PartitioningCriteriaAnyOf
+from capif_events import util
+
+from capif_events.models.partitioning_criteria_any_of import PartitioningCriteriaAnyOf  # noqa: E501
+
+class PartitioningCriteria(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self):  # noqa: E501
+        """PartitioningCriteria - a model defined in OpenAPI
+
+        """
+        self.openapi_types = {
+        }
+
+        self.attribute_map = {
+        }
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'PartitioningCriteria':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The PartitioningCriteria of this PartitioningCriteria.  # noqa: E501
+        :rtype: PartitioningCriteria
+        """
+        return util.deserialize_model(dikt, cls)
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/partitioning_criteria_any_of.py b/services/TS29222_CAPIF_Events_API/capif_events/models/partitioning_criteria_any_of.py
new file mode 100644
index 0000000000000000000000000000000000000000..4c0faedcde0c1860034fd7d5366ff9e23b0fe9fc
--- /dev/null
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/partitioning_criteria_any_of.py
@@ -0,0 +1,45 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_events.models.base_model_ import Model
+from capif_events import util
+
+
+class PartitioningCriteriaAnyOf(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    """
+    allowed enum values
+    """
+    TAC = "TAC"
+    SUBPLMN = "SUBPLMN"
+    GEOAREA = "GEOAREA"
+    SNSSAI = "SNSSAI"
+    DNN = "DNN"
+    def __init__(self):  # noqa: E501
+        """PartitioningCriteriaAnyOf - a model defined in OpenAPI
+
+        """
+        self.openapi_types = {
+        }
+
+        self.attribute_map = {
+        }
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'PartitioningCriteriaAnyOf':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The PartitioningCriteria_anyOf of this PartitioningCriteriaAnyOf.  # noqa: E501
+        :rtype: PartitioningCriteriaAnyOf
+        """
+        return util.deserialize_model(dikt, cls)
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/problem_details.py b/services/TS29222_CAPIF_Events_API/capif_events/models/problem_details.py
new file mode 100644
index 0000000000000000000000000000000000000000..04f1577f8316c536702a3bc52a2cbf96252f7990
--- /dev/null
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/problem_details.py
@@ -0,0 +1,270 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_events.models.base_model_ import Model
+from capif_events.models.invalid_param import InvalidParam
+import re
+from capif_events import util
+
+from capif_events.models.invalid_param import InvalidParam  # noqa: E501
+import re  # noqa: E501
+
+class ProblemDetails(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, type=None, title=None, status=None, detail=None, instance=None, cause=None, invalid_params=None, supported_features=None):  # noqa: E501
+        """ProblemDetails - a model defined in OpenAPI
+
+        :param type: The type of this ProblemDetails.  # noqa: E501
+        :type type: str
+        :param title: The title of this ProblemDetails.  # noqa: E501
+        :type title: str
+        :param status: The status of this ProblemDetails.  # noqa: E501
+        :type status: int
+        :param detail: The detail of this ProblemDetails.  # noqa: E501
+        :type detail: str
+        :param instance: The instance of this ProblemDetails.  # noqa: E501
+        :type instance: str
+        :param cause: The cause of this ProblemDetails.  # noqa: E501
+        :type cause: str
+        :param invalid_params: The invalid_params of this ProblemDetails.  # noqa: E501
+        :type invalid_params: List[InvalidParam]
+        :param supported_features: The supported_features of this ProblemDetails.  # noqa: E501
+        :type supported_features: str
+        """
+        self.openapi_types = {
+            'type': str,
+            'title': str,
+            'status': int,
+            'detail': str,
+            'instance': str,
+            'cause': str,
+            'invalid_params': List[InvalidParam],
+            'supported_features': str
+        }
+
+        self.attribute_map = {
+            'type': 'type',
+            'title': 'title',
+            'status': 'status',
+            'detail': 'detail',
+            'instance': 'instance',
+            'cause': 'cause',
+            'invalid_params': 'invalidParams',
+            'supported_features': 'supportedFeatures'
+        }
+
+        self._type = type
+        self._title = title
+        self._status = status
+        self._detail = detail
+        self._instance = instance
+        self._cause = cause
+        self._invalid_params = invalid_params
+        self._supported_features = supported_features
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'ProblemDetails':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The ProblemDetails of this ProblemDetails.  # noqa: E501
+        :rtype: ProblemDetails
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def type(self):
+        """Gets the type of this ProblemDetails.
+
+        string providing an URI formatted according to IETF RFC 3986.  # noqa: E501
+
+        :return: The type of this ProblemDetails.
+        :rtype: str
+        """
+        return self._type
+
+    @type.setter
+    def type(self, type):
+        """Sets the type of this ProblemDetails.
+
+        string providing an URI formatted according to IETF RFC 3986.  # noqa: E501
+
+        :param type: The type of this ProblemDetails.
+        :type type: str
+        """
+
+        self._type = type
+
+    @property
+    def title(self):
+        """Gets the title of this ProblemDetails.
+
+        A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem.  # noqa: E501
+
+        :return: The title of this ProblemDetails.
+        :rtype: str
+        """
+        return self._title
+
+    @title.setter
+    def title(self, title):
+        """Sets the title of this ProblemDetails.
+
+        A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem.  # noqa: E501
+
+        :param title: The title of this ProblemDetails.
+        :type title: str
+        """
+
+        self._title = title
+
+    @property
+    def status(self):
+        """Gets the status of this ProblemDetails.
+
+        The HTTP status code for this occurrence of the problem.  # noqa: E501
+
+        :return: The status of this ProblemDetails.
+        :rtype: int
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """Sets the status of this ProblemDetails.
+
+        The HTTP status code for this occurrence of the problem.  # noqa: E501
+
+        :param status: The status of this ProblemDetails.
+        :type status: int
+        """
+
+        self._status = status
+
+    @property
+    def detail(self):
+        """Gets the detail of this ProblemDetails.
+
+        A human-readable explanation specific to this occurrence of the problem.  # noqa: E501
+
+        :return: The detail of this ProblemDetails.
+        :rtype: str
+        """
+        return self._detail
+
+    @detail.setter
+    def detail(self, detail):
+        """Sets the detail of this ProblemDetails.
+
+        A human-readable explanation specific to this occurrence of the problem.  # noqa: E501
+
+        :param detail: The detail of this ProblemDetails.
+        :type detail: str
+        """
+
+        self._detail = detail
+
+    @property
+    def instance(self):
+        """Gets the instance of this ProblemDetails.
+
+        string providing an URI formatted according to IETF RFC 3986.  # noqa: E501
+
+        :return: The instance of this ProblemDetails.
+        :rtype: str
+        """
+        return self._instance
+
+    @instance.setter
+    def instance(self, instance):
+        """Sets the instance of this ProblemDetails.
+
+        string providing an URI formatted according to IETF RFC 3986.  # noqa: E501
+
+        :param instance: The instance of this ProblemDetails.
+        :type instance: str
+        """
+
+        self._instance = instance
+
+    @property
+    def cause(self):
+        """Gets the cause of this ProblemDetails.
+
+        A machine-readable application error cause specific to this occurrence of the problem. This IE should be present and provide application-related error information, if available.  # noqa: E501
+
+        :return: The cause of this ProblemDetails.
+        :rtype: str
+        """
+        return self._cause
+
+    @cause.setter
+    def cause(self, cause):
+        """Sets the cause of this ProblemDetails.
+
+        A machine-readable application error cause specific to this occurrence of the problem. This IE should be present and provide application-related error information, if available.  # noqa: E501
+
+        :param cause: The cause of this ProblemDetails.
+        :type cause: str
+        """
+
+        self._cause = cause
+
+    @property
+    def invalid_params(self):
+        """Gets the invalid_params of this ProblemDetails.
+
+        Description of invalid parameters, for a request rejected due to invalid parameters.  # noqa: E501
+
+        :return: The invalid_params of this ProblemDetails.
+        :rtype: List[InvalidParam]
+        """
+        return self._invalid_params
+
+    @invalid_params.setter
+    def invalid_params(self, invalid_params):
+        """Sets the invalid_params of this ProblemDetails.
+
+        Description of invalid parameters, for a request rejected due to invalid parameters.  # noqa: E501
+
+        :param invalid_params: The invalid_params of this ProblemDetails.
+        :type invalid_params: List[InvalidParam]
+        """
+        if invalid_params is not None and len(invalid_params) < 1:
+            raise ValueError("Invalid value for `invalid_params`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._invalid_params = invalid_params
+
+    @property
+    def supported_features(self):
+        """Gets the supported_features of this ProblemDetails.
+
+        A string used to indicate the features supported by an API that is used as defined in clause 6.6 in 3GPP TS 29.500. The string shall contain a bitmask indicating supported features in hexadecimal representation Each character in the string shall take a value of \"0\" to \"9\", \"a\" to \"f\" or \"A\" to \"F\" and shall represent the support of 4 features as described in table 5.2.2-3. The most significant character representing the highest-numbered features shall appear first in the string, and the character representing features 1 to 4 shall appear last in the string. The list of features and their numbering (starting with 1) are defined separately for each API. If the string contains a lower number of characters than there are defined features for an API, all features that would be represented by characters that are not present in the string are not supported  # noqa: E501
+
+        :return: The supported_features of this ProblemDetails.
+        :rtype: str
+        """
+        return self._supported_features
+
+    @supported_features.setter
+    def supported_features(self, supported_features):
+        """Sets the supported_features of this ProblemDetails.
+
+        A string used to indicate the features supported by an API that is used as defined in clause 6.6 in 3GPP TS 29.500. The string shall contain a bitmask indicating supported features in hexadecimal representation Each character in the string shall take a value of \"0\" to \"9\", \"a\" to \"f\" or \"A\" to \"F\" and shall represent the support of 4 features as described in table 5.2.2-3. The most significant character representing the highest-numbered features shall appear first in the string, and the character representing features 1 to 4 shall appear last in the string. The list of features and their numbering (starting with 1) are defined separately for each API. If the string contains a lower number of characters than there are defined features for an API, all features that would be represented by characters that are not present in the string are not supported  # noqa: E501
+
+        :param supported_features: The supported_features of this ProblemDetails.
+        :type supported_features: str
+        """
+        if supported_features is not None and not re.search(r'^[A-Fa-f0-9]*$', supported_features):  # noqa: E501
+            raise ValueError("Invalid value for `supported_features`, must be a follow pattern or equal to `/^[A-Fa-f0-9]*$/`")  # noqa: E501
+
+        self._supported_features = supported_features
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/protocol.py b/services/TS29222_CAPIF_Events_API/capif_events/models/protocol.py
new file mode 100644
index 0000000000000000000000000000000000000000..e62d3cdde7fd2eb83a33afbd26f1c0ef46a66c85
--- /dev/null
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/protocol.py
@@ -0,0 +1,39 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_events.models.base_model_ import Model
+from capif_events.models.protocol_any_of import ProtocolAnyOf
+from capif_events import util
+
+from capif_events.models.protocol_any_of import ProtocolAnyOf  # noqa: E501
+
+class Protocol(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self):  # noqa: E501
+        """Protocol - a model defined in OpenAPI
+
+        """
+        self.openapi_types = {
+        }
+
+        self.attribute_map = {
+        }
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'Protocol':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The Protocol of this Protocol.  # noqa: E501
+        :rtype: Protocol
+        """
+        return util.deserialize_model(dikt, cls)
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/protocol_any_of.py b/services/TS29222_CAPIF_Events_API/capif_events/models/protocol_any_of.py
new file mode 100644
index 0000000000000000000000000000000000000000..fe2fe7c2787db319b162d62d6957ed0d782d55cd
--- /dev/null
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/protocol_any_of.py
@@ -0,0 +1,42 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_events.models.base_model_ import Model
+from capif_events import util
+
+
+class ProtocolAnyOf(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    """
+    allowed enum values
+    """
+    _1_1 = "HTTP_1_1"
+    _2 = "HTTP_2"
+    def __init__(self):  # noqa: E501
+        """ProtocolAnyOf - a model defined in OpenAPI
+
+        """
+        self.openapi_types = {
+        }
+
+        self.attribute_map = {
+        }
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'ProtocolAnyOf':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The Protocol_anyOf of this ProtocolAnyOf.  # noqa: E501
+        :rtype: ProtocolAnyOf
+        """
+        return util.deserialize_model(dikt, cls)
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/published_api_path.py b/services/TS29222_CAPIF_Events_API/capif_events/models/published_api_path.py
new file mode 100644
index 0000000000000000000000000000000000000000..6554d778c32ff0c13b123bcb392ec501a3631d7a
--- /dev/null
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/published_api_path.py
@@ -0,0 +1,68 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_events.models.base_model_ import Model
+from capif_events import util
+
+
+class PublishedApiPath(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, ccf_ids=None):  # noqa: E501
+        """PublishedApiPath - a model defined in OpenAPI
+
+        :param ccf_ids: The ccf_ids of this PublishedApiPath.  # noqa: E501
+        :type ccf_ids: List[str]
+        """
+        self.openapi_types = {
+            'ccf_ids': List[str]
+        }
+
+        self.attribute_map = {
+            'ccf_ids': 'ccfIds'
+        }
+
+        self._ccf_ids = ccf_ids
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'PublishedApiPath':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The PublishedApiPath of this PublishedApiPath.  # noqa: E501
+        :rtype: PublishedApiPath
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def ccf_ids(self):
+        """Gets the ccf_ids of this PublishedApiPath.
+
+        A list of CCF identifiers where the service API is already published.  # noqa: E501
+
+        :return: The ccf_ids of this PublishedApiPath.
+        :rtype: List[str]
+        """
+        return self._ccf_ids
+
+    @ccf_ids.setter
+    def ccf_ids(self, ccf_ids):
+        """Sets the ccf_ids of this PublishedApiPath.
+
+        A list of CCF identifiers where the service API is already published.  # noqa: E501
+
+        :param ccf_ids: The ccf_ids of this PublishedApiPath.
+        :type ccf_ids: List[str]
+        """
+        if ccf_ids is not None and len(ccf_ids) < 1:
+            raise ValueError("Invalid value for `ccf_ids`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._ccf_ids = ccf_ids
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/reporting_information.py b/services/TS29222_CAPIF_Events_API/capif_events/models/reporting_information.py
new file mode 100644
index 0000000000000000000000000000000000000000..8a1a517b4bd52fa97bc13cad1da27126753cae4c
--- /dev/null
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/reporting_information.py
@@ -0,0 +1,298 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_events.models.base_model_ import Model
+from capif_events.models.notification_flag import NotificationFlag
+from capif_events.models.notification_method import NotificationMethod
+from capif_events.models.partitioning_criteria import PartitioningCriteria
+from capif_events import util
+
+from capif_events.models.notification_flag import NotificationFlag  # noqa: E501
+from capif_events.models.notification_method import NotificationMethod  # noqa: E501
+from capif_events.models.partitioning_criteria import PartitioningCriteria  # noqa: E501
+
+class ReportingInformation(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, imm_rep=None, notif_method=None, max_report_nbr=None, mon_dur=None, rep_period=None, samp_ratio=None, partition_criteria=None, grp_rep_time=None, notif_flag=None):  # noqa: E501
+        """ReportingInformation - a model defined in OpenAPI
+
+        :param imm_rep: The imm_rep of this ReportingInformation.  # noqa: E501
+        :type imm_rep: bool
+        :param notif_method: The notif_method of this ReportingInformation.  # noqa: E501
+        :type notif_method: NotificationMethod
+        :param max_report_nbr: The max_report_nbr of this ReportingInformation.  # noqa: E501
+        :type max_report_nbr: int
+        :param mon_dur: The mon_dur of this ReportingInformation.  # noqa: E501
+        :type mon_dur: datetime
+        :param rep_period: The rep_period of this ReportingInformation.  # noqa: E501
+        :type rep_period: int
+        :param samp_ratio: The samp_ratio of this ReportingInformation.  # noqa: E501
+        :type samp_ratio: int
+        :param partition_criteria: The partition_criteria of this ReportingInformation.  # noqa: E501
+        :type partition_criteria: List[PartitioningCriteria]
+        :param grp_rep_time: The grp_rep_time of this ReportingInformation.  # noqa: E501
+        :type grp_rep_time: int
+        :param notif_flag: The notif_flag of this ReportingInformation.  # noqa: E501
+        :type notif_flag: NotificationFlag
+        """
+        self.openapi_types = {
+            'imm_rep': bool,
+            'notif_method': NotificationMethod,
+            'max_report_nbr': int,
+            'mon_dur': datetime,
+            'rep_period': int,
+            'samp_ratio': int,
+            'partition_criteria': List[PartitioningCriteria],
+            'grp_rep_time': int,
+            'notif_flag': NotificationFlag
+        }
+
+        self.attribute_map = {
+            'imm_rep': 'immRep',
+            'notif_method': 'notifMethod',
+            'max_report_nbr': 'maxReportNbr',
+            'mon_dur': 'monDur',
+            'rep_period': 'repPeriod',
+            'samp_ratio': 'sampRatio',
+            'partition_criteria': 'partitionCriteria',
+            'grp_rep_time': 'grpRepTime',
+            'notif_flag': 'notifFlag'
+        }
+
+        self._imm_rep = imm_rep
+        self._notif_method = notif_method
+        self._max_report_nbr = max_report_nbr
+        self._mon_dur = mon_dur
+        self._rep_period = rep_period
+        self._samp_ratio = samp_ratio
+        self._partition_criteria = partition_criteria
+        self._grp_rep_time = grp_rep_time
+        self._notif_flag = notif_flag
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'ReportingInformation':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The ReportingInformation of this ReportingInformation.  # noqa: E501
+        :rtype: ReportingInformation
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def imm_rep(self):
+        """Gets the imm_rep of this ReportingInformation.
+
+
+        :return: The imm_rep of this ReportingInformation.
+        :rtype: bool
+        """
+        return self._imm_rep
+
+    @imm_rep.setter
+    def imm_rep(self, imm_rep):
+        """Sets the imm_rep of this ReportingInformation.
+
+
+        :param imm_rep: The imm_rep of this ReportingInformation.
+        :type imm_rep: bool
+        """
+
+        self._imm_rep = imm_rep
+
+    @property
+    def notif_method(self):
+        """Gets the notif_method of this ReportingInformation.
+
+
+        :return: The notif_method of this ReportingInformation.
+        :rtype: NotificationMethod
+        """
+        return self._notif_method
+
+    @notif_method.setter
+    def notif_method(self, notif_method):
+        """Sets the notif_method of this ReportingInformation.
+
+
+        :param notif_method: The notif_method of this ReportingInformation.
+        :type notif_method: NotificationMethod
+        """
+
+        self._notif_method = notif_method
+
+    @property
+    def max_report_nbr(self):
+        """Gets the max_report_nbr of this ReportingInformation.
+
+        Unsigned Integer, i.e. only value 0 and integers above 0 are permissible.  # noqa: E501
+
+        :return: The max_report_nbr of this ReportingInformation.
+        :rtype: int
+        """
+        return self._max_report_nbr
+
+    @max_report_nbr.setter
+    def max_report_nbr(self, max_report_nbr):
+        """Sets the max_report_nbr of this ReportingInformation.
+
+        Unsigned Integer, i.e. only value 0 and integers above 0 are permissible.  # noqa: E501
+
+        :param max_report_nbr: The max_report_nbr of this ReportingInformation.
+        :type max_report_nbr: int
+        """
+        if max_report_nbr is not None and max_report_nbr < 0:  # noqa: E501
+            raise ValueError("Invalid value for `max_report_nbr`, must be a value greater than or equal to `0`")  # noqa: E501
+
+        self._max_report_nbr = max_report_nbr
+
+    @property
+    def mon_dur(self):
+        """Gets the mon_dur of this ReportingInformation.
+
+        string with format \"date-time\" as defined in OpenAPI.  # noqa: E501
+
+        :return: The mon_dur of this ReportingInformation.
+        :rtype: datetime
+        """
+        return self._mon_dur
+
+    @mon_dur.setter
+    def mon_dur(self, mon_dur):
+        """Sets the mon_dur of this ReportingInformation.
+
+        string with format \"date-time\" as defined in OpenAPI.  # noqa: E501
+
+        :param mon_dur: The mon_dur of this ReportingInformation.
+        :type mon_dur: datetime
+        """
+
+        self._mon_dur = mon_dur
+
+    @property
+    def rep_period(self):
+        """Gets the rep_period of this ReportingInformation.
+
+        indicating a time in seconds.  # noqa: E501
+
+        :return: The rep_period of this ReportingInformation.
+        :rtype: int
+        """
+        return self._rep_period
+
+    @rep_period.setter
+    def rep_period(self, rep_period):
+        """Sets the rep_period of this ReportingInformation.
+
+        indicating a time in seconds.  # noqa: E501
+
+        :param rep_period: The rep_period of this ReportingInformation.
+        :type rep_period: int
+        """
+
+        self._rep_period = rep_period
+
+    @property
+    def samp_ratio(self):
+        """Gets the samp_ratio of this ReportingInformation.
+
+        Unsigned integer indicating Sampling Ratio (see clauses 4.15.1 of 3GPP TS 23.502), expressed in percent.  # noqa: E501
+
+        :return: The samp_ratio of this ReportingInformation.
+        :rtype: int
+        """
+        return self._samp_ratio
+
+    @samp_ratio.setter
+    def samp_ratio(self, samp_ratio):
+        """Sets the samp_ratio of this ReportingInformation.
+
+        Unsigned integer indicating Sampling Ratio (see clauses 4.15.1 of 3GPP TS 23.502), expressed in percent.  # noqa: E501
+
+        :param samp_ratio: The samp_ratio of this ReportingInformation.
+        :type samp_ratio: int
+        """
+        if samp_ratio is not None and samp_ratio > 100:  # noqa: E501
+            raise ValueError("Invalid value for `samp_ratio`, must be a value less than or equal to `100`")  # noqa: E501
+        if samp_ratio is not None and samp_ratio < 1:  # noqa: E501
+            raise ValueError("Invalid value for `samp_ratio`, must be a value greater than or equal to `1`")  # noqa: E501
+
+        self._samp_ratio = samp_ratio
+
+    @property
+    def partition_criteria(self):
+        """Gets the partition_criteria of this ReportingInformation.
+
+        Criteria for partitioning the UEs before applying the sampling ratio.  # noqa: E501
+
+        :return: The partition_criteria of this ReportingInformation.
+        :rtype: List[PartitioningCriteria]
+        """
+        return self._partition_criteria
+
+    @partition_criteria.setter
+    def partition_criteria(self, partition_criteria):
+        """Sets the partition_criteria of this ReportingInformation.
+
+        Criteria for partitioning the UEs before applying the sampling ratio.  # noqa: E501
+
+        :param partition_criteria: The partition_criteria of this ReportingInformation.
+        :type partition_criteria: List[PartitioningCriteria]
+        """
+        if partition_criteria is not None and len(partition_criteria) < 1:
+            raise ValueError("Invalid value for `partition_criteria`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._partition_criteria = partition_criteria
+
+    @property
+    def grp_rep_time(self):
+        """Gets the grp_rep_time of this ReportingInformation.
+
+        indicating a time in seconds.  # noqa: E501
+
+        :return: The grp_rep_time of this ReportingInformation.
+        :rtype: int
+        """
+        return self._grp_rep_time
+
+    @grp_rep_time.setter
+    def grp_rep_time(self, grp_rep_time):
+        """Sets the grp_rep_time of this ReportingInformation.
+
+        indicating a time in seconds.  # noqa: E501
+
+        :param grp_rep_time: The grp_rep_time of this ReportingInformation.
+        :type grp_rep_time: int
+        """
+
+        self._grp_rep_time = grp_rep_time
+
+    @property
+    def notif_flag(self):
+        """Gets the notif_flag of this ReportingInformation.
+
+
+        :return: The notif_flag of this ReportingInformation.
+        :rtype: NotificationFlag
+        """
+        return self._notif_flag
+
+    @notif_flag.setter
+    def notif_flag(self, notif_flag):
+        """Sets the notif_flag of this ReportingInformation.
+
+
+        :param notif_flag: The notif_flag of this ReportingInformation.
+        :type notif_flag: NotificationFlag
+        """
+
+        self._notif_flag = notif_flag
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/resource.py b/services/TS29222_CAPIF_Events_API/capif_events/models/resource.py
new file mode 100644
index 0000000000000000000000000000000000000000..36e1623b9657a1ea69034a50dcd17303c2bf80c1
--- /dev/null
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/resource.py
@@ -0,0 +1,216 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_events.models.base_model_ import Model
+from capif_events.models.communication_type import CommunicationType
+from capif_events.models.operation import Operation
+from capif_events import util
+
+from capif_events.models.communication_type import CommunicationType  # noqa: E501
+from capif_events.models.operation import Operation  # noqa: E501
+
+class Resource(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, resource_name=None, comm_type=None, uri=None, cust_op_name=None, operations=None, description=None):  # noqa: E501
+        """Resource - a model defined in OpenAPI
+
+        :param resource_name: The resource_name of this Resource.  # noqa: E501
+        :type resource_name: str
+        :param comm_type: The comm_type of this Resource.  # noqa: E501
+        :type comm_type: CommunicationType
+        :param uri: The uri of this Resource.  # noqa: E501
+        :type uri: str
+        :param cust_op_name: The cust_op_name of this Resource.  # noqa: E501
+        :type cust_op_name: str
+        :param operations: The operations of this Resource.  # noqa: E501
+        :type operations: List[Operation]
+        :param description: The description of this Resource.  # noqa: E501
+        :type description: str
+        """
+        self.openapi_types = {
+            'resource_name': str,
+            'comm_type': CommunicationType,
+            'uri': str,
+            'cust_op_name': str,
+            'operations': List[Operation],
+            'description': str
+        }
+
+        self.attribute_map = {
+            'resource_name': 'resourceName',
+            'comm_type': 'commType',
+            'uri': 'uri',
+            'cust_op_name': 'custOpName',
+            'operations': 'operations',
+            'description': 'description'
+        }
+
+        self._resource_name = resource_name
+        self._comm_type = comm_type
+        self._uri = uri
+        self._cust_op_name = cust_op_name
+        self._operations = operations
+        self._description = description
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'Resource':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The Resource of this Resource.  # noqa: E501
+        :rtype: Resource
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def resource_name(self):
+        """Gets the resource_name of this Resource.
+
+        Resource name  # noqa: E501
+
+        :return: The resource_name of this Resource.
+        :rtype: str
+        """
+        return self._resource_name
+
+    @resource_name.setter
+    def resource_name(self, resource_name):
+        """Sets the resource_name of this Resource.
+
+        Resource name  # noqa: E501
+
+        :param resource_name: The resource_name of this Resource.
+        :type resource_name: str
+        """
+        if resource_name is None:
+            raise ValueError("Invalid value for `resource_name`, must not be `None`")  # noqa: E501
+
+        self._resource_name = resource_name
+
+    @property
+    def comm_type(self):
+        """Gets the comm_type of this Resource.
+
+
+        :return: The comm_type of this Resource.
+        :rtype: CommunicationType
+        """
+        return self._comm_type
+
+    @comm_type.setter
+    def comm_type(self, comm_type):
+        """Sets the comm_type of this Resource.
+
+
+        :param comm_type: The comm_type of this Resource.
+        :type comm_type: CommunicationType
+        """
+        if comm_type is None:
+            raise ValueError("Invalid value for `comm_type`, must not be `None`")  # noqa: E501
+
+        self._comm_type = comm_type
+
+    @property
+    def uri(self):
+        """Gets the uri of this Resource.
+
+        Relative URI of the API resource, it is set as {apiSpecificResourceUriPart} part of the URI structure as defined in subclause 4.4 of 3GPP TS 29.501.  # noqa: E501
+
+        :return: The uri of this Resource.
+        :rtype: str
+        """
+        return self._uri
+
+    @uri.setter
+    def uri(self, uri):
+        """Sets the uri of this Resource.
+
+        Relative URI of the API resource, it is set as {apiSpecificResourceUriPart} part of the URI structure as defined in subclause 4.4 of 3GPP TS 29.501.  # noqa: E501
+
+        :param uri: The uri of this Resource.
+        :type uri: str
+        """
+        if uri is None:
+            raise ValueError("Invalid value for `uri`, must not be `None`")  # noqa: E501
+
+        self._uri = uri
+
+    @property
+    def cust_op_name(self):
+        """Gets the cust_op_name of this Resource.
+
+        it is set as {custOpName} part of the URI structure for a custom operation associated with a resource as defined in subclause 4.4 of 3GPP TS 29.501.  # noqa: E501
+
+        :return: The cust_op_name of this Resource.
+        :rtype: str
+        """
+        return self._cust_op_name
+
+    @cust_op_name.setter
+    def cust_op_name(self, cust_op_name):
+        """Sets the cust_op_name of this Resource.
+
+        it is set as {custOpName} part of the URI structure for a custom operation associated with a resource as defined in subclause 4.4 of 3GPP TS 29.501.  # noqa: E501
+
+        :param cust_op_name: The cust_op_name of this Resource.
+        :type cust_op_name: str
+        """
+
+        self._cust_op_name = cust_op_name
+
+    @property
+    def operations(self):
+        """Gets the operations of this Resource.
+
+        Supported HTTP methods for the API resource. Only applicable when the protocol in AefProfile indicates HTTP.  # noqa: E501
+
+        :return: The operations of this Resource.
+        :rtype: List[Operation]
+        """
+        return self._operations
+
+    @operations.setter
+    def operations(self, operations):
+        """Sets the operations of this Resource.
+
+        Supported HTTP methods for the API resource. Only applicable when the protocol in AefProfile indicates HTTP.  # noqa: E501
+
+        :param operations: The operations of this Resource.
+        :type operations: List[Operation]
+        """
+        if operations is not None and len(operations) < 1:
+            raise ValueError("Invalid value for `operations`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._operations = operations
+
+    @property
+    def description(self):
+        """Gets the description of this Resource.
+
+        Text description of the API resource  # noqa: E501
+
+        :return: The description of this Resource.
+        :rtype: str
+        """
+        return self._description
+
+    @description.setter
+    def description(self, description):
+        """Sets the description of this Resource.
+
+        Text description of the API resource  # noqa: E501
+
+        :param description: The description of this Resource.
+        :type description: str
+        """
+
+        self._description = description
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/routing_rule.py b/services/TS29222_CAPIF_Events_API/capif_events/models/routing_rule.py
new file mode 100644
index 0000000000000000000000000000000000000000..7ff1d4e3a3b7bd28cc89b4db118d9d602ef00065
--- /dev/null
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/routing_rule.py
@@ -0,0 +1,128 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_events.models.base_model_ import Model
+from capif_events.models.aef_profile import AefProfile
+from capif_events.models.ipv4_address_range import Ipv4AddressRange
+from capif_events.models.ipv6_address_range import Ipv6AddressRange
+from capif_events import util
+
+from capif_events.models.aef_profile import AefProfile  # noqa: E501
+from capif_events.models.ipv4_address_range import Ipv4AddressRange  # noqa: E501
+from capif_events.models.ipv6_address_range import Ipv6AddressRange  # noqa: E501
+
+class RoutingRule(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, ipv4_addr_ranges=None, ipv6_addr_ranges=None, aef_profile=None):  # noqa: E501
+        """RoutingRule - a model defined in OpenAPI
+
+        :param ipv4_addr_ranges: The ipv4_addr_ranges of this RoutingRule.  # noqa: E501
+        :type ipv4_addr_ranges: List[Ipv4AddressRange]
+        :param ipv6_addr_ranges: The ipv6_addr_ranges of this RoutingRule.  # noqa: E501
+        :type ipv6_addr_ranges: List[Ipv6AddressRange]
+        :param aef_profile: The aef_profile of this RoutingRule.  # noqa: E501
+        :type aef_profile: AefProfile
+        """
+        self.openapi_types = {
+            'ipv4_addr_ranges': List[Ipv4AddressRange],
+            'ipv6_addr_ranges': List[Ipv6AddressRange],
+            'aef_profile': AefProfile
+        }
+
+        self.attribute_map = {
+            'ipv4_addr_ranges': 'ipv4AddrRanges',
+            'ipv6_addr_ranges': 'ipv6AddrRanges',
+            'aef_profile': 'aefProfile'
+        }
+
+        self._ipv4_addr_ranges = ipv4_addr_ranges
+        self._ipv6_addr_ranges = ipv6_addr_ranges
+        self._aef_profile = aef_profile
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'RoutingRule':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The RoutingRule of this RoutingRule.  # noqa: E501
+        :rtype: RoutingRule
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def ipv4_addr_ranges(self):
+        """Gets the ipv4_addr_ranges of this RoutingRule.
+
+
+        :return: The ipv4_addr_ranges of this RoutingRule.
+        :rtype: List[Ipv4AddressRange]
+        """
+        return self._ipv4_addr_ranges
+
+    @ipv4_addr_ranges.setter
+    def ipv4_addr_ranges(self, ipv4_addr_ranges):
+        """Sets the ipv4_addr_ranges of this RoutingRule.
+
+
+        :param ipv4_addr_ranges: The ipv4_addr_ranges of this RoutingRule.
+        :type ipv4_addr_ranges: List[Ipv4AddressRange]
+        """
+        if ipv4_addr_ranges is not None and len(ipv4_addr_ranges) < 1:
+            raise ValueError("Invalid value for `ipv4_addr_ranges`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._ipv4_addr_ranges = ipv4_addr_ranges
+
+    @property
+    def ipv6_addr_ranges(self):
+        """Gets the ipv6_addr_ranges of this RoutingRule.
+
+
+        :return: The ipv6_addr_ranges of this RoutingRule.
+        :rtype: List[Ipv6AddressRange]
+        """
+        return self._ipv6_addr_ranges
+
+    @ipv6_addr_ranges.setter
+    def ipv6_addr_ranges(self, ipv6_addr_ranges):
+        """Sets the ipv6_addr_ranges of this RoutingRule.
+
+
+        :param ipv6_addr_ranges: The ipv6_addr_ranges of this RoutingRule.
+        :type ipv6_addr_ranges: List[Ipv6AddressRange]
+        """
+        if ipv6_addr_ranges is not None and len(ipv6_addr_ranges) < 1:
+            raise ValueError("Invalid value for `ipv6_addr_ranges`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._ipv6_addr_ranges = ipv6_addr_ranges
+
+    @property
+    def aef_profile(self):
+        """Gets the aef_profile of this RoutingRule.
+
+
+        :return: The aef_profile of this RoutingRule.
+        :rtype: AefProfile
+        """
+        return self._aef_profile
+
+    @aef_profile.setter
+    def aef_profile(self, aef_profile):
+        """Sets the aef_profile of this RoutingRule.
+
+
+        :param aef_profile: The aef_profile of this RoutingRule.
+        :type aef_profile: AefProfile
+        """
+        if aef_profile is None:
+            raise ValueError("Invalid value for `aef_profile`, must not be `None`")  # noqa: E501
+
+        self._aef_profile = aef_profile
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/security_method.py b/services/TS29222_CAPIF_Events_API/capif_events/models/security_method.py
new file mode 100644
index 0000000000000000000000000000000000000000..4aec36033eb09b96a97a9d89f92a0e4347d79e90
--- /dev/null
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/security_method.py
@@ -0,0 +1,39 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_events.models.base_model_ import Model
+from capif_events.models.security_method_any_of import SecurityMethodAnyOf
+from capif_events import util
+
+from capif_events.models.security_method_any_of import SecurityMethodAnyOf  # noqa: E501
+
+class SecurityMethod(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self):  # noqa: E501
+        """SecurityMethod - a model defined in OpenAPI
+
+        """
+        self.openapi_types = {
+        }
+
+        self.attribute_map = {
+        }
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'SecurityMethod':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The SecurityMethod of this SecurityMethod.  # noqa: E501
+        :rtype: SecurityMethod
+        """
+        return util.deserialize_model(dikt, cls)
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/security_method_any_of.py b/services/TS29222_CAPIF_Events_API/capif_events/models/security_method_any_of.py
new file mode 100644
index 0000000000000000000000000000000000000000..2ceeb4d11ca5c54375c16fdac78cd63edef723a5
--- /dev/null
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/security_method_any_of.py
@@ -0,0 +1,43 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_events.models.base_model_ import Model
+from capif_events import util
+
+
+class SecurityMethodAnyOf(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    """
+    allowed enum values
+    """
+    PSK = "PSK"
+    PKI = "PKI"
+    OAUTH = "OAUTH"
+    def __init__(self):  # noqa: E501
+        """SecurityMethodAnyOf - a model defined in OpenAPI
+
+        """
+        self.openapi_types = {
+        }
+
+        self.attribute_map = {
+        }
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'SecurityMethodAnyOf':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The SecurityMethod_anyOf of this SecurityMethodAnyOf.  # noqa: E501
+        :rtype: SecurityMethodAnyOf
+        """
+        return util.deserialize_model(dikt, cls)
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/service_api_description.py b/services/TS29222_CAPIF_Events_API/capif_events/models/service_api_description.py
new file mode 100644
index 0000000000000000000000000000000000000000..5c902fe24809564979aa5b5084a2fa09e213c307
--- /dev/null
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/service_api_description.py
@@ -0,0 +1,328 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_events.models.base_model_ import Model
+from capif_events.models.aef_profile import AefProfile
+from capif_events.models.published_api_path import PublishedApiPath
+from capif_events.models.shareable_information import ShareableInformation
+import re
+from capif_events import util
+
+from capif_events.models.aef_profile import AefProfile  # noqa: E501
+from capif_events.models.published_api_path import PublishedApiPath  # noqa: E501
+from capif_events.models.shareable_information import ShareableInformation  # noqa: E501
+import re  # noqa: E501
+
+class ServiceAPIDescription(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, api_name=None, api_id=None, aef_profiles=None, description=None, supported_features=None, shareable_info=None, service_api_category=None, api_supp_feats=None, pub_api_path=None, ccf_id=None):  # noqa: E501
+        """ServiceAPIDescription - a model defined in OpenAPI
+
+        :param api_name: The api_name of this ServiceAPIDescription.  # noqa: E501
+        :type api_name: str
+        :param api_id: The api_id of this ServiceAPIDescription.  # noqa: E501
+        :type api_id: str
+        :param aef_profiles: The aef_profiles of this ServiceAPIDescription.  # noqa: E501
+        :type aef_profiles: List[AefProfile]
+        :param description: The description of this ServiceAPIDescription.  # noqa: E501
+        :type description: str
+        :param supported_features: The supported_features of this ServiceAPIDescription.  # noqa: E501
+        :type supported_features: str
+        :param shareable_info: The shareable_info of this ServiceAPIDescription.  # noqa: E501
+        :type shareable_info: ShareableInformation
+        :param service_api_category: The service_api_category of this ServiceAPIDescription.  # noqa: E501
+        :type service_api_category: str
+        :param api_supp_feats: The api_supp_feats of this ServiceAPIDescription.  # noqa: E501
+        :type api_supp_feats: str
+        :param pub_api_path: The pub_api_path of this ServiceAPIDescription.  # noqa: E501
+        :type pub_api_path: PublishedApiPath
+        :param ccf_id: The ccf_id of this ServiceAPIDescription.  # noqa: E501
+        :type ccf_id: str
+        """
+        self.openapi_types = {
+            'api_name': str,
+            'api_id': str,
+            'aef_profiles': List[AefProfile],
+            'description': str,
+            'supported_features': str,
+            'shareable_info': ShareableInformation,
+            'service_api_category': str,
+            'api_supp_feats': str,
+            'pub_api_path': PublishedApiPath,
+            'ccf_id': str
+        }
+
+        self.attribute_map = {
+            'api_name': 'apiName',
+            'api_id': 'apiId',
+            'aef_profiles': 'aefProfiles',
+            'description': 'description',
+            'supported_features': 'supportedFeatures',
+            'shareable_info': 'shareableInfo',
+            'service_api_category': 'serviceAPICategory',
+            'api_supp_feats': 'apiSuppFeats',
+            'pub_api_path': 'pubApiPath',
+            'ccf_id': 'ccfId'
+        }
+
+        self._api_name = api_name
+        self._api_id = api_id
+        self._aef_profiles = aef_profiles
+        self._description = description
+        self._supported_features = supported_features
+        self._shareable_info = shareable_info
+        self._service_api_category = service_api_category
+        self._api_supp_feats = api_supp_feats
+        self._pub_api_path = pub_api_path
+        self._ccf_id = ccf_id
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'ServiceAPIDescription':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The ServiceAPIDescription of this ServiceAPIDescription.  # noqa: E501
+        :rtype: ServiceAPIDescription
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def api_name(self):
+        """Gets the api_name of this ServiceAPIDescription.
+
+        API name, it is set as {apiName} part of the URI structure as defined in subclause 4.4 of 3GPP TS 29.501.  # noqa: E501
+
+        :return: The api_name of this ServiceAPIDescription.
+        :rtype: str
+        """
+        return self._api_name
+
+    @api_name.setter
+    def api_name(self, api_name):
+        """Sets the api_name of this ServiceAPIDescription.
+
+        API name, it is set as {apiName} part of the URI structure as defined in subclause 4.4 of 3GPP TS 29.501.  # noqa: E501
+
+        :param api_name: The api_name of this ServiceAPIDescription.
+        :type api_name: str
+        """
+        if api_name is None:
+            raise ValueError("Invalid value for `api_name`, must not be `None`")  # noqa: E501
+
+        self._api_name = api_name
+
+    @property
+    def api_id(self):
+        """Gets the api_id of this ServiceAPIDescription.
+
+        API identifier assigned by the CAPIF core function to the published service API. Shall not be present in the HTTP POST request from the API publishing function to the CAPIF core function. Shall be present in the HTTP POST response from the CAPIF core function to the API publishing function and in the HTTP GET response from the CAPIF core function to the API invoker (discovery API).  # noqa: E501
+
+        :return: The api_id of this ServiceAPIDescription.
+        :rtype: str
+        """
+        return self._api_id
+
+    @api_id.setter
+    def api_id(self, api_id):
+        """Sets the api_id of this ServiceAPIDescription.
+
+        API identifier assigned by the CAPIF core function to the published service API. Shall not be present in the HTTP POST request from the API publishing function to the CAPIF core function. Shall be present in the HTTP POST response from the CAPIF core function to the API publishing function and in the HTTP GET response from the CAPIF core function to the API invoker (discovery API).  # noqa: E501
+
+        :param api_id: The api_id of this ServiceAPIDescription.
+        :type api_id: str
+        """
+
+        self._api_id = api_id
+
+    @property
+    def aef_profiles(self):
+        """Gets the aef_profiles of this ServiceAPIDescription.
+
+        AEF profile information, which includes the exposed API details (e.g. protocol).  # noqa: E501
+
+        :return: The aef_profiles of this ServiceAPIDescription.
+        :rtype: List[AefProfile]
+        """
+        return self._aef_profiles
+
+    @aef_profiles.setter
+    def aef_profiles(self, aef_profiles):
+        """Sets the aef_profiles of this ServiceAPIDescription.
+
+        AEF profile information, which includes the exposed API details (e.g. protocol).  # noqa: E501
+
+        :param aef_profiles: The aef_profiles of this ServiceAPIDescription.
+        :type aef_profiles: List[AefProfile]
+        """
+        if aef_profiles is not None and len(aef_profiles) < 1:
+            raise ValueError("Invalid value for `aef_profiles`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._aef_profiles = aef_profiles
+
+    @property
+    def description(self):
+        """Gets the description of this ServiceAPIDescription.
+
+        Text description of the API  # noqa: E501
+
+        :return: The description of this ServiceAPIDescription.
+        :rtype: str
+        """
+        return self._description
+
+    @description.setter
+    def description(self, description):
+        """Sets the description of this ServiceAPIDescription.
+
+        Text description of the API  # noqa: E501
+
+        :param description: The description of this ServiceAPIDescription.
+        :type description: str
+        """
+
+        self._description = description
+
+    @property
+    def supported_features(self):
+        """Gets the supported_features of this ServiceAPIDescription.
+
+        A string used to indicate the features supported by an API that is used as defined in clause 6.6 in 3GPP TS 29.500. The string shall contain a bitmask indicating supported features in hexadecimal representation Each character in the string shall take a value of \"0\" to \"9\", \"a\" to \"f\" or \"A\" to \"F\" and shall represent the support of 4 features as described in table 5.2.2-3. The most significant character representing the highest-numbered features shall appear first in the string, and the character representing features 1 to 4 shall appear last in the string. The list of features and their numbering (starting with 1) are defined separately for each API. If the string contains a lower number of characters than there are defined features for an API, all features that would be represented by characters that are not present in the string are not supported  # noqa: E501
+
+        :return: The supported_features of this ServiceAPIDescription.
+        :rtype: str
+        """
+        return self._supported_features
+
+    @supported_features.setter
+    def supported_features(self, supported_features):
+        """Sets the supported_features of this ServiceAPIDescription.
+
+        A string used to indicate the features supported by an API that is used as defined in clause 6.6 in 3GPP TS 29.500. The string shall contain a bitmask indicating supported features in hexadecimal representation Each character in the string shall take a value of \"0\" to \"9\", \"a\" to \"f\" or \"A\" to \"F\" and shall represent the support of 4 features as described in table 5.2.2-3. The most significant character representing the highest-numbered features shall appear first in the string, and the character representing features 1 to 4 shall appear last in the string. The list of features and their numbering (starting with 1) are defined separately for each API. If the string contains a lower number of characters than there are defined features for an API, all features that would be represented by characters that are not present in the string are not supported  # noqa: E501
+
+        :param supported_features: The supported_features of this ServiceAPIDescription.
+        :type supported_features: str
+        """
+        if supported_features is not None and not re.search(r'^[A-Fa-f0-9]*$', supported_features):  # noqa: E501
+            raise ValueError("Invalid value for `supported_features`, must be a follow pattern or equal to `/^[A-Fa-f0-9]*$/`")  # noqa: E501
+
+        self._supported_features = supported_features
+
+    @property
+    def shareable_info(self):
+        """Gets the shareable_info of this ServiceAPIDescription.
+
+
+        :return: The shareable_info of this ServiceAPIDescription.
+        :rtype: ShareableInformation
+        """
+        return self._shareable_info
+
+    @shareable_info.setter
+    def shareable_info(self, shareable_info):
+        """Sets the shareable_info of this ServiceAPIDescription.
+
+
+        :param shareable_info: The shareable_info of this ServiceAPIDescription.
+        :type shareable_info: ShareableInformation
+        """
+
+        self._shareable_info = shareable_info
+
+    @property
+    def service_api_category(self):
+        """Gets the service_api_category of this ServiceAPIDescription.
+
+
+        :return: The service_api_category of this ServiceAPIDescription.
+        :rtype: str
+        """
+        return self._service_api_category
+
+    @service_api_category.setter
+    def service_api_category(self, service_api_category):
+        """Sets the service_api_category of this ServiceAPIDescription.
+
+
+        :param service_api_category: The service_api_category of this ServiceAPIDescription.
+        :type service_api_category: str
+        """
+
+        self._service_api_category = service_api_category
+
+    @property
+    def api_supp_feats(self):
+        """Gets the api_supp_feats of this ServiceAPIDescription.
+
+        A string used to indicate the features supported by an API that is used as defined in clause 6.6 in 3GPP TS 29.500. The string shall contain a bitmask indicating supported features in hexadecimal representation Each character in the string shall take a value of \"0\" to \"9\", \"a\" to \"f\" or \"A\" to \"F\" and shall represent the support of 4 features as described in table 5.2.2-3. The most significant character representing the highest-numbered features shall appear first in the string, and the character representing features 1 to 4 shall appear last in the string. The list of features and their numbering (starting with 1) are defined separately for each API. If the string contains a lower number of characters than there are defined features for an API, all features that would be represented by characters that are not present in the string are not supported  # noqa: E501
+
+        :return: The api_supp_feats of this ServiceAPIDescription.
+        :rtype: str
+        """
+        return self._api_supp_feats
+
+    @api_supp_feats.setter
+    def api_supp_feats(self, api_supp_feats):
+        """Sets the api_supp_feats of this ServiceAPIDescription.
+
+        A string used to indicate the features supported by an API that is used as defined in clause 6.6 in 3GPP TS 29.500. The string shall contain a bitmask indicating supported features in hexadecimal representation Each character in the string shall take a value of \"0\" to \"9\", \"a\" to \"f\" or \"A\" to \"F\" and shall represent the support of 4 features as described in table 5.2.2-3. The most significant character representing the highest-numbered features shall appear first in the string, and the character representing features 1 to 4 shall appear last in the string. The list of features and their numbering (starting with 1) are defined separately for each API. If the string contains a lower number of characters than there are defined features for an API, all features that would be represented by characters that are not present in the string are not supported  # noqa: E501
+
+        :param api_supp_feats: The api_supp_feats of this ServiceAPIDescription.
+        :type api_supp_feats: str
+        """
+        if api_supp_feats is not None and not re.search(r'^[A-Fa-f0-9]*$', api_supp_feats):  # noqa: E501
+            raise ValueError("Invalid value for `api_supp_feats`, must be a follow pattern or equal to `/^[A-Fa-f0-9]*$/`")  # noqa: E501
+
+        self._api_supp_feats = api_supp_feats
+
+    @property
+    def pub_api_path(self):
+        """Gets the pub_api_path of this ServiceAPIDescription.
+
+
+        :return: The pub_api_path of this ServiceAPIDescription.
+        :rtype: PublishedApiPath
+        """
+        return self._pub_api_path
+
+    @pub_api_path.setter
+    def pub_api_path(self, pub_api_path):
+        """Sets the pub_api_path of this ServiceAPIDescription.
+
+
+        :param pub_api_path: The pub_api_path of this ServiceAPIDescription.
+        :type pub_api_path: PublishedApiPath
+        """
+
+        self._pub_api_path = pub_api_path
+
+    @property
+    def ccf_id(self):
+        """Gets the ccf_id of this ServiceAPIDescription.
+
+        CAPIF core function identifier.  # noqa: E501
+
+        :return: The ccf_id of this ServiceAPIDescription.
+        :rtype: str
+        """
+        return self._ccf_id
+
+    @ccf_id.setter
+    def ccf_id(self, ccf_id):
+        """Sets the ccf_id of this ServiceAPIDescription.
+
+        CAPIF core function identifier.  # noqa: E501
+
+        :param ccf_id: The ccf_id of this ServiceAPIDescription.
+        :type ccf_id: str
+        """
+
+        self._ccf_id = ccf_id
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/shareable_information.py b/services/TS29222_CAPIF_Events_API/capif_events/models/shareable_information.py
new file mode 100644
index 0000000000000000000000000000000000000000..134674a984d2cb7daee3955a7588070cd8e97530
--- /dev/null
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/shareable_information.py
@@ -0,0 +1,98 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_events.models.base_model_ import Model
+from capif_events import util
+
+
+class ShareableInformation(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, is_shareable=None, capif_prov_doms=None):  # noqa: E501
+        """ShareableInformation - a model defined in OpenAPI
+
+        :param is_shareable: The is_shareable of this ShareableInformation.  # noqa: E501
+        :type is_shareable: bool
+        :param capif_prov_doms: The capif_prov_doms of this ShareableInformation.  # noqa: E501
+        :type capif_prov_doms: List[str]
+        """
+        self.openapi_types = {
+            'is_shareable': bool,
+            'capif_prov_doms': List[str]
+        }
+
+        self.attribute_map = {
+            'is_shareable': 'isShareable',
+            'capif_prov_doms': 'capifProvDoms'
+        }
+
+        self._is_shareable = is_shareable
+        self._capif_prov_doms = capif_prov_doms
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'ShareableInformation':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The ShareableInformation of this ShareableInformation.  # noqa: E501
+        :rtype: ShareableInformation
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def is_shareable(self):
+        """Gets the is_shareable of this ShareableInformation.
+
+        Set to \"true\" indicates that the service API and/or the service API category can be shared to the list of CAPIF provider domain information. Otherwise set to \"false\".  # noqa: E501
+
+        :return: The is_shareable of this ShareableInformation.
+        :rtype: bool
+        """
+        return self._is_shareable
+
+    @is_shareable.setter
+    def is_shareable(self, is_shareable):
+        """Sets the is_shareable of this ShareableInformation.
+
+        Set to \"true\" indicates that the service API and/or the service API category can be shared to the list of CAPIF provider domain information. Otherwise set to \"false\".  # noqa: E501
+
+        :param is_shareable: The is_shareable of this ShareableInformation.
+        :type is_shareable: bool
+        """
+        if is_shareable is None:
+            raise ValueError("Invalid value for `is_shareable`, must not be `None`")  # noqa: E501
+
+        self._is_shareable = is_shareable
+
+    @property
+    def capif_prov_doms(self):
+        """Gets the capif_prov_doms of this ShareableInformation.
+
+        List of CAPIF provider domains to which the service API information to be shared.  # noqa: E501
+
+        :return: The capif_prov_doms of this ShareableInformation.
+        :rtype: List[str]
+        """
+        return self._capif_prov_doms
+
+    @capif_prov_doms.setter
+    def capif_prov_doms(self, capif_prov_doms):
+        """Sets the capif_prov_doms of this ShareableInformation.
+
+        List of CAPIF provider domains to which the service API information to be shared.  # noqa: E501
+
+        :param capif_prov_doms: The capif_prov_doms of this ShareableInformation.
+        :type capif_prov_doms: List[str]
+        """
+        if capif_prov_doms is not None and len(capif_prov_doms) < 1:
+            raise ValueError("Invalid value for `capif_prov_doms`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._capif_prov_doms = capif_prov_doms
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/time_range_list.py b/services/TS29222_CAPIF_Events_API/capif_events/models/time_range_list.py
new file mode 100644
index 0000000000000000000000000000000000000000..71c9987291be72767977bc59c1cad42b193b6548
--- /dev/null
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/time_range_list.py
@@ -0,0 +1,94 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_events.models.base_model_ import Model
+from capif_events import util
+
+
+class TimeRangeList(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, start_time=None, stop_time=None):  # noqa: E501
+        """TimeRangeList - a model defined in OpenAPI
+
+        :param start_time: The start_time of this TimeRangeList.  # noqa: E501
+        :type start_time: datetime
+        :param stop_time: The stop_time of this TimeRangeList.  # noqa: E501
+        :type stop_time: datetime
+        """
+        self.openapi_types = {
+            'start_time': datetime,
+            'stop_time': datetime
+        }
+
+        self.attribute_map = {
+            'start_time': 'startTime',
+            'stop_time': 'stopTime'
+        }
+
+        self._start_time = start_time
+        self._stop_time = stop_time
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'TimeRangeList':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The TimeRangeList of this TimeRangeList.  # noqa: E501
+        :rtype: TimeRangeList
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def start_time(self):
+        """Gets the start_time of this TimeRangeList.
+
+        string with format \"date-time\" as defined in OpenAPI.  # noqa: E501
+
+        :return: The start_time of this TimeRangeList.
+        :rtype: datetime
+        """
+        return self._start_time
+
+    @start_time.setter
+    def start_time(self, start_time):
+        """Sets the start_time of this TimeRangeList.
+
+        string with format \"date-time\" as defined in OpenAPI.  # noqa: E501
+
+        :param start_time: The start_time of this TimeRangeList.
+        :type start_time: datetime
+        """
+
+        self._start_time = start_time
+
+    @property
+    def stop_time(self):
+        """Gets the stop_time of this TimeRangeList.
+
+        string with format \"date-time\" as defined in OpenAPI.  # noqa: E501
+
+        :return: The stop_time of this TimeRangeList.
+        :rtype: datetime
+        """
+        return self._stop_time
+
+    @stop_time.setter
+    def stop_time(self, stop_time):
+        """Sets the stop_time of this TimeRangeList.
+
+        string with format \"date-time\" as defined in OpenAPI.  # noqa: E501
+
+        :param stop_time: The stop_time of this TimeRangeList.
+        :type stop_time: datetime
+        """
+
+        self._stop_time = stop_time
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/topology_hiding.py b/services/TS29222_CAPIF_Events_API/capif_events/models/topology_hiding.py
new file mode 100644
index 0000000000000000000000000000000000000000..5d22b9ce2f67a0a468bfe65845529f816523a77e
--- /dev/null
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/topology_hiding.py
@@ -0,0 +1,98 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_events.models.base_model_ import Model
+from capif_events.models.routing_rule import RoutingRule
+from capif_events import util
+
+from capif_events.models.routing_rule import RoutingRule  # noqa: E501
+
+class TopologyHiding(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, api_id=None, routing_rules=None):  # noqa: E501
+        """TopologyHiding - a model defined in OpenAPI
+
+        :param api_id: The api_id of this TopologyHiding.  # noqa: E501
+        :type api_id: str
+        :param routing_rules: The routing_rules of this TopologyHiding.  # noqa: E501
+        :type routing_rules: List[RoutingRule]
+        """
+        self.openapi_types = {
+            'api_id': str,
+            'routing_rules': List[RoutingRule]
+        }
+
+        self.attribute_map = {
+            'api_id': 'apiId',
+            'routing_rules': 'routingRules'
+        }
+
+        self._api_id = api_id
+        self._routing_rules = routing_rules
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'TopologyHiding':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The TopologyHiding of this TopologyHiding.  # noqa: E501
+        :rtype: TopologyHiding
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def api_id(self):
+        """Gets the api_id of this TopologyHiding.
+
+
+        :return: The api_id of this TopologyHiding.
+        :rtype: str
+        """
+        return self._api_id
+
+    @api_id.setter
+    def api_id(self, api_id):
+        """Sets the api_id of this TopologyHiding.
+
+
+        :param api_id: The api_id of this TopologyHiding.
+        :type api_id: str
+        """
+        if api_id is None:
+            raise ValueError("Invalid value for `api_id`, must not be `None`")  # noqa: E501
+
+        self._api_id = api_id
+
+    @property
+    def routing_rules(self):
+        """Gets the routing_rules of this TopologyHiding.
+
+
+        :return: The routing_rules of this TopologyHiding.
+        :rtype: List[RoutingRule]
+        """
+        return self._routing_rules
+
+    @routing_rules.setter
+    def routing_rules(self, routing_rules):
+        """Sets the routing_rules of this TopologyHiding.
+
+
+        :param routing_rules: The routing_rules of this TopologyHiding.
+        :type routing_rules: List[RoutingRule]
+        """
+        if routing_rules is None:
+            raise ValueError("Invalid value for `routing_rules`, must not be `None`")  # noqa: E501
+        if routing_rules is not None and len(routing_rules) < 1:
+            raise ValueError("Invalid value for `routing_rules`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._routing_rules = routing_rules
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/version.py b/services/TS29222_CAPIF_Events_API/capif_events/models/version.py
new file mode 100644
index 0000000000000000000000000000000000000000..3b78d8f2b21eb6c450444c66c21f7e429abbad92
--- /dev/null
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/version.py
@@ -0,0 +1,160 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_events.models.base_model_ import Model
+from capif_events.models.custom_operation import CustomOperation
+from capif_events.models.resource import Resource
+from capif_events import util
+
+from capif_events.models.custom_operation import CustomOperation  # noqa: E501
+from capif_events.models.resource import Resource  # noqa: E501
+
+class Version(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, api_version=None, expiry=None, resources=None, cust_operations=None):  # noqa: E501
+        """Version - a model defined in OpenAPI
+
+        :param api_version: The api_version of this Version.  # noqa: E501
+        :type api_version: str
+        :param expiry: The expiry of this Version.  # noqa: E501
+        :type expiry: datetime
+        :param resources: The resources of this Version.  # noqa: E501
+        :type resources: List[Resource]
+        :param cust_operations: The cust_operations of this Version.  # noqa: E501
+        :type cust_operations: List[CustomOperation]
+        """
+        self.openapi_types = {
+            'api_version': str,
+            'expiry': datetime,
+            'resources': List[Resource],
+            'cust_operations': List[CustomOperation]
+        }
+
+        self.attribute_map = {
+            'api_version': 'apiVersion',
+            'expiry': 'expiry',
+            'resources': 'resources',
+            'cust_operations': 'custOperations'
+        }
+
+        self._api_version = api_version
+        self._expiry = expiry
+        self._resources = resources
+        self._cust_operations = cust_operations
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'Version':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The Version of this Version.  # noqa: E501
+        :rtype: Version
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def api_version(self):
+        """Gets the api_version of this Version.
+
+        API major version in URI (e.g. v1)  # noqa: E501
+
+        :return: The api_version of this Version.
+        :rtype: str
+        """
+        return self._api_version
+
+    @api_version.setter
+    def api_version(self, api_version):
+        """Sets the api_version of this Version.
+
+        API major version in URI (e.g. v1)  # noqa: E501
+
+        :param api_version: The api_version of this Version.
+        :type api_version: str
+        """
+        if api_version is None:
+            raise ValueError("Invalid value for `api_version`, must not be `None`")  # noqa: E501
+
+        self._api_version = api_version
+
+    @property
+    def expiry(self):
+        """Gets the expiry of this Version.
+
+        string with format \"date-time\" as defined in OpenAPI.  # noqa: E501
+
+        :return: The expiry of this Version.
+        :rtype: datetime
+        """
+        return self._expiry
+
+    @expiry.setter
+    def expiry(self, expiry):
+        """Sets the expiry of this Version.
+
+        string with format \"date-time\" as defined in OpenAPI.  # noqa: E501
+
+        :param expiry: The expiry of this Version.
+        :type expiry: datetime
+        """
+
+        self._expiry = expiry
+
+    @property
+    def resources(self):
+        """Gets the resources of this Version.
+
+        Resources supported by the API.  # noqa: E501
+
+        :return: The resources of this Version.
+        :rtype: List[Resource]
+        """
+        return self._resources
+
+    @resources.setter
+    def resources(self, resources):
+        """Sets the resources of this Version.
+
+        Resources supported by the API.  # noqa: E501
+
+        :param resources: The resources of this Version.
+        :type resources: List[Resource]
+        """
+        if resources is not None and len(resources) < 1:
+            raise ValueError("Invalid value for `resources`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._resources = resources
+
+    @property
+    def cust_operations(self):
+        """Gets the cust_operations of this Version.
+
+        Custom operations without resource association.  # noqa: E501
+
+        :return: The cust_operations of this Version.
+        :rtype: List[CustomOperation]
+        """
+        return self._cust_operations
+
+    @cust_operations.setter
+    def cust_operations(self, cust_operations):
+        """Sets the cust_operations of this Version.
+
+        Custom operations without resource association.  # noqa: E501
+
+        :param cust_operations: The cust_operations of this Version.
+        :type cust_operations: List[CustomOperation]
+        """
+        if cust_operations is not None and len(cust_operations) < 1:
+            raise ValueError("Invalid value for `cust_operations`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._cust_operations = cust_operations
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/models/websock_notif_config.py b/services/TS29222_CAPIF_Events_API/capif_events/models/websock_notif_config.py
new file mode 100644
index 0000000000000000000000000000000000000000..9a7c40bf246d840b7714b335f9db2d0d306dece8
--- /dev/null
+++ b/services/TS29222_CAPIF_Events_API/capif_events/models/websock_notif_config.py
@@ -0,0 +1,94 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_events.models.base_model_ import Model
+from capif_events import util
+
+
+class WebsockNotifConfig(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, websocket_uri=None, request_websocket_uri=None):  # noqa: E501
+        """WebsockNotifConfig - a model defined in OpenAPI
+
+        :param websocket_uri: The websocket_uri of this WebsockNotifConfig.  # noqa: E501
+        :type websocket_uri: str
+        :param request_websocket_uri: The request_websocket_uri of this WebsockNotifConfig.  # noqa: E501
+        :type request_websocket_uri: bool
+        """
+        self.openapi_types = {
+            'websocket_uri': str,
+            'request_websocket_uri': bool
+        }
+
+        self.attribute_map = {
+            'websocket_uri': 'websocketUri',
+            'request_websocket_uri': 'requestWebsocketUri'
+        }
+
+        self._websocket_uri = websocket_uri
+        self._request_websocket_uri = request_websocket_uri
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'WebsockNotifConfig':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The WebsockNotifConfig of this WebsockNotifConfig.  # noqa: E501
+        :rtype: WebsockNotifConfig
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def websocket_uri(self):
+        """Gets the websocket_uri of this WebsockNotifConfig.
+
+        string formatted according to IETF RFC 3986 identifying a referenced resource.  # noqa: E501
+
+        :return: The websocket_uri of this WebsockNotifConfig.
+        :rtype: str
+        """
+        return self._websocket_uri
+
+    @websocket_uri.setter
+    def websocket_uri(self, websocket_uri):
+        """Sets the websocket_uri of this WebsockNotifConfig.
+
+        string formatted according to IETF RFC 3986 identifying a referenced resource.  # noqa: E501
+
+        :param websocket_uri: The websocket_uri of this WebsockNotifConfig.
+        :type websocket_uri: str
+        """
+
+        self._websocket_uri = websocket_uri
+
+    @property
+    def request_websocket_uri(self):
+        """Gets the request_websocket_uri of this WebsockNotifConfig.
+
+        Set by the SCS/AS to indicate that the Websocket delivery is requested.  # noqa: E501
+
+        :return: The request_websocket_uri of this WebsockNotifConfig.
+        :rtype: bool
+        """
+        return self._request_websocket_uri
+
+    @request_websocket_uri.setter
+    def request_websocket_uri(self, request_websocket_uri):
+        """Sets the request_websocket_uri of this WebsockNotifConfig.
+
+        Set by the SCS/AS to indicate that the Websocket delivery is requested.  # noqa: E501
+
+        :param request_websocket_uri: The request_websocket_uri of this WebsockNotifConfig.
+        :type request_websocket_uri: bool
+        """
+
+        self._request_websocket_uri = request_websocket_uri
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/openapi/openapi.yaml b/services/TS29222_CAPIF_Events_API/capif_events/openapi/openapi.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..d89f8dd381d9da7fbbec77fc3c57bfe53e7dff93
--- /dev/null
+++ b/services/TS29222_CAPIF_Events_API/capif_events/openapi/openapi.yaml
@@ -0,0 +1,3314 @@
+openapi: 3.0.0
+info:
+  description: |
+    API for event subscription management.
+    © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
+    All rights reserved.
+  title: CAPIF_Events_API
+  version: 1.2.0-alpha.1
+externalDocs:
+  description: 3GPP TS 29.222 V17.1.0 Common API Framework for 3GPP Northbound APIs
+  url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.222/
+servers:
+- url: '{apiRoot}/capif-events/v1'
+  variables:
+    apiRoot:
+      default: https://example.com
+      description: apiRoot as defined in subclause 7.5 of 3GPP TS 29.222
+paths:
+  /{subscriberId}/subscriptions:
+    post:
+      callbacks:
+        notificationDestination:
+          '{request.body#/notificationDestination}':
+            post:
+              operationId: notificationDestination_request_bodyNotificationDestinationPost
+              requestBody:
+                content:
+                  application/json:
+                    schema:
+                      $ref: '#/components/schemas/EventNotification'
+                required: true
+              responses:
+                "204":
+                  description: No Content (successful notification)
+                "307":
+                  description: Temporary Redirect
+                  headers:
+                    Location:
+                      description: An alternative URI of the resource.
+                      required: true
+                      schema:
+                        type: string
+                "308":
+                  description: Permanent Redirect
+                  headers:
+                    Location:
+                      description: An alternative URI of the resource.
+                      required: true
+                      schema:
+                        type: string
+                "400":
+                  content:
+                    application/problem+json:
+                      schema:
+                        $ref: '#/components/schemas/ProblemDetails'
+                  description: Bad request
+                "401":
+                  content:
+                    application/problem+json:
+                      schema:
+                        $ref: '#/components/schemas/ProblemDetails'
+                  description: Unauthorized
+                "403":
+                  content:
+                    application/problem+json:
+                      schema:
+                        $ref: '#/components/schemas/ProblemDetails'
+                  description: Forbidden
+                "404":
+                  content:
+                    application/problem+json:
+                      schema:
+                        $ref: '#/components/schemas/ProblemDetails'
+                  description: Not Found
+                "411":
+                  content:
+                    application/problem+json:
+                      schema:
+                        $ref: '#/components/schemas/ProblemDetails'
+                  description: Length Required
+                "413":
+                  content:
+                    application/problem+json:
+                      schema:
+                        $ref: '#/components/schemas/ProblemDetails'
+                  description: Payload Too Large
+                "415":
+                  content:
+                    application/problem+json:
+                      schema:
+                        $ref: '#/components/schemas/ProblemDetails'
+                  description: Unsupported Media Type
+                "429":
+                  content:
+                    application/problem+json:
+                      schema:
+                        $ref: '#/components/schemas/ProblemDetails'
+                  description: Too Many Requests
+                "500":
+                  content:
+                    application/problem+json:
+                      schema:
+                        $ref: '#/components/schemas/ProblemDetails'
+                  description: Internal Server Error
+                "503":
+                  content:
+                    application/problem+json:
+                      schema:
+                        $ref: '#/components/schemas/ProblemDetails'
+                  description: Service Unavailable
+                default:
+                  description: Generic Error
+              x-callback-request: true
+      description: Creates a new individual CAPIF Event Subscription.
+      operationId: subscriber_id_subscriptions_post
+      parameters:
+      - description: Identifier of the Subscriber
+        explode: false
+        in: path
+        name: subscriberId
+        required: true
+        schema:
+          type: string
+        style: simple
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/EventSubscription'
+        required: true
+      responses:
+        "201":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/EventSubscription'
+          description: Created (Successful creation of subscription)
+          headers:
+            Location:
+              description: 'Contains the URI of the newly created resource, according
+                to the structure: {apiRoot}/capif-events/v1/{subscriberId}/subscriptions/{subscriptionId}'
+              explode: false
+              required: true
+              schema:
+                type: string
+              style: simple
+        "400":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Bad request
+        "401":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Unauthorized
+        "403":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Forbidden
+        "404":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Not Found
+        "411":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Length Required
+        "413":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Payload Too Large
+        "415":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Unsupported Media Type
+        "429":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Too Many Requests
+        "500":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Internal Server Error
+        "503":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Service Unavailable
+        default:
+          description: Generic Error
+      x-openapi-router-controller: capif_events.controllers.default_controller
+  /{subscriberId}/subscriptions/{subscriptionId}:
+    delete:
+      description: Deletes an individual CAPIF Event Subscription.
+      operationId: subscriber_id_subscriptions_subscription_id_delete
+      parameters:
+      - description: Identifier of the Subscriber
+        explode: false
+        in: path
+        name: subscriberId
+        required: true
+        schema:
+          type: string
+        style: simple
+      - description: Identifier of an individual Events Subscription
+        explode: false
+        in: path
+        name: subscriptionId
+        required: true
+        schema:
+          type: string
+        style: simple
+      responses:
+        "204":
+          description: The individual CAPIF Events Subscription matching the subscriptionId
+            is deleted.
+        "307":
+          description: Temporary Redirect
+          headers:
+            Location:
+              description: An alternative URI of the resource.
+              required: true
+              schema:
+                type: string
+        "308":
+          description: Permanent Redirect
+          headers:
+            Location:
+              description: An alternative URI of the resource.
+              required: true
+              schema:
+                type: string
+        "400":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Bad request
+        "401":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Unauthorized
+        "403":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Forbidden
+        "404":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Not Found
+        "429":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Too Many Requests
+        "500":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Internal Server Error
+        "503":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Service Unavailable
+        default:
+          description: Generic Error
+      x-openapi-router-controller: capif_events.controllers.default_controller
+components:
+  schemas:
+    EventSubscription:
+      description: Represents an individual CAPIF Event Subscription resource.
+      example:
+        notificationDestination: notificationDestination
+        eventFilters:
+        - aefIds:
+          - aefIds
+          - aefIds
+          apiInvokerIds:
+          - apiInvokerIds
+          - apiInvokerIds
+          apiIds:
+          - apiIds
+          - apiIds
+        - aefIds:
+          - aefIds
+          - aefIds
+          apiInvokerIds:
+          - apiInvokerIds
+          - apiInvokerIds
+          apiIds:
+          - apiIds
+          - apiIds
+        supportedFeatures: supportedFeatures
+        eventReq:
+          partitionCriteria:
+          - null
+          - null
+          grpRepTime: 5
+          monDur: 2000-01-23T04:56:07.000+00:00
+          immRep: true
+          maxReportNbr: 0
+          repPeriod: 6
+          sampRatio: 15
+        websockNotifConfig:
+          requestWebsocketUri: true
+          websocketUri: websocketUri
+        events:
+        - null
+        - null
+        requestTestNotification: true
+      properties:
+        events:
+          description: Subscribed events
+          items:
+            $ref: '#/components/schemas/CAPIFEvent'
+          minItems: 1
+          title: events
+          type: array
+        eventFilters:
+          description: Subscribed event filters
+          items:
+            $ref: '#/components/schemas/CAPIFEventFilter'
+          minItems: 1
+          title: eventFilters
+          type: array
+        eventReq:
+          $ref: '#/components/schemas/ReportingInformation'
+        notificationDestination:
+          description: string providing an URI formatted according to IETF RFC 3986.
+          title: Uri
+          type: string
+        requestTestNotification:
+          description: Set to true by Subscriber to request the CAPIF core function
+            to send a test notification as defined in in subclause 7.6. Set to false
+            or omitted otherwise.
+          title: requestTestNotification
+          type: boolean
+        websockNotifConfig:
+          $ref: '#/components/schemas/WebsockNotifConfig'
+        supportedFeatures:
+          description: A string used to indicate the features supported by an API
+            that is used as defined in clause 6.6 in 3GPP TS 29.500. The string shall
+            contain a bitmask indicating supported features in hexadecimal representation
+            Each character in the string shall take a value of "0" to "9", "a" to
+            "f" or "A" to "F" and shall represent the support of 4 features as described
+            in table 5.2.2-3. The most significant character representing the highest-numbered
+            features shall appear first in the string, and the character representing
+            features 1 to 4 shall appear last in the string. The list of features
+            and their numbering (starting with 1) are defined separately for each
+            API. If the string contains a lower number of characters than there are
+            defined features for an API, all features that would be represented by
+            characters that are not present in the string are not supported
+          pattern: ^[A-Fa-f0-9]*$
+          title: SupportedFeatures
+          type: string
+      required:
+      - events
+      - notificationDestination
+      title: EventSubscription
+      type: object
+    EventNotification:
+      description: Represents an individual CAPIF Event notification.
+      example:
+        subscriptionId: subscriptionId
+        eventDetail:
+          apiInvokerIds:
+          - apiInvokerIds
+          - apiInvokerIds
+          invocationLogs:
+          - supportedFeatures: supportedFeatures
+            apiInvokerId: apiInvokerId
+            aefId: aefId
+            logs:
+            - apiName: apiName
+              invocationTime: 2000-01-23T04:56:07.000+00:00
+              srcInterface:
+                ipv6Addr: ipv6Addr
+                securityMethods:
+                - null
+                - null
+                port: 5248
+                ipv4Addr: ipv4Addr
+              fwdInterface: fwdInterface
+              resourceName: resourceName
+              uri: uri
+              inputParameters: ""
+              invocationLatency: 0
+              result: result
+              apiVersion: apiVersion
+              destInterface:
+                ipv6Addr: ipv6Addr
+                securityMethods:
+                - null
+                - null
+                port: 5248
+                ipv4Addr: ipv4Addr
+              apiId: apiId
+              outputParameters: ""
+            - apiName: apiName
+              invocationTime: 2000-01-23T04:56:07.000+00:00
+              srcInterface:
+                ipv6Addr: ipv6Addr
+                securityMethods:
+                - null
+                - null
+                port: 5248
+                ipv4Addr: ipv4Addr
+              fwdInterface: fwdInterface
+              resourceName: resourceName
+              uri: uri
+              inputParameters: ""
+              invocationLatency: 0
+              result: result
+              apiVersion: apiVersion
+              destInterface:
+                ipv6Addr: ipv6Addr
+                securityMethods:
+                - null
+                - null
+                port: 5248
+                ipv4Addr: ipv4Addr
+              apiId: apiId
+              outputParameters: ""
+          - supportedFeatures: supportedFeatures
+            apiInvokerId: apiInvokerId
+            aefId: aefId
+            logs:
+            - apiName: apiName
+              invocationTime: 2000-01-23T04:56:07.000+00:00
+              srcInterface:
+                ipv6Addr: ipv6Addr
+                securityMethods:
+                - null
+                - null
+                port: 5248
+                ipv4Addr: ipv4Addr
+              fwdInterface: fwdInterface
+              resourceName: resourceName
+              uri: uri
+              inputParameters: ""
+              invocationLatency: 0
+              result: result
+              apiVersion: apiVersion
+              destInterface:
+                ipv6Addr: ipv6Addr
+                securityMethods:
+                - null
+                - null
+                port: 5248
+                ipv4Addr: ipv4Addr
+              apiId: apiId
+              outputParameters: ""
+            - apiName: apiName
+              invocationTime: 2000-01-23T04:56:07.000+00:00
+              srcInterface:
+                ipv6Addr: ipv6Addr
+                securityMethods:
+                - null
+                - null
+                port: 5248
+                ipv4Addr: ipv4Addr
+              fwdInterface: fwdInterface
+              resourceName: resourceName
+              uri: uri
+              inputParameters: ""
+              invocationLatency: 0
+              result: result
+              apiVersion: apiVersion
+              destInterface:
+                ipv6Addr: ipv6Addr
+                securityMethods:
+                - null
+                - null
+                port: 5248
+                ipv4Addr: ipv4Addr
+              apiId: apiId
+              outputParameters: ""
+          apiTopoHide:
+            apiId: apiId
+            routingRules:
+            - ipv6AddrRanges:
+              - start: start
+                end: end
+              - start: start
+                end: end
+              aefProfile:
+                securityMethods:
+                - null
+                - null
+                versions:
+                - apiVersion: apiVersion
+                  resources:
+                  - operations:
+                    - null
+                    - null
+                    description: description
+                    resourceName: resourceName
+                    custOpName: custOpName
+                    uri: uri
+                  - operations:
+                    - null
+                    - null
+                    description: description
+                    resourceName: resourceName
+                    custOpName: custOpName
+                    uri: uri
+                  custOperations:
+                  - operations:
+                    - null
+                    - null
+                    description: description
+                    custOpName: custOpName
+                  - operations:
+                    - null
+                    - null
+                    description: description
+                    custOpName: custOpName
+                  expiry: 2000-01-23T04:56:07.000+00:00
+                - apiVersion: apiVersion
+                  resources:
+                  - operations:
+                    - null
+                    - null
+                    description: description
+                    resourceName: resourceName
+                    custOpName: custOpName
+                    uri: uri
+                  - operations:
+                    - null
+                    - null
+                    description: description
+                    resourceName: resourceName
+                    custOpName: custOpName
+                    uri: uri
+                  custOperations:
+                  - operations:
+                    - null
+                    - null
+                    description: description
+                    custOpName: custOpName
+                  - operations:
+                    - null
+                    - null
+                    description: description
+                    custOpName: custOpName
+                  expiry: 2000-01-23T04:56:07.000+00:00
+                domainName: domainName
+                aefId: aefId
+                interfaceDescriptions:
+                - ipv6Addr: ipv6Addr
+                  securityMethods:
+                  - null
+                  - null
+                  port: 5248
+                  ipv4Addr: ipv4Addr
+                - ipv6Addr: ipv6Addr
+                  securityMethods:
+                  - null
+                  - null
+                  port: 5248
+                  ipv4Addr: ipv4Addr
+              ipv4AddrRanges:
+              - start: 198.51.100.1
+                end: 198.51.100.1
+              - start: 198.51.100.1
+                end: 198.51.100.1
+            - ipv6AddrRanges:
+              - start: start
+                end: end
+              - start: start
+                end: end
+              aefProfile:
+                securityMethods:
+                - null
+                - null
+                versions:
+                - apiVersion: apiVersion
+                  resources:
+                  - operations:
+                    - null
+                    - null
+                    description: description
+                    resourceName: resourceName
+                    custOpName: custOpName
+                    uri: uri
+                  - operations:
+                    - null
+                    - null
+                    description: description
+                    resourceName: resourceName
+                    custOpName: custOpName
+                    uri: uri
+                  custOperations:
+                  - operations:
+                    - null
+                    - null
+                    description: description
+                    custOpName: custOpName
+                  - operations:
+                    - null
+                    - null
+                    description: description
+                    custOpName: custOpName
+                  expiry: 2000-01-23T04:56:07.000+00:00
+                - apiVersion: apiVersion
+                  resources:
+                  - operations:
+                    - null
+                    - null
+                    description: description
+                    resourceName: resourceName
+                    custOpName: custOpName
+                    uri: uri
+                  - operations:
+                    - null
+                    - null
+                    description: description
+                    resourceName: resourceName
+                    custOpName: custOpName
+                    uri: uri
+                  custOperations:
+                  - operations:
+                    - null
+                    - null
+                    description: description
+                    custOpName: custOpName
+                  - operations:
+                    - null
+                    - null
+                    description: description
+                    custOpName: custOpName
+                  expiry: 2000-01-23T04:56:07.000+00:00
+                domainName: domainName
+                aefId: aefId
+                interfaceDescriptions:
+                - ipv6Addr: ipv6Addr
+                  securityMethods:
+                  - null
+                  - null
+                  port: 5248
+                  ipv4Addr: ipv4Addr
+                - ipv6Addr: ipv6Addr
+                  securityMethods:
+                  - null
+                  - null
+                  port: 5248
+                  ipv4Addr: ipv4Addr
+              ipv4AddrRanges:
+              - start: 198.51.100.1
+                end: 198.51.100.1
+              - start: 198.51.100.1
+                end: 198.51.100.1
+          serviceAPIDescriptions:
+          - serviceAPICategory: serviceAPICategory
+            ccfId: ccfId
+            apiName: apiName
+            shareableInfo:
+              capifProvDoms:
+              - capifProvDoms
+              - capifProvDoms
+              isShareable: true
+            supportedFeatures: supportedFeatures
+            description: description
+            apiSuppFeats: apiSuppFeats
+            apiId: apiId
+            aefProfiles:
+            - securityMethods:
+              - null
+              - null
+              versions:
+              - apiVersion: apiVersion
+                resources:
+                - operations:
+                  - null
+                  - null
+                  description: description
+                  resourceName: resourceName
+                  custOpName: custOpName
+                  uri: uri
+                - operations:
+                  - null
+                  - null
+                  description: description
+                  resourceName: resourceName
+                  custOpName: custOpName
+                  uri: uri
+                custOperations:
+                - operations:
+                  - null
+                  - null
+                  description: description
+                  custOpName: custOpName
+                - operations:
+                  - null
+                  - null
+                  description: description
+                  custOpName: custOpName
+                expiry: 2000-01-23T04:56:07.000+00:00
+              - apiVersion: apiVersion
+                resources:
+                - operations:
+                  - null
+                  - null
+                  description: description
+                  resourceName: resourceName
+                  custOpName: custOpName
+                  uri: uri
+                - operations:
+                  - null
+                  - null
+                  description: description
+                  resourceName: resourceName
+                  custOpName: custOpName
+                  uri: uri
+                custOperations:
+                - operations:
+                  - null
+                  - null
+                  description: description
+                  custOpName: custOpName
+                - operations:
+                  - null
+                  - null
+                  description: description
+                  custOpName: custOpName
+                expiry: 2000-01-23T04:56:07.000+00:00
+              domainName: domainName
+              aefId: aefId
+              interfaceDescriptions:
+              - ipv6Addr: ipv6Addr
+                securityMethods:
+                - null
+                - null
+                port: 5248
+                ipv4Addr: ipv4Addr
+              - ipv6Addr: ipv6Addr
+                securityMethods:
+                - null
+                - null
+                port: 5248
+                ipv4Addr: ipv4Addr
+            - securityMethods:
+              - null
+              - null
+              versions:
+              - apiVersion: apiVersion
+                resources:
+                - operations:
+                  - null
+                  - null
+                  description: description
+                  resourceName: resourceName
+                  custOpName: custOpName
+                  uri: uri
+                - operations:
+                  - null
+                  - null
+                  description: description
+                  resourceName: resourceName
+                  custOpName: custOpName
+                  uri: uri
+                custOperations:
+                - operations:
+                  - null
+                  - null
+                  description: description
+                  custOpName: custOpName
+                - operations:
+                  - null
+                  - null
+                  description: description
+                  custOpName: custOpName
+                expiry: 2000-01-23T04:56:07.000+00:00
+              - apiVersion: apiVersion
+                resources:
+                - operations:
+                  - null
+                  - null
+                  description: description
+                  resourceName: resourceName
+                  custOpName: custOpName
+                  uri: uri
+                - operations:
+                  - null
+                  - null
+                  description: description
+                  resourceName: resourceName
+                  custOpName: custOpName
+                  uri: uri
+                custOperations:
+                - operations:
+                  - null
+                  - null
+                  description: description
+                  custOpName: custOpName
+                - operations:
+                  - null
+                  - null
+                  description: description
+                  custOpName: custOpName
+                expiry: 2000-01-23T04:56:07.000+00:00
+              domainName: domainName
+              aefId: aefId
+              interfaceDescriptions:
+              - ipv6Addr: ipv6Addr
+                securityMethods:
+                - null
+                - null
+                port: 5248
+                ipv4Addr: ipv4Addr
+              - ipv6Addr: ipv6Addr
+                securityMethods:
+                - null
+                - null
+                port: 5248
+                ipv4Addr: ipv4Addr
+            pubApiPath:
+              ccfIds:
+              - ccfIds
+              - ccfIds
+          - serviceAPICategory: serviceAPICategory
+            ccfId: ccfId
+            apiName: apiName
+            shareableInfo:
+              capifProvDoms:
+              - capifProvDoms
+              - capifProvDoms
+              isShareable: true
+            supportedFeatures: supportedFeatures
+            description: description
+            apiSuppFeats: apiSuppFeats
+            apiId: apiId
+            aefProfiles:
+            - securityMethods:
+              - null
+              - null
+              versions:
+              - apiVersion: apiVersion
+                resources:
+                - operations:
+                  - null
+                  - null
+                  description: description
+                  resourceName: resourceName
+                  custOpName: custOpName
+                  uri: uri
+                - operations:
+                  - null
+                  - null
+                  description: description
+                  resourceName: resourceName
+                  custOpName: custOpName
+                  uri: uri
+                custOperations:
+                - operations:
+                  - null
+                  - null
+                  description: description
+                  custOpName: custOpName
+                - operations:
+                  - null
+                  - null
+                  description: description
+                  custOpName: custOpName
+                expiry: 2000-01-23T04:56:07.000+00:00
+              - apiVersion: apiVersion
+                resources:
+                - operations:
+                  - null
+                  - null
+                  description: description
+                  resourceName: resourceName
+                  custOpName: custOpName
+                  uri: uri
+                - operations:
+                  - null
+                  - null
+                  description: description
+                  resourceName: resourceName
+                  custOpName: custOpName
+                  uri: uri
+                custOperations:
+                - operations:
+                  - null
+                  - null
+                  description: description
+                  custOpName: custOpName
+                - operations:
+                  - null
+                  - null
+                  description: description
+                  custOpName: custOpName
+                expiry: 2000-01-23T04:56:07.000+00:00
+              domainName: domainName
+              aefId: aefId
+              interfaceDescriptions:
+              - ipv6Addr: ipv6Addr
+                securityMethods:
+                - null
+                - null
+                port: 5248
+                ipv4Addr: ipv4Addr
+              - ipv6Addr: ipv6Addr
+                securityMethods:
+                - null
+                - null
+                port: 5248
+                ipv4Addr: ipv4Addr
+            - securityMethods:
+              - null
+              - null
+              versions:
+              - apiVersion: apiVersion
+                resources:
+                - operations:
+                  - null
+                  - null
+                  description: description
+                  resourceName: resourceName
+                  custOpName: custOpName
+                  uri: uri
+                - operations:
+                  - null
+                  - null
+                  description: description
+                  resourceName: resourceName
+                  custOpName: custOpName
+                  uri: uri
+                custOperations:
+                - operations:
+                  - null
+                  - null
+                  description: description
+                  custOpName: custOpName
+                - operations:
+                  - null
+                  - null
+                  description: description
+                  custOpName: custOpName
+                expiry: 2000-01-23T04:56:07.000+00:00
+              - apiVersion: apiVersion
+                resources:
+                - operations:
+                  - null
+                  - null
+                  description: description
+                  resourceName: resourceName
+                  custOpName: custOpName
+                  uri: uri
+                - operations:
+                  - null
+                  - null
+                  description: description
+                  resourceName: resourceName
+                  custOpName: custOpName
+                  uri: uri
+                custOperations:
+                - operations:
+                  - null
+                  - null
+                  description: description
+                  custOpName: custOpName
+                - operations:
+                  - null
+                  - null
+                  description: description
+                  custOpName: custOpName
+                expiry: 2000-01-23T04:56:07.000+00:00
+              domainName: domainName
+              aefId: aefId
+              interfaceDescriptions:
+              - ipv6Addr: ipv6Addr
+                securityMethods:
+                - null
+                - null
+                port: 5248
+                ipv4Addr: ipv4Addr
+              - ipv6Addr: ipv6Addr
+                securityMethods:
+                - null
+                - null
+                port: 5248
+                ipv4Addr: ipv4Addr
+            pubApiPath:
+              ccfIds:
+              - ccfIds
+              - ccfIds
+          apiIds:
+          - apiIds
+          - apiIds
+      properties:
+        subscriptionId:
+          description: Identifier of the subscription resource to which the notification
+            is related – CAPIF resource identifier
+          type: string
+        events:
+          $ref: '#/components/schemas/CAPIFEvent'
+        eventDetail:
+          $ref: '#/components/schemas/CAPIFEventDetail'
+      required:
+      - events
+      - subscriptionId
+      type: object
+    CAPIFEventFilter:
+      description: Represents a CAPIF event filter.
+      example:
+        aefIds:
+        - aefIds
+        - aefIds
+        apiInvokerIds:
+        - apiInvokerIds
+        - apiInvokerIds
+        apiIds:
+        - apiIds
+        - apiIds
+      properties:
+        apiIds:
+          description: Identifier of the service API
+          items:
+            type: string
+          minItems: 1
+          title: apiIds
+          type: array
+        apiInvokerIds:
+          description: Identity of the API invoker
+          items:
+            type: string
+          minItems: 1
+          title: apiInvokerIds
+          type: array
+        aefIds:
+          description: Identifier of the API exposing function
+          items:
+            type: string
+          minItems: 1
+          title: aefIds
+          type: array
+      title: CAPIFEventFilter
+      type: object
+    CAPIFEventDetail:
+      description: Represents a CAPIF event details.
+      example:
+        apiInvokerIds:
+        - apiInvokerIds
+        - apiInvokerIds
+        invocationLogs:
+        - supportedFeatures: supportedFeatures
+          apiInvokerId: apiInvokerId
+          aefId: aefId
+          logs:
+          - apiName: apiName
+            invocationTime: 2000-01-23T04:56:07.000+00:00
+            srcInterface:
+              ipv6Addr: ipv6Addr
+              securityMethods:
+              - null
+              - null
+              port: 5248
+              ipv4Addr: ipv4Addr
+            fwdInterface: fwdInterface
+            resourceName: resourceName
+            uri: uri
+            inputParameters: ""
+            invocationLatency: 0
+            result: result
+            apiVersion: apiVersion
+            destInterface:
+              ipv6Addr: ipv6Addr
+              securityMethods:
+              - null
+              - null
+              port: 5248
+              ipv4Addr: ipv4Addr
+            apiId: apiId
+            outputParameters: ""
+          - apiName: apiName
+            invocationTime: 2000-01-23T04:56:07.000+00:00
+            srcInterface:
+              ipv6Addr: ipv6Addr
+              securityMethods:
+              - null
+              - null
+              port: 5248
+              ipv4Addr: ipv4Addr
+            fwdInterface: fwdInterface
+            resourceName: resourceName
+            uri: uri
+            inputParameters: ""
+            invocationLatency: 0
+            result: result
+            apiVersion: apiVersion
+            destInterface:
+              ipv6Addr: ipv6Addr
+              securityMethods:
+              - null
+              - null
+              port: 5248
+              ipv4Addr: ipv4Addr
+            apiId: apiId
+            outputParameters: ""
+        - supportedFeatures: supportedFeatures
+          apiInvokerId: apiInvokerId
+          aefId: aefId
+          logs:
+          - apiName: apiName
+            invocationTime: 2000-01-23T04:56:07.000+00:00
+            srcInterface:
+              ipv6Addr: ipv6Addr
+              securityMethods:
+              - null
+              - null
+              port: 5248
+              ipv4Addr: ipv4Addr
+            fwdInterface: fwdInterface
+            resourceName: resourceName
+            uri: uri
+            inputParameters: ""
+            invocationLatency: 0
+            result: result
+            apiVersion: apiVersion
+            destInterface:
+              ipv6Addr: ipv6Addr
+              securityMethods:
+              - null
+              - null
+              port: 5248
+              ipv4Addr: ipv4Addr
+            apiId: apiId
+            outputParameters: ""
+          - apiName: apiName
+            invocationTime: 2000-01-23T04:56:07.000+00:00
+            srcInterface:
+              ipv6Addr: ipv6Addr
+              securityMethods:
+              - null
+              - null
+              port: 5248
+              ipv4Addr: ipv4Addr
+            fwdInterface: fwdInterface
+            resourceName: resourceName
+            uri: uri
+            inputParameters: ""
+            invocationLatency: 0
+            result: result
+            apiVersion: apiVersion
+            destInterface:
+              ipv6Addr: ipv6Addr
+              securityMethods:
+              - null
+              - null
+              port: 5248
+              ipv4Addr: ipv4Addr
+            apiId: apiId
+            outputParameters: ""
+        apiTopoHide:
+          apiId: apiId
+          routingRules:
+          - ipv6AddrRanges:
+            - start: start
+              end: end
+            - start: start
+              end: end
+            aefProfile:
+              securityMethods:
+              - null
+              - null
+              versions:
+              - apiVersion: apiVersion
+                resources:
+                - operations:
+                  - null
+                  - null
+                  description: description
+                  resourceName: resourceName
+                  custOpName: custOpName
+                  uri: uri
+                - operations:
+                  - null
+                  - null
+                  description: description
+                  resourceName: resourceName
+                  custOpName: custOpName
+                  uri: uri
+                custOperations:
+                - operations:
+                  - null
+                  - null
+                  description: description
+                  custOpName: custOpName
+                - operations:
+                  - null
+                  - null
+                  description: description
+                  custOpName: custOpName
+                expiry: 2000-01-23T04:56:07.000+00:00
+              - apiVersion: apiVersion
+                resources:
+                - operations:
+                  - null
+                  - null
+                  description: description
+                  resourceName: resourceName
+                  custOpName: custOpName
+                  uri: uri
+                - operations:
+                  - null
+                  - null
+                  description: description
+                  resourceName: resourceName
+                  custOpName: custOpName
+                  uri: uri
+                custOperations:
+                - operations:
+                  - null
+                  - null
+                  description: description
+                  custOpName: custOpName
+                - operations:
+                  - null
+                  - null
+                  description: description
+                  custOpName: custOpName
+                expiry: 2000-01-23T04:56:07.000+00:00
+              domainName: domainName
+              aefId: aefId
+              interfaceDescriptions:
+              - ipv6Addr: ipv6Addr
+                securityMethods:
+                - null
+                - null
+                port: 5248
+                ipv4Addr: ipv4Addr
+              - ipv6Addr: ipv6Addr
+                securityMethods:
+                - null
+                - null
+                port: 5248
+                ipv4Addr: ipv4Addr
+            ipv4AddrRanges:
+            - start: 198.51.100.1
+              end: 198.51.100.1
+            - start: 198.51.100.1
+              end: 198.51.100.1
+          - ipv6AddrRanges:
+            - start: start
+              end: end
+            - start: start
+              end: end
+            aefProfile:
+              securityMethods:
+              - null
+              - null
+              versions:
+              - apiVersion: apiVersion
+                resources:
+                - operations:
+                  - null
+                  - null
+                  description: description
+                  resourceName: resourceName
+                  custOpName: custOpName
+                  uri: uri
+                - operations:
+                  - null
+                  - null
+                  description: description
+                  resourceName: resourceName
+                  custOpName: custOpName
+                  uri: uri
+                custOperations:
+                - operations:
+                  - null
+                  - null
+                  description: description
+                  custOpName: custOpName
+                - operations:
+                  - null
+                  - null
+                  description: description
+                  custOpName: custOpName
+                expiry: 2000-01-23T04:56:07.000+00:00
+              - apiVersion: apiVersion
+                resources:
+                - operations:
+                  - null
+                  - null
+                  description: description
+                  resourceName: resourceName
+                  custOpName: custOpName
+                  uri: uri
+                - operations:
+                  - null
+                  - null
+                  description: description
+                  resourceName: resourceName
+                  custOpName: custOpName
+                  uri: uri
+                custOperations:
+                - operations:
+                  - null
+                  - null
+                  description: description
+                  custOpName: custOpName
+                - operations:
+                  - null
+                  - null
+                  description: description
+                  custOpName: custOpName
+                expiry: 2000-01-23T04:56:07.000+00:00
+              domainName: domainName
+              aefId: aefId
+              interfaceDescriptions:
+              - ipv6Addr: ipv6Addr
+                securityMethods:
+                - null
+                - null
+                port: 5248
+                ipv4Addr: ipv4Addr
+              - ipv6Addr: ipv6Addr
+                securityMethods:
+                - null
+                - null
+                port: 5248
+                ipv4Addr: ipv4Addr
+            ipv4AddrRanges:
+            - start: 198.51.100.1
+              end: 198.51.100.1
+            - start: 198.51.100.1
+              end: 198.51.100.1
+        serviceAPIDescriptions:
+        - serviceAPICategory: serviceAPICategory
+          ccfId: ccfId
+          apiName: apiName
+          shareableInfo:
+            capifProvDoms:
+            - capifProvDoms
+            - capifProvDoms
+            isShareable: true
+          supportedFeatures: supportedFeatures
+          description: description
+          apiSuppFeats: apiSuppFeats
+          apiId: apiId
+          aefProfiles:
+          - securityMethods:
+            - null
+            - null
+            versions:
+            - apiVersion: apiVersion
+              resources:
+              - operations:
+                - null
+                - null
+                description: description
+                resourceName: resourceName
+                custOpName: custOpName
+                uri: uri
+              - operations:
+                - null
+                - null
+                description: description
+                resourceName: resourceName
+                custOpName: custOpName
+                uri: uri
+              custOperations:
+              - operations:
+                - null
+                - null
+                description: description
+                custOpName: custOpName
+              - operations:
+                - null
+                - null
+                description: description
+                custOpName: custOpName
+              expiry: 2000-01-23T04:56:07.000+00:00
+            - apiVersion: apiVersion
+              resources:
+              - operations:
+                - null
+                - null
+                description: description
+                resourceName: resourceName
+                custOpName: custOpName
+                uri: uri
+              - operations:
+                - null
+                - null
+                description: description
+                resourceName: resourceName
+                custOpName: custOpName
+                uri: uri
+              custOperations:
+              - operations:
+                - null
+                - null
+                description: description
+                custOpName: custOpName
+              - operations:
+                - null
+                - null
+                description: description
+                custOpName: custOpName
+              expiry: 2000-01-23T04:56:07.000+00:00
+            domainName: domainName
+            aefId: aefId
+            interfaceDescriptions:
+            - ipv6Addr: ipv6Addr
+              securityMethods:
+              - null
+              - null
+              port: 5248
+              ipv4Addr: ipv4Addr
+            - ipv6Addr: ipv6Addr
+              securityMethods:
+              - null
+              - null
+              port: 5248
+              ipv4Addr: ipv4Addr
+          - securityMethods:
+            - null
+            - null
+            versions:
+            - apiVersion: apiVersion
+              resources:
+              - operations:
+                - null
+                - null
+                description: description
+                resourceName: resourceName
+                custOpName: custOpName
+                uri: uri
+              - operations:
+                - null
+                - null
+                description: description
+                resourceName: resourceName
+                custOpName: custOpName
+                uri: uri
+              custOperations:
+              - operations:
+                - null
+                - null
+                description: description
+                custOpName: custOpName
+              - operations:
+                - null
+                - null
+                description: description
+                custOpName: custOpName
+              expiry: 2000-01-23T04:56:07.000+00:00
+            - apiVersion: apiVersion
+              resources:
+              - operations:
+                - null
+                - null
+                description: description
+                resourceName: resourceName
+                custOpName: custOpName
+                uri: uri
+              - operations:
+                - null
+                - null
+                description: description
+                resourceName: resourceName
+                custOpName: custOpName
+                uri: uri
+              custOperations:
+              - operations:
+                - null
+                - null
+                description: description
+                custOpName: custOpName
+              - operations:
+                - null
+                - null
+                description: description
+                custOpName: custOpName
+              expiry: 2000-01-23T04:56:07.000+00:00
+            domainName: domainName
+            aefId: aefId
+            interfaceDescriptions:
+            - ipv6Addr: ipv6Addr
+              securityMethods:
+              - null
+              - null
+              port: 5248
+              ipv4Addr: ipv4Addr
+            - ipv6Addr: ipv6Addr
+              securityMethods:
+              - null
+              - null
+              port: 5248
+              ipv4Addr: ipv4Addr
+          pubApiPath:
+            ccfIds:
+            - ccfIds
+            - ccfIds
+        - serviceAPICategory: serviceAPICategory
+          ccfId: ccfId
+          apiName: apiName
+          shareableInfo:
+            capifProvDoms:
+            - capifProvDoms
+            - capifProvDoms
+            isShareable: true
+          supportedFeatures: supportedFeatures
+          description: description
+          apiSuppFeats: apiSuppFeats
+          apiId: apiId
+          aefProfiles:
+          - securityMethods:
+            - null
+            - null
+            versions:
+            - apiVersion: apiVersion
+              resources:
+              - operations:
+                - null
+                - null
+                description: description
+                resourceName: resourceName
+                custOpName: custOpName
+                uri: uri
+              - operations:
+                - null
+                - null
+                description: description
+                resourceName: resourceName
+                custOpName: custOpName
+                uri: uri
+              custOperations:
+              - operations:
+                - null
+                - null
+                description: description
+                custOpName: custOpName
+              - operations:
+                - null
+                - null
+                description: description
+                custOpName: custOpName
+              expiry: 2000-01-23T04:56:07.000+00:00
+            - apiVersion: apiVersion
+              resources:
+              - operations:
+                - null
+                - null
+                description: description
+                resourceName: resourceName
+                custOpName: custOpName
+                uri: uri
+              - operations:
+                - null
+                - null
+                description: description
+                resourceName: resourceName
+                custOpName: custOpName
+                uri: uri
+              custOperations:
+              - operations:
+                - null
+                - null
+                description: description
+                custOpName: custOpName
+              - operations:
+                - null
+                - null
+                description: description
+                custOpName: custOpName
+              expiry: 2000-01-23T04:56:07.000+00:00
+            domainName: domainName
+            aefId: aefId
+            interfaceDescriptions:
+            - ipv6Addr: ipv6Addr
+              securityMethods:
+              - null
+              - null
+              port: 5248
+              ipv4Addr: ipv4Addr
+            - ipv6Addr: ipv6Addr
+              securityMethods:
+              - null
+              - null
+              port: 5248
+              ipv4Addr: ipv4Addr
+          - securityMethods:
+            - null
+            - null
+            versions:
+            - apiVersion: apiVersion
+              resources:
+              - operations:
+                - null
+                - null
+                description: description
+                resourceName: resourceName
+                custOpName: custOpName
+                uri: uri
+              - operations:
+                - null
+                - null
+                description: description
+                resourceName: resourceName
+                custOpName: custOpName
+                uri: uri
+              custOperations:
+              - operations:
+                - null
+                - null
+                description: description
+                custOpName: custOpName
+              - operations:
+                - null
+                - null
+                description: description
+                custOpName: custOpName
+              expiry: 2000-01-23T04:56:07.000+00:00
+            - apiVersion: apiVersion
+              resources:
+              - operations:
+                - null
+                - null
+                description: description
+                resourceName: resourceName
+                custOpName: custOpName
+                uri: uri
+              - operations:
+                - null
+                - null
+                description: description
+                resourceName: resourceName
+                custOpName: custOpName
+                uri: uri
+              custOperations:
+              - operations:
+                - null
+                - null
+                description: description
+                custOpName: custOpName
+              - operations:
+                - null
+                - null
+                description: description
+                custOpName: custOpName
+              expiry: 2000-01-23T04:56:07.000+00:00
+            domainName: domainName
+            aefId: aefId
+            interfaceDescriptions:
+            - ipv6Addr: ipv6Addr
+              securityMethods:
+              - null
+              - null
+              port: 5248
+              ipv4Addr: ipv4Addr
+            - ipv6Addr: ipv6Addr
+              securityMethods:
+              - null
+              - null
+              port: 5248
+              ipv4Addr: ipv4Addr
+          pubApiPath:
+            ccfIds:
+            - ccfIds
+            - ccfIds
+        apiIds:
+        - apiIds
+        - apiIds
+      properties:
+        serviceAPIDescriptions:
+          description: Description of the service API as published by the APF.
+          items:
+            $ref: '#/components/schemas/ServiceAPIDescription'
+          minItems: 1
+          title: serviceAPIDescriptions
+          type: array
+        apiIds:
+          description: Identifier of the service API
+          items:
+            type: string
+          minItems: 1
+          title: apiIds
+          type: array
+        apiInvokerIds:
+          description: Identity of the API invoker
+          items:
+            type: string
+          minItems: 1
+          title: apiInvokerIds
+          type: array
+        accCtrlPolList:
+          $ref: '#/components/schemas/AccessControlPolicyListExt'
+        invocationLogs:
+          description: Invocation logs.
+          items:
+            $ref: '#/components/schemas/InvocationLog'
+          minItems: 1
+          title: invocationLogs
+          type: array
+        apiTopoHide:
+          $ref: '#/components/schemas/TopologyHiding'
+      title: CAPIFEventDetail
+      type: object
+    AccessControlPolicyListExt:
+      allOf:
+      - $ref: '#/components/schemas/AccessControlPolicyList'
+      - $ref: '#/components/schemas/AccessControlPolicyListExt_allOf'
+      description: Represents the extension for access control policies.
+      required:
+      - apiId
+      properties:
+        apiId:
+          title: apiId
+          type: string
+      title: AccessControlPolicyListExt
+    TopologyHiding:
+      description: Represents the routing rules information of a service API.
+      example:
+        apiId: apiId
+        routingRules:
+        - ipv6AddrRanges:
+          - start: start
+            end: end
+          - start: start
+            end: end
+          aefProfile:
+            securityMethods:
+            - null
+            - null
+            versions:
+            - apiVersion: apiVersion
+              resources:
+              - operations:
+                - null
+                - null
+                description: description
+                resourceName: resourceName
+                custOpName: custOpName
+                uri: uri
+              - operations:
+                - null
+                - null
+                description: description
+                resourceName: resourceName
+                custOpName: custOpName
+                uri: uri
+              custOperations:
+              - operations:
+                - null
+                - null
+                description: description
+                custOpName: custOpName
+              - operations:
+                - null
+                - null
+                description: description
+                custOpName: custOpName
+              expiry: 2000-01-23T04:56:07.000+00:00
+            - apiVersion: apiVersion
+              resources:
+              - operations:
+                - null
+                - null
+                description: description
+                resourceName: resourceName
+                custOpName: custOpName
+                uri: uri
+              - operations:
+                - null
+                - null
+                description: description
+                resourceName: resourceName
+                custOpName: custOpName
+                uri: uri
+              custOperations:
+              - operations:
+                - null
+                - null
+                description: description
+                custOpName: custOpName
+              - operations:
+                - null
+                - null
+                description: description
+                custOpName: custOpName
+              expiry: 2000-01-23T04:56:07.000+00:00
+            domainName: domainName
+            aefId: aefId
+            interfaceDescriptions:
+            - ipv6Addr: ipv6Addr
+              securityMethods:
+              - null
+              - null
+              port: 5248
+              ipv4Addr: ipv4Addr
+            - ipv6Addr: ipv6Addr
+              securityMethods:
+              - null
+              - null
+              port: 5248
+              ipv4Addr: ipv4Addr
+          ipv4AddrRanges:
+          - start: 198.51.100.1
+            end: 198.51.100.1
+          - start: 198.51.100.1
+            end: 198.51.100.1
+        - ipv6AddrRanges:
+          - start: start
+            end: end
+          - start: start
+            end: end
+          aefProfile:
+            securityMethods:
+            - null
+            - null
+            versions:
+            - apiVersion: apiVersion
+              resources:
+              - operations:
+                - null
+                - null
+                description: description
+                resourceName: resourceName
+                custOpName: custOpName
+                uri: uri
+              - operations:
+                - null
+                - null
+                description: description
+                resourceName: resourceName
+                custOpName: custOpName
+                uri: uri
+              custOperations:
+              - operations:
+                - null
+                - null
+                description: description
+                custOpName: custOpName
+              - operations:
+                - null
+                - null
+                description: description
+                custOpName: custOpName
+              expiry: 2000-01-23T04:56:07.000+00:00
+            - apiVersion: apiVersion
+              resources:
+              - operations:
+                - null
+                - null
+                description: description
+                resourceName: resourceName
+                custOpName: custOpName
+                uri: uri
+              - operations:
+                - null
+                - null
+                description: description
+                resourceName: resourceName
+                custOpName: custOpName
+                uri: uri
+              custOperations:
+              - operations:
+                - null
+                - null
+                description: description
+                custOpName: custOpName
+              - operations:
+                - null
+                - null
+                description: description
+                custOpName: custOpName
+              expiry: 2000-01-23T04:56:07.000+00:00
+            domainName: domainName
+            aefId: aefId
+            interfaceDescriptions:
+            - ipv6Addr: ipv6Addr
+              securityMethods:
+              - null
+              - null
+              port: 5248
+              ipv4Addr: ipv4Addr
+            - ipv6Addr: ipv6Addr
+              securityMethods:
+              - null
+              - null
+              port: 5248
+              ipv4Addr: ipv4Addr
+          ipv4AddrRanges:
+          - start: 198.51.100.1
+            end: 198.51.100.1
+          - start: 198.51.100.1
+            end: 198.51.100.1
+      properties:
+        apiId:
+          title: apiId
+          type: string
+        routingRules:
+          items:
+            $ref: '#/components/schemas/RoutingRule'
+          minItems: 1
+          title: routingRules
+          type: array
+      required:
+      - apiId
+      - routingRules
+      title: TopologyHiding
+      type: object
+    CAPIFEvent:
+      anyOf:
+      - $ref: '#/components/schemas/CAPIFEvent_anyOf'
+      - description: |
+          This string provides forward-compatibility with future extensions to the enumeration but is not used to encode content defined in the present version of this API.
+        type: string
+      description: |
+        Possible values are - SERVICE_API_AVAILABLE: Events related to the availability of service APIs after the service APIs are published. - SERVICE_API_UNAVAILABLE: Events related to the unavailability of service APIs after the service APIs are unpublished. - SERVICE_API_UPDATE: Events related to change in service API information. - API_INVOKER_ONBOARDED: Events related to API invoker onboarded to CAPIF. - API_INVOKER_OFFBOARDED: Events related to API invoker offboarded from CAPIF. - SERVICE_API_INVOCATION_SUCCESS: Events related to the successful invocation of service APIs. - SERVICE_API_INVOCATION_FAILURE: Events related to the failed invocation of service APIs. - ACCESS_CONTROL_POLICY_UPDATE: Events related to the update for the access control policy related to the service APIs. - ACCESS_CONTROL_POLICY_UNAVAILABLE: Events related to the unavailability of the access control policy related to the service APIs. - API_INVOKER_AUTHORIZATION_REVOKED: Events related to the revocation of the authorization of API invokers to access the service APIs. - API_INVOKER_UPDATED: Events related to API invoker profile updated to CAPIF. - API_TOPOLOGY_HIDING_CREATED: Events related to the creation or update of the API topology hiding information of the service APIs after the service APIs are published. - API_TOPOLOGY_HIDING_REVOKED: Events related to the revocation of the API topology hiding information of the service APIs after the service APIs are unpublished.
+      title: CAPIFEvent
+    ProblemDetails:
+      description: Represents additional information and details on an error response.
+      properties:
+        type:
+          description: string providing an URI formatted according to IETF RFC 3986.
+          title: Uri
+          type: string
+        title:
+          description: A short, human-readable summary of the problem type. It should
+            not change from occurrence to occurrence of the problem.
+          title: title
+          type: string
+        status:
+          description: The HTTP status code for this occurrence of the problem.
+          title: status
+          type: integer
+        detail:
+          description: A human-readable explanation specific to this occurrence of
+            the problem.
+          title: detail
+          type: string
+        instance:
+          description: string providing an URI formatted according to IETF RFC 3986.
+          title: Uri
+          type: string
+        cause:
+          description: A machine-readable application error cause specific to this
+            occurrence of the problem. This IE should be present and provide application-related
+            error information, if available.
+          title: cause
+          type: string
+        invalidParams:
+          description: Description of invalid parameters, for a request rejected due
+            to invalid parameters.
+          items:
+            $ref: '#/components/schemas/InvalidParam'
+          minItems: 1
+          title: invalidParams
+          type: array
+        supportedFeatures:
+          description: A string used to indicate the features supported by an API
+            that is used as defined in clause 6.6 in 3GPP TS 29.500. The string shall
+            contain a bitmask indicating supported features in hexadecimal representation
+            Each character in the string shall take a value of "0" to "9", "a" to
+            "f" or "A" to "F" and shall represent the support of 4 features as described
+            in table 5.2.2-3. The most significant character representing the highest-numbered
+            features shall appear first in the string, and the character representing
+            features 1 to 4 shall appear last in the string. The list of features
+            and their numbering (starting with 1) are defined separately for each
+            API. If the string contains a lower number of characters than there are
+            defined features for an API, all features that would be represented by
+            characters that are not present in the string are not supported
+          pattern: ^[A-Fa-f0-9]*$
+          title: SupportedFeatures
+          type: string
+      title: ProblemDetails
+      type: object
+    Uri:
+      description: string providing an URI formatted according to IETF RFC 3986.
+      title: Uri
+      type: string
+    InvalidParam:
+      description: Represents the description of invalid parameters, for a request
+        rejected due to invalid parameters.
+      properties:
+        param:
+          description: Attribute's name encoded as a JSON Pointer, or header's name.
+          title: param
+          type: string
+        reason:
+          description: A human-readable reason, e.g. "must be a positive integer".
+          title: reason
+          type: string
+      required:
+      - param
+      title: InvalidParam
+      type: object
+    ReportingInformation:
+      description: Represents the type of reporting that the subscription requires.
+      example:
+        partitionCriteria:
+        - null
+        - null
+        grpRepTime: 5
+        monDur: 2000-01-23T04:56:07.000+00:00
+        immRep: true
+        maxReportNbr: 0
+        repPeriod: 6
+        sampRatio: 15
+      properties:
+        immRep:
+          title: immRep
+          type: boolean
+        notifMethod:
+          $ref: '#/components/schemas/NotificationMethod'
+        maxReportNbr:
+          description: Unsigned Integer, i.e. only value 0 and integers above 0 are
+            permissible.
+          minimum: 0
+          title: Uinteger
+          type: integer
+        monDur:
+          description: string with format "date-time" as defined in OpenAPI.
+          format: date-time
+          title: DateTime
+          type: string
+        repPeriod:
+          description: indicating a time in seconds.
+          title: DurationSec
+          type: integer
+        sampRatio:
+          description: Unsigned integer indicating Sampling Ratio (see clauses 4.15.1
+            of 3GPP TS 23.502), expressed in percent.
+          maximum: 100
+          minimum: 1
+          title: SamplingRatio
+          type: integer
+        partitionCriteria:
+          description: Criteria for partitioning the UEs before applying the sampling
+            ratio.
+          items:
+            $ref: '#/components/schemas/PartitioningCriteria'
+          minItems: 1
+          title: partitionCriteria
+          type: array
+        grpRepTime:
+          description: indicating a time in seconds.
+          title: DurationSec
+          type: integer
+        notifFlag:
+          $ref: '#/components/schemas/NotificationFlag'
+      title: ReportingInformation
+      type: object
+    WebsockNotifConfig:
+      description: Represents the configuration information for the delivery of notifications
+        over Websockets.
+      example:
+        requestWebsocketUri: true
+        websocketUri: websocketUri
+      properties:
+        websocketUri:
+          description: string formatted according to IETF RFC 3986 identifying a referenced
+            resource.
+          title: Link
+          type: string
+        requestWebsocketUri:
+          description: Set by the SCS/AS to indicate that the Websocket delivery is
+            requested.
+          title: requestWebsocketUri
+          type: boolean
+      title: WebsockNotifConfig
+      type: object
+    Link:
+      description: string formatted according to IETF RFC 3986 identifying a referenced
+        resource.
+      title: Link
+      type: string
+    SupportedFeatures:
+      description: A string used to indicate the features supported by an API that
+        is used as defined in clause 6.6 in 3GPP TS 29.500. The string shall contain
+        a bitmask indicating supported features in hexadecimal representation Each
+        character in the string shall take a value of "0" to "9", "a" to "f" or "A"
+        to "F" and shall represent the support of 4 features as described in table 5.2.2-3.
+        The most significant character representing the highest-numbered features
+        shall appear first in the string, and the character representing features
+        1 to 4 shall appear last in the string. The list of features and their numbering
+        (starting with 1) are defined separately for each API. If the string contains
+        a lower number of characters than there are defined features for an API, all
+        features that would be represented by characters that are not present in the
+        string are not supported
+      pattern: ^[A-Fa-f0-9]*$
+      title: SupportedFeatures
+      type: string
+    ServiceAPIDescription:
+      description: Represents the description of a service API as published by the
+        APF.
+      example:
+        serviceAPICategory: serviceAPICategory
+        ccfId: ccfId
+        apiName: apiName
+        shareableInfo:
+          capifProvDoms:
+          - capifProvDoms
+          - capifProvDoms
+          isShareable: true
+        supportedFeatures: supportedFeatures
+        description: description
+        apiSuppFeats: apiSuppFeats
+        apiId: apiId
+        aefProfiles:
+        - securityMethods:
+          - null
+          - null
+          versions:
+          - apiVersion: apiVersion
+            resources:
+            - operations:
+              - null
+              - null
+              description: description
+              resourceName: resourceName
+              custOpName: custOpName
+              uri: uri
+            - operations:
+              - null
+              - null
+              description: description
+              resourceName: resourceName
+              custOpName: custOpName
+              uri: uri
+            custOperations:
+            - operations:
+              - null
+              - null
+              description: description
+              custOpName: custOpName
+            - operations:
+              - null
+              - null
+              description: description
+              custOpName: custOpName
+            expiry: 2000-01-23T04:56:07.000+00:00
+          - apiVersion: apiVersion
+            resources:
+            - operations:
+              - null
+              - null
+              description: description
+              resourceName: resourceName
+              custOpName: custOpName
+              uri: uri
+            - operations:
+              - null
+              - null
+              description: description
+              resourceName: resourceName
+              custOpName: custOpName
+              uri: uri
+            custOperations:
+            - operations:
+              - null
+              - null
+              description: description
+              custOpName: custOpName
+            - operations:
+              - null
+              - null
+              description: description
+              custOpName: custOpName
+            expiry: 2000-01-23T04:56:07.000+00:00
+          domainName: domainName
+          aefId: aefId
+          interfaceDescriptions:
+          - ipv6Addr: ipv6Addr
+            securityMethods:
+            - null
+            - null
+            port: 5248
+            ipv4Addr: ipv4Addr
+          - ipv6Addr: ipv6Addr
+            securityMethods:
+            - null
+            - null
+            port: 5248
+            ipv4Addr: ipv4Addr
+        - securityMethods:
+          - null
+          - null
+          versions:
+          - apiVersion: apiVersion
+            resources:
+            - operations:
+              - null
+              - null
+              description: description
+              resourceName: resourceName
+              custOpName: custOpName
+              uri: uri
+            - operations:
+              - null
+              - null
+              description: description
+              resourceName: resourceName
+              custOpName: custOpName
+              uri: uri
+            custOperations:
+            - operations:
+              - null
+              - null
+              description: description
+              custOpName: custOpName
+            - operations:
+              - null
+              - null
+              description: description
+              custOpName: custOpName
+            expiry: 2000-01-23T04:56:07.000+00:00
+          - apiVersion: apiVersion
+            resources:
+            - operations:
+              - null
+              - null
+              description: description
+              resourceName: resourceName
+              custOpName: custOpName
+              uri: uri
+            - operations:
+              - null
+              - null
+              description: description
+              resourceName: resourceName
+              custOpName: custOpName
+              uri: uri
+            custOperations:
+            - operations:
+              - null
+              - null
+              description: description
+              custOpName: custOpName
+            - operations:
+              - null
+              - null
+              description: description
+              custOpName: custOpName
+            expiry: 2000-01-23T04:56:07.000+00:00
+          domainName: domainName
+          aefId: aefId
+          interfaceDescriptions:
+          - ipv6Addr: ipv6Addr
+            securityMethods:
+            - null
+            - null
+            port: 5248
+            ipv4Addr: ipv4Addr
+          - ipv6Addr: ipv6Addr
+            securityMethods:
+            - null
+            - null
+            port: 5248
+            ipv4Addr: ipv4Addr
+        pubApiPath:
+          ccfIds:
+          - ccfIds
+          - ccfIds
+      properties:
+        apiName:
+          description: API name, it is set as {apiName} part of the URI structure
+            as defined in subclause 4.4 of 3GPP TS 29.501.
+          title: apiName
+          type: string
+        apiId:
+          description: API identifier assigned by the CAPIF core function to the published
+            service API. Shall not be present in the HTTP POST request from the API
+            publishing function to the CAPIF core function. Shall be present in the
+            HTTP POST response from the CAPIF core function to the API publishing
+            function and in the HTTP GET response from the CAPIF core function to
+            the API invoker (discovery API).
+          title: apiId
+          type: string
+        aefProfiles:
+          description: AEF profile information, which includes the exposed API details
+            (e.g. protocol).
+          items:
+            $ref: '#/components/schemas/AefProfile'
+          minItems: 1
+          title: aefProfiles
+          type: array
+        description:
+          description: Text description of the API
+          title: description
+          type: string
+        supportedFeatures:
+          description: A string used to indicate the features supported by an API
+            that is used as defined in clause 6.6 in 3GPP TS 29.500. The string shall
+            contain a bitmask indicating supported features in hexadecimal representation
+            Each character in the string shall take a value of "0" to "9", "a" to
+            "f" or "A" to "F" and shall represent the support of 4 features as described
+            in table 5.2.2-3. The most significant character representing the highest-numbered
+            features shall appear first in the string, and the character representing
+            features 1 to 4 shall appear last in the string. The list of features
+            and their numbering (starting with 1) are defined separately for each
+            API. If the string contains a lower number of characters than there are
+            defined features for an API, all features that would be represented by
+            characters that are not present in the string are not supported
+          pattern: ^[A-Fa-f0-9]*$
+          title: SupportedFeatures
+          type: string
+        shareableInfo:
+          $ref: '#/components/schemas/ShareableInformation'
+        serviceAPICategory:
+          title: serviceAPICategory
+          type: string
+        apiSuppFeats:
+          description: A string used to indicate the features supported by an API
+            that is used as defined in clause 6.6 in 3GPP TS 29.500. The string shall
+            contain a bitmask indicating supported features in hexadecimal representation
+            Each character in the string shall take a value of "0" to "9", "a" to
+            "f" or "A" to "F" and shall represent the support of 4 features as described
+            in table 5.2.2-3. The most significant character representing the highest-numbered
+            features shall appear first in the string, and the character representing
+            features 1 to 4 shall appear last in the string. The list of features
+            and their numbering (starting with 1) are defined separately for each
+            API. If the string contains a lower number of characters than there are
+            defined features for an API, all features that would be represented by
+            characters that are not present in the string are not supported
+          pattern: ^[A-Fa-f0-9]*$
+          title: SupportedFeatures
+          type: string
+        pubApiPath:
+          $ref: '#/components/schemas/PublishedApiPath'
+        ccfId:
+          description: CAPIF core function identifier.
+          title: ccfId
+          type: string
+      required:
+      - apiName
+      title: ServiceAPIDescription
+      type: object
+    AefProfile:
+      description: Represents the AEF profile data.
+      example:
+        securityMethods:
+        - null
+        - null
+        versions:
+        - apiVersion: apiVersion
+          resources:
+          - operations:
+            - null
+            - null
+            description: description
+            resourceName: resourceName
+            custOpName: custOpName
+            uri: uri
+          - operations:
+            - null
+            - null
+            description: description
+            resourceName: resourceName
+            custOpName: custOpName
+            uri: uri
+          custOperations:
+          - operations:
+            - null
+            - null
+            description: description
+            custOpName: custOpName
+          - operations:
+            - null
+            - null
+            description: description
+            custOpName: custOpName
+          expiry: 2000-01-23T04:56:07.000+00:00
+        - apiVersion: apiVersion
+          resources:
+          - operations:
+            - null
+            - null
+            description: description
+            resourceName: resourceName
+            custOpName: custOpName
+            uri: uri
+          - operations:
+            - null
+            - null
+            description: description
+            resourceName: resourceName
+            custOpName: custOpName
+            uri: uri
+          custOperations:
+          - operations:
+            - null
+            - null
+            description: description
+            custOpName: custOpName
+          - operations:
+            - null
+            - null
+            description: description
+            custOpName: custOpName
+          expiry: 2000-01-23T04:56:07.000+00:00
+        domainName: domainName
+        aefId: aefId
+        interfaceDescriptions:
+        - ipv6Addr: ipv6Addr
+          securityMethods:
+          - null
+          - null
+          port: 5248
+          ipv4Addr: ipv4Addr
+        - ipv6Addr: ipv6Addr
+          securityMethods:
+          - null
+          - null
+          port: 5248
+          ipv4Addr: ipv4Addr
+      oneOf:
+      - required:
+        - domainName
+      - required:
+        - interfaceDescriptions
+      properties:
+        aefId:
+          description: Identifier of the API exposing function
+          title: aefId
+          type: string
+        versions:
+          description: API version
+          items:
+            $ref: '#/components/schemas/Version'
+          minItems: 1
+          title: versions
+          type: array
+        protocol:
+          $ref: '#/components/schemas/Protocol'
+        dataFormat:
+          $ref: '#/components/schemas/DataFormat'
+        securityMethods:
+          description: Security methods supported by the AEF
+          items:
+            $ref: '#/components/schemas/SecurityMethod'
+          minItems: 1
+          title: securityMethods
+          type: array
+        domainName:
+          description: Domain to which API belongs to
+          title: domainName
+          type: string
+        interfaceDescriptions:
+          description: Interface details
+          items:
+            $ref: '#/components/schemas/InterfaceDescription'
+          minItems: 1
+          title: interfaceDescriptions
+          type: array
+      required:
+      - aefId
+      - versions
+      title: AefProfile
+      type: object
+    Version:
+      description: Represents the API version information.
+      example:
+        apiVersion: apiVersion
+        resources:
+        - operations:
+          - null
+          - null
+          description: description
+          resourceName: resourceName
+          custOpName: custOpName
+          uri: uri
+        - operations:
+          - null
+          - null
+          description: description
+          resourceName: resourceName
+          custOpName: custOpName
+          uri: uri
+        custOperations:
+        - operations:
+          - null
+          - null
+          description: description
+          custOpName: custOpName
+        - operations:
+          - null
+          - null
+          description: description
+          custOpName: custOpName
+        expiry: 2000-01-23T04:56:07.000+00:00
+      properties:
+        apiVersion:
+          description: API major version in URI (e.g. v1)
+          title: apiVersion
+          type: string
+        expiry:
+          description: string with format "date-time" as defined in OpenAPI.
+          format: date-time
+          title: DateTime
+          type: string
+        resources:
+          description: Resources supported by the API.
+          items:
+            $ref: '#/components/schemas/Resource'
+          minItems: 1
+          title: resources
+          type: array
+        custOperations:
+          description: Custom operations without resource association.
+          items:
+            $ref: '#/components/schemas/CustomOperation'
+          minItems: 1
+          title: custOperations
+          type: array
+      required:
+      - apiVersion
+      title: Version
+      type: object
+    Resource:
+      description: Represents the API resource data.
+      example:
+        operations:
+        - null
+        - null
+        description: description
+        resourceName: resourceName
+        custOpName: custOpName
+        uri: uri
+      properties:
+        resourceName:
+          description: Resource name
+          title: resourceName
+          type: string
+        commType:
+          $ref: '#/components/schemas/CommunicationType'
+        uri:
+          description: Relative URI of the API resource, it is set as {apiSpecificResourceUriPart}
+            part of the URI structure as defined in subclause 4.4 of 3GPP TS 29.501.
+          title: uri
+          type: string
+        custOpName:
+          description: it is set as {custOpName} part of the URI structure for a custom
+            operation associated with a resource as defined in subclause 4.4 of 3GPP
+            TS 29.501.
+          title: custOpName
+          type: string
+        operations:
+          description: Supported HTTP methods for the API resource. Only applicable
+            when the protocol in AefProfile indicates HTTP.
+          items:
+            $ref: '#/components/schemas/Operation'
+          minItems: 1
+          title: operations
+          type: array
+        description:
+          description: Text description of the API resource
+          title: description
+          type: string
+      required:
+      - commType
+      - resourceName
+      - uri
+      title: Resource
+      type: object
+    CommunicationType:
+      anyOf:
+      - $ref: '#/components/schemas/CommunicationType_anyOf'
+      - description: |
+          This string provides forward-compatibility with future extensions to the enumeration but is not used to encode content defined in the present version of this API.
+        type: string
+      description: |
+        Possible values are - REQUEST_RESPONSE: The communication is of the type request-response - SUBSCRIBE_NOTIFY: The communication is of the type subscribe-notify
+      title: CommunicationType
+    Operation:
+      anyOf:
+      - $ref: '#/components/schemas/Operation_anyOf'
+      - description: |
+          This string provides forward-compatibility with future extensions to the enumeration but is not used to encode content defined in the present version of this API.
+        type: string
+      description: |
+        Possible values are - GET: HTTP GET method - POST: HTTP POST method - PUT: HTTP PUT method - PATCH: HTTP PATCH method - DELETE: HTTP DELETE method
+      title: Operation
+    CustomOperation:
+      description: Represents the description of a custom operation.
+      example:
+        operations:
+        - null
+        - null
+        description: description
+        custOpName: custOpName
+      properties:
+        commType:
+          $ref: '#/components/schemas/CommunicationType'
+        custOpName:
+          description: it is set as {custOpName} part of the URI structure for a custom
+            operation without resource association as defined in subclause 4.4 of
+            3GPP TS 29.501.
+          title: custOpName
+          type: string
+        operations:
+          description: Supported HTTP methods for the API resource. Only applicable
+            when the protocol in AefProfile indicates HTTP.
+          items:
+            $ref: '#/components/schemas/Operation'
+          minItems: 1
+          title: operations
+          type: array
+        description:
+          description: Text description of the custom operation
+          title: description
+          type: string
+      required:
+      - commType
+      - custOpName
+      title: CustomOperation
+      type: object
+    Protocol:
+      anyOf:
+      - $ref: '#/components/schemas/Protocol_anyOf'
+      - description: |
+          This string provides forward-compatibility with future extensions to the enumeration but is not used to encode content defined in the present version of this API.
+        type: string
+      description: |
+        Possible values are - HTTP_1_1: HTTP version 1.1 - HTTP_2: HTTP version 2
+      title: Protocol
+    DataFormat:
+      anyOf:
+      - $ref: '#/components/schemas/DataFormat_anyOf'
+      - description: |
+          This string provides forward-compatibility with future extensions to the enumeration but is not used to encode content defined in the present version of this API.
+        type: string
+      description: |
+        Possible values are - JSON: JavaScript Object Notation
+      title: DataFormat
+    SecurityMethod:
+      anyOf:
+      - $ref: '#/components/schemas/SecurityMethod_anyOf'
+      - description: |
+          This string provides forward-compatibility with future extensions to the enumeration but is not used to encode content defined in the present version of this API.
+        type: string
+      description: |
+        Possible values are - PSK: Security method 1 (Using TLS-PSK) as described in 3GPP TS 33.122 - PKI: Security method 2 (Using PKI) as described in 3GPP TS 33.122 - OAUTH: Security method 3 (TLS with OAuth token) as described in 3GPP TS 33.122
+      title: SecurityMethod
+    InterfaceDescription:
+      description: Represents the description of an API's interface.
+      example:
+        ipv6Addr: ipv6Addr
+        securityMethods:
+        - null
+        - null
+        port: 5248
+        ipv4Addr: ipv4Addr
+      oneOf:
+      - required:
+        - ipv4Addr
+      - required:
+        - ipv6Addr
+      properties:
+        ipv4Addr:
+          description: string identifying a Ipv4 address formatted in the "dotted
+            decimal" notation as defined in IETF RFC 1166.
+          title: Ipv4Addr
+          type: string
+        ipv6Addr:
+          description: string identifying a Ipv6 address formatted according to clause
+            4 in IETF RFC 5952. The mixed Ipv4 Ipv6 notation according to clause 5
+            of IETF RFC 5952 shall not be used.
+          title: Ipv6Addr
+          type: string
+        port:
+          description: Unsigned integer with valid values between 0 and 65535.
+          maximum: 65535
+          minimum: 0
+          title: Port
+          type: integer
+        securityMethods:
+          description: Security methods supported by the interface, it take precedence
+            over the security methods provided in AefProfile, for this specific interface.
+          items:
+            $ref: '#/components/schemas/SecurityMethod'
+          minItems: 1
+          title: securityMethods
+          type: array
+      title: InterfaceDescription
+      type: object
+    ShareableInformation:
+      description: Indicates whether the service API and/or the service API category
+        can be shared to the list of CAPIF provider domains.
+      example:
+        capifProvDoms:
+        - capifProvDoms
+        - capifProvDoms
+        isShareable: true
+      properties:
+        isShareable:
+          description: Set to "true" indicates that the service API and/or the service
+            API category can be shared to the list of CAPIF provider domain information.
+            Otherwise set to "false".
+          title: isShareable
+          type: boolean
+        capifProvDoms:
+          description: List of CAPIF provider domains to which the service API information
+            to be shared.
+          items:
+            type: string
+          minItems: 1
+          title: capifProvDoms
+          type: array
+      required:
+      - isShareable
+      title: ShareableInformation
+      type: object
+    PublishedApiPath:
+      description: Represents the published API path within the same CAPIF provider
+        domain.
+      example:
+        ccfIds:
+        - ccfIds
+        - ccfIds
+      properties:
+        ccfIds:
+          description: A list of CCF identifiers where the service API is already
+            published.
+          items:
+            type: string
+          minItems: 1
+          title: ccfIds
+          type: array
+      title: PublishedApiPath
+      type: object
+    InvocationLog:
+      description: Represents a set of Service API invocation logs to be stored in
+        a CAPIF core function.
+      example:
+        supportedFeatures: supportedFeatures
+        apiInvokerId: apiInvokerId
+        aefId: aefId
+        logs:
+        - apiName: apiName
+          invocationTime: 2000-01-23T04:56:07.000+00:00
+          srcInterface:
+            ipv6Addr: ipv6Addr
+            securityMethods:
+            - null
+            - null
+            port: 5248
+            ipv4Addr: ipv4Addr
+          fwdInterface: fwdInterface
+          resourceName: resourceName
+          uri: uri
+          inputParameters: ""
+          invocationLatency: 0
+          result: result
+          apiVersion: apiVersion
+          destInterface:
+            ipv6Addr: ipv6Addr
+            securityMethods:
+            - null
+            - null
+            port: 5248
+            ipv4Addr: ipv4Addr
+          apiId: apiId
+          outputParameters: ""
+        - apiName: apiName
+          invocationTime: 2000-01-23T04:56:07.000+00:00
+          srcInterface:
+            ipv6Addr: ipv6Addr
+            securityMethods:
+            - null
+            - null
+            port: 5248
+            ipv4Addr: ipv4Addr
+          fwdInterface: fwdInterface
+          resourceName: resourceName
+          uri: uri
+          inputParameters: ""
+          invocationLatency: 0
+          result: result
+          apiVersion: apiVersion
+          destInterface:
+            ipv6Addr: ipv6Addr
+            securityMethods:
+            - null
+            - null
+            port: 5248
+            ipv4Addr: ipv4Addr
+          apiId: apiId
+          outputParameters: ""
+      properties:
+        aefId:
+          description: Identity information of the API exposing function requesting
+            logging of service API invocations
+          title: aefId
+          type: string
+        apiInvokerId:
+          description: Identity of the API invoker which invoked the service API
+          title: apiInvokerId
+          type: string
+        logs:
+          description: Service API invocation log
+          items:
+            $ref: '#/components/schemas/Log'
+          minItems: 1
+          title: logs
+          type: array
+        supportedFeatures:
+          description: A string used to indicate the features supported by an API
+            that is used as defined in clause 6.6 in 3GPP TS 29.500. The string shall
+            contain a bitmask indicating supported features in hexadecimal representation
+            Each character in the string shall take a value of "0" to "9", "a" to
+            "f" or "A" to "F" and shall represent the support of 4 features as described
+            in table 5.2.2-3. The most significant character representing the highest-numbered
+            features shall appear first in the string, and the character representing
+            features 1 to 4 shall appear last in the string. The list of features
+            and their numbering (starting with 1) are defined separately for each
+            API. If the string contains a lower number of characters than there are
+            defined features for an API, all features that would be represented by
+            characters that are not present in the string are not supported
+          pattern: ^[A-Fa-f0-9]*$
+          title: SupportedFeatures
+          type: string
+      required:
+      - aefId
+      - apiInvokerId
+      - logs
+      title: InvocationLog
+      type: object
+    Log:
+      description: Represents an individual service API invocation log entry.
+      example:
+        apiName: apiName
+        invocationTime: 2000-01-23T04:56:07.000+00:00
+        srcInterface:
+          ipv6Addr: ipv6Addr
+          securityMethods:
+          - null
+          - null
+          port: 5248
+          ipv4Addr: ipv4Addr
+        fwdInterface: fwdInterface
+        resourceName: resourceName
+        uri: uri
+        inputParameters: ""
+        invocationLatency: 0
+        result: result
+        apiVersion: apiVersion
+        destInterface:
+          ipv6Addr: ipv6Addr
+          securityMethods:
+          - null
+          - null
+          port: 5248
+          ipv4Addr: ipv4Addr
+        apiId: apiId
+        outputParameters: ""
+      properties:
+        apiId:
+          description: String identifying the API invoked.
+          title: apiId
+          type: string
+        apiName:
+          description: Name of the API which was invoked, it is set as {apiName} part
+            of the URI structure as defined in subclause 4.4 of 3GPP TS 29.501.
+          title: apiName
+          type: string
+        apiVersion:
+          description: Version of the API which was invoked
+          title: apiVersion
+          type: string
+        resourceName:
+          description: Name of the specific resource invoked
+          title: resourceName
+          type: string
+        uri:
+          description: string providing an URI formatted according to IETF RFC 3986.
+          title: Uri
+          type: string
+        protocol:
+          $ref: '#/components/schemas/Protocol'
+        operation:
+          $ref: '#/components/schemas/Operation'
+        result:
+          description: For HTTP protocol, it contains HTTP status code of the invocation
+          title: result
+          type: string
+        invocationTime:
+          description: string with format "date-time" as defined in OpenAPI.
+          format: date-time
+          title: DateTime
+          type: string
+        invocationLatency:
+          description: Unsigned integer identifying a period of time in units of milliseconds.
+          minimum: 0
+          title: DurationMs
+          type: integer
+        inputParameters:
+          description: List of input parameters. Can be any value - string, number,
+            boolean, array or object.
+          title: inputParameters
+        outputParameters:
+          description: List of output parameters. Can be any value - string, number,
+            boolean, array or object.
+          title: outputParameters
+        srcInterface:
+          $ref: '#/components/schemas/InterfaceDescription'
+        destInterface:
+          $ref: '#/components/schemas/InterfaceDescription'
+        fwdInterface:
+          description: It includes the node identifier (as defined in IETF RFC 7239
+            of all forwarding entities between the API invoker and the AEF, concatenated
+            with comma and space, e.g. 192.0.2.43:80, unknown:_OBFport, 203.0.113.60
+          title: fwdInterface
+          type: string
+      required:
+      - apiId
+      - apiName
+      - apiVersion
+      - protocol
+      - resourceName
+      - result
+      title: Log
+      type: object
+    DurationMs:
+      description: Unsigned integer identifying a period of time in units of milliseconds.
+      minimum: 0
+      title: DurationMs
+      type: integer
+    AccessControlPolicyList:
+      description: Represents the access control policy list for a published service
+        API.
+      properties:
+        apiInvokerPolicies:
+          description: Policy of each API invoker.
+          items:
+            $ref: '#/components/schemas/ApiInvokerPolicy'
+          minItems: 0
+          title: apiInvokerPolicies
+          type: array
+      title: AccessControlPolicyList
+      type: object
+    ApiInvokerPolicy:
+      description: Represents the policy of an API Invoker.
+      properties:
+        apiInvokerId:
+          description: API invoker ID assigned by the CAPIF core function
+          title: apiInvokerId
+          type: string
+        allowedTotalInvocations:
+          description: Total number of invocations allowed on the service API by the
+            API invoker.
+          title: allowedTotalInvocations
+          type: integer
+        allowedInvocationsPerSecond:
+          description: Invocations per second allowed on the service API by the API
+            invoker.
+          title: allowedInvocationsPerSecond
+          type: integer
+        allowedInvocationTimeRangeList:
+          description: The time ranges during which the invocations are allowed on
+            the service API by the API invoker.
+          items:
+            $ref: '#/components/schemas/TimeRangeList'
+          minItems: 0
+          title: allowedInvocationTimeRangeList
+          type: array
+      required:
+      - apiInvokerId
+      title: ApiInvokerPolicy
+      type: object
+    TimeRangeList:
+      description: Represents the time range during which the invocation of a service
+        API is allowed by the API invoker.
+      properties:
+        startTime:
+          description: string with format "date-time" as defined in OpenAPI.
+          format: date-time
+          title: DateTime
+          type: string
+        stopTime:
+          description: string with format "date-time" as defined in OpenAPI.
+          format: date-time
+          title: DateTime
+          type: string
+      title: TimeRangeList
+      type: object
+    RoutingRule:
+      description: Represents an API routing rule.
+      example:
+        ipv6AddrRanges:
+        - start: start
+          end: end
+        - start: start
+          end: end
+        aefProfile:
+          securityMethods:
+          - null
+          - null
+          versions:
+          - apiVersion: apiVersion
+            resources:
+            - operations:
+              - null
+              - null
+              description: description
+              resourceName: resourceName
+              custOpName: custOpName
+              uri: uri
+            - operations:
+              - null
+              - null
+              description: description
+              resourceName: resourceName
+              custOpName: custOpName
+              uri: uri
+            custOperations:
+            - operations:
+              - null
+              - null
+              description: description
+              custOpName: custOpName
+            - operations:
+              - null
+              - null
+              description: description
+              custOpName: custOpName
+            expiry: 2000-01-23T04:56:07.000+00:00
+          - apiVersion: apiVersion
+            resources:
+            - operations:
+              - null
+              - null
+              description: description
+              resourceName: resourceName
+              custOpName: custOpName
+              uri: uri
+            - operations:
+              - null
+              - null
+              description: description
+              resourceName: resourceName
+              custOpName: custOpName
+              uri: uri
+            custOperations:
+            - operations:
+              - null
+              - null
+              description: description
+              custOpName: custOpName
+            - operations:
+              - null
+              - null
+              description: description
+              custOpName: custOpName
+            expiry: 2000-01-23T04:56:07.000+00:00
+          domainName: domainName
+          aefId: aefId
+          interfaceDescriptions:
+          - ipv6Addr: ipv6Addr
+            securityMethods:
+            - null
+            - null
+            port: 5248
+            ipv4Addr: ipv4Addr
+          - ipv6Addr: ipv6Addr
+            securityMethods:
+            - null
+            - null
+            port: 5248
+            ipv4Addr: ipv4Addr
+        ipv4AddrRanges:
+        - start: 198.51.100.1
+          end: 198.51.100.1
+        - start: 198.51.100.1
+          end: 198.51.100.1
+      properties:
+        ipv4AddrRanges:
+          items:
+            $ref: '#/components/schemas/Ipv4AddressRange'
+          minItems: 1
+          title: ipv4AddrRanges
+          type: array
+        ipv6AddrRanges:
+          items:
+            $ref: '#/components/schemas/Ipv6AddressRange'
+          minItems: 1
+          title: ipv6AddrRanges
+          type: array
+        aefProfile:
+          $ref: '#/components/schemas/AefProfile'
+      required:
+      - aefProfile
+      title: RoutingRule
+      type: object
+    Ipv6AddressRange:
+      description: Represents IPv6 address range.
+      example:
+        start: start
+        end: end
+      properties:
+        start:
+          description: string identifying a Ipv6 address formatted according to clause
+            4 in IETF RFC 5952. The mixed Ipv4 Ipv6 notation according to clause 5
+            of IETF RFC 5952 shall not be used.
+          title: Ipv6Addr
+          type: string
+        end:
+          description: string identifying a Ipv6 address formatted according to clause
+            4 in IETF RFC 5952. The mixed Ipv4 Ipv6 notation according to clause 5
+            of IETF RFC 5952 shall not be used.
+          title: Ipv6Addr
+          type: string
+      required:
+      - end
+      - start
+      title: Ipv6AddressRange
+      type: object
+    NotificationMethod:
+      anyOf:
+      - $ref: '#/components/schemas/NotificationMethod_anyOf'
+      - description: |
+          This string provides forward-compatibility with future extensions to the enumeration but is not used to encode content defined in the present version of this API.
+        type: string
+      description: |
+        Possible values are - PERIODIC - ONE_TIME - ON_EVENT_DETECTION
+      title: NotificationMethod
+    Uinteger:
+      description: Unsigned Integer, i.e. only value 0 and integers above 0 are permissible.
+      minimum: 0
+      title: Uinteger
+      type: integer
+    DateTime:
+      description: string with format "date-time" as defined in OpenAPI.
+      format: date-time
+      title: DateTime
+      type: string
+    DurationSec:
+      description: indicating a time in seconds.
+      title: DurationSec
+      type: integer
+    SamplingRatio:
+      description: Unsigned integer indicating Sampling Ratio (see clauses 4.15.1
+        of 3GPP TS 23.502), expressed in percent.
+      maximum: 100
+      minimum: 1
+      title: SamplingRatio
+      type: integer
+    PartitioningCriteria:
+      anyOf:
+      - $ref: '#/components/schemas/PartitioningCriteria_anyOf'
+      - description: |
+          This string provides forward-compatibility with future extensions to the enumeration but is not used to encode content defined in the present version of this API.
+        type: string
+      description: |
+        Possible values are - "TAC": Type Allocation Code - "SUBPLMN": Subscriber PLMN ID - "GEOAREA": Geographical area, i.e. list(s) of TAI(s) - "SNSSAI": S-NSSAI - "DNN": DNN
+      title: PartitioningCriteria
+    NotificationFlag:
+      anyOf:
+      - $ref: '#/components/schemas/NotificationFlag_anyOf'
+      - description: |
+          This string provides forward-compatibility with future extensions to the enumeration but is not used to encode content defined in the present version of this API.
+        type: string
+      description: |
+        Possible values are - ACTIVATE: The event notification is activated. - DEACTIVATE: The event notification is deactivated and shall be muted. The available event(s) shall be stored. - RETRIEVAL: The event notification shall be sent to the NF service consumer(s), after that, is muted again.
+      title: NotificationFlag
+    Ipv4Addr:
+      description: string identifying a Ipv4 address formatted in the "dotted decimal"
+        notation as defined in IETF RFC 1166.
+      title: Ipv4Addr
+      type: string
+    Ipv6Addr:
+      description: string identifying a Ipv6 address formatted according to clause
+        4 in IETF RFC 5952. The mixed Ipv4 Ipv6 notation according to clause 5 of
+        IETF RFC 5952 shall not be used.
+      title: Ipv6Addr
+      type: string
+    Port:
+      description: Unsigned integer with valid values between 0 and 65535.
+      maximum: 65535
+      minimum: 0
+      title: Port
+      type: integer
+    Ipv4AddressRange:
+      description: Range of IPv4 addresses
+      example:
+        start: 198.51.100.1
+        end: 198.51.100.1
+      properties:
+        start:
+          description: String identifying a IPv4 address formatted in the "dotted
+            decimal" notation as defined in RFC 1166.
+          example: 198.51.100.1
+          pattern: ^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])$
+          title: Ipv4Addr_1
+          type: string
+        end:
+          description: String identifying a IPv4 address formatted in the "dotted
+            decimal" notation as defined in RFC 1166.
+          example: 198.51.100.1
+          pattern: ^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])$
+          title: Ipv4Addr_1
+          type: string
+      title: Ipv4AddressRange
+      type: object
+    Ipv4Addr_1:
+      description: String identifying a IPv4 address formatted in the "dotted decimal"
+        notation as defined in RFC 1166.
+      example: 198.51.100.1
+      pattern: ^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])$
+      title: Ipv4Addr_1
+      type: string
+    AccessControlPolicyListExt_allOf:
+      properties:
+        apiId:
+          title: apiId
+          type: string
+      title: AccessControlPolicyListExt_allOf
+      type: object
+    CAPIFEvent_anyOf:
+      enum:
+      - SERVICE_API_AVAILABLE
+      - SERVICE_API_UNAVAILABLE
+      - SERVICE_API_UPDATE
+      - API_INVOKER_ONBOARDED
+      - API_INVOKER_OFFBOARDED
+      - SERVICE_API_INVOCATION_SUCCESS
+      - SERVICE_API_INVOCATION_FAILURE
+      - ACCESS_CONTROL_POLICY_UPDATE
+      - ACCESS_CONTROL_POLICY_UNAVAILABLE
+      - API_INVOKER_AUTHORIZATION_REVOKED
+      - API_INVOKER_UPDATED
+      - API_TOPOLOGY_HIDING_CREATED
+      - API_TOPOLOGY_HIDING_REVOKED
+      title: CAPIFEvent_anyOf
+      type: string
+    CommunicationType_anyOf:
+      enum:
+      - REQUEST_RESPONSE
+      - SUBSCRIBE_NOTIFY
+      title: CommunicationType_anyOf
+      type: string
+    Operation_anyOf:
+      enum:
+      - GET
+      - POST
+      - PUT
+      - PATCH
+      - DELETE
+      title: Operation_anyOf
+      type: string
+    Protocol_anyOf:
+      enum:
+      - HTTP_1_1
+      - HTTP_2
+      title: Protocol_anyOf
+      type: string
+    DataFormat_anyOf:
+      enum:
+      - JSON
+      title: DataFormat_anyOf
+      type: string
+    SecurityMethod_anyOf:
+      enum:
+      - PSK
+      - PKI
+      - OAUTH
+      title: SecurityMethod_anyOf
+      type: string
+    NotificationMethod_anyOf:
+      enum:
+      - PERIODIC
+      - ONE_TIME
+      - ON_EVENT_DETECTION
+      title: NotificationMethod_anyOf
+      type: string
+    PartitioningCriteria_anyOf:
+      enum:
+      - TAC
+      - SUBPLMN
+      - GEOAREA
+      - SNSSAI
+      - DNN
+      title: PartitioningCriteria_anyOf
+      type: string
+    NotificationFlag_anyOf:
+      enum:
+      - ACTIVATE
+      - DEACTIVATE
+      - RETRIEVAL
+      title: NotificationFlag_anyOf
+      type: string
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/typing_utils.py b/services/TS29222_CAPIF_Events_API/capif_events/typing_utils.py
new file mode 100644
index 0000000000000000000000000000000000000000..0563f81fd5345282a33705038dfa77fdcaa15872
--- /dev/null
+++ b/services/TS29222_CAPIF_Events_API/capif_events/typing_utils.py
@@ -0,0 +1,32 @@
+# coding: utf-8
+
+import sys
+
+if sys.version_info < (3, 7):
+    import typing
+
+    def is_generic(klass):
+        """ Determine whether klass is a generic class """
+        return type(klass) == typing.GenericMeta
+
+    def is_dict(klass):
+        """ Determine whether klass is a Dict """
+        return klass.__extra__ == dict
+
+    def is_list(klass):
+        """ Determine whether klass is a List """
+        return klass.__extra__ == list
+
+else:
+
+    def is_generic(klass):
+        """ Determine whether klass is a generic class """
+        return hasattr(klass, '__origin__')
+
+    def is_dict(klass):
+        """ Determine whether klass is a Dict """
+        return klass.__origin__ == dict
+
+    def is_list(klass):
+        """ Determine whether klass is a List """
+        return klass.__origin__ == list
diff --git a/services/TS29222_CAPIF_Events_API/capif_events/util.py b/services/TS29222_CAPIF_Events_API/capif_events/util.py
new file mode 100644
index 0000000000000000000000000000000000000000..396c6a5b258c051cf1c86b93d2bf79e998463ace
--- /dev/null
+++ b/services/TS29222_CAPIF_Events_API/capif_events/util.py
@@ -0,0 +1,175 @@
+import datetime
+
+import six
+import typing
+from capif_events import typing_utils
+
+
+def dict_to_camel_case(my_dict):
+
+
+        result = {}
+
+        for attr, value in my_dict.items():
+
+            my_key = ''.join(word.title() for word in attr.split('_'))
+            my_key= ''.join([my_key[0].lower(), my_key[1:]])
+
+            if isinstance(value, list):
+                result[my_key] = list(map(
+                    lambda x: dict_to_camel_case(x) if isinstance(x, dict) else x, value ))
+
+            elif hasattr(value, "to_dict"):
+                result[my_key] = dict_to_camel_case(value)
+
+            elif isinstance(value, dict):
+                value = dict_to_camel_case(value)
+                result[my_key] = value
+            else:
+                result[my_key] = value
+
+        return result
+
+
+
+def _deserialize(data, klass):
+    """Deserializes dict, list, str into an object.
+
+    :param data: dict, list or str.
+    :param klass: class literal, or string of class name.
+
+    :return: object.
+    """
+    if data is None:
+        return None
+
+    if klass in six.integer_types or klass in (float, str, bool, bytearray):
+        return _deserialize_primitive(data, klass)
+    elif klass == object:
+        return _deserialize_object(data)
+    elif klass == datetime.date:
+        return deserialize_date(data)
+    elif klass == datetime.datetime:
+        return deserialize_datetime(data)
+    elif typing_utils.is_generic(klass):
+        if typing_utils.is_list(klass):
+            return _deserialize_list(data, klass.__args__[0])
+        if typing_utils.is_dict(klass):
+            return _deserialize_dict(data, klass.__args__[1])
+    else:
+        return deserialize_model(data, klass)
+
+
+def _deserialize_primitive(data, klass):
+    """Deserializes to primitive type.
+
+    :param data: data to deserialize.
+    :param klass: class literal.
+
+    :return: int, long, float, str, bool.
+    :rtype: int | long | float | str | bool
+    """
+    try:
+        value = klass(data)
+    except UnicodeEncodeError:
+        value = six.u(data)
+    except TypeError:
+        value = data
+    return value
+
+
+def _deserialize_object(value):
+    """Return an original value.
+
+    :return: object.
+    """
+    return value
+
+
+def deserialize_date(string):
+    """Deserializes string to date.
+
+    :param string: str.
+    :type string: str
+    :return: date.
+    :rtype: date
+    """
+    if string is None:
+      return None
+    
+    try:
+        from dateutil.parser import parse
+        return parse(string).date()
+    except ImportError:
+        return string
+
+
+def deserialize_datetime(string):
+    """Deserializes string to datetime.
+
+    The string should be in iso8601 datetime format.
+
+    :param string: str.
+    :type string: str
+    :return: datetime.
+    :rtype: datetime
+    """
+    if string is None:
+      return None
+    
+    try:
+        from dateutil.parser import parse
+        return parse(string)
+    except ImportError:
+        return string
+
+
+def deserialize_model(data, klass):
+    """Deserializes list or dict to model.
+
+    :param data: dict, list.
+    :type data: dict | list
+    :param klass: class literal.
+    :return: model object.
+    """
+    instance = klass()
+
+    if not instance.openapi_types:
+        return data
+
+    for attr, attr_type in six.iteritems(instance.openapi_types):
+        if data is not None \
+                and instance.attribute_map[attr] in data \
+                and isinstance(data, (list, dict)):
+            value = data[instance.attribute_map[attr]]
+            setattr(instance, attr, _deserialize(value, attr_type))
+
+    return instance
+
+
+def _deserialize_list(data, boxed_type):
+    """Deserializes a list and its elements.
+
+    :param data: list to deserialize.
+    :type data: list
+    :param boxed_type: class literal.
+
+    :return: deserialized list.
+    :rtype: list
+    """
+    return [_deserialize(sub_data, boxed_type)
+            for sub_data in data]
+
+
+def _deserialize_dict(data, boxed_type):
+    """Deserializes a dict and its elements.
+
+    :param data: dict to deserialize.
+    :type data: dict
+    :param boxed_type: class literal.
+
+    :return: deserialized dict.
+    :rtype: dict
+    """
+    return {k: _deserialize(v, boxed_type)
+            for k, v in six.iteritems(data)}
diff --git a/services/TS29222_CAPIF_Events_API/config.yaml b/services/TS29222_CAPIF_Events_API/config.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..101d300e8b86d57d77a4d054e9100cc25bf42aa0
--- /dev/null
+++ b/services/TS29222_CAPIF_Events_API/config.yaml
@@ -0,0 +1,23 @@
+mongo: {
+  'user': 'root',
+  'password': 'example',
+  'db': 'capif',
+  'col': 'eventsdetails',
+  'certs_col': "certs",
+  'capif_invokers_col': 'invokerdetails',
+  'capif_providers_col': 'providerenrolmentdetails',
+  'capif_acls_col': 'acls',
+  'host': 'mongo',
+  'port': "27017"
+}
+
+monitoring: {
+  "fluent_bit_host": fluent-bit,
+  "fluent_bit_port": 24224,
+  "opentelemetry_url": "otel-collector",
+  "opentelemetry_port": "55680",
+  "opentelemetry_max_queue_size": 8192,
+  "opentelemetry_schedule_delay_millis": 20000,
+  "opentelemetry_max_export_batch_size": 2048,
+  "opentelemetry_export_timeout_millis": 60000
+}
diff --git a/services/TS29222_CAPIF_Events_API/git_push.sh b/services/TS29222_CAPIF_Events_API/git_push.sh
new file mode 100644
index 0000000000000000000000000000000000000000..9405f72e950cdb8ca24c3cf4d15cee7eac62fde7
--- /dev/null
+++ b/services/TS29222_CAPIF_Events_API/git_push.sh
@@ -0,0 +1,57 @@
+#!/bin/sh
+# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
+#
+# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl "minor update" "gitlab.com"
+
+git_user_id=$1
+git_repo_id=$2
+release_note=$3
+git_host=$4
+
+if [ "$git_host" = "" ]; then
+    git_host="github.com"
+    echo "[INFO] No command line input provided. Set \$git_host to $git_host"
+fi
+
+if [ "$git_user_id" = "" ]; then
+    git_user_id="GIT_USER_ID"
+    echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id"
+fi
+
+if [ "$git_repo_id" = "" ]; then
+    git_repo_id="GIT_REPO_ID"
+    echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id"
+fi
+
+if [ "$release_note" = "" ]; then
+    release_note="Minor update"
+    echo "[INFO] No command line input provided. Set \$release_note to $release_note"
+fi
+
+# Initialize the local directory as a Git repository
+git init
+
+# Adds the files in the local repository and stages them for commit.
+git add .
+
+# Commits the tracked changes and prepares them to be pushed to a remote repository.
+git commit -m "$release_note"
+
+# Sets the new remote
+git_remote=`git remote`
+if [ "$git_remote" = "" ]; then # git remote not defined
+
+    if [ "$GIT_TOKEN" = "" ]; then
+        echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git credential in your environment."
+        git remote add origin https://${git_host}/${git_user_id}/${git_repo_id}.git
+    else
+        git remote add origin https://${git_user_id}:${GIT_TOKEN}@${git_host}/${git_user_id}/${git_repo_id}.git
+    fi
+
+fi
+
+git pull origin master
+
+# Pushes (Forces) the changes in the local repository up to the remote repository
+echo "Git pushing to https://${git_host}/${git_user_id}/${git_repo_id}.git"
+git push origin master 2>&1 | grep -v 'To https'
diff --git a/services/TS29222_CAPIF_Events_API/requirements.txt b/services/TS29222_CAPIF_Events_API/requirements.txt
new file mode 100644
index 0000000000000000000000000000000000000000..bbef950cda414a17f3ebb70ca8689ae35c121ca0
--- /dev/null
+++ b/services/TS29222_CAPIF_Events_API/requirements.txt
@@ -0,0 +1,23 @@
+connexion[swagger-ui] == 2.14.2; python_version>="3.6"
+swagger-ui-bundle >= 0.0.2
+python_dateutil >= 2.6.0
+setuptools >= 21.0.0
+Flask == 2.0.3
+pymongo == 4.0.1
+opentelemetry-instrumentation == 0.38b0
+opentelemetry-instrumentation-flask == 0.38b0
+opentelemetry-instrumentation-redis == 0.38b0
+opentelemetry-instrumentation-pymongo == 0.38b0
+opentelemetry-exporter-otlp == 1.17.0
+opentelemetry-exporter-jaeger==1.17.0
+fluent == 0.10.0
+fluent-logger == 0.10.0
+opentelemetry-api == 1.17.0
+opentelemetry-sdk == 1.17.0
+flask_executor == 1.0.0
+flask_jwt_extended
+pyopenssl
+rfc3987
+redis
+flask_executor
+Flask-APScheduler
diff --git a/services/TS29222_CAPIF_Events_API/setup.py b/services/TS29222_CAPIF_Events_API/setup.py
new file mode 100644
index 0000000000000000000000000000000000000000..6ac5631dac95d9c1e7c12c25cfad23e2545309e5
--- /dev/null
+++ b/services/TS29222_CAPIF_Events_API/setup.py
@@ -0,0 +1,39 @@
+# coding: utf-8
+
+import sys
+from setuptools import setup, find_packages
+
+NAME = "capif_events"
+VERSION = "1.0.0"
+
+# To install the library, run the following
+#
+# python setup.py install
+#
+# prerequisite: setuptools
+# http://pypi.python.org/pypi/setuptools
+
+REQUIRES = [
+    "connexion>=2.0.2",
+    "swagger-ui-bundle>=0.0.2",
+    "python_dateutil>=2.6.0"
+]
+
+setup(
+    name=NAME,
+    version=VERSION,
+    description="CAPIF_Events_API",
+    author_email="",
+    url="",
+    keywords=["OpenAPI", "CAPIF_Events_API"],
+    install_requires=REQUIRES,
+    packages=find_packages(),
+    package_data={'': ['openapi/openapi.yaml']},
+    include_package_data=True,
+    entry_points={
+        'console_scripts': ['capif_events=capif_events.__main__:main']},
+    long_description="""\
+    API for event subscription management. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. 
+    """
+)
+
diff --git a/services/TS29222_CAPIF_Events_API/test-requirements.txt b/services/TS29222_CAPIF_Events_API/test-requirements.txt
new file mode 100644
index 0000000000000000000000000000000000000000..0970f28c7c5a344d7fd9b9c893c584e7336df266
--- /dev/null
+++ b/services/TS29222_CAPIF_Events_API/test-requirements.txt
@@ -0,0 +1,4 @@
+pytest~=4.6.7 # needed for python 2.7+3.4
+pytest-cov>=2.8.1
+pytest-randomly==1.2.3 # needed for python 2.7+3.4
+Flask-Testing==0.8.0
diff --git a/services/TS29222_CAPIF_Events_API/tox.ini b/services/TS29222_CAPIF_Events_API/tox.ini
new file mode 100644
index 0000000000000000000000000000000000000000..8ef20cd60fb4784affc6da7cb242fb29f10a3e3e
--- /dev/null
+++ b/services/TS29222_CAPIF_Events_API/tox.ini
@@ -0,0 +1,11 @@
+[tox]
+envlist = py3
+skipsdist=True
+
+[testenv]
+deps=-r{toxinidir}/requirements.txt
+     -r{toxinidir}/test-requirements.txt
+	 {toxinidir}
+
+commands=
+   pytest --cov=capif_events
diff --git a/services/TS29222_CAPIF_Logging_API_Invocation_API/.dockerignore b/services/TS29222_CAPIF_Logging_API_Invocation_API/.dockerignore
new file mode 100644
index 0000000000000000000000000000000000000000..f9619601908b43d5d90c9befea5aa6ef6a732fa9
--- /dev/null
+++ b/services/TS29222_CAPIF_Logging_API_Invocation_API/.dockerignore
@@ -0,0 +1,72 @@
+.travis.yaml
+.openapi-generator-ignore
+README.md
+tox.ini
+git_push.sh
+test-requirements.txt
+setup.py
+
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+env/
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*,cover
+.hypothesis/
+venv/
+.python-version
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+#Ipython Notebook
+.ipynb_checkpoints
diff --git a/services/TS29222_CAPIF_Logging_API_Invocation_API/.gitignore b/services/TS29222_CAPIF_Logging_API_Invocation_API/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..43995bd42fa23bbc4c3a59d5fb9da99042fcf139
--- /dev/null
+++ b/services/TS29222_CAPIF_Logging_API_Invocation_API/.gitignore
@@ -0,0 +1,66 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+env/
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*,cover
+.hypothesis/
+venv/
+.venv/
+.python-version
+.pytest_cache
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+#Ipython Notebook
+.ipynb_checkpoints
diff --git a/services/TS29222_CAPIF_Logging_API_Invocation_API/.openapi-generator-ignore b/services/TS29222_CAPIF_Logging_API_Invocation_API/.openapi-generator-ignore
new file mode 100644
index 0000000000000000000000000000000000000000..7484ee590a3894506cf063799b885428f95a71be
--- /dev/null
+++ b/services/TS29222_CAPIF_Logging_API_Invocation_API/.openapi-generator-ignore
@@ -0,0 +1,23 @@
+# OpenAPI Generator Ignore
+# Generated by openapi-generator https://github.com/openapitools/openapi-generator
+
+# Use this file to prevent files from being overwritten by the generator.
+# The patterns follow closely to .gitignore or .dockerignore.
+
+# As an example, the C# client generator defines ApiClient.cs.
+# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line:
+#ApiClient.cs
+
+# You can match any string of characters against a directory, file or extension with a single asterisk (*):
+#foo/*/qux
+# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
+
+# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
+#foo/**/qux
+# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
+
+# You can also negate patterns with an exclamation (!).
+# For example, you can ignore all files in a docs folder with the file extension .md:
+#docs/*.md
+# Then explicitly reverse the ignore rule for a single file:
+#!docs/README.md
diff --git a/services/TS29222_CAPIF_Logging_API_Invocation_API/.openapi-generator/FILES b/services/TS29222_CAPIF_Logging_API_Invocation_API/.openapi-generator/FILES
new file mode 100644
index 0000000000000000000000000000000000000000..42622dc2876ba25dcf5b2283ab3136c094690452
--- /dev/null
+++ b/services/TS29222_CAPIF_Logging_API_Invocation_API/.openapi-generator/FILES
@@ -0,0 +1,33 @@
+.dockerignore
+.gitignore
+.travis.yml
+Dockerfile
+README.md
+api_invocation_logs/__init__.py
+api_invocation_logs/__main__.py
+api_invocation_logs/controllers/__init__.py
+api_invocation_logs/controllers/default_controller.py
+api_invocation_logs/controllers/security_controller_.py
+api_invocation_logs/encoder.py
+api_invocation_logs/models/__init__.py
+api_invocation_logs/models/base_model_.py
+api_invocation_logs/models/interface_description.py
+api_invocation_logs/models/invalid_param.py
+api_invocation_logs/models/invocation_log.py
+api_invocation_logs/models/log.py
+api_invocation_logs/models/operation.py
+api_invocation_logs/models/operation_any_of.py
+api_invocation_logs/models/problem_details.py
+api_invocation_logs/models/protocol.py
+api_invocation_logs/models/protocol_any_of.py
+api_invocation_logs/models/security_method.py
+api_invocation_logs/models/security_method_any_of.py
+api_invocation_logs/openapi/openapi.yaml
+api_invocation_logs/test/__init__.py
+api_invocation_logs/typing_utils.py
+api_invocation_logs/util.py
+git_push.sh
+requirements.txt
+setup.py
+test-requirements.txt
+tox.ini
diff --git a/services/TS29222_CAPIF_Logging_API_Invocation_API/.openapi-generator/VERSION b/services/TS29222_CAPIF_Logging_API_Invocation_API/.openapi-generator/VERSION
new file mode 100644
index 0000000000000000000000000000000000000000..4b448de535c7dd619da0df6d8221995dbd5d118a
--- /dev/null
+++ b/services/TS29222_CAPIF_Logging_API_Invocation_API/.openapi-generator/VERSION
@@ -0,0 +1 @@
+5.3.0-SNAPSHOT
\ No newline at end of file
diff --git a/services/TS29222_CAPIF_Logging_API_Invocation_API/.travis.yml b/services/TS29222_CAPIF_Logging_API_Invocation_API/.travis.yml
new file mode 100644
index 0000000000000000000000000000000000000000..ad71ee5ca083a6923c91104533c5c7b86f297f3f
--- /dev/null
+++ b/services/TS29222_CAPIF_Logging_API_Invocation_API/.travis.yml
@@ -0,0 +1,14 @@
+# ref: https://docs.travis-ci.com/user/languages/python
+language: python
+python:
+  - "3.2"
+  - "3.3"
+  - "3.4"
+  - "3.5"
+  - "3.6"
+  - "3.7"
+  - "3.8"
+# command to install dependencies
+install: "pip install -r requirements.txt"
+# command to run tests
+script: nosetests
diff --git a/services/TS29222_CAPIF_Logging_API_Invocation_API/Dockerfile b/services/TS29222_CAPIF_Logging_API_Invocation_API/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..7339cecd74384864a4d4414b579e0dbc012e6b1c
--- /dev/null
+++ b/services/TS29222_CAPIF_Logging_API_Invocation_API/Dockerfile
@@ -0,0 +1,17 @@
+FROM public.ecr.aws/o2v4a8t6/opencapif/python:3-alpine
+
+RUN mkdir -p /usr/src/app
+WORKDIR /usr/src/app
+
+COPY requirements.txt /usr/src/app/requirements.txt
+
+RUN apk add -U --no-cache gcc build-base linux-headers ca-certificates libffi-dev libressl-dev libxslt-dev
+RUN pip3 install --no-cache-dir -r requirements.txt
+
+COPY . /usr/src/app
+
+EXPOSE 8080
+
+ENTRYPOINT ["python3"]
+
+CMD ["-m", "api_invocation_logs"]
\ No newline at end of file
diff --git a/services/TS29222_CAPIF_Logging_API_Invocation_API/README.md b/services/TS29222_CAPIF_Logging_API_Invocation_API/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..4c9ab923afeaccca940210e6dab592af62487c1e
--- /dev/null
+++ b/services/TS29222_CAPIF_Logging_API_Invocation_API/README.md
@@ -0,0 +1,49 @@
+# OpenAPI generated server
+
+## Overview
+This server was generated by the [OpenAPI Generator](https://openapi-generator.tech) project. By using the
+[OpenAPI-Spec](https://openapis.org) from a remote server, you can easily generate a server stub.  This
+is an example of building a OpenAPI-enabled Flask server.
+
+This example uses the [Connexion](https://github.com/zalando/connexion) library on top of Flask.
+
+## Requirements
+Python 3.5.2+
+
+## Usage
+To run the server, please execute the following from the root directory:
+
+```
+pip3 install -r requirements.txt
+python3 -m api_invocation_logs
+```
+
+and open your browser to here:
+
+```
+http://localhost:8080/api-invocation-logs/v1/ui/
+```
+
+Your OpenAPI definition lives here:
+
+```
+http://localhost:8080/api-invocation-logs/v1/openapi.json
+```
+
+To launch the integration tests, use tox:
+```
+sudo pip install tox
+tox
+```
+
+## Running with Docker
+
+To run the server on a Docker container, please execute the following from the root directory:
+
+```bash
+# building the image
+docker build -t api_invocation_logs .
+
+# starting up a container
+docker run -p 8080:8080 api_invocation_logs
+```
\ No newline at end of file
diff --git a/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/__init__.py b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/__main__.py b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/__main__.py
new file mode 100644
index 0000000000000000000000000000000000000000..f5323c9ef96c6ffeb29dcdb8e932859a7d1f64d0
--- /dev/null
+++ b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/__main__.py
@@ -0,0 +1,120 @@
+#!/usr/bin/env python3
+
+import connexion
+import logging
+from logging.handlers import RotatingFileHandler
+from api_invocation_logs import encoder
+from .config import Config
+import os
+from fluent import sender
+from opentelemetry.instrumentation.flask import FlaskInstrumentor
+from opentelemetry import trace
+from opentelemetry.exporter.otlp.proto.grpc.trace_exporter import OTLPSpanExporter
+from opentelemetry.trace.propagation.tracecontext import TraceContextTextMapPropagator
+from opentelemetry.sdk.resources import Resource
+from opentelemetry.sdk.trace import TracerProvider
+from opentelemetry.sdk.trace.export import BatchSpanProcessor
+
+
+
+
+NAME = "Logging-Service"
+
+def configure_monitoring(app, config):
+
+    resource = Resource(attributes={"service.name": NAME})
+
+    fluent_bit_host = config['monitoring']['fluent_bit_host']
+    fluent_bit_port = config['monitoring']['fluent_bit_port']
+    fluent_bit_sender = sender.FluentSender('Logging-Service', host=fluent_bit_host, port=fluent_bit_port)
+    propagator = TraceContextTextMapPropagator()
+
+    tracer_provider = TracerProvider(resource=resource)
+    trace.set_tracer_provider(tracer_provider)
+    exporter = OTLPSpanExporter(endpoint=f"http://{config['monitoring']['opentelemetry_url']}:{config['monitoring']['opentelemetry_port']}", insecure=True)
+    span_processor = BatchSpanProcessor(
+        exporter,
+        max_queue_size=config['monitoring']['opentelemetry_max_queue_size'],
+        schedule_delay_millis=config['monitoring']['opentelemetry_schedule_delay_millis'],
+        max_export_batch_size=config['monitoring']['opentelemetry_max_export_batch_size'],
+        export_timeout_millis=config['monitoring']['opentelemetry_export_timeout_millis'],
+    )
+
+    trace.get_tracer_provider().add_span_processor(span_processor)
+
+    FlaskInstrumentor().instrument_app(app)
+
+    class FluentBitHandler(logging.Handler):
+
+        def __init__(self):
+            logging.Handler.__init__(self)
+
+        def emit(self, record):
+            log_entry = self.format(record)
+            log_data = {
+                'message': log_entry,
+                'level': record.levelname,
+                'timestamp': record.created,
+                'logger': record.name,
+                'function': record.funcName,
+                'line': record.lineno,
+                'container_name': os.environ.get('CONTAINER_NAME', ''),
+            }
+
+            # # Obtener el trace ID actual
+            current_context = trace.get_current_span().get_span_context()
+
+            trace_id = current_context.trace_id
+            traceparent_id = current_context.span_id
+            log_data['traceID'] = hex(trace_id)[2:]
+            if traceparent_id != None:
+                log_data['traceparent'] = hex(traceparent_id)[2:]
+            fluent_bit_sender.emit('Logging-Service', log_data)
+
+    loggers = [app.logger, ]
+    for l in loggers:
+         l.addHandler(FluentBitHandler())
+
+
+def configure_logging(app):
+    del app.logger.handlers[:]
+    loggers = [app.logger, ]
+    handlers = []
+    console_handler = logging.StreamHandler()
+    console_handler.setLevel(logging.DEBUG)
+    console_handler.setFormatter(verbose_formatter())
+    file_handler = RotatingFileHandler(filename="logging_logs.log", maxBytes=1024 * 1024 * 100, backupCount=20)
+    file_handler.setLevel(logging.DEBUG)
+    file_handler.setFormatter(verbose_formatter())
+    handlers.append(console_handler)
+    handlers.append(file_handler)
+  
+
+    for l in loggers:
+        for handler in handlers:
+            l.addHandler(handler)
+        l.propagate = False
+        l.setLevel(logging.DEBUG)
+
+
+def verbose_formatter():
+    return logging.Formatter(
+        '{"timestamp": "%(asctime)s", "level": "%(levelname)s", "logger": "%(name)s", "function": "%(funcName)s", "line": %(lineno)d, "message": %(message)s}',
+        datefmt='%d/%m/%Y %H:%M:%S'
+    )
+
+app = connexion.App(__name__, specification_dir='./openapi/')
+app.app.json_encoder = encoder.JSONEncoder
+app.add_api('openapi.yaml',
+            arguments={'title': 'CAPIF_Logging_API_Invocation_API'},
+            pythonic_params=True)
+
+configure_logging(app.app)
+
+config = Config()
+
+if eval(os.environ.get("MONITORING").lower().capitalize()):
+    configure_monitoring(app.app, config.get_config())
+
+if __name__ == '__main__':
+    app.run(port=8080)
diff --git a/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/config.py b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/config.py
new file mode 100644
index 0000000000000000000000000000000000000000..d04bd1acd87603f491b09f464d8db1d6cdc52ad7
--- /dev/null
+++ b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/config.py
@@ -0,0 +1,20 @@
+import yaml
+import os
+
+#Config class to get config
+class Config:
+	def __init__(self):
+		self.cached = 0
+		self.file="./config.yaml"
+		self.my_config = {}
+
+		stamp = os.stat(self.file).st_mtime
+		if stamp != self.cached:
+			self.cached = stamp
+			f = open(self.file)
+			self.my_config = yaml.safe_load(f)
+			f.close()
+
+	def get_config(self):
+		return self.my_config
+
diff --git a/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/controllers/__init__.py b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/controllers/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/controllers/default_controller.py b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/controllers/default_controller.py
new file mode 100644
index 0000000000000000000000000000000000000000..eb0cd986a51c521efd0f201c10cb529f65e45d51
--- /dev/null
+++ b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/controllers/default_controller.py
@@ -0,0 +1,69 @@
+import connexion
+
+from api_invocation_logs.models.invocation_log import InvocationLog  # noqa: E501
+
+from ..core.invocationlogs import LoggingInvocationOperations
+
+import json
+from flask import Response, request, current_app
+from ..encoder import JSONEncoder
+from ..models.problem_details import ProblemDetails
+from ..core.validate_user import ControlAccess
+from cryptography import x509
+from cryptography.hazmat.backends import default_backend
+
+logging_invocation_operations = LoggingInvocationOperations()
+
+valid_user = ControlAccess()
+
+
+def cert_validation():
+    def _cert_validation(f):
+        @wraps(f)
+        def __cert_validation(*args, **kwargs):
+
+            args = request.view_args
+            cert_tmp = request.headers['X-Ssl-Client-Cert']
+            cert_raw = cert_tmp.replace('\t', '')
+
+            cert = x509.load_pem_x509_certificate(str.encode(cert_raw), default_backend())
+
+            cn = cert.subject.get_attributes_for_oid(x509.OID_COMMON_NAME)[0].value.strip()
+
+            if cn != "superadmin":
+                cert_signature = cert.signature.hex()
+                result = valid_user.validate_user_cert(args["aefId"], cert_signature)
+
+                if result is not None:
+                    return result
+
+            result = f(**kwargs)
+            return result
+        return __cert_validation
+    return _cert_validation
+
+
+def aef_id_logs_post(aef_id, body):  # noqa: E501
+    """aef_id_logs_post
+
+    Creates a new log entry for service API invocations. # noqa: E501
+
+    :param aef_id: Identifier of the API exposing function
+    :type aef_id: str
+    :param invocation_log: 
+    :type invocation_log: dict | bytes
+
+    :rtype: InvocationLog
+    """
+    current_app.logger.info("API Invocation Logs")
+
+    if connexion.request.is_json:
+        body = InvocationLog.from_dict(connexion.request.get_json())  # noqa: E501
+
+    res = logging_invocation_operations.add_invocationlog(aef_id, body)
+
+    if res.status_code == 201:
+        current_app.logger.info("Invocation Logs stored successfully")
+
+    return res
+
diff --git a/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/controllers/security_controller_.py b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/controllers/security_controller_.py
new file mode 100644
index 0000000000000000000000000000000000000000..6d294ffd6df1a26a469dbb4e72533b01503468dd
--- /dev/null
+++ b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/controllers/security_controller_.py
@@ -0,0 +1,2 @@
+from typing import List
+
diff --git a/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/core/invocationlogs.py b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/core/invocationlogs.py
new file mode 100644
index 0000000000000000000000000000000000000000..dde0c649d29cbd53c51ba20119422551f415e031
--- /dev/null
+++ b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/core/invocationlogs.py
@@ -0,0 +1,121 @@
+import sys
+import os
+import pymongo
+import secrets
+from flask import current_app, Flask, Response
+import json
+
+from ..db.db import MongoDatabse
+from ..encoder import JSONEncoder
+from ..models.problem_details import ProblemDetails
+from pymongo import ReturnDocument
+from ..util import dict_to_camel_case, clean_empty
+from .resources import Resource
+from .responses import bad_request_error, internal_server_error, forbidden_error, not_found_error, unauthorized_error, make_response
+from ..models.invocation_log import InvocationLog
+
+
+class LoggingInvocationOperations(Resource):
+
+    def __check_aef(self, request_aef_id, body_aef_id):
+
+        prov_col = self.db.get_col_by_name(self.db.provider_details)
+
+        current_app.logger.debug("Checking aef id")
+        aef_res = prov_col.find_one({'api_prov_funcs': {'$elemMatch': {'api_prov_func_role': 'AEF', 'api_prov_func_id': request_aef_id}}})
+
+        if aef_res is None:
+            current_app.logger.error("Exposer not exist")
+            return not_found_error(detail="Exposer not exist", cause="Exposer id not found")
+
+        if request_aef_id != body_aef_id:
+            return unauthorized_error(detail="AEF id not matching in request and body", cause="Not identical AEF id")
+
+
+        return None
+
+    def __check_invoker(self, invoker_id):
+        inv_col = self.db.get_col_by_name(self.db.invoker_details)
+
+        current_app.logger.debug("Checking invoker id")
+        invoker_res = inv_col.find_one({'api_invoker_id': invoker_id})
+
+        if invoker_res is None:
+            current_app.logger.error("Invoker not exist")
+            return not_found_error(detail="Invoker not exist", cause="Invoker id not found")
+
+        return None
+
+    def __check_service_apis(self, api_id, api_name):
+        serv_apis = self.db.get_col_by_name(self.db.service_apis)
+
+        current_app.logger.debug("Checking service apis")
+        services_api_res = serv_apis.find_one({"$and": [{'api_id': api_id}, {'api_name': api_name}]})
+
+        if services_api_res is None:
+            detail = "Service API not exist"
+            cause = "Service API with id {} and name {} not found".format(api_id, api_name)
+            current_app.logger.error(detail)
+            return not_found_error(detail=detail, cause=cause)
+
+        return None
+
+    def add_invocationlog(self, aef_id, invocationlog):
+
+        mycol = self.db.get_col_by_name(self.db.invocation_logs)
+
+        try:
+            current_app.logger.debug("Adding invocation logs")
+            current_app.logger.debug("Check request aef_id")
+            result = self.__check_aef(aef_id, invocationlog.aef_id)
+
+            if result is not None:
+                return result
+
+            current_app.logger.debug("Check request api_invoker_id")
+            result = self.__check_invoker(invocationlog.api_invoker_id)
+
+            if result is not None:
+                return result
+
+            current_app.logger.debug("Check service apis")
+            for log in invocationlog.logs:
+                result = self.__check_service_apis(log.api_id, log.api_name)
+
+                if result is not None:
+                    return result
+
+            current_app.logger.debug("Check existing logs")
+            my_query = {'aef_id': aef_id, 'api_invoker_id': invocationlog.api_invoker_id}
+            existing_invocationlog = mycol.find_one(my_query)
+
+            if existing_invocationlog is None:
+                current_app.logger.debug("Create new log")
+                log_id = secrets.token_hex(15)
+                rec = dict()
+                rec['log_id'] = log_id
+                rec.update(invocationlog.to_dict())
+                mycol.insert_one(rec)
+            else:
+                current_app.logger.debug("Update existing log")
+                log_id = existing_invocationlog['log_id']
+                updated_invocation_logs = invocationlog.to_dict()
+                for updated_invocation_log in updated_invocation_logs['logs']:
+                    existing_invocationlog['logs'].append(updated_invocation_log)
+                mycol.find_one_and_update(my_query, {"$set": existing_invocationlog}, projection={'_id': 0, 'log_id': 0}, return_document=ReturnDocument.AFTER, upsert=False)
+
+            res = make_response(object=invocationlog, status=201)
+            current_app.logger.debug("Invocation Logs response ready")
+
+            apis_added = {log.api_id:log.api_name for log in invocationlog.logs}
+
+            current_app.logger.debug(f"Added log entry to apis: {apis_added}")
+
+            res.headers['Location'] = "https://{}/api-invocation-logs/v1/{}/logs/{}".format(os.getenv('CAPIF_HOSTNAME'), str(aef_id), str(log_id))
+            return res
+
+        except Exception as e:
+            exception = "An exception occurred in inserting invocation logs"
+            current_app.logger.error(exception + "::" + str(e))
+            return internal_server_error(detail=exception, cause=str(e))
+
diff --git a/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/core/resources.py b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/core/resources.py
new file mode 100644
index 0000000000000000000000000000000000000000..d55b30c74cf87bf22eec115dfc1bd0e6d413a018
--- /dev/null
+++ b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/core/resources.py
@@ -0,0 +1,8 @@
+from abc import ABC, abstractmethod
+from ..db.db import MongoDatabse
+
+
+class Resource(ABC):
+
+    def __init__(self):
+        self.db = MongoDatabse()
\ No newline at end of file
diff --git a/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/core/responses.py b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/core/responses.py
new file mode 100644
index 0000000000000000000000000000000000000000..3a136b1459f0cad9410148983fbdfbbe294a03d0
--- /dev/null
+++ b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/core/responses.py
@@ -0,0 +1,43 @@
+from ..models.problem_details import ProblemDetails
+from ..encoder import JSONEncoder
+from flask import Response
+import json
+from bson import json_util
+
+mimetype = "application/json"
+
+
+def make_response(object, status):
+    res = Response(json.dumps(object, cls=JSONEncoder), status=status, mimetype=mimetype)
+
+    return res
+
+
+def internal_server_error(detail, cause):
+    prob = ProblemDetails(title="Internal Server Error", status=500, detail=detail, cause=cause)
+
+    return Response(json.dumps(prob, cls=JSONEncoder), status=500, mimetype=mimetype)
+
+
+def forbidden_error(detail, cause):
+    prob = ProblemDetails(title="Forbidden", status=403, detail=detail, cause=cause)
+
+    return Response(json.dumps(prob, cls=JSONEncoder), status=403, mimetype=mimetype)
+
+
+def bad_request_error(detail, cause, invalid_params):
+    prob = ProblemDetails(title="Bad Request", status=400, detail=detail, cause=cause, invalid_params=invalid_params)
+
+    return Response(json.dumps(prob, cls=JSONEncoder), status=400, mimetype=cause)
+
+
+def not_found_error(detail, cause):
+    prob = ProblemDetails(title="Not Found", status=404, detail=detail, cause=cause)
+
+    return Response(json.dumps(prob, cls=JSONEncoder), status=404, mimetype=mimetype)
+
+
+def unauthorized_error(detail, cause):
+    prob = ProblemDetails(title="Unauthorized", status=401, detail=detail, cause=cause)
+
+    return Response(json.dumps(prob, cls=JSONEncoder), status=401, mimetype=mimetype)
\ No newline at end of file
diff --git a/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/core/validate_user.py b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/core/validate_user.py
new file mode 100644
index 0000000000000000000000000000000000000000..2a8943738218ab542605b4a3e5053ddd7dbefaf9
--- /dev/null
+++ b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/core/validate_user.py
@@ -0,0 +1,26 @@
+from flask import current_app, Response
+import json
+from ..models.problem_details import ProblemDetails
+from ..encoder import JSONEncoder
+from .resources import Resource
+from .responses import internal_server_error
+
+class ControlAccess(Resource):
+
+    def validate_user_cert(self, aef_id, cert_signature):
+
+        cert_col = self.db.get_col_by_name(self.db.certs_col)
+
+        try:
+            my_query = {'id':aef_id}
+            cert_entry = cert_col.find_one(my_query)
+
+            if cert_entry is not None:
+                if cert_entry["cert_signature"] != cert_signature:
+                    prob = ProblemDetails(title="Unauthorized", detail="User not authorized", cause="You are not the owner of this resource")
+                    return Response(json.dumps(prob, cls=JSONEncoder), status=401, mimetype="application/json")
+
+        except Exception as e:
+            exception = "An exception occurred in validate invoker"
+            current_app.logger.error(exception + "::" + str(e))
+            return internal_server_error(detail=exception, cause=str(e))
\ No newline at end of file
diff --git a/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/db/db.py b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/db/db.py
new file mode 100644
index 0000000000000000000000000000000000000000..96a39f3aa05be3e6945173dd832fc4777a4e01dd
--- /dev/null
+++ b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/db/db.py
@@ -0,0 +1,46 @@
+import atexit
+import time
+from pymongo import MongoClient
+from pymongo.errors import AutoReconnect
+from ..config import Config
+from bson.codec_options import CodecOptions
+import os
+from opentelemetry.instrumentation.pymongo import PymongoInstrumentor
+
+if eval(os.environ.get("MONITORING").lower().capitalize()):
+    PymongoInstrumentor().instrument()
+
+
+class MongoDatabse():
+
+    def __init__(self):
+        self.config = Config().get_config()
+        self.db = self.__connect()
+        self.invocation_logs = self.config['mongo']['logs_col']
+        self.invoker_details = self.config['mongo']['invoker_col']
+        self.provider_details = self.config['mongo']['prov_col']
+        self.service_apis = self.config['mongo']['serv_col']
+        self.capif_users = self.config['mongo']['capif_users_col']
+
+    def get_col_by_name(self, name):
+        return self.db[name]
+
+    def __connect(self, max_retries=3, retry_delay=1):
+        retries = 0
+        while retries < max_retries:
+            try:
+                uri = f"mongodb://{self.config['mongo']['user']}:{self.config['mongo']['password']}@" \
+                      f"{self.config['mongo']['host']}:{self.config['mongo']['port']}"
+                client = MongoClient(uri)
+                mydb = client[self.config['mongo']['db']]
+                mydb.command("ping")
+                return mydb
+            except AutoReconnect:
+                retries += 1
+                print(f"Reconnecting... Retry {retries} of {max_retries}")
+                time.sleep(retry_delay)
+        return None
+
+    def close_connection(self):
+        if self.db.client:
+            self.db.client.close()
diff --git a/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/encoder.py b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/encoder.py
new file mode 100644
index 0000000000000000000000000000000000000000..efa1154be1714b16879b8fa9ee6d09169c86076e
--- /dev/null
+++ b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/encoder.py
@@ -0,0 +1,20 @@
+from connexion.apps.flask_app import FlaskJSONEncoder
+import six
+
+from api_invocation_logs.models.base_model_ import Model
+
+
+class JSONEncoder(FlaskJSONEncoder):
+    include_nulls = False
+
+    def default(self, o):
+        if isinstance(o, Model):
+            dikt = {}
+            for attr, _ in six.iteritems(o.openapi_types):
+                value = getattr(o, attr)
+                if value is None and not self.include_nulls:
+                    continue
+                attr = o.attribute_map[attr]
+                dikt[attr] = value
+            return dikt
+        return FlaskJSONEncoder.default(self, o)
diff --git a/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/models/__init__.py b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/models/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..6660505319cd082392acacb0fed61c72d34b47b9
--- /dev/null
+++ b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/models/__init__.py
@@ -0,0 +1,16 @@
+# coding: utf-8
+
+# flake8: noqa
+from __future__ import absolute_import
+# import models into model package
+from api_invocation_logs.models.interface_description import InterfaceDescription
+from api_invocation_logs.models.invalid_param import InvalidParam
+from api_invocation_logs.models.invocation_log import InvocationLog
+from api_invocation_logs.models.log import Log
+from api_invocation_logs.models.operation import Operation
+from api_invocation_logs.models.operation_any_of import OperationAnyOf
+from api_invocation_logs.models.problem_details import ProblemDetails
+from api_invocation_logs.models.protocol import Protocol
+from api_invocation_logs.models.protocol_any_of import ProtocolAnyOf
+from api_invocation_logs.models.security_method import SecurityMethod
+from api_invocation_logs.models.security_method_any_of import SecurityMethodAnyOf
diff --git a/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/models/base_model_.py b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/models/base_model_.py
new file mode 100644
index 0000000000000000000000000000000000000000..31d975116c556b940f7308a81ca3c1804e3f599f
--- /dev/null
+++ b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/models/base_model_.py
@@ -0,0 +1,69 @@
+import pprint
+
+import six
+import typing
+
+from api_invocation_logs import util
+
+T = typing.TypeVar('T')
+
+
+class Model(object):
+    # openapiTypes: The key is attribute name and the
+    # value is attribute type.
+    openapi_types = {}
+
+    # attributeMap: The key is attribute name and the
+    # value is json key in definition.
+    attribute_map = {}
+
+    @classmethod
+    def from_dict(cls: typing.Type[T], dikt) -> T:
+        """Returns the dict as a model"""
+        return util.deserialize_model(dikt, cls)
+
+    def to_dict(self):
+        """Returns the model properties as a dict
+
+        :rtype: dict
+        """
+        result = {}
+
+        for attr, _ in six.iteritems(self.openapi_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model
+
+        :rtype: str
+        """
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/models/interface_description.py b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/models/interface_description.py
new file mode 100644
index 0000000000000000000000000000000000000000..b484946ec91f701c809493524a51ffb87006b0b8
--- /dev/null
+++ b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/models/interface_description.py
@@ -0,0 +1,158 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from api_invocation_logs.models.base_model_ import Model
+from api_invocation_logs.models.security_method import SecurityMethod
+from api_invocation_logs import util
+
+from api_invocation_logs.models.security_method import SecurityMethod  # noqa: E501
+
+class InterfaceDescription(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, ipv4_addr=None, ipv6_addr=None, port=None, security_methods=None):  # noqa: E501
+        """InterfaceDescription - a model defined in OpenAPI
+
+        :param ipv4_addr: The ipv4_addr of this InterfaceDescription.  # noqa: E501
+        :type ipv4_addr: str
+        :param ipv6_addr: The ipv6_addr of this InterfaceDescription.  # noqa: E501
+        :type ipv6_addr: str
+        :param port: The port of this InterfaceDescription.  # noqa: E501
+        :type port: int
+        :param security_methods: The security_methods of this InterfaceDescription.  # noqa: E501
+        :type security_methods: List[SecurityMethod]
+        """
+        self.openapi_types = {
+            'ipv4_addr': str,
+            'ipv6_addr': str,
+            'port': int,
+            'security_methods': List[SecurityMethod]
+        }
+
+        self.attribute_map = {
+            'ipv4_addr': 'ipv4Addr',
+            'ipv6_addr': 'ipv6Addr',
+            'port': 'port',
+            'security_methods': 'securityMethods'
+        }
+
+        self._ipv4_addr = ipv4_addr
+        self._ipv6_addr = ipv6_addr
+        self._port = port
+        self._security_methods = security_methods
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'InterfaceDescription':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The InterfaceDescription of this InterfaceDescription.  # noqa: E501
+        :rtype: InterfaceDescription
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def ipv4_addr(self):
+        """Gets the ipv4_addr of this InterfaceDescription.
+
+        string identifying a Ipv4 address formatted in the \"dotted decimal\" notation as defined in IETF RFC 1166.  # noqa: E501
+
+        :return: The ipv4_addr of this InterfaceDescription.
+        :rtype: str
+        """
+        return self._ipv4_addr
+
+    @ipv4_addr.setter
+    def ipv4_addr(self, ipv4_addr):
+        """Sets the ipv4_addr of this InterfaceDescription.
+
+        string identifying a Ipv4 address formatted in the \"dotted decimal\" notation as defined in IETF RFC 1166.  # noqa: E501
+
+        :param ipv4_addr: The ipv4_addr of this InterfaceDescription.
+        :type ipv4_addr: str
+        """
+
+        self._ipv4_addr = ipv4_addr
+
+    @property
+    def ipv6_addr(self):
+        """Gets the ipv6_addr of this InterfaceDescription.
+
+        string identifying a Ipv6 address formatted according to clause 4 in IETF RFC 5952. The mixed Ipv4 Ipv6 notation according to clause 5 of IETF RFC 5952 shall not be used.  # noqa: E501
+
+        :return: The ipv6_addr of this InterfaceDescription.
+        :rtype: str
+        """
+        return self._ipv6_addr
+
+    @ipv6_addr.setter
+    def ipv6_addr(self, ipv6_addr):
+        """Sets the ipv6_addr of this InterfaceDescription.
+
+        string identifying a Ipv6 address formatted according to clause 4 in IETF RFC 5952. The mixed Ipv4 Ipv6 notation according to clause 5 of IETF RFC 5952 shall not be used.  # noqa: E501
+
+        :param ipv6_addr: The ipv6_addr of this InterfaceDescription.
+        :type ipv6_addr: str
+        """
+
+        self._ipv6_addr = ipv6_addr
+
+    @property
+    def port(self):
+        """Gets the port of this InterfaceDescription.
+
+        Unsigned integer with valid values between 0 and 65535.  # noqa: E501
+
+        :return: The port of this InterfaceDescription.
+        :rtype: int
+        """
+        return self._port
+
+    @port.setter
+    def port(self, port):
+        """Sets the port of this InterfaceDescription.
+
+        Unsigned integer with valid values between 0 and 65535.  # noqa: E501
+
+        :param port: The port of this InterfaceDescription.
+        :type port: int
+        """
+        if port is not None and port > 65535:  # noqa: E501
+            raise ValueError("Invalid value for `port`, must be a value less than or equal to `65535`")  # noqa: E501
+        if port is not None and port < 0:  # noqa: E501
+            raise ValueError("Invalid value for `port`, must be a value greater than or equal to `0`")  # noqa: E501
+
+        self._port = port
+
+    @property
+    def security_methods(self):
+        """Gets the security_methods of this InterfaceDescription.
+
+        Security methods supported by the interface, it take precedence over the security methods provided in AefProfile, for this specific interface.  # noqa: E501
+
+        :return: The security_methods of this InterfaceDescription.
+        :rtype: List[SecurityMethod]
+        """
+        return self._security_methods
+
+    @security_methods.setter
+    def security_methods(self, security_methods):
+        """Sets the security_methods of this InterfaceDescription.
+
+        Security methods supported by the interface, it take precedence over the security methods provided in AefProfile, for this specific interface.  # noqa: E501
+
+        :param security_methods: The security_methods of this InterfaceDescription.
+        :type security_methods: List[SecurityMethod]
+        """
+        if security_methods is not None and len(security_methods) < 1:
+            raise ValueError("Invalid value for `security_methods`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._security_methods = security_methods
diff --git a/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/models/invalid_param.py b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/models/invalid_param.py
new file mode 100644
index 0000000000000000000000000000000000000000..58f04d69ed3c64f3e218cc591c4afdb73edefcd3
--- /dev/null
+++ b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/models/invalid_param.py
@@ -0,0 +1,96 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from api_invocation_logs.models.base_model_ import Model
+from api_invocation_logs import util
+
+
+class InvalidParam(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, param=None, reason=None):  # noqa: E501
+        """InvalidParam - a model defined in OpenAPI
+
+        :param param: The param of this InvalidParam.  # noqa: E501
+        :type param: str
+        :param reason: The reason of this InvalidParam.  # noqa: E501
+        :type reason: str
+        """
+        self.openapi_types = {
+            'param': str,
+            'reason': str
+        }
+
+        self.attribute_map = {
+            'param': 'param',
+            'reason': 'reason'
+        }
+
+        self._param = param
+        self._reason = reason
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'InvalidParam':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The InvalidParam of this InvalidParam.  # noqa: E501
+        :rtype: InvalidParam
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def param(self):
+        """Gets the param of this InvalidParam.
+
+        Attribute's name encoded as a JSON Pointer, or header's name.  # noqa: E501
+
+        :return: The param of this InvalidParam.
+        :rtype: str
+        """
+        return self._param
+
+    @param.setter
+    def param(self, param):
+        """Sets the param of this InvalidParam.
+
+        Attribute's name encoded as a JSON Pointer, or header's name.  # noqa: E501
+
+        :param param: The param of this InvalidParam.
+        :type param: str
+        """
+        if param is None:
+            raise ValueError("Invalid value for `param`, must not be `None`")  # noqa: E501
+
+        self._param = param
+
+    @property
+    def reason(self):
+        """Gets the reason of this InvalidParam.
+
+        A human-readable reason, e.g. \"must be a positive integer\".  # noqa: E501
+
+        :return: The reason of this InvalidParam.
+        :rtype: str
+        """
+        return self._reason
+
+    @reason.setter
+    def reason(self, reason):
+        """Sets the reason of this InvalidParam.
+
+        A human-readable reason, e.g. \"must be a positive integer\".  # noqa: E501
+
+        :param reason: The reason of this InvalidParam.
+        :type reason: str
+        """
+
+        self._reason = reason
diff --git a/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/models/invocation_log.py b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/models/invocation_log.py
new file mode 100644
index 0000000000000000000000000000000000000000..79a228cded1140db0c90229563babc16f8af0939
--- /dev/null
+++ b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/models/invocation_log.py
@@ -0,0 +1,164 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from api_invocation_logs.models.base_model_ import Model
+from api_invocation_logs.models.log import Log
+import re
+from api_invocation_logs import util
+
+from api_invocation_logs.models.log import Log  # noqa: E501
+import re  # noqa: E501
+
+class InvocationLog(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, aef_id=None, api_invoker_id=None, logs=None, supported_features=None):  # noqa: E501
+        """InvocationLog - a model defined in OpenAPI
+
+        :param aef_id: The aef_id of this InvocationLog.  # noqa: E501
+        :type aef_id: str
+        :param api_invoker_id: The api_invoker_id of this InvocationLog.  # noqa: E501
+        :type api_invoker_id: str
+        :param logs: The logs of this InvocationLog.  # noqa: E501
+        :type logs: List[Log]
+        :param supported_features: The supported_features of this InvocationLog.  # noqa: E501
+        :type supported_features: str
+        """
+        self.openapi_types = {
+            'aef_id': str,
+            'api_invoker_id': str,
+            'logs': List[Log],
+            'supported_features': str
+        }
+
+        self.attribute_map = {
+            'aef_id': 'aefId',
+            'api_invoker_id': 'apiInvokerId',
+            'logs': 'logs',
+            'supported_features': 'supportedFeatures'
+        }
+
+        self._aef_id = aef_id
+        self._api_invoker_id = api_invoker_id
+        self._logs = logs
+        self._supported_features = supported_features
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'InvocationLog':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The InvocationLog of this InvocationLog.  # noqa: E501
+        :rtype: InvocationLog
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def aef_id(self):
+        """Gets the aef_id of this InvocationLog.
+
+        Identity information of the API exposing function requesting logging of service API invocations  # noqa: E501
+
+        :return: The aef_id of this InvocationLog.
+        :rtype: str
+        """
+        return self._aef_id
+
+    @aef_id.setter
+    def aef_id(self, aef_id):
+        """Sets the aef_id of this InvocationLog.
+
+        Identity information of the API exposing function requesting logging of service API invocations  # noqa: E501
+
+        :param aef_id: The aef_id of this InvocationLog.
+        :type aef_id: str
+        """
+        if aef_id is None:
+            raise ValueError("Invalid value for `aef_id`, must not be `None`")  # noqa: E501
+
+        self._aef_id = aef_id
+
+    @property
+    def api_invoker_id(self):
+        """Gets the api_invoker_id of this InvocationLog.
+
+        Identity of the API invoker which invoked the service API  # noqa: E501
+
+        :return: The api_invoker_id of this InvocationLog.
+        :rtype: str
+        """
+        return self._api_invoker_id
+
+    @api_invoker_id.setter
+    def api_invoker_id(self, api_invoker_id):
+        """Sets the api_invoker_id of this InvocationLog.
+
+        Identity of the API invoker which invoked the service API  # noqa: E501
+
+        :param api_invoker_id: The api_invoker_id of this InvocationLog.
+        :type api_invoker_id: str
+        """
+        if api_invoker_id is None:
+            raise ValueError("Invalid value for `api_invoker_id`, must not be `None`")  # noqa: E501
+
+        self._api_invoker_id = api_invoker_id
+
+    @property
+    def logs(self):
+        """Gets the logs of this InvocationLog.
+
+        Service API invocation log  # noqa: E501
+
+        :return: The logs of this InvocationLog.
+        :rtype: List[Log]
+        """
+        return self._logs
+
+    @logs.setter
+    def logs(self, logs):
+        """Sets the logs of this InvocationLog.
+
+        Service API invocation log  # noqa: E501
+
+        :param logs: The logs of this InvocationLog.
+        :type logs: List[Log]
+        """
+        if logs is None:
+            raise ValueError("Invalid value for `logs`, must not be `None`")  # noqa: E501
+        if logs is not None and len(logs) < 1:
+            raise ValueError("Invalid value for `logs`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._logs = logs
+
+    @property
+    def supported_features(self):
+        """Gets the supported_features of this InvocationLog.
+
+        A string used to indicate the features supported by an API that is used as defined in clause 6.6 in 3GPP TS 29.500. The string shall contain a bitmask indicating supported features in hexadecimal representation Each character in the string shall take a value of \"0\" to \"9\", \"a\" to \"f\" or \"A\" to \"F\" and shall represent the support of 4 features as described in table 5.2.2-3. The most significant character representing the highest-numbered features shall appear first in the string, and the character representing features 1 to 4 shall appear last in the string. The list of features and their numbering (starting with 1) are defined separately for each API. If the string contains a lower number of characters than there are defined features for an API, all features that would be represented by characters that are not present in the string are not supported  # noqa: E501
+
+        :return: The supported_features of this InvocationLog.
+        :rtype: str
+        """
+        return self._supported_features
+
+    @supported_features.setter
+    def supported_features(self, supported_features):
+        """Sets the supported_features of this InvocationLog.
+
+        A string used to indicate the features supported by an API that is used as defined in clause 6.6 in 3GPP TS 29.500. The string shall contain a bitmask indicating supported features in hexadecimal representation Each character in the string shall take a value of \"0\" to \"9\", \"a\" to \"f\" or \"A\" to \"F\" and shall represent the support of 4 features as described in table 5.2.2-3. The most significant character representing the highest-numbered features shall appear first in the string, and the character representing features 1 to 4 shall appear last in the string. The list of features and their numbering (starting with 1) are defined separately for each API. If the string contains a lower number of characters than there are defined features for an API, all features that would be represented by characters that are not present in the string are not supported  # noqa: E501
+
+        :param supported_features: The supported_features of this InvocationLog.
+        :type supported_features: str
+        """
+        if supported_features is not None and not re.search(r'^[A-Fa-f0-9]*$', supported_features):  # noqa: E501
+            raise ValueError("Invalid value for `supported_features`, must be a follow pattern or equal to `/^[A-Fa-f0-9]*$/`")  # noqa: E501
+
+        self._supported_features = supported_features
diff --git a/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/models/log.py b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/models/log.py
new file mode 100644
index 0000000000000000000000000000000000000000..8f4570663c24619cdb9e754de6f8fc05d743a3f6
--- /dev/null
+++ b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/models/log.py
@@ -0,0 +1,470 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from api_invocation_logs.models.base_model_ import Model
+from api_invocation_logs.models.interface_description import InterfaceDescription
+from api_invocation_logs.models.operation import Operation
+from api_invocation_logs.models.protocol import Protocol
+from api_invocation_logs import util
+
+from api_invocation_logs.models.interface_description import InterfaceDescription  # noqa: E501
+from api_invocation_logs.models.operation import Operation  # noqa: E501
+from api_invocation_logs.models.protocol import Protocol  # noqa: E501
+
+class Log(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, api_id=None, api_name=None, api_version=None, resource_name=None, uri=None, protocol=None, operation=None, result=None, invocation_time=None, invocation_latency=None, input_parameters=None, output_parameters=None, src_interface=None, dest_interface=None, fwd_interface=None):  # noqa: E501
+        """Log - a model defined in OpenAPI
+
+        :param api_id: The api_id of this Log.  # noqa: E501
+        :type api_id: str
+        :param api_name: The api_name of this Log.  # noqa: E501
+        :type api_name: str
+        :param api_version: The api_version of this Log.  # noqa: E501
+        :type api_version: str
+        :param resource_name: The resource_name of this Log.  # noqa: E501
+        :type resource_name: str
+        :param uri: The uri of this Log.  # noqa: E501
+        :type uri: str
+        :param protocol: The protocol of this Log.  # noqa: E501
+        :type protocol: Protocol
+        :param operation: The operation of this Log.  # noqa: E501
+        :type operation: Operation
+        :param result: The result of this Log.  # noqa: E501
+        :type result: str
+        :param invocation_time: The invocation_time of this Log.  # noqa: E501
+        :type invocation_time: datetime
+        :param invocation_latency: The invocation_latency of this Log.  # noqa: E501
+        :type invocation_latency: int
+        :param input_parameters: The input_parameters of this Log.  # noqa: E501
+        :type input_parameters: object
+        :param output_parameters: The output_parameters of this Log.  # noqa: E501
+        :type output_parameters: object
+        :param src_interface: The src_interface of this Log.  # noqa: E501
+        :type src_interface: InterfaceDescription
+        :param dest_interface: The dest_interface of this Log.  # noqa: E501
+        :type dest_interface: InterfaceDescription
+        :param fwd_interface: The fwd_interface of this Log.  # noqa: E501
+        :type fwd_interface: str
+        """
+        self.openapi_types = {
+            'api_id': str,
+            'api_name': str,
+            'api_version': str,
+            'resource_name': str,
+            'uri': str,
+            'protocol': Protocol,
+            'operation': Operation,
+            'result': str,
+            'invocation_time': datetime,
+            'invocation_latency': int,
+            'input_parameters': object,
+            'output_parameters': object,
+            'src_interface': InterfaceDescription,
+            'dest_interface': InterfaceDescription,
+            'fwd_interface': str
+        }
+
+        self.attribute_map = {
+            'api_id': 'apiId',
+            'api_name': 'apiName',
+            'api_version': 'apiVersion',
+            'resource_name': 'resourceName',
+            'uri': 'uri',
+            'protocol': 'protocol',
+            'operation': 'operation',
+            'result': 'result',
+            'invocation_time': 'invocationTime',
+            'invocation_latency': 'invocationLatency',
+            'input_parameters': 'inputParameters',
+            'output_parameters': 'outputParameters',
+            'src_interface': 'srcInterface',
+            'dest_interface': 'destInterface',
+            'fwd_interface': 'fwdInterface'
+        }
+
+        self._api_id = api_id
+        self._api_name = api_name
+        self._api_version = api_version
+        self._resource_name = resource_name
+        self._uri = uri
+        self._protocol = protocol
+        self._operation = operation
+        self._result = result
+        self._invocation_time = invocation_time
+        self._invocation_latency = invocation_latency
+        self._input_parameters = input_parameters
+        self._output_parameters = output_parameters
+        self._src_interface = src_interface
+        self._dest_interface = dest_interface
+        self._fwd_interface = fwd_interface
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'Log':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The Log of this Log.  # noqa: E501
+        :rtype: Log
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def api_id(self):
+        """Gets the api_id of this Log.
+
+        String identifying the API invoked.  # noqa: E501
+
+        :return: The api_id of this Log.
+        :rtype: str
+        """
+        return self._api_id
+
+    @api_id.setter
+    def api_id(self, api_id):
+        """Sets the api_id of this Log.
+
+        String identifying the API invoked.  # noqa: E501
+
+        :param api_id: The api_id of this Log.
+        :type api_id: str
+        """
+        if api_id is None:
+            raise ValueError("Invalid value for `api_id`, must not be `None`")  # noqa: E501
+
+        self._api_id = api_id
+
+    @property
+    def api_name(self):
+        """Gets the api_name of this Log.
+
+        Name of the API which was invoked, it is set as {apiName} part of the URI structure as defined in subclause 4.4 of 3GPP TS 29.501.  # noqa: E501
+
+        :return: The api_name of this Log.
+        :rtype: str
+        """
+        return self._api_name
+
+    @api_name.setter
+    def api_name(self, api_name):
+        """Sets the api_name of this Log.
+
+        Name of the API which was invoked, it is set as {apiName} part of the URI structure as defined in subclause 4.4 of 3GPP TS 29.501.  # noqa: E501
+
+        :param api_name: The api_name of this Log.
+        :type api_name: str
+        """
+        if api_name is None:
+            raise ValueError("Invalid value for `api_name`, must not be `None`")  # noqa: E501
+
+        self._api_name = api_name
+
+    @property
+    def api_version(self):
+        """Gets the api_version of this Log.
+
+        Version of the API which was invoked  # noqa: E501
+
+        :return: The api_version of this Log.
+        :rtype: str
+        """
+        return self._api_version
+
+    @api_version.setter
+    def api_version(self, api_version):
+        """Sets the api_version of this Log.
+
+        Version of the API which was invoked  # noqa: E501
+
+        :param api_version: The api_version of this Log.
+        :type api_version: str
+        """
+        if api_version is None:
+            raise ValueError("Invalid value for `api_version`, must not be `None`")  # noqa: E501
+
+        self._api_version = api_version
+
+    @property
+    def resource_name(self):
+        """Gets the resource_name of this Log.
+
+        Name of the specific resource invoked  # noqa: E501
+
+        :return: The resource_name of this Log.
+        :rtype: str
+        """
+        return self._resource_name
+
+    @resource_name.setter
+    def resource_name(self, resource_name):
+        """Sets the resource_name of this Log.
+
+        Name of the specific resource invoked  # noqa: E501
+
+        :param resource_name: The resource_name of this Log.
+        :type resource_name: str
+        """
+        if resource_name is None:
+            raise ValueError("Invalid value for `resource_name`, must not be `None`")  # noqa: E501
+
+        self._resource_name = resource_name
+
+    @property
+    def uri(self):
+        """Gets the uri of this Log.
+
+        string providing an URI formatted according to IETF RFC 3986.  # noqa: E501
+
+        :return: The uri of this Log.
+        :rtype: str
+        """
+        return self._uri
+
+    @uri.setter
+    def uri(self, uri):
+        """Sets the uri of this Log.
+
+        string providing an URI formatted according to IETF RFC 3986.  # noqa: E501
+
+        :param uri: The uri of this Log.
+        :type uri: str
+        """
+
+        self._uri = uri
+
+    @property
+    def protocol(self):
+        """Gets the protocol of this Log.
+
+
+        :return: The protocol of this Log.
+        :rtype: Protocol
+        """
+        return self._protocol
+
+    @protocol.setter
+    def protocol(self, protocol):
+        """Sets the protocol of this Log.
+
+
+        :param protocol: The protocol of this Log.
+        :type protocol: Protocol
+        """
+        if protocol is None:
+            raise ValueError("Invalid value for `protocol`, must not be `None`")  # noqa: E501
+
+        self._protocol = protocol
+
+    @property
+    def operation(self):
+        """Gets the operation of this Log.
+
+
+        :return: The operation of this Log.
+        :rtype: Operation
+        """
+        return self._operation
+
+    @operation.setter
+    def operation(self, operation):
+        """Sets the operation of this Log.
+
+
+        :param operation: The operation of this Log.
+        :type operation: Operation
+        """
+
+        self._operation = operation
+
+    @property
+    def result(self):
+        """Gets the result of this Log.
+
+        For HTTP protocol, it contains HTTP status code of the invocation  # noqa: E501
+
+        :return: The result of this Log.
+        :rtype: str
+        """
+        return self._result
+
+    @result.setter
+    def result(self, result):
+        """Sets the result of this Log.
+
+        For HTTP protocol, it contains HTTP status code of the invocation  # noqa: E501
+
+        :param result: The result of this Log.
+        :type result: str
+        """
+        if result is None:
+            raise ValueError("Invalid value for `result`, must not be `None`")  # noqa: E501
+
+        self._result = result
+
+    @property
+    def invocation_time(self):
+        """Gets the invocation_time of this Log.
+
+        string with format \"date-time\" as defined in OpenAPI.  # noqa: E501
+
+        :return: The invocation_time of this Log.
+        :rtype: datetime
+        """
+        return self._invocation_time
+
+    @invocation_time.setter
+    def invocation_time(self, invocation_time):
+        """Sets the invocation_time of this Log.
+
+        string with format \"date-time\" as defined in OpenAPI.  # noqa: E501
+
+        :param invocation_time: The invocation_time of this Log.
+        :type invocation_time: datetime
+        """
+
+        self._invocation_time = invocation_time
+
+    @property
+    def invocation_latency(self):
+        """Gets the invocation_latency of this Log.
+
+        Unsigned integer identifying a period of time in units of milliseconds.  # noqa: E501
+
+        :return: The invocation_latency of this Log.
+        :rtype: int
+        """
+        return self._invocation_latency
+
+    @invocation_latency.setter
+    def invocation_latency(self, invocation_latency):
+        """Sets the invocation_latency of this Log.
+
+        Unsigned integer identifying a period of time in units of milliseconds.  # noqa: E501
+
+        :param invocation_latency: The invocation_latency of this Log.
+        :type invocation_latency: int
+        """
+        if invocation_latency is not None and invocation_latency < 0:  # noqa: E501
+            raise ValueError("Invalid value for `invocation_latency`, must be a value greater than or equal to `0`")  # noqa: E501
+
+        self._invocation_latency = invocation_latency
+
+    @property
+    def input_parameters(self):
+        """Gets the input_parameters of this Log.
+
+        List of input parameters. Can be any value - string, number, boolean, array or object.  # noqa: E501
+
+        :return: The input_parameters of this Log.
+        :rtype: object
+        """
+        return self._input_parameters
+
+    @input_parameters.setter
+    def input_parameters(self, input_parameters):
+        """Sets the input_parameters of this Log.
+
+        List of input parameters. Can be any value - string, number, boolean, array or object.  # noqa: E501
+
+        :param input_parameters: The input_parameters of this Log.
+        :type input_parameters: object
+        """
+
+        self._input_parameters = input_parameters
+
+    @property
+    def output_parameters(self):
+        """Gets the output_parameters of this Log.
+
+        List of output parameters. Can be any value - string, number, boolean, array or object.  # noqa: E501
+
+        :return: The output_parameters of this Log.
+        :rtype: object
+        """
+        return self._output_parameters
+
+    @output_parameters.setter
+    def output_parameters(self, output_parameters):
+        """Sets the output_parameters of this Log.
+
+        List of output parameters. Can be any value - string, number, boolean, array or object.  # noqa: E501
+
+        :param output_parameters: The output_parameters of this Log.
+        :type output_parameters: object
+        """
+
+        self._output_parameters = output_parameters
+
+    @property
+    def src_interface(self):
+        """Gets the src_interface of this Log.
+
+
+        :return: The src_interface of this Log.
+        :rtype: InterfaceDescription
+        """
+        return self._src_interface
+
+    @src_interface.setter
+    def src_interface(self, src_interface):
+        """Sets the src_interface of this Log.
+
+
+        :param src_interface: The src_interface of this Log.
+        :type src_interface: InterfaceDescription
+        """
+
+        self._src_interface = src_interface
+
+    @property
+    def dest_interface(self):
+        """Gets the dest_interface of this Log.
+
+
+        :return: The dest_interface of this Log.
+        :rtype: InterfaceDescription
+        """
+        return self._dest_interface
+
+    @dest_interface.setter
+    def dest_interface(self, dest_interface):
+        """Sets the dest_interface of this Log.
+
+
+        :param dest_interface: The dest_interface of this Log.
+        :type dest_interface: InterfaceDescription
+        """
+
+        self._dest_interface = dest_interface
+
+    @property
+    def fwd_interface(self):
+        """Gets the fwd_interface of this Log.
+
+        It includes the node identifier (as defined in IETF RFC 7239 of all forwarding entities between the API invoker and the AEF, concatenated with comma and space, e.g. 192.0.2.43:80, unknown:_OBFport, 203.0.113.60  # noqa: E501
+
+        :return: The fwd_interface of this Log.
+        :rtype: str
+        """
+        return self._fwd_interface
+
+    @fwd_interface.setter
+    def fwd_interface(self, fwd_interface):
+        """Sets the fwd_interface of this Log.
+
+        It includes the node identifier (as defined in IETF RFC 7239 of all forwarding entities between the API invoker and the AEF, concatenated with comma and space, e.g. 192.0.2.43:80, unknown:_OBFport, 203.0.113.60  # noqa: E501
+
+        :param fwd_interface: The fwd_interface of this Log.
+        :type fwd_interface: str
+        """
+
+        self._fwd_interface = fwd_interface
diff --git a/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/models/operation.py b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/models/operation.py
new file mode 100644
index 0000000000000000000000000000000000000000..e4cdbe45ceae0a9b19b18ae5efe5d0b6360c5d44
--- /dev/null
+++ b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/models/operation.py
@@ -0,0 +1,39 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from api_invocation_logs.models.base_model_ import Model
+from api_invocation_logs.models.operation_any_of import OperationAnyOf
+from api_invocation_logs import util
+
+from api_invocation_logs.models.operation_any_of import OperationAnyOf  # noqa: E501
+
+class Operation(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self):  # noqa: E501
+        """Operation - a model defined in OpenAPI
+
+        """
+        self.openapi_types = {
+        }
+
+        self.attribute_map = {
+        }
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'Operation':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The Operation of this Operation.  # noqa: E501
+        :rtype: Operation
+        """
+        return util.deserialize_model(dikt, cls)
diff --git a/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/models/operation_any_of.py b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/models/operation_any_of.py
new file mode 100644
index 0000000000000000000000000000000000000000..46c192127c0075dbec133c6c11064527b23f2ad6
--- /dev/null
+++ b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/models/operation_any_of.py
@@ -0,0 +1,45 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from api_invocation_logs.models.base_model_ import Model
+from api_invocation_logs import util
+
+
+class OperationAnyOf(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    """
+    allowed enum values
+    """
+    GET = "GET"
+    POST = "POST"
+    PUT = "PUT"
+    PATCH = "PATCH"
+    DELETE = "DELETE"
+    def __init__(self):  # noqa: E501
+        """OperationAnyOf - a model defined in OpenAPI
+
+        """
+        self.openapi_types = {
+        }
+
+        self.attribute_map = {
+        }
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'OperationAnyOf':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The Operation_anyOf of this OperationAnyOf.  # noqa: E501
+        :rtype: OperationAnyOf
+        """
+        return util.deserialize_model(dikt, cls)
diff --git a/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/models/problem_details.py b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/models/problem_details.py
new file mode 100644
index 0000000000000000000000000000000000000000..e4cb2c91e2f9bfb150b96f09212a0bc76d8182b1
--- /dev/null
+++ b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/models/problem_details.py
@@ -0,0 +1,270 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from api_invocation_logs.models.base_model_ import Model
+from api_invocation_logs.models.invalid_param import InvalidParam
+import re
+from api_invocation_logs import util
+
+from api_invocation_logs.models.invalid_param import InvalidParam  # noqa: E501
+import re  # noqa: E501
+
+class ProblemDetails(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, type=None, title=None, status=None, detail=None, instance=None, cause=None, invalid_params=None, supported_features=None):  # noqa: E501
+        """ProblemDetails - a model defined in OpenAPI
+
+        :param type: The type of this ProblemDetails.  # noqa: E501
+        :type type: str
+        :param title: The title of this ProblemDetails.  # noqa: E501
+        :type title: str
+        :param status: The status of this ProblemDetails.  # noqa: E501
+        :type status: int
+        :param detail: The detail of this ProblemDetails.  # noqa: E501
+        :type detail: str
+        :param instance: The instance of this ProblemDetails.  # noqa: E501
+        :type instance: str
+        :param cause: The cause of this ProblemDetails.  # noqa: E501
+        :type cause: str
+        :param invalid_params: The invalid_params of this ProblemDetails.  # noqa: E501
+        :type invalid_params: List[InvalidParam]
+        :param supported_features: The supported_features of this ProblemDetails.  # noqa: E501
+        :type supported_features: str
+        """
+        self.openapi_types = {
+            'type': str,
+            'title': str,
+            'status': int,
+            'detail': str,
+            'instance': str,
+            'cause': str,
+            'invalid_params': List[InvalidParam],
+            'supported_features': str
+        }
+
+        self.attribute_map = {
+            'type': 'type',
+            'title': 'title',
+            'status': 'status',
+            'detail': 'detail',
+            'instance': 'instance',
+            'cause': 'cause',
+            'invalid_params': 'invalidParams',
+            'supported_features': 'supportedFeatures'
+        }
+
+        self._type = type
+        self._title = title
+        self._status = status
+        self._detail = detail
+        self._instance = instance
+        self._cause = cause
+        self._invalid_params = invalid_params
+        self._supported_features = supported_features
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'ProblemDetails':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The ProblemDetails of this ProblemDetails.  # noqa: E501
+        :rtype: ProblemDetails
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def type(self):
+        """Gets the type of this ProblemDetails.
+
+        string providing an URI formatted according to IETF RFC 3986.  # noqa: E501
+
+        :return: The type of this ProblemDetails.
+        :rtype: str
+        """
+        return self._type
+
+    @type.setter
+    def type(self, type):
+        """Sets the type of this ProblemDetails.
+
+        string providing an URI formatted according to IETF RFC 3986.  # noqa: E501
+
+        :param type: The type of this ProblemDetails.
+        :type type: str
+        """
+
+        self._type = type
+
+    @property
+    def title(self):
+        """Gets the title of this ProblemDetails.
+
+        A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem.  # noqa: E501
+
+        :return: The title of this ProblemDetails.
+        :rtype: str
+        """
+        return self._title
+
+    @title.setter
+    def title(self, title):
+        """Sets the title of this ProblemDetails.
+
+        A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem.  # noqa: E501
+
+        :param title: The title of this ProblemDetails.
+        :type title: str
+        """
+
+        self._title = title
+
+    @property
+    def status(self):
+        """Gets the status of this ProblemDetails.
+
+        The HTTP status code for this occurrence of the problem.  # noqa: E501
+
+        :return: The status of this ProblemDetails.
+        :rtype: int
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """Sets the status of this ProblemDetails.
+
+        The HTTP status code for this occurrence of the problem.  # noqa: E501
+
+        :param status: The status of this ProblemDetails.
+        :type status: int
+        """
+
+        self._status = status
+
+    @property
+    def detail(self):
+        """Gets the detail of this ProblemDetails.
+
+        A human-readable explanation specific to this occurrence of the problem.  # noqa: E501
+
+        :return: The detail of this ProblemDetails.
+        :rtype: str
+        """
+        return self._detail
+
+    @detail.setter
+    def detail(self, detail):
+        """Sets the detail of this ProblemDetails.
+
+        A human-readable explanation specific to this occurrence of the problem.  # noqa: E501
+
+        :param detail: The detail of this ProblemDetails.
+        :type detail: str
+        """
+
+        self._detail = detail
+
+    @property
+    def instance(self):
+        """Gets the instance of this ProblemDetails.
+
+        string providing an URI formatted according to IETF RFC 3986.  # noqa: E501
+
+        :return: The instance of this ProblemDetails.
+        :rtype: str
+        """
+        return self._instance
+
+    @instance.setter
+    def instance(self, instance):
+        """Sets the instance of this ProblemDetails.
+
+        string providing an URI formatted according to IETF RFC 3986.  # noqa: E501
+
+        :param instance: The instance of this ProblemDetails.
+        :type instance: str
+        """
+
+        self._instance = instance
+
+    @property
+    def cause(self):
+        """Gets the cause of this ProblemDetails.
+
+        A machine-readable application error cause specific to this occurrence of the problem. This IE should be present and provide application-related error information, if available.  # noqa: E501
+
+        :return: The cause of this ProblemDetails.
+        :rtype: str
+        """
+        return self._cause
+
+    @cause.setter
+    def cause(self, cause):
+        """Sets the cause of this ProblemDetails.
+
+        A machine-readable application error cause specific to this occurrence of the problem. This IE should be present and provide application-related error information, if available.  # noqa: E501
+
+        :param cause: The cause of this ProblemDetails.
+        :type cause: str
+        """
+
+        self._cause = cause
+
+    @property
+    def invalid_params(self):
+        """Gets the invalid_params of this ProblemDetails.
+
+        Description of invalid parameters, for a request rejected due to invalid parameters.  # noqa: E501
+
+        :return: The invalid_params of this ProblemDetails.
+        :rtype: List[InvalidParam]
+        """
+        return self._invalid_params
+
+    @invalid_params.setter
+    def invalid_params(self, invalid_params):
+        """Sets the invalid_params of this ProblemDetails.
+
+        Description of invalid parameters, for a request rejected due to invalid parameters.  # noqa: E501
+
+        :param invalid_params: The invalid_params of this ProblemDetails.
+        :type invalid_params: List[InvalidParam]
+        """
+        if invalid_params is not None and len(invalid_params) < 1:
+            raise ValueError("Invalid value for `invalid_params`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._invalid_params = invalid_params
+
+    @property
+    def supported_features(self):
+        """Gets the supported_features of this ProblemDetails.
+
+        A string used to indicate the features supported by an API that is used as defined in clause 6.6 in 3GPP TS 29.500. The string shall contain a bitmask indicating supported features in hexadecimal representation Each character in the string shall take a value of \"0\" to \"9\", \"a\" to \"f\" or \"A\" to \"F\" and shall represent the support of 4 features as described in table 5.2.2-3. The most significant character representing the highest-numbered features shall appear first in the string, and the character representing features 1 to 4 shall appear last in the string. The list of features and their numbering (starting with 1) are defined separately for each API. If the string contains a lower number of characters than there are defined features for an API, all features that would be represented by characters that are not present in the string are not supported  # noqa: E501
+
+        :return: The supported_features of this ProblemDetails.
+        :rtype: str
+        """
+        return self._supported_features
+
+    @supported_features.setter
+    def supported_features(self, supported_features):
+        """Sets the supported_features of this ProblemDetails.
+
+        A string used to indicate the features supported by an API that is used as defined in clause 6.6 in 3GPP TS 29.500. The string shall contain a bitmask indicating supported features in hexadecimal representation Each character in the string shall take a value of \"0\" to \"9\", \"a\" to \"f\" or \"A\" to \"F\" and shall represent the support of 4 features as described in table 5.2.2-3. The most significant character representing the highest-numbered features shall appear first in the string, and the character representing features 1 to 4 shall appear last in the string. The list of features and their numbering (starting with 1) are defined separately for each API. If the string contains a lower number of characters than there are defined features for an API, all features that would be represented by characters that are not present in the string are not supported  # noqa: E501
+
+        :param supported_features: The supported_features of this ProblemDetails.
+        :type supported_features: str
+        """
+        if supported_features is not None and not re.search(r'^[A-Fa-f0-9]*$', supported_features):  # noqa: E501
+            raise ValueError("Invalid value for `supported_features`, must be a follow pattern or equal to `/^[A-Fa-f0-9]*$/`")  # noqa: E501
+
+        self._supported_features = supported_features
diff --git a/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/models/protocol.py b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/models/protocol.py
new file mode 100644
index 0000000000000000000000000000000000000000..023ba4d925e237b05054d47cf5da1eb6d6f87253
--- /dev/null
+++ b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/models/protocol.py
@@ -0,0 +1,39 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from api_invocation_logs.models.base_model_ import Model
+from api_invocation_logs.models.protocol_any_of import ProtocolAnyOf
+from api_invocation_logs import util
+
+from api_invocation_logs.models.protocol_any_of import ProtocolAnyOf  # noqa: E501
+
+class Protocol(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self):  # noqa: E501
+        """Protocol - a model defined in OpenAPI
+
+        """
+        self.openapi_types = {
+        }
+
+        self.attribute_map = {
+        }
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'Protocol':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The Protocol of this Protocol.  # noqa: E501
+        :rtype: Protocol
+        """
+        return util.deserialize_model(dikt, cls)
diff --git a/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/models/protocol_any_of.py b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/models/protocol_any_of.py
new file mode 100644
index 0000000000000000000000000000000000000000..b7966dfce8bfa44ee911ab3f55ecc527844a210d
--- /dev/null
+++ b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/models/protocol_any_of.py
@@ -0,0 +1,42 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from api_invocation_logs.models.base_model_ import Model
+from api_invocation_logs import util
+
+
+class ProtocolAnyOf(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    """
+    allowed enum values
+    """
+    _1_1 = "HTTP_1_1"
+    _2 = "HTTP_2"
+    def __init__(self):  # noqa: E501
+        """ProtocolAnyOf - a model defined in OpenAPI
+
+        """
+        self.openapi_types = {
+        }
+
+        self.attribute_map = {
+        }
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'ProtocolAnyOf':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The Protocol_anyOf of this ProtocolAnyOf.  # noqa: E501
+        :rtype: ProtocolAnyOf
+        """
+        return util.deserialize_model(dikt, cls)
diff --git a/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/models/security_method.py b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/models/security_method.py
new file mode 100644
index 0000000000000000000000000000000000000000..e059b81cb7383828d2dd95c5f2ce06c9c5d6601c
--- /dev/null
+++ b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/models/security_method.py
@@ -0,0 +1,39 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from api_invocation_logs.models.base_model_ import Model
+from api_invocation_logs.models.security_method_any_of import SecurityMethodAnyOf
+from api_invocation_logs import util
+
+from api_invocation_logs.models.security_method_any_of import SecurityMethodAnyOf  # noqa: E501
+
+class SecurityMethod(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self):  # noqa: E501
+        """SecurityMethod - a model defined in OpenAPI
+
+        """
+        self.openapi_types = {
+        }
+
+        self.attribute_map = {
+        }
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'SecurityMethod':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The SecurityMethod of this SecurityMethod.  # noqa: E501
+        :rtype: SecurityMethod
+        """
+        return util.deserialize_model(dikt, cls)
diff --git a/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/models/security_method_any_of.py b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/models/security_method_any_of.py
new file mode 100644
index 0000000000000000000000000000000000000000..877c646311c51f2668894a4e9bf43b4c6c0d0bd1
--- /dev/null
+++ b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/models/security_method_any_of.py
@@ -0,0 +1,43 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from api_invocation_logs.models.base_model_ import Model
+from api_invocation_logs import util
+
+
+class SecurityMethodAnyOf(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    """
+    allowed enum values
+    """
+    PSK = "PSK"
+    PKI = "PKI"
+    OAUTH = "OAUTH"
+    def __init__(self):  # noqa: E501
+        """SecurityMethodAnyOf - a model defined in OpenAPI
+
+        """
+        self.openapi_types = {
+        }
+
+        self.attribute_map = {
+        }
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'SecurityMethodAnyOf':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The SecurityMethod_anyOf of this SecurityMethodAnyOf.  # noqa: E501
+        :rtype: SecurityMethodAnyOf
+        """
+        return util.deserialize_model(dikt, cls)
diff --git a/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/openapi/openapi.yaml b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/openapi/openapi.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..85b35aa9453bdf4cda8efbae46abc61ccbb85450
--- /dev/null
+++ b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/openapi/openapi.yaml
@@ -0,0 +1,524 @@
+openapi: 3.0.0
+info:
+  description: |
+    API for invocation logs.
+    © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
+    All rights reserved.
+  title: CAPIF_Logging_API_Invocation_API
+  version: 1.2.0-alpha.1
+externalDocs:
+  description: 3GPP TS 29.222 V17.1.0 Common API Framework for 3GPP Northbound APIs
+  url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.222/
+servers:
+- url: '{apiRoot}/api-invocation-logs/v1'
+  variables:
+    apiRoot:
+      default: https://example.com
+      description: apiRoot as defined in subclause 7.5 of 3GPP TS 29.222
+paths:
+  /{aefId}/logs:
+    post:
+      description: Creates a new log entry for service API invocations.
+      operationId: aef_id_logs_post
+      parameters:
+      - description: Identifier of the API exposing function
+        explode: false
+        in: path
+        name: aefId
+        required: true
+        schema:
+          type: string
+        style: simple
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/InvocationLog'
+        required: true
+      responses:
+        "201":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/InvocationLog'
+          description: Log of service API invocations provided by API exposing function
+            successfully stored on the CAPIF core function.
+          headers:
+            Location:
+              description: 'Contains the URI of the newly created resource, according
+                to the structure: {apiRoot}/api-invocation-logs/v1/{aefId}/logs/{logId}'
+              explode: false
+              required: true
+              schema:
+                type: string
+              style: simple
+        "400":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Bad request
+        "401":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Unauthorized
+        "403":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Forbidden
+        "404":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Not Found
+        "411":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Length Required
+        "413":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Payload Too Large
+        "415":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Unsupported Media Type
+        "429":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Too Many Requests
+        "500":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Internal Server Error
+        "503":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Service Unavailable
+        default:
+          description: Generic Error
+      x-openapi-router-controller: api_invocation_logs.controllers.default_controller
+  /{aefId}/logs/{logId}:
+    description: Creates a new log entry for service API invocations.
+components:
+  schemas:
+    InvocationLog:
+      description: Represents a set of Service API invocation logs to be stored in
+        a CAPIF core function.
+      example:
+        supportedFeatures: supportedFeatures
+        apiInvokerId: apiInvokerId
+        aefId: aefId
+        logs:
+        - apiName: apiName
+          invocationTime: 2000-01-23T04:56:07.000+00:00
+          srcInterface:
+            ipv6Addr: ipv6Addr
+            securityMethods:
+            - null
+            - null
+            port: 39500
+            ipv4Addr: ipv4Addr
+          fwdInterface: fwdInterface
+          resourceName: resourceName
+          uri: uri
+          inputParameters: ""
+          invocationLatency: 0
+          result: result
+          apiVersion: apiVersion
+          destInterface:
+            ipv6Addr: ipv6Addr
+            securityMethods:
+            - null
+            - null
+            port: 39500
+            ipv4Addr: ipv4Addr
+          apiId: apiId
+          outputParameters: ""
+        - apiName: apiName
+          invocationTime: 2000-01-23T04:56:07.000+00:00
+          srcInterface:
+            ipv6Addr: ipv6Addr
+            securityMethods:
+            - null
+            - null
+            port: 39500
+            ipv4Addr: ipv4Addr
+          fwdInterface: fwdInterface
+          resourceName: resourceName
+          uri: uri
+          inputParameters: ""
+          invocationLatency: 0
+          result: result
+          apiVersion: apiVersion
+          destInterface:
+            ipv6Addr: ipv6Addr
+            securityMethods:
+            - null
+            - null
+            port: 39500
+            ipv4Addr: ipv4Addr
+          apiId: apiId
+          outputParameters: ""
+      properties:
+        aefId:
+          description: Identity information of the API exposing function requesting
+            logging of service API invocations
+          title: aefId
+          type: string
+        apiInvokerId:
+          description: Identity of the API invoker which invoked the service API
+          title: apiInvokerId
+          type: string
+        logs:
+          description: Service API invocation log
+          items:
+            $ref: '#/components/schemas/Log'
+          minItems: 1
+          title: logs
+          type: array
+        supportedFeatures:
+          description: A string used to indicate the features supported by an API
+            that is used as defined in clause 6.6 in 3GPP TS 29.500. The string shall
+            contain a bitmask indicating supported features in hexadecimal representation
+            Each character in the string shall take a value of "0" to "9", "a" to
+            "f" or "A" to "F" and shall represent the support of 4 features as described
+            in table 5.2.2-3. The most significant character representing the highest-numbered
+            features shall appear first in the string, and the character representing
+            features 1 to 4 shall appear last in the string. The list of features
+            and their numbering (starting with 1) are defined separately for each
+            API. If the string contains a lower number of characters than there are
+            defined features for an API, all features that would be represented by
+            characters that are not present in the string are not supported
+          pattern: ^[A-Fa-f0-9]*$
+          title: supportedFeatures
+          type: string
+      required:
+      - aefId
+      - apiInvokerId
+      - logs
+      title: InvocationLog
+      type: object
+    Log:
+      description: Represents an individual service API invocation log entry.
+      example:
+        apiName: apiName
+        invocationTime: 2000-01-23T04:56:07.000+00:00
+        srcInterface:
+          ipv6Addr: ipv6Addr
+          securityMethods:
+          - null
+          - null
+          port: 39500
+          ipv4Addr: ipv4Addr
+        fwdInterface: fwdInterface
+        resourceName: resourceName
+        uri: uri
+        inputParameters: ""
+        invocationLatency: 0
+        result: result
+        apiVersion: apiVersion
+        destInterface:
+          ipv6Addr: ipv6Addr
+          securityMethods:
+          - null
+          - null
+          port: 39500
+          ipv4Addr: ipv4Addr
+        apiId: apiId
+        outputParameters: ""
+      properties:
+        apiId:
+          description: String identifying the API invoked.
+          title: apiId
+          type: string
+        apiName:
+          description: Name of the API which was invoked, it is set as {apiName} part
+            of the URI structure as defined in subclause 4.4 of 3GPP TS 29.501.
+          title: apiName
+          type: string
+        apiVersion:
+          description: Version of the API which was invoked
+          title: apiVersion
+          type: string
+        resourceName:
+          description: Name of the specific resource invoked
+          title: resourceName
+          type: string
+        uri:
+          description: string providing an URI formatted according to IETF RFC 3986.
+          title: Uri
+          type: string
+        protocol:
+          $ref: '#/components/schemas/Protocol'
+        operation:
+          $ref: '#/components/schemas/Operation'
+        result:
+          description: For HTTP protocol, it contains HTTP status code of the invocation
+          title: result
+          type: string
+        invocationTime:
+          description: string with format "date-time" as defined in OpenAPI.
+          format: date-time
+          title: DateTime
+          type: string
+        invocationLatency:
+          description: Unsigned integer identifying a period of time in units of milliseconds.
+          minimum: 0
+          title: DurationMs
+          type: integer
+        inputParameters:
+          description: List of input parameters. Can be any value - string, number,
+            boolean, array or object.
+          title: inputParameters
+        outputParameters:
+          description: List of output parameters. Can be any value - string, number,
+            boolean, array or object.
+          title: outputParameters
+        srcInterface:
+          $ref: '#/components/schemas/InterfaceDescription'
+        destInterface:
+          $ref: '#/components/schemas/InterfaceDescription'
+        fwdInterface:
+          description: It includes the node identifier (as defined in IETF RFC 7239
+            of all forwarding entities between the API invoker and the AEF, concatenated
+            with comma and space, e.g. 192.0.2.43:80, unknown:_OBFport, 203.0.113.60
+          title: fwdInterface
+          type: string
+      required:
+      - apiId
+      - apiName
+      - apiVersion
+      - protocol
+      - resourceName
+      - result
+      title: Log
+      type: object
+    DurationMs:
+      description: Unsigned integer identifying a period of time in units of milliseconds.
+      minimum: 0
+      title: DurationMs
+      type: integer
+    ProblemDetails:
+      description: Represents additional information and details on an error response.
+      properties:
+        type:
+          description: string providing an URI formatted according to IETF RFC 3986.
+          title: Uri
+          type: string
+        title:
+          description: A short, human-readable summary of the problem type. It should
+            not change from occurrence to occurrence of the problem.
+          title: title
+          type: string
+        status:
+          description: The HTTP status code for this occurrence of the problem.
+          title: status
+          type: integer
+        detail:
+          description: A human-readable explanation specific to this occurrence of
+            the problem.
+          title: detail
+          type: string
+        instance:
+          description: string providing an URI formatted according to IETF RFC 3986.
+          title: Uri
+          type: string
+        cause:
+          description: A machine-readable application error cause specific to this
+            occurrence of the problem. This IE should be present and provide application-related
+            error information, if available.
+          title: cause
+          type: string
+        invalidParams:
+          description: Description of invalid parameters, for a request rejected due
+            to invalid parameters.
+          items:
+            $ref: '#/components/schemas/InvalidParam'
+          minItems: 1
+          title: invalidParams
+          type: array
+        supportedFeatures:
+          description: A string used to indicate the features supported by an API
+            that is used as defined in clause 6.6 in 3GPP TS 29.500. The string shall
+            contain a bitmask indicating supported features in hexadecimal representation
+            Each character in the string shall take a value of "0" to "9", "a" to
+            "f" or "A" to "F" and shall represent the support of 4 features as described
+            in table 5.2.2-3. The most significant character representing the highest-numbered
+            features shall appear first in the string, and the character representing
+            features 1 to 4 shall appear last in the string. The list of features
+            and their numbering (starting with 1) are defined separately for each
+            API. If the string contains a lower number of characters than there are
+            defined features for an API, all features that would be represented by
+            characters that are not present in the string are not supported
+          pattern: ^[A-Fa-f0-9]*$
+          title: supportedFeatures
+          type: string
+      title: ProblemDetails
+      type: object
+    Uri:
+      description: string providing an URI formatted according to IETF RFC 3986.
+      title: Uri
+      type: string
+    InvalidParam:
+      description: Represents the description of invalid parameters, for a request
+        rejected due to invalid parameters.
+      properties:
+        param:
+          description: Attribute's name encoded as a JSON Pointer, or header's name.
+          title: param
+          type: string
+        reason:
+          description: A human-readable reason, e.g. "must be a positive integer".
+          title: reason
+          type: string
+      required:
+      - param
+      title: InvalidParam
+      type: object
+    SupportedFeatures:
+      description: A string used to indicate the features supported by an API that
+        is used as defined in clause 6.6 in 3GPP TS 29.500. The string shall contain
+        a bitmask indicating supported features in hexadecimal representation Each
+        character in the string shall take a value of "0" to "9", "a" to "f" or "A"
+        to "F" and shall represent the support of 4 features as described in table 5.2.2-3.
+        The most significant character representing the highest-numbered features
+        shall appear first in the string, and the character representing features
+        1 to 4 shall appear last in the string. The list of features and their numbering
+        (starting with 1) are defined separately for each API. If the string contains
+        a lower number of characters than there are defined features for an API, all
+        features that would be represented by characters that are not present in the
+        string are not supported
+      pattern: ^[A-Fa-f0-9]*$
+      title: supportedFeatures
+      type: string
+    Protocol:
+      anyOf:
+      - $ref: '#/components/schemas/Protocol_anyOf'
+      - description: |
+          This string provides forward-compatibility with future extensions to the enumeration but is not used to encode content defined in the present version of this API.
+        type: string
+      description: |
+        Possible values are - HTTP_1_1: HTTP version 1.1 - HTTP_2: HTTP version 2
+      title: Protocol
+    Operation:
+      anyOf:
+      - $ref: '#/components/schemas/Operation_anyOf'
+      - description: |
+          This string provides forward-compatibility with future extensions to the enumeration but is not used to encode content defined in the present version of this API.
+        type: string
+      description: |
+        Possible values are - GET: HTTP GET method - POST: HTTP POST method - PUT: HTTP PUT method - PATCH: HTTP PATCH method - DELETE: HTTP DELETE method
+      title: Operation
+    DateTime:
+      description: string with format "date-time" as defined in OpenAPI.
+      format: date-time
+      title: DateTime
+      type: string
+    InterfaceDescription:
+      description: Represents the description of an API's interface.
+      example:
+        ipv6Addr: ipv6Addr
+        securityMethods:
+        - null
+        - null
+        port: 39500
+        ipv4Addr: ipv4Addr
+      oneOf:
+      - required:
+        - ipv4Addr
+      - required:
+        - ipv6Addr
+      properties:
+        ipv4Addr:
+          description: string identifying a Ipv4 address formatted in the "dotted
+            decimal" notation as defined in IETF RFC 1166.
+          title: Ipv4Addr
+          type: string
+        ipv6Addr:
+          description: string identifying a Ipv6 address formatted according to clause
+            4 in IETF RFC 5952. The mixed Ipv4 Ipv6 notation according to clause 5
+            of IETF RFC 5952 shall not be used.
+          title: Ipv6Addr
+          type: string
+        port:
+          description: Unsigned integer with valid values between 0 and 65535.
+          maximum: 65535
+          minimum: 0
+          title: Port
+          type: integer
+        securityMethods:
+          description: Security methods supported by the interface, it take precedence
+            over the security methods provided in AefProfile, for this specific interface.
+          items:
+            $ref: '#/components/schemas/SecurityMethod'
+          minItems: 1
+          title: securityMethods
+          type: array
+      title: InterfaceDescription
+      type: object
+    SecurityMethod:
+      anyOf:
+      - $ref: '#/components/schemas/SecurityMethod_anyOf'
+      - description: |
+          This string provides forward-compatibility with future extensions to the enumeration but is not used to encode content defined in the present version of this API.
+        type: string
+      description: |
+        Possible values are - PSK: Security method 1 (Using TLS-PSK) as described in 3GPP TS 33.122 - PKI: Security method 2 (Using PKI) as described in 3GPP TS 33.122 - OAUTH: Security method 3 (TLS with OAuth token) as described in 3GPP TS 33.122
+      title: SecurityMethod
+    Ipv4Addr:
+      description: string identifying a Ipv4 address formatted in the "dotted decimal"
+        notation as defined in IETF RFC 1166.
+      title: Ipv4Addr
+      type: string
+    Ipv6Addr:
+      description: string identifying a Ipv6 address formatted according to clause
+        4 in IETF RFC 5952. The mixed Ipv4 Ipv6 notation according to clause 5 of
+        IETF RFC 5952 shall not be used.
+      title: Ipv6Addr
+      type: string
+    Port:
+      description: Unsigned integer with valid values between 0 and 65535.
+      maximum: 65535
+      minimum: 0
+      title: Port
+      type: integer
+    Protocol_anyOf:
+      enum:
+      - HTTP_1_1
+      - HTTP_2
+      title: Protocol_anyOf
+      type: string
+    Operation_anyOf:
+      enum:
+      - GET
+      - POST
+      - PUT
+      - PATCH
+      - DELETE
+      title: Operation_anyOf
+      type: string
+    SecurityMethod_anyOf:
+      enum:
+      - PSK
+      - PKI
+      - OAUTH
+      title: SecurityMethod_anyOf
+      type: string
diff --git a/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/typing_utils.py b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/typing_utils.py
new file mode 100644
index 0000000000000000000000000000000000000000..0563f81fd5345282a33705038dfa77fdcaa15872
--- /dev/null
+++ b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/typing_utils.py
@@ -0,0 +1,32 @@
+# coding: utf-8
+
+import sys
+
+if sys.version_info < (3, 7):
+    import typing
+
+    def is_generic(klass):
+        """ Determine whether klass is a generic class """
+        return type(klass) == typing.GenericMeta
+
+    def is_dict(klass):
+        """ Determine whether klass is a Dict """
+        return klass.__extra__ == dict
+
+    def is_list(klass):
+        """ Determine whether klass is a List """
+        return klass.__extra__ == list
+
+else:
+
+    def is_generic(klass):
+        """ Determine whether klass is a generic class """
+        return hasattr(klass, '__origin__')
+
+    def is_dict(klass):
+        """ Determine whether klass is a Dict """
+        return klass.__origin__ == dict
+
+    def is_list(klass):
+        """ Determine whether klass is a List """
+        return klass.__origin__ == list
diff --git a/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/util.py b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/util.py
new file mode 100644
index 0000000000000000000000000000000000000000..af555673357bf337cf79d74e3dae42b9c84dafb9
--- /dev/null
+++ b/services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/util.py
@@ -0,0 +1,186 @@
+import datetime
+
+import six
+import typing
+from api_invocation_logs import typing_utils
+
+def clean_empty(d):
+    if isinstance(d, dict):
+        return {
+            k: v
+            for k, v in ((k, clean_empty(v)) for k, v in d.items())
+            if v
+        }
+    if isinstance(d, list):
+        return [v for v in map(clean_empty, d) if v]
+    return d
+
+def dict_to_camel_case(my_dict):
+
+
+        result = {}
+
+        for attr, value in my_dict.items():
+
+            my_key = ''.join(word.title() for word in attr.split('_'))
+            my_key= ''.join([my_key[0].lower(), my_key[1:]])
+            if my_key == "serviceApiCategory":
+                my_key = "serviceAPICategory"
+
+            if isinstance(value, list):
+                result[my_key] = list(map(
+                    lambda x: dict_to_camel_case(x) if isinstance(x, dict) else x, value ))
+
+            elif hasattr(value, "to_dict"):
+                result[my_key] = dict_to_camel_case(value)
+
+            elif isinstance(value, dict):
+                value = dict_to_camel_case(value)
+                result[my_key] = value
+            else:
+                result[my_key] = value
+
+        return result
+
+
+def _deserialize(data, klass):
+    """Deserializes dict, list, str into an object.
+
+    :param data: dict, list or str.
+    :param klass: class literal, or string of class name.
+
+    :return: object.
+    """
+    if data is None:
+        return None
+
+    if klass in six.integer_types or klass in (float, str, bool, bytearray):
+        return _deserialize_primitive(data, klass)
+    elif klass == object:
+        return _deserialize_object(data)
+    elif klass == datetime.date:
+        return deserialize_date(data)
+    elif klass == datetime.datetime:
+        return deserialize_datetime(data)
+    elif typing_utils.is_generic(klass):
+        if typing_utils.is_list(klass):
+            return _deserialize_list(data, klass.__args__[0])
+        if typing_utils.is_dict(klass):
+            return _deserialize_dict(data, klass.__args__[1])
+    else:
+        return deserialize_model(data, klass)
+
+
+def _deserialize_primitive(data, klass):
+    """Deserializes to primitive type.
+
+    :param data: data to deserialize.
+    :param klass: class literal.
+
+    :return: int, long, float, str, bool.
+    :rtype: int | long | float | str | bool
+    """
+    try:
+        value = klass(data)
+    except UnicodeEncodeError:
+        value = six.u(data)
+    except TypeError:
+        value = data
+    return value
+
+
+def _deserialize_object(value):
+    """Return an original value.
+
+    :return: object.
+    """
+    return value
+
+
+def deserialize_date(string):
+    """Deserializes string to date.
+
+    :param string: str.
+    :type string: str
+    :return: date.
+    :rtype: date
+    """
+    if string is None:
+      return None
+    
+    try:
+        from dateutil.parser import parse
+        return parse(string).date()
+    except ImportError:
+        return string
+
+
+def deserialize_datetime(string):
+    """Deserializes string to datetime.
+
+    The string should be in iso8601 datetime format.
+
+    :param string: str.
+    :type string: str
+    :return: datetime.
+    :rtype: datetime
+    """
+    if string is None:
+      return None
+    
+    try:
+        from dateutil.parser import parse
+        return parse(string)
+    except ImportError:
+        return string
+
+
+def deserialize_model(data, klass):
+    """Deserializes list or dict to model.
+
+    :param data: dict, list.
+    :type data: dict | list
+    :param klass: class literal.
+    :return: model object.
+    """
+    instance = klass()
+
+    if not instance.openapi_types:
+        return data
+
+    for attr, attr_type in six.iteritems(instance.openapi_types):
+        if data is not None \
+                and instance.attribute_map[attr] in data \
+                and isinstance(data, (list, dict)):
+            value = data[instance.attribute_map[attr]]
+            setattr(instance, attr, _deserialize(value, attr_type))
+
+    return instance
+
+
+def _deserialize_list(data, boxed_type):
+    """Deserializes a list and its elements.
+
+    :param data: list to deserialize.
+    :type data: list
+    :param boxed_type: class literal.
+
+    :return: deserialized list.
+    :rtype: list
+    """
+    return [_deserialize(sub_data, boxed_type)
+            for sub_data in data]
+
+
+def _deserialize_dict(data, boxed_type):
+    """Deserializes a dict and its elements.
+
+    :param data: dict to deserialize.
+    :type data: dict
+    :param boxed_type: class literal.
+
+    :return: deserialized dict.
+    :rtype: dict
+    """
+    return {k: _deserialize(v, boxed_type)
+            for k, v in six.iteritems(data)}
diff --git a/services/TS29222_CAPIF_Logging_API_Invocation_API/config.yaml b/services/TS29222_CAPIF_Logging_API_Invocation_API/config.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..0625fc64a5792a5246f81ea9ab556c23b984a384
--- /dev/null
+++ b/services/TS29222_CAPIF_Logging_API_Invocation_API/config.yaml
@@ -0,0 +1,23 @@
+mongo: {
+  'user': 'root',
+  'password': 'example',
+  'db': 'capif',
+  'logs_col': 'invocationlogs',
+  'invoker_col': 'invokerdetails',
+  'prov_col': 'providerenrolmentdetails',
+  'serv_col': 'serviceapidescriptions',
+  'capif_users_col': "user",
+  'host': 'mongo',
+  'port': "27017"
+}
+
+monitoring: {
+  "fluent_bit_host": fluent-bit,
+  "fluent_bit_port": 24224,
+  "opentelemetry_url": "otel-collector",
+  "opentelemetry_port": "55680",
+  "opentelemetry_max_queue_size": 8192,
+  "opentelemetry_schedule_delay_millis": 20000,
+  "opentelemetry_max_export_batch_size": 2048,
+  "opentelemetry_export_timeout_millis": 60000
+}
diff --git a/services/TS29222_CAPIF_Logging_API_Invocation_API/git_push.sh b/services/TS29222_CAPIF_Logging_API_Invocation_API/git_push.sh
new file mode 100644
index 0000000000000000000000000000000000000000..9405f72e950cdb8ca24c3cf4d15cee7eac62fde7
--- /dev/null
+++ b/services/TS29222_CAPIF_Logging_API_Invocation_API/git_push.sh
@@ -0,0 +1,57 @@
+#!/bin/sh
+# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
+#
+# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl "minor update" "gitlab.com"
+
+git_user_id=$1
+git_repo_id=$2
+release_note=$3
+git_host=$4
+
+if [ "$git_host" = "" ]; then
+    git_host="github.com"
+    echo "[INFO] No command line input provided. Set \$git_host to $git_host"
+fi
+
+if [ "$git_user_id" = "" ]; then
+    git_user_id="GIT_USER_ID"
+    echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id"
+fi
+
+if [ "$git_repo_id" = "" ]; then
+    git_repo_id="GIT_REPO_ID"
+    echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id"
+fi
+
+if [ "$release_note" = "" ]; then
+    release_note="Minor update"
+    echo "[INFO] No command line input provided. Set \$release_note to $release_note"
+fi
+
+# Initialize the local directory as a Git repository
+git init
+
+# Adds the files in the local repository and stages them for commit.
+git add .
+
+# Commits the tracked changes and prepares them to be pushed to a remote repository.
+git commit -m "$release_note"
+
+# Sets the new remote
+git_remote=`git remote`
+if [ "$git_remote" = "" ]; then # git remote not defined
+
+    if [ "$GIT_TOKEN" = "" ]; then
+        echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git credential in your environment."
+        git remote add origin https://${git_host}/${git_user_id}/${git_repo_id}.git
+    else
+        git remote add origin https://${git_user_id}:${GIT_TOKEN}@${git_host}/${git_user_id}/${git_repo_id}.git
+    fi
+
+fi
+
+git pull origin master
+
+# Pushes (Forces) the changes in the local repository up to the remote repository
+echo "Git pushing to https://${git_host}/${git_user_id}/${git_repo_id}.git"
+git push origin master 2>&1 | grep -v 'To https'
diff --git a/services/TS29222_CAPIF_Logging_API_Invocation_API/requirements.txt b/services/TS29222_CAPIF_Logging_API_Invocation_API/requirements.txt
new file mode 100644
index 0000000000000000000000000000000000000000..197399ff21107a2e3f2edc6519445c38b38de335
--- /dev/null
+++ b/services/TS29222_CAPIF_Logging_API_Invocation_API/requirements.txt
@@ -0,0 +1,20 @@
+connexion[swagger-ui] == 2.14.2; python_version>="3.6"
+swagger-ui-bundle >= 0.0.2
+python_dateutil >= 2.6.0
+setuptools >= 21.0.0
+Flask == 2.0.3
+pymongo == 4.0.1
+elasticsearch == 8.4.3
+flask_jwt_extended == 4.4.4
+opentelemetry-instrumentation == 0.38b0
+opentelemetry-instrumentation-flask == 0.38b0
+opentelemetry-instrumentation-redis == 0.38b0
+opentelemetry-instrumentation-pymongo == 0.38b0
+opentelemetry-exporter-otlp == 1.17.0
+opentelemetry-exporter-jaeger==1.17.0
+fluent == 0.10.0
+fluent-logger == 0.10.0
+opentelemetry-api == 1.17.0
+opentelemetry-sdk == 1.17.0
+flask_executor == 1.0.0
+pyopenssl == 23.0.0
diff --git a/services/TS29222_CAPIF_Logging_API_Invocation_API/setup.py b/services/TS29222_CAPIF_Logging_API_Invocation_API/setup.py
new file mode 100644
index 0000000000000000000000000000000000000000..cf63e4a1b868b72d4be486250e1919437743123c
--- /dev/null
+++ b/services/TS29222_CAPIF_Logging_API_Invocation_API/setup.py
@@ -0,0 +1,39 @@
+# coding: utf-8
+
+import sys
+from setuptools import setup, find_packages
+
+NAME = "api_invocation_logs"
+VERSION = "1.0.0"
+
+# To install the library, run the following
+#
+# python setup.py install
+#
+# prerequisite: setuptools
+# http://pypi.python.org/pypi/setuptools
+
+REQUIRES = [
+    "connexion>=2.0.2",
+    "swagger-ui-bundle>=0.0.2",
+    "python_dateutil>=2.6.0"
+]
+
+setup(
+    name=NAME,
+    version=VERSION,
+    description="CAPIF_Logging_API_Invocation_API",
+    author_email="",
+    url="",
+    keywords=["OpenAPI", "CAPIF_Logging_API_Invocation_API"],
+    install_requires=REQUIRES,
+    packages=find_packages(),
+    package_data={'': ['openapi/openapi.yaml']},
+    include_package_data=True,
+    entry_points={
+        'console_scripts': ['api_invocation_logs=api_invocation_logs.__main__:main']},
+    long_description="""\
+    API for invocation logs. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. 
+    """
+)
+
diff --git a/services/TS29222_CAPIF_Logging_API_Invocation_API/test-requirements.txt b/services/TS29222_CAPIF_Logging_API_Invocation_API/test-requirements.txt
new file mode 100644
index 0000000000000000000000000000000000000000..0970f28c7c5a344d7fd9b9c893c584e7336df266
--- /dev/null
+++ b/services/TS29222_CAPIF_Logging_API_Invocation_API/test-requirements.txt
@@ -0,0 +1,4 @@
+pytest~=4.6.7 # needed for python 2.7+3.4
+pytest-cov>=2.8.1
+pytest-randomly==1.2.3 # needed for python 2.7+3.4
+Flask-Testing==0.8.0
diff --git a/services/TS29222_CAPIF_Logging_API_Invocation_API/tox.ini b/services/TS29222_CAPIF_Logging_API_Invocation_API/tox.ini
new file mode 100644
index 0000000000000000000000000000000000000000..01a6d218dc3df53a27f797996c244658e113b2f0
--- /dev/null
+++ b/services/TS29222_CAPIF_Logging_API_Invocation_API/tox.ini
@@ -0,0 +1,11 @@
+[tox]
+envlist = py3
+skipsdist=True
+
+[testenv]
+deps=-r{toxinidir}/requirements.txt
+     -r{toxinidir}/test-requirements.txt
+	 {toxinidir}
+
+commands=
+   pytest --cov=api_invocation_logs
diff --git a/services/TS29222_CAPIF_Publish_Service_API/.dockerignore b/services/TS29222_CAPIF_Publish_Service_API/.dockerignore
new file mode 100644
index 0000000000000000000000000000000000000000..f9619601908b43d5d90c9befea5aa6ef6a732fa9
--- /dev/null
+++ b/services/TS29222_CAPIF_Publish_Service_API/.dockerignore
@@ -0,0 +1,72 @@
+.travis.yaml
+.openapi-generator-ignore
+README.md
+tox.ini
+git_push.sh
+test-requirements.txt
+setup.py
+
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+env/
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*,cover
+.hypothesis/
+venv/
+.python-version
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+#Ipython Notebook
+.ipynb_checkpoints
diff --git a/services/TS29222_CAPIF_Publish_Service_API/.gitignore b/services/TS29222_CAPIF_Publish_Service_API/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..43995bd42fa23bbc4c3a59d5fb9da99042fcf139
--- /dev/null
+++ b/services/TS29222_CAPIF_Publish_Service_API/.gitignore
@@ -0,0 +1,66 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+env/
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*,cover
+.hypothesis/
+venv/
+.venv/
+.python-version
+.pytest_cache
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+#Ipython Notebook
+.ipynb_checkpoints
diff --git a/services/TS29222_CAPIF_Publish_Service_API/.openapi-generator-ignore b/services/TS29222_CAPIF_Publish_Service_API/.openapi-generator-ignore
new file mode 100644
index 0000000000000000000000000000000000000000..7484ee590a3894506cf063799b885428f95a71be
--- /dev/null
+++ b/services/TS29222_CAPIF_Publish_Service_API/.openapi-generator-ignore
@@ -0,0 +1,23 @@
+# OpenAPI Generator Ignore
+# Generated by openapi-generator https://github.com/openapitools/openapi-generator
+
+# Use this file to prevent files from being overwritten by the generator.
+# The patterns follow closely to .gitignore or .dockerignore.
+
+# As an example, the C# client generator defines ApiClient.cs.
+# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line:
+#ApiClient.cs
+
+# You can match any string of characters against a directory, file or extension with a single asterisk (*):
+#foo/*/qux
+# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
+
+# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
+#foo/**/qux
+# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
+
+# You can also negate patterns with an exclamation (!).
+# For example, you can ignore all files in a docs folder with the file extension .md:
+#docs/*.md
+# Then explicitly reverse the ignore rule for a single file:
+#!docs/README.md
diff --git a/services/TS29222_CAPIF_Publish_Service_API/.openapi-generator/FILES b/services/TS29222_CAPIF_Publish_Service_API/.openapi-generator/FILES
new file mode 100644
index 0000000000000000000000000000000000000000..fc1b00e9235a5c80a8bc15fc870b21f7ca99b024
--- /dev/null
+++ b/services/TS29222_CAPIF_Publish_Service_API/.openapi-generator/FILES
@@ -0,0 +1,42 @@
+.dockerignore
+.gitignore
+.travis.yml
+Dockerfile
+README.md
+git_push.sh
+published_apis/__init__.py
+published_apis/__main__.py
+published_apis/controllers/__init__.py
+published_apis/controllers/default_controller.py
+published_apis/controllers/security_controller_.py
+published_apis/encoder.py
+published_apis/models/__init__.py
+published_apis/models/aef_profile.py
+published_apis/models/base_model_.py
+published_apis/models/communication_type.py
+published_apis/models/communication_type_any_of.py
+published_apis/models/custom_operation.py
+published_apis/models/data_format.py
+published_apis/models/data_format_any_of.py
+published_apis/models/interface_description.py
+published_apis/models/invalid_param.py
+published_apis/models/operation.py
+published_apis/models/operation_any_of.py
+published_apis/models/problem_details.py
+published_apis/models/protocol.py
+published_apis/models/protocol_any_of.py
+published_apis/models/published_api_path.py
+published_apis/models/resource.py
+published_apis/models/security_method.py
+published_apis/models/security_method_any_of.py
+published_apis/models/service_api_description.py
+published_apis/models/shareable_information.py
+published_apis/models/version.py
+published_apis/openapi/openapi.yaml
+published_apis/test/__init__.py
+published_apis/typing_utils.py
+published_apis/util.py
+requirements.txt
+setup.py
+test-requirements.txt
+tox.ini
diff --git a/services/TS29222_CAPIF_Publish_Service_API/.openapi-generator/VERSION b/services/TS29222_CAPIF_Publish_Service_API/.openapi-generator/VERSION
new file mode 100644
index 0000000000000000000000000000000000000000..4b448de535c7dd619da0df6d8221995dbd5d118a
--- /dev/null
+++ b/services/TS29222_CAPIF_Publish_Service_API/.openapi-generator/VERSION
@@ -0,0 +1 @@
+5.3.0-SNAPSHOT
\ No newline at end of file
diff --git a/services/TS29222_CAPIF_Publish_Service_API/.travis.yml b/services/TS29222_CAPIF_Publish_Service_API/.travis.yml
new file mode 100644
index 0000000000000000000000000000000000000000..ad71ee5ca083a6923c91104533c5c7b86f297f3f
--- /dev/null
+++ b/services/TS29222_CAPIF_Publish_Service_API/.travis.yml
@@ -0,0 +1,14 @@
+# ref: https://docs.travis-ci.com/user/languages/python
+language: python
+python:
+  - "3.2"
+  - "3.3"
+  - "3.4"
+  - "3.5"
+  - "3.6"
+  - "3.7"
+  - "3.8"
+# command to install dependencies
+install: "pip install -r requirements.txt"
+# command to run tests
+script: nosetests
diff --git a/services/TS29222_CAPIF_Publish_Service_API/Dockerfile b/services/TS29222_CAPIF_Publish_Service_API/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..b2e6167309094b21ac6526fb45d679861032d65f
--- /dev/null
+++ b/services/TS29222_CAPIF_Publish_Service_API/Dockerfile
@@ -0,0 +1,17 @@
+FROM public.ecr.aws/o2v4a8t6/opencapif/python:3-alpine
+
+RUN mkdir -p /usr/src/app
+WORKDIR /usr/src/app
+
+COPY requirements.txt /usr/src/app/requirements.txt
+
+RUN apk add -U --no-cache gcc build-base linux-headers ca-certificates libffi-dev libressl-dev libxslt-dev
+RUN pip3 install --no-cache-dir -r requirements.txt
+
+COPY . /usr/src/app
+
+EXPOSE 8080
+
+ENTRYPOINT ["python3"]
+
+CMD ["-m", "published_apis"]
\ No newline at end of file
diff --git a/services/TS29222_CAPIF_Publish_Service_API/README.md b/services/TS29222_CAPIF_Publish_Service_API/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..60ff8b067416f4815ed1c0b7b954e45a1a0e0189
--- /dev/null
+++ b/services/TS29222_CAPIF_Publish_Service_API/README.md
@@ -0,0 +1,49 @@
+# OpenAPI generated server
+
+## Overview
+This server was generated by the [OpenAPI Generator](https://openapi-generator.tech) project. By using the
+[OpenAPI-Spec](https://openapis.org) from a remote server, you can easily generate a server stub.  This
+is an example of building a OpenAPI-enabled Flask server.
+
+This example uses the [Connexion](https://github.com/zalando/connexion) library on top of Flask.
+
+## Requirements
+Python 3.5.2+
+
+## Usage
+To run the server, please execute the following from the root directory:
+
+```
+pip3 install -r requirements.txt
+python3 -m published_apis
+```
+
+and open your browser to here:
+
+```
+http://localhost:8080/published-apis/v1/ui/
+```
+
+Your OpenAPI definition lives here:
+
+```
+http://localhost:8080/published-apis/v1/openapi.json
+```
+
+To launch the integration tests, use tox:
+```
+sudo pip install tox
+tox
+```
+
+## Running with Docker
+
+To run the server on a Docker container, please execute the following from the root directory:
+
+```bash
+# building the image
+docker build -t published_apis .
+
+# starting up a container
+docker run -p 8080:8080 published_apis
+```
\ No newline at end of file
diff --git a/services/TS29222_CAPIF_Publish_Service_API/config.yaml b/services/TS29222_CAPIF_Publish_Service_API/config.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..3ca4ba31f7e3857d6dca841737edea2a4791e267
--- /dev/null
+++ b/services/TS29222_CAPIF_Publish_Service_API/config.yaml
@@ -0,0 +1,21 @@
+mongo: {
+  'user': 'root',
+  'password': 'example',
+  'db': 'capif',
+  'col': 'serviceapidescriptions',
+  'certs_col': "certs",
+  'capif_provider_col': "providerenrolmentdetails",
+  'host': 'mongo',
+  'port': "27017"
+}
+
+monitoring: {
+  "fluent_bit_host": fluent-bit,
+  "fluent_bit_port": 24224,
+  "opentelemetry_url": "otel-collector",
+  "opentelemetry_port": "55680",
+  "opentelemetry_max_queue_size": 8192,
+  "opentelemetry_schedule_delay_millis": 20000,
+  "opentelemetry_max_export_batch_size": 2048,
+  "opentelemetry_export_timeout_millis": 60000
+}
\ No newline at end of file
diff --git a/services/TS29222_CAPIF_Publish_Service_API/git_push.sh b/services/TS29222_CAPIF_Publish_Service_API/git_push.sh
new file mode 100644
index 0000000000000000000000000000000000000000..9405f72e950cdb8ca24c3cf4d15cee7eac62fde7
--- /dev/null
+++ b/services/TS29222_CAPIF_Publish_Service_API/git_push.sh
@@ -0,0 +1,57 @@
+#!/bin/sh
+# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
+#
+# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl "minor update" "gitlab.com"
+
+git_user_id=$1
+git_repo_id=$2
+release_note=$3
+git_host=$4
+
+if [ "$git_host" = "" ]; then
+    git_host="github.com"
+    echo "[INFO] No command line input provided. Set \$git_host to $git_host"
+fi
+
+if [ "$git_user_id" = "" ]; then
+    git_user_id="GIT_USER_ID"
+    echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id"
+fi
+
+if [ "$git_repo_id" = "" ]; then
+    git_repo_id="GIT_REPO_ID"
+    echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id"
+fi
+
+if [ "$release_note" = "" ]; then
+    release_note="Minor update"
+    echo "[INFO] No command line input provided. Set \$release_note to $release_note"
+fi
+
+# Initialize the local directory as a Git repository
+git init
+
+# Adds the files in the local repository and stages them for commit.
+git add .
+
+# Commits the tracked changes and prepares them to be pushed to a remote repository.
+git commit -m "$release_note"
+
+# Sets the new remote
+git_remote=`git remote`
+if [ "$git_remote" = "" ]; then # git remote not defined
+
+    if [ "$GIT_TOKEN" = "" ]; then
+        echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git credential in your environment."
+        git remote add origin https://${git_host}/${git_user_id}/${git_repo_id}.git
+    else
+        git remote add origin https://${git_user_id}:${GIT_TOKEN}@${git_host}/${git_user_id}/${git_repo_id}.git
+    fi
+
+fi
+
+git pull origin master
+
+# Pushes (Forces) the changes in the local repository up to the remote repository
+echo "Git pushing to https://${git_host}/${git_user_id}/${git_repo_id}.git"
+git push origin master 2>&1 | grep -v 'To https'
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/__init__.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/__main__.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/__main__.py
new file mode 100644
index 0000000000000000000000000000000000000000..dfba9ef99bcbb5c96e9260d7d1a1f22ace86e6b1
--- /dev/null
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/__main__.py
@@ -0,0 +1,142 @@
+#!/usr/bin/env python3
+
+import connexion
+import logging 
+
+from published_apis import encoder
+
+from flask import Flask, jsonify, request
+from flask_jwt_extended import JWTManager, jwt_required, create_access_token
+from pymongo import MongoClient
+from .config import Config
+from logging.handlers import RotatingFileHandler
+from .core.consumer_messager import Subscriber
+from flask_executor import Executor
+import os
+from fluent import sender
+from flask_executor import Executor
+from opentelemetry.instrumentation.flask import FlaskInstrumentor
+from opentelemetry import trace
+from opentelemetry.exporter.otlp.proto.grpc.trace_exporter import OTLPSpanExporter
+from opentelemetry.trace.propagation.tracecontext import TraceContextTextMapPropagator
+from opentelemetry.sdk.resources import Resource
+from opentelemetry.sdk.trace import TracerProvider
+from opentelemetry.sdk.trace.export import BatchSpanProcessor
+from opentelemetry.instrumentation.redis import RedisInstrumentor
+
+
+
+NAME = "Publish-Service"
+
+def configure_monitoring(app, config):
+
+    resource = Resource(attributes={"service.name": NAME})
+
+    fluent_bit_host = config['monitoring']['fluent_bit_host']
+    fluent_bit_port = config['monitoring']['fluent_bit_port']
+    fluent_bit_sender = sender.FluentSender('Publish-Service', host=fluent_bit_host, port=fluent_bit_port)
+    propagator = TraceContextTextMapPropagator()
+
+    tracer_provider = TracerProvider(resource=resource)
+    trace.set_tracer_provider(tracer_provider)
+    exporter = OTLPSpanExporter(endpoint=f"http://{config['monitoring']['opentelemetry_url']}:{config['monitoring']['opentelemetry_port']}", insecure=True)
+    span_processor = BatchSpanProcessor(
+        exporter,
+        max_queue_size=config['monitoring']['opentelemetry_max_queue_size'],
+        schedule_delay_millis=config['monitoring']['opentelemetry_schedule_delay_millis'],
+        max_export_batch_size=config['monitoring']['opentelemetry_max_export_batch_size'],
+        export_timeout_millis=config['monitoring']['opentelemetry_export_timeout_millis'],
+    )
+
+    trace.get_tracer_provider().add_span_processor(span_processor)
+
+    FlaskInstrumentor().instrument_app(app)
+
+    RedisInstrumentor().instrument()
+
+    class FluentBitHandler(logging.Handler):
+
+        def __init__(self):
+            logging.Handler.__init__(self)
+
+        def emit(self, record):
+            log_entry = self.format(record)
+            log_data = {
+                'message': log_entry,
+                'level': record.levelname,
+                'timestamp': record.created,
+                'logger': record.name,
+                'function': record.funcName,
+                'line': record.lineno,
+                'container_name': os.environ.get('CONTAINER_NAME', ''),
+            }
+
+            # # Obtener el trace ID actual
+            current_context = trace.get_current_span().get_span_context()
+
+            trace_id = current_context.trace_id
+            traceparent_id = current_context.span_id
+            log_data['traceID'] = hex(trace_id)[2:]
+            if traceparent_id != None:
+                log_data['traceparent'] = hex(traceparent_id)[2:]
+            fluent_bit_sender.emit('Publish-Service', log_data)
+
+    loggers = [app.logger, ]
+    for l in loggers:
+         l.addHandler(FluentBitHandler())
+
+
+
+def configure_logging(app):
+    del app.logger.handlers[:]
+    loggers = [app.logger, ]
+    handlers = []
+    console_handler = logging.StreamHandler()
+    console_handler.setLevel(logging.DEBUG)
+    console_handler.setFormatter(verbose_formatter())
+    file_handler = RotatingFileHandler(filename="publish_logs.log", maxBytes=1024 * 1024 * 100, backupCount=20)
+    file_handler.setLevel(logging.DEBUG)
+    file_handler.setFormatter(verbose_formatter())
+    handlers.append(console_handler)
+    handlers.append(file_handler)
+
+
+    for l in loggers:
+        for handler in handlers:
+            l.addHandler(handler)
+        l.propagate = False
+        l.setLevel(logging.DEBUG)
+
+
+def verbose_formatter():
+    return logging.Formatter(
+        '{"timestamp": "%(asctime)s", "level": "%(levelname)s", "logger": "%(name)s", "function": "%(funcName)s", "line": %(lineno)d, "message": %(message)s}',
+        datefmt='%d/%m/%Y %H:%M:%S'
+    )
+
+app = connexion.App(__name__, specification_dir='./openapi/')
+app.app.json_encoder = encoder.JSONEncoder
+app.add_api('openapi.yaml',
+            arguments={'title': 'CAPIF_Publish_Service_API'},
+            pythonic_params=True)
+
+app.app.config["JWT_SECRET_KEY"] = "this-is-secret-key"
+
+config = Config()
+
+jwt = JWTManager(app.app)
+configure_logging(app.app)
+
+if eval(os.environ.get("MONITORING").lower().capitalize()):
+    configure_monitoring(app.app, config.get_config())
+
+executor = Executor(app.app)
+subscriber = Subscriber()
+
+@app.app.before_first_request
+def up_listener():
+    executor.submit(subscriber.listen)
+
+
+if __name__ == '__main__':
+    app.run(debug=True, port=8080)
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/config.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/config.py
new file mode 100644
index 0000000000000000000000000000000000000000..11e1c4f3626d7440c6cd999ed118afb3c93caa2e
--- /dev/null
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/config.py
@@ -0,0 +1,21 @@
+import yaml
+import os
+
+#Config class to get config
+class Config:
+	def __init__(self):
+		self.cached = 0
+		self.file="./config.yaml"
+		self.my_config = {}
+
+		stamp = os.stat(self.file).st_mtime
+		if stamp != self.cached:
+			self.cached = stamp
+			f = open(self.file)
+			self.my_config = yaml.safe_load(f)
+			f.close()
+
+	def get_config(self):
+		return self.my_config
+
+
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/controllers/__init__.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/controllers/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/controllers/default_controller.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/controllers/default_controller.py
new file mode 100644
index 0000000000000000000000000000000000000000..8fc2b6269ac2c0363ca96b3d3e76cdac7edeba01
--- /dev/null
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/controllers/default_controller.py
@@ -0,0 +1,160 @@
+import connexion
+from published_apis.models.service_api_description import ServiceAPIDescription  # noqa: E501
+from ..core import serviceapidescriptions
+from ..core.serviceapidescriptions import PublishServiceOperations
+from ..core.publisher import Publisher
+
+import json
+from flask import Response, request, current_app
+from flask_jwt_extended import jwt_required, get_jwt_identity
+from flask import current_app
+from ..encoder import JSONEncoder
+from ..models.problem_details import ProblemDetails
+from cryptography import x509
+from cryptography.hazmat.backends import default_backend
+from ..core.validate_user import ControlAccess
+from functools import wraps
+import pymongo
+
+
+service_operations = PublishServiceOperations()
+publisher_ops = Publisher()
+
+valid_user = ControlAccess()
+
+def cert_validation():
+    def _cert_validation(f):
+        @wraps(f)
+        def __cert_validation(*args, **kwargs):
+
+            args = request.view_args
+            cert_tmp = request.headers['X-Ssl-Client-Cert']
+            cert_raw = cert_tmp.replace('\t', '')
+
+            cert = x509.load_pem_x509_certificate(str.encode(cert_raw), default_backend())
+
+            cn = cert.subject.get_attributes_for_oid(x509.OID_COMMON_NAME)[0].value.strip()
+
+            if cn != "superadmin":
+                cert_signature = cert.signature.hex()
+                result = valid_user.validate_user_cert(args["apfId"], args["serviceApiId"], cert_signature)
+
+                if result is not None:
+                    return result
+
+            result = f(**kwargs)
+            return result
+        return __cert_validation
+    return _cert_validation
+
+def apf_id_service_apis_get(apf_id):  # noqa: E501
+    """apf_id_service_apis_get
+
+    Retrieve all published APIs. # noqa: E501
+
+    :param apf_id: 
+    :type apf_id: str
+
+    :rtype: ServiceAPIDescription
+    """
+    current_app.logger.info("Obtainig all service published")
+    res = service_operations.get_serviceapis(apf_id)
+
+    return res
+
+
+def apf_id_service_apis_post(apf_id, body):  # noqa: E501
+    """apf_id_service_apis_post
+
+    Publish a new API. # noqa: E501
+
+    :param apf_id: 
+    :type apf_id: str
+    :param service_api_description: 
+    :type service_api_description: dict | bytes
+
+    :rtype: ServiceAPIDescription
+    """
+
+    current_app.logger.info("Publishing service")
+    if connexion.request.is_json:
+        body = ServiceAPIDescription.from_dict(connexion.request.get_json())  # noqa: E501
+
+    res = service_operations.add_serviceapidescription(apf_id, body)
+
+    if res.status_code == 201:
+        current_app.logger.info("Service published")
+        publisher_ops.publish_message("events", "SERVICE_API_AVAILABLE")
+
+    return res
+
+@cert_validation()
+def apf_id_service_apis_service_api_id_delete(service_api_id, apf_id):  # noqa: E501
+    """apf_id_service_apis_service_api_id_delete
+
+    Unpublish a published service API. # noqa: E501
+
+    :param service_api_id: 
+    :type service_api_id: str
+    :param apf_id: 
+    :type apf_id: str
+
+    :rtype: None
+    """
+
+    current_app.logger.info("Removing service published")
+    res = service_operations.delete_serviceapidescription(service_api_id, apf_id)
+
+    if res.status_code == 204:
+        current_app.logger.info("Removed service published")
+        publisher_ops.publish_message("events", "SERVICE_API_UNAVAILABLE")
+        publisher_ops.publish_message("internal-messages", f"service-removed:{service_api_id}")
+
+    return res
+
+@cert_validation()
+def apf_id_service_apis_service_api_id_get(service_api_id, apf_id):  # noqa: E501
+    """apf_id_service_apis_service_api_id_get
+
+    Retrieve a published service API. # noqa: E501
+
+    :param service_api_id: 
+    :type service_api_id: str
+    :param apf_id: 
+    :type apf_id: str
+
+    :rtype: ServiceAPIDescription
+    """
+
+    current_app.logger.info("Obtaining service api with id: " + service_api_id)
+    res = service_operations.get_one_serviceapi(service_api_id, apf_id)
+
+    return res
+
+@cert_validation()
+def apf_id_service_apis_service_api_id_put(service_api_id, apf_id, body):  # noqa: E501
+    """apf_id_service_apis_service_api_id_put
+
+    Update a published service API. # noqa: E501
+
+    :param service_api_id: 
+    :type service_api_id: str
+    :param apf_id: 
+    :type apf_id: str
+    :param service_api_description: 
+    :type service_api_description: dict | bytes
+
+    :rtype: ServiceAPIDescription
+    """
+
+    current_app.logger.info("Updating service api id with id: " + service_api_id)
+
+    if connexion.request.is_json:
+        body = ServiceAPIDescription.from_dict(connexion.request.get_json())  # noqa: E501
+
+    response = service_operations.update_serviceapidescription(service_api_id, apf_id, body)
+
+    if response.status_code == 200:
+        publisher_ops.publish_message("events", "SERVICE_API_UPDATE")
+
+    return response
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/controllers/security_controller_.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/controllers/security_controller_.py
new file mode 100644
index 0000000000000000000000000000000000000000..6d294ffd6df1a26a469dbb4e72533b01503468dd
--- /dev/null
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/controllers/security_controller_.py
@@ -0,0 +1,2 @@
+from typing import List
+
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/core/auth_manager.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/core/auth_manager.py
new file mode 100644
index 0000000000000000000000000000000000000000..6e329a486848233a1c0600e5625d095e32a54661
--- /dev/null
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/core/auth_manager.py
@@ -0,0 +1,47 @@
+
+from flask import current_app
+from cryptography import x509
+from cryptography.hazmat.backends import default_backend
+from .resources import Resource
+
+
+class AuthManager(Resource):
+
+    def add_auth_service(self, service_id, apf_id):
+        cert_col = self.db.get_col_by_name(self.db.certs_col)
+
+        auth_context = cert_col.find_one({"id":apf_id})
+
+        if "services" in auth_context["resources"]:
+            if service_id not in auth_context["resources"]["services"]:
+                auth_context["resources"]["services"].append(service_id)
+        else:
+            auth_context["resources"]["services"] = [service_id]
+
+        current_app.logger.info(auth_context)
+        cert_col.find_one_and_update({"id":apf_id}, {"$set":auth_context})
+
+
+    def remove_auth_service(self, service_id, apf_id):
+
+        cert_col = self.db.get_col_by_name(self.db.certs_col)
+
+        auth_context = cert_col.find_one({"id":apf_id})
+
+        if "services" in auth_context["resources"]:
+            if service_id in auth_context["resources"]["services"]:
+                auth_context["resources"]["services"].remove(service_id)
+
+        cert_col.find_one_and_update({"id":apf_id}, {"$set":auth_context})
+
+    def remove_auth_all_service(self, apf_id):
+
+        cert_col = self.db.get_col_by_name(self.db.certs_col)
+
+        auth_context = cert_col.find_one({"id":apf_id})
+
+        if auth_context != None:
+            if "services" in auth_context["resources"]:
+                auth_context["resources"]["services"] = []
+
+            cert_col.find_one_and_update({"id":apf_id}, {"$set":auth_context})
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/core/consumer_messager.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/core/consumer_messager.py
new file mode 100644
index 0000000000000000000000000000000000000000..93d35e481efb1c4550b4590934c70edd24b31795
--- /dev/null
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/core/consumer_messager.py
@@ -0,0 +1,29 @@
+# subscriber.py
+import redis
+import time
+import sys
+import json
+import asyncio
+from threading import Thread
+from .internal_service_ops import InternalServiceOps
+from flask import current_app
+
+class Subscriber():
+
+    def __init__(self):
+        self.r = redis.Redis(host='redis', port=6379, db=0)
+        self.security_ops = InternalServiceOps()
+        self.p = self.r.pubsub()
+        self.p.subscribe("internal-messages")
+
+    def listen(self):
+        current_app.logger.info("Listening publish messages")
+        for raw_message in self.p.listen():
+            if raw_message["type"] == "message" and raw_message["channel"].decode('utf-8') == "internal-messages":
+                message, *ids = raw_message["data"].decode('utf-8').split(":")
+                if message == "provider-removed" and len(ids)==2:
+                    self.security_ops.delete_intern_service(ids[1])
+
+
+
+
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/core/internal_service_ops.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/core/internal_service_ops.py
new file mode 100644
index 0000000000000000000000000000000000000000..71c2759ddb2faeae4ddefc657055119bda31ee9d
--- /dev/null
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/core/internal_service_ops.py
@@ -0,0 +1,22 @@
+
+from flask import current_app
+from .resources import Resource
+from .auth_manager import AuthManager
+
+class InternalServiceOps(Resource):
+
+    def __init__(self):
+        Resource.__init__(self)
+        self.auth_manager = AuthManager()
+
+    def delete_intern_service(self, apf_id):
+
+        current_app.logger.info("Provider removed, removing services published by APF")
+        mycol = self.db.get_col_by_name(self.db.service_api_descriptions)
+        my_query = {'apf_id': apf_id}
+        mycol.delete_many(my_query)
+
+        #We dont need remove all auth events, because when provider is removed, remove auth entry
+        #self.auth_manager.remove_auth_all_service(apf_id)
+
+        current_app.logger.info("Removed service")
\ No newline at end of file
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/core/publisher.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/core/publisher.py
new file mode 100644
index 0000000000000000000000000000000000000000..f7b0c3c4b25f9abbe24d2dc734a72a93ffe0af01
--- /dev/null
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/core/publisher.py
@@ -0,0 +1,10 @@
+import redis
+import sys
+
+class Publisher():
+
+    def __init__(self):
+        self. r = redis.Redis(host='redis', port=6379, db=0)
+
+    def publish_message(self, channel, message):
+        self.r.publish(channel, message)
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/core/resources.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/core/resources.py
new file mode 100644
index 0000000000000000000000000000000000000000..94e29ec07359c93a78d520f24fa91c88971d65c4
--- /dev/null
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/core/resources.py
@@ -0,0 +1,7 @@
+from abc import ABC, abstractmethod
+from ..db.db import MongoDatabse
+
+class Resource(ABC):
+
+    def __init__(self):
+        self.db = MongoDatabse()
\ No newline at end of file
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/core/responses.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/core/responses.py
new file mode 100644
index 0000000000000000000000000000000000000000..c1809eda5a7669e869fb2e83fa7ebf2628f4d3f2
--- /dev/null
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/core/responses.py
@@ -0,0 +1,37 @@
+from ..models.problem_details import ProblemDetails
+from ..encoder import JSONEncoder
+from flask import Response
+import json
+from bson import json_util
+
+mimetype = "application/json"
+
+def make_response(object, status):
+    res = Response(json.dumps(object, cls=JSONEncoder), status=status, mimetype=mimetype)
+
+    return res
+
+def internal_server_error(detail, cause):
+    prob = ProblemDetails(title="Internal Server Error", status=500, detail=detail, cause=cause)
+
+    return Response(json.dumps(prob, cls=JSONEncoder), status=500, mimetype=mimetype)
+
+def forbidden_error(detail, cause):
+    prob = ProblemDetails(title="Forbidden", status=403, detail=detail, cause=cause)
+
+    return Response(json.dumps(prob, cls=JSONEncoder), status=403, mimetype=mimetype)
+
+def bad_request_error(detail, cause, invalid_params):
+    prob = ProblemDetails(title="Bad Request", status=400, detail=detail, cause=cause, invalid_params=invalid_params)
+
+    return Response(json.dumps(prob, cls=JSONEncoder), status=400, mimetype=cause)
+
+def not_found_error(detail, cause):
+    prob = ProblemDetails(title="Not Found", status=404, detail=detail, cause=cause)
+
+    return Response(json.dumps(prob, cls=JSONEncoder), status=404, mimetype=mimetype)
+
+def unauthorized_error(detail, cause):
+    prob = ProblemDetails(title="Unauthorized", status=401, detail=detail, cause=cause)
+
+    return Response(json.dumps(prob, cls=JSONEncoder), status=401, mimetype=mimetype)
\ No newline at end of file
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/core/serviceapidescriptions.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/core/serviceapidescriptions.py
new file mode 100644
index 0000000000000000000000000000000000000000..e2892e69573b8b42fff6f71aaf618162a4da6773
--- /dev/null
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/core/serviceapidescriptions.py
@@ -0,0 +1,218 @@
+import sys
+
+import pymongo
+from pymongo import ReturnDocument
+import secrets
+from flask import current_app, Flask, Response
+import json
+
+from pymongo import response
+from ..db.db import MongoDatabse
+from ..encoder import JSONEncoder
+from ..models.problem_details import ProblemDetails
+from .resources import Resource
+from ..util import dict_to_camel_case, clean_empty
+from .responses import bad_request_error, internal_server_error, forbidden_error, not_found_error, unauthorized_error, make_response
+from bson import json_util
+from .auth_manager import AuthManager
+
+
+service_api_not_found_message = "Service API not found"
+
+class PublishServiceOperations(Resource):
+
+    def __check_apf(self, apf_id):
+        providers_col = self.db.get_col_by_name(self.db.capif_provider_col)
+
+        current_app.logger.debug("Checking apf id")
+        provider = providers_col.find_one({"api_prov_funcs.api_prov_func_id": apf_id})
+
+        if provider is None:
+            current_app.logger.error("Publisher not exist")
+            return unauthorized_error(detail = "Publisher not existing", cause = "Publisher id not found")
+
+        list_apf_ids =  [func["api_prov_func_id"] for func in provider["api_prov_funcs"] if func["api_prov_func_role"] == "APF"]
+        if apf_id not in list_apf_ids:
+            current_app.logger.debug("This id not belongs to APF")
+            return unauthorized_error(detail ="You are not a publisher", cause ="This API is only available for publishers")
+
+        return None
+
+    def __init__(self):
+        Resource.__init__(self)
+        self.auth_manager = AuthManager()
+
+    def get_serviceapis(self, apf_id):
+
+        mycol = self.db.get_col_by_name(self.db.service_api_descriptions)
+
+        try:
+
+            current_app.logger.debug("Geting service apis")
+
+            result = self.__check_apf(apf_id)
+
+            if result != None:
+                return result
+
+            service = mycol.find({"apf_id": apf_id}, {"apf_id":0, "_id":0})
+            if service is None:
+                current_app.logger.error("Not found services for this apf id")
+                return not_found_error(detail="Not exist published services for this apf_id", cause="Not exist service with this apf_id")
+
+            json_docs = []
+            for serviceapi in service:
+                my_service_api = dict_to_camel_case(serviceapi)
+                my_service_api = clean_empty(my_service_api)
+                json_docs.append(my_service_api)
+
+            current_app.logger.debug("Obtained services apis")
+
+            res = make_response(object=json_docs, status=200)
+            return res
+
+        except Exception as e:
+            exception = "An exception occurred in get services"
+            current_app.logger.error(exception + "::" + str(e))
+            return internal_server_error(detail=exception, cause=str(e))
+
+    def add_serviceapidescription(self, apf_id, serviceapidescription):
+
+        mycol = self.db.get_col_by_name(self.db.service_api_descriptions)
+
+        try:
+
+            current_app.logger.debug("Publishing service")
+            result = self.__check_apf(apf_id)
+
+            if result != None:
+                return result
+
+            service = mycol.find_one({"api_name": serviceapidescription.api_name})
+            if service is not None:
+                current_app.logger.error("Service already registered with same api name")
+                return forbidden_error(detail="Already registered service with same api name", cause="Found service with same api name")
+
+            api_id = secrets.token_hex(15)
+            serviceapidescription.api_id = api_id
+            rec = dict()
+            rec['apf_id'] = apf_id
+            rec.update(serviceapidescription.to_dict())
+            mycol.insert_one(rec)
+
+            self.auth_manager.add_auth_service(api_id, apf_id)
+
+            current_app.logger.debug("Service inserted in database")
+            res = make_response(object=serviceapidescription, status=201)
+            res.headers['Location'] = "http://localhost:8080/published-apis/v1/" + str(apf_id) + "/service-apis/" + str(api_id)
+
+            return res
+
+        except Exception as e:
+            exception = "An exception occurred in add services"
+            current_app.logger.error(exception + "::" + str(e))
+            return internal_server_error(detail=exception, cause=str(e))
+
+
+
+    def get_one_serviceapi(self, service_api_id, apf_id):
+
+        mycol = self.db.get_col_by_name(self.db.service_api_descriptions)
+
+        try:
+            current_app.logger.debug("Geting service api with id: " + service_api_id)
+            result = self.__check_apf(apf_id)
+
+            if result != None:
+                return result
+
+            my_query = {'apf_id': apf_id, 'api_id': service_api_id}
+            service_api = mycol.find_one(my_query, {"apf_id":0, "_id":0})
+            if service_api is None:
+                current_app.logger.error(service_api_not_found_message)
+                return not_found_error(detail=service_api_not_found_message, cause="No Service with specific credentials exists")
+
+
+            my_service_api = dict_to_camel_case(service_api)
+            my_service_api = clean_empty(my_service_api)
+
+            current_app.logger.debug("Obtained service api")
+            res = make_response(object=my_service_api, status=200)
+            return res
+
+        except Exception as e:
+            exception = "An exception occurred in get one service"
+            current_app.logger.error(exception + "::" + str(e))
+            return internal_server_error(detail=exception, cause=str(e))
+
+    def delete_serviceapidescription(self, service_api_id, apf_id):
+
+        mycol = self.db.get_col_by_name(self.db.service_api_descriptions)
+
+        try:
+
+            current_app.logger.debug("Removing api service with id: " + service_api_id)
+            result = self.__check_apf(apf_id)
+
+            if result != None:
+                return result
+
+            my_query = {'apf_id': apf_id, 'api_id': service_api_id}
+            serviceapidescription = mycol.find_one(my_query)
+
+            if serviceapidescription is None:
+                current_app.logger.error(service_api_not_found_message)
+                return not_found_error(detail="Service API not existing", cause="Service API id not found")
+
+            mycol.delete_one(my_query)
+
+            self.auth_manager.remove_auth_service(service_api_id, apf_id)
+
+            current_app.logger.debug("Removed service from database")
+            out =  "The service matching api_id " + service_api_id + " was deleted."
+            return make_response(out, status=204)
+
+        except Exception as e:
+            exception = "An exception occurred in delete service"
+            current_app.logger.error(exception + "::" + str(e))
+            return internal_server_error(detail=exception, cause=str(e))
+
+
+    def update_serviceapidescription(self, service_api_id, apf_id, service_api_description):
+
+        mycol = self.db.get_col_by_name(self.db.service_api_descriptions)
+
+        try:
+
+            current_app.logger.debug("Updating service api with id: " + service_api_id)
+
+            result = self.__check_apf(apf_id)
+
+            if result != None:
+                return result
+
+            my_query = {'apf_id': apf_id, 'api_id': service_api_id}
+            serviceapidescription = mycol.find_one(my_query)
+
+            if serviceapidescription is None:
+                current_app.logger.error(service_api_not_found_message)
+                return not_found_error(detail="Service API not existing", cause="Service API id not found")
+
+            service_api_description = service_api_description.to_dict()
+            service_api_description = clean_empty(service_api_description)
+
+            result = mycol.find_one_and_update(serviceapidescription, {"$set":service_api_description}, projection={"apf_id":0, "_id":0},return_document=ReturnDocument.AFTER ,upsert=False)
+
+            result = clean_empty(result)
+
+            current_app.logger.debug("Updated service api")
+    
+            response = make_response(object=dict_to_camel_case(result), status=200)
+
+            return response
+
+        except Exception as e:
+            exception = "An exception occurred in update service"
+            current_app.logger.error(exception + "::" + str(e))
+            return internal_server_error(detail=exception, cause=str(e))
+
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/core/validate_user.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/core/validate_user.py
new file mode 100644
index 0000000000000000000000000000000000000000..67d434dc13624075dbc1698d90046d9c10326ac8
--- /dev/null
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/core/validate_user.py
@@ -0,0 +1,26 @@
+from flask import current_app, Response
+import json
+from ..models.problem_details import ProblemDetails
+from ..encoder import JSONEncoder
+from .resources import Resource
+from .responses import internal_server_error
+
+class ControlAccess(Resource):
+
+    def validate_user_cert(self, apf_id, service_id, cert_signature):
+
+        cert_col = self.db.get_col_by_name(self.db.certs_col)
+
+        try:
+            my_query = {'id':apf_id}
+            cert_entry = cert_col.find_one(my_query)
+
+            if cert_entry is not None:
+                if cert_entry["cert_signature"] != cert_signature or "services" not in cert_entry["resources"] or service_id not in cert_entry["resources"]["services"]:
+                    prob = ProblemDetails(title="Unauthorized", detail="User not authorized", cause="You are not the owner of this resource")
+                    return Response(json.dumps(prob, cls=JSONEncoder), status=401, mimetype="application/json")
+
+        except Exception as e:
+            exception = "An exception occurred in validate apf"
+            current_app.logger.error(exception + "::" + str(e))
+            return internal_server_error(detail=exception, cause=str(e))
\ No newline at end of file
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/db/db.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/db/db.py
new file mode 100644
index 0000000000000000000000000000000000000000..91f7b6bb9408859d41a1e9a8c05be563669902fd
--- /dev/null
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/db/db.py
@@ -0,0 +1,45 @@
+import atexit
+import time
+from pymongo import MongoClient
+from pymongo.errors import AutoReconnect
+from ..config import Config
+from bson.codec_options import CodecOptions
+import os
+from opentelemetry.instrumentation.pymongo import PymongoInstrumentor
+
+if eval(os.environ.get("MONITORING").lower().capitalize()):
+    PymongoInstrumentor().instrument()
+
+
+class MongoDatabse():
+
+    def __init__(self):
+        self.config = Config().get_config()
+        self.db = self.__connect()
+        self.service_api_descriptions = self.config['mongo']['col']
+        self.capif_provider_col = self.config['mongo']['capif_provider_col']
+        self.certs_col = self.config['mongo']['certs_col']
+
+
+    def get_col_by_name(self, name):
+        return self.db[name].with_options(codec_options=CodecOptions(tz_aware=True))
+
+    def __connect(self, max_retries=3, retry_delay=1):
+        retries = 0
+        while retries < max_retries:
+            try:
+                uri = f"mongodb://{self.config['mongo']['user']}:{self.config['mongo']['password']}@" \
+                      f"{self.config['mongo']['host']}:{self.config['mongo']['port']}"
+                client = MongoClient(uri)
+                mydb = client[self.config['mongo']['db']]
+                mydb.command("ping")
+                return mydb
+            except AutoReconnect:
+                retries += 1
+                print(f"Reconnecting... Retry {retries} of {max_retries}")
+                time.sleep(retry_delay)
+        return None
+
+    def close_connection(self):
+        if self.db.client:
+            self.db.client.close()
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/encoder.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/encoder.py
new file mode 100644
index 0000000000000000000000000000000000000000..c753f45e1f69eda91e19d4328d2447f9e7114fe0
--- /dev/null
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/encoder.py
@@ -0,0 +1,20 @@
+from connexion.apps.flask_app import FlaskJSONEncoder
+import six
+
+from published_apis.models.base_model_ import Model
+
+
+class JSONEncoder(FlaskJSONEncoder):
+    include_nulls = False
+
+    def default(self, o):
+        if isinstance(o, Model):
+            dikt = {}
+            for attr, _ in six.iteritems(o.openapi_types):
+                value = getattr(o, attr)
+                if value is None and not self.include_nulls:
+                    continue
+                attr = o.attribute_map[attr]
+                dikt[attr] = value
+            return dikt
+        return FlaskJSONEncoder.default(self, o)
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/__init__.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e80629d7c4c4a4a772946187c2f3710fe8574adc
--- /dev/null
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/__init__.py
@@ -0,0 +1,25 @@
+# coding: utf-8
+
+# flake8: noqa
+from __future__ import absolute_import
+# import models into model package
+from published_apis.models.aef_profile import AefProfile
+from published_apis.models.communication_type import CommunicationType
+from published_apis.models.communication_type_any_of import CommunicationTypeAnyOf
+from published_apis.models.custom_operation import CustomOperation
+from published_apis.models.data_format import DataFormat
+from published_apis.models.data_format_any_of import DataFormatAnyOf
+from published_apis.models.interface_description import InterfaceDescription
+from published_apis.models.invalid_param import InvalidParam
+from published_apis.models.operation import Operation
+from published_apis.models.operation_any_of import OperationAnyOf
+from published_apis.models.problem_details import ProblemDetails
+from published_apis.models.protocol import Protocol
+from published_apis.models.protocol_any_of import ProtocolAnyOf
+from published_apis.models.published_api_path import PublishedApiPath
+from published_apis.models.resource import Resource
+from published_apis.models.security_method import SecurityMethod
+from published_apis.models.security_method_any_of import SecurityMethodAnyOf
+from published_apis.models.service_api_description import ServiceAPIDescription
+from published_apis.models.shareable_information import ShareableInformation
+from published_apis.models.version import Version
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/aef_profile.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/aef_profile.py
new file mode 100644
index 0000000000000000000000000000000000000000..ff3c3c505d870d361046e849a169b671d8446113
--- /dev/null
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/aef_profile.py
@@ -0,0 +1,250 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from published_apis.models.base_model_ import Model
+from published_apis.models.data_format import DataFormat
+from published_apis.models.interface_description import InterfaceDescription
+from published_apis.models.protocol import Protocol
+from published_apis.models.security_method import SecurityMethod
+from published_apis.models.version import Version
+from published_apis import util
+
+from published_apis.models.data_format import DataFormat  # noqa: E501
+from published_apis.models.interface_description import InterfaceDescription  # noqa: E501
+from published_apis.models.protocol import Protocol  # noqa: E501
+from published_apis.models.security_method import SecurityMethod  # noqa: E501
+from published_apis.models.version import Version  # noqa: E501
+
+class AefProfile(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, aef_id=None, versions=None, protocol=None, data_format=None, security_methods=None, domain_name=None, interface_descriptions=None):  # noqa: E501
+        """AefProfile - a model defined in OpenAPI
+
+        :param aef_id: The aef_id of this AefProfile.  # noqa: E501
+        :type aef_id: str
+        :param versions: The versions of this AefProfile.  # noqa: E501
+        :type versions: List[Version]
+        :param protocol: The protocol of this AefProfile.  # noqa: E501
+        :type protocol: Protocol
+        :param data_format: The data_format of this AefProfile.  # noqa: E501
+        :type data_format: DataFormat
+        :param security_methods: The security_methods of this AefProfile.  # noqa: E501
+        :type security_methods: List[SecurityMethod]
+        :param domain_name: The domain_name of this AefProfile.  # noqa: E501
+        :type domain_name: str
+        :param interface_descriptions: The interface_descriptions of this AefProfile.  # noqa: E501
+        :type interface_descriptions: List[InterfaceDescription]
+        """
+        self.openapi_types = {
+            'aef_id': str,
+            'versions': List[Version],
+            'protocol': Protocol,
+            'data_format': DataFormat,
+            'security_methods': List[SecurityMethod],
+            'domain_name': str,
+            'interface_descriptions': List[InterfaceDescription]
+        }
+
+        self.attribute_map = {
+            'aef_id': 'aefId',
+            'versions': 'versions',
+            'protocol': 'protocol',
+            'data_format': 'dataFormat',
+            'security_methods': 'securityMethods',
+            'domain_name': 'domainName',
+            'interface_descriptions': 'interfaceDescriptions'
+        }
+
+        self._aef_id = aef_id
+        self._versions = versions
+        self._protocol = protocol
+        self._data_format = data_format
+        self._security_methods = security_methods
+        self._domain_name = domain_name
+        self._interface_descriptions = interface_descriptions
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'AefProfile':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The AefProfile of this AefProfile.  # noqa: E501
+        :rtype: AefProfile
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def aef_id(self):
+        """Gets the aef_id of this AefProfile.
+
+        Identifier of the API exposing function  # noqa: E501
+
+        :return: The aef_id of this AefProfile.
+        :rtype: str
+        """
+        return self._aef_id
+
+    @aef_id.setter
+    def aef_id(self, aef_id):
+        """Sets the aef_id of this AefProfile.
+
+        Identifier of the API exposing function  # noqa: E501
+
+        :param aef_id: The aef_id of this AefProfile.
+        :type aef_id: str
+        """
+        if aef_id is None:
+            raise ValueError("Invalid value for `aef_id`, must not be `None`")  # noqa: E501
+
+        self._aef_id = aef_id
+
+    @property
+    def versions(self):
+        """Gets the versions of this AefProfile.
+
+        API version  # noqa: E501
+
+        :return: The versions of this AefProfile.
+        :rtype: List[Version]
+        """
+        return self._versions
+
+    @versions.setter
+    def versions(self, versions):
+        """Sets the versions of this AefProfile.
+
+        API version  # noqa: E501
+
+        :param versions: The versions of this AefProfile.
+        :type versions: List[Version]
+        """
+        if versions is None:
+            raise ValueError("Invalid value for `versions`, must not be `None`")  # noqa: E501
+        if versions is not None and len(versions) < 1:
+            raise ValueError("Invalid value for `versions`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._versions = versions
+
+    @property
+    def protocol(self):
+        """Gets the protocol of this AefProfile.
+
+
+        :return: The protocol of this AefProfile.
+        :rtype: Protocol
+        """
+        return self._protocol
+
+    @protocol.setter
+    def protocol(self, protocol):
+        """Sets the protocol of this AefProfile.
+
+
+        :param protocol: The protocol of this AefProfile.
+        :type protocol: Protocol
+        """
+
+        self._protocol = protocol
+
+    @property
+    def data_format(self):
+        """Gets the data_format of this AefProfile.
+
+
+        :return: The data_format of this AefProfile.
+        :rtype: DataFormat
+        """
+        return self._data_format
+
+    @data_format.setter
+    def data_format(self, data_format):
+        """Sets the data_format of this AefProfile.
+
+
+        :param data_format: The data_format of this AefProfile.
+        :type data_format: DataFormat
+        """
+
+        self._data_format = data_format
+
+    @property
+    def security_methods(self):
+        """Gets the security_methods of this AefProfile.
+
+        Security methods supported by the AEF  # noqa: E501
+
+        :return: The security_methods of this AefProfile.
+        :rtype: List[SecurityMethod]
+        """
+        return self._security_methods
+
+    @security_methods.setter
+    def security_methods(self, security_methods):
+        """Sets the security_methods of this AefProfile.
+
+        Security methods supported by the AEF  # noqa: E501
+
+        :param security_methods: The security_methods of this AefProfile.
+        :type security_methods: List[SecurityMethod]
+        """
+        if security_methods is not None and len(security_methods) < 1:
+            raise ValueError("Invalid value for `security_methods`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._security_methods = security_methods
+
+    @property
+    def domain_name(self):
+        """Gets the domain_name of this AefProfile.
+
+        Domain to which API belongs to  # noqa: E501
+
+        :return: The domain_name of this AefProfile.
+        :rtype: str
+        """
+        return self._domain_name
+
+    @domain_name.setter
+    def domain_name(self, domain_name):
+        """Sets the domain_name of this AefProfile.
+
+        Domain to which API belongs to  # noqa: E501
+
+        :param domain_name: The domain_name of this AefProfile.
+        :type domain_name: str
+        """
+
+        self._domain_name = domain_name
+
+    @property
+    def interface_descriptions(self):
+        """Gets the interface_descriptions of this AefProfile.
+
+        Interface details  # noqa: E501
+
+        :return: The interface_descriptions of this AefProfile.
+        :rtype: List[InterfaceDescription]
+        """
+        return self._interface_descriptions
+
+    @interface_descriptions.setter
+    def interface_descriptions(self, interface_descriptions):
+        """Sets the interface_descriptions of this AefProfile.
+
+        Interface details  # noqa: E501
+
+        :param interface_descriptions: The interface_descriptions of this AefProfile.
+        :type interface_descriptions: List[InterfaceDescription]
+        """
+        if interface_descriptions is not None and len(interface_descriptions) < 1:
+            raise ValueError("Invalid value for `interface_descriptions`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._interface_descriptions = interface_descriptions
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/base_model_.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/base_model_.py
new file mode 100644
index 0000000000000000000000000000000000000000..2c63ab05edeb6eea0a182b86e45af166d2cbfaad
--- /dev/null
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/base_model_.py
@@ -0,0 +1,69 @@
+import pprint
+
+import six
+import typing
+
+from published_apis import util
+
+T = typing.TypeVar('T')
+
+
+class Model(object):
+    # openapiTypes: The key is attribute name and the
+    # value is attribute type.
+    openapi_types = {}
+
+    # attributeMap: The key is attribute name and the
+    # value is json key in definition.
+    attribute_map = {}
+
+    @classmethod
+    def from_dict(cls: typing.Type[T], dikt) -> T:
+        """Returns the dict as a model"""
+        return util.deserialize_model(dikt, cls)
+
+    def to_dict(self):
+        """Returns the model properties as a dict
+
+        :rtype: dict
+        """
+        result = {}
+
+        for attr, _ in six.iteritems(self.openapi_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model
+
+        :rtype: str
+        """
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/communication_type.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/communication_type.py
new file mode 100644
index 0000000000000000000000000000000000000000..2c4d15f1c8ca87a9295fa3e573d4fa6801947caa
--- /dev/null
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/communication_type.py
@@ -0,0 +1,39 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from published_apis.models.base_model_ import Model
+from published_apis.models.communication_type_any_of import CommunicationTypeAnyOf
+from published_apis import util
+
+from published_apis.models.communication_type_any_of import CommunicationTypeAnyOf  # noqa: E501
+
+class CommunicationType(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self):  # noqa: E501
+        """CommunicationType - a model defined in OpenAPI
+
+        """
+        self.openapi_types = {
+        }
+
+        self.attribute_map = {
+        }
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'CommunicationType':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The CommunicationType of this CommunicationType.  # noqa: E501
+        :rtype: CommunicationType
+        """
+        return util.deserialize_model(dikt, cls)
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/communication_type_any_of.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/communication_type_any_of.py
new file mode 100644
index 0000000000000000000000000000000000000000..831558346b6514656e91797323792be27e775cf0
--- /dev/null
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/communication_type_any_of.py
@@ -0,0 +1,42 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from published_apis.models.base_model_ import Model
+from published_apis import util
+
+
+class CommunicationTypeAnyOf(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    """
+    allowed enum values
+    """
+    REQUEST_RESPONSE = "REQUEST_RESPONSE"
+    SUBSCRIBE_NOTIFY = "SUBSCRIBE_NOTIFY"
+    def __init__(self):  # noqa: E501
+        """CommunicationTypeAnyOf - a model defined in OpenAPI
+
+        """
+        self.openapi_types = {
+        }
+
+        self.attribute_map = {
+        }
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'CommunicationTypeAnyOf':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The CommunicationType_anyOf of this CommunicationTypeAnyOf.  # noqa: E501
+        :rtype: CommunicationTypeAnyOf
+        """
+        return util.deserialize_model(dikt, cls)
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/custom_operation.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/custom_operation.py
new file mode 100644
index 0000000000000000000000000000000000000000..bf1cd38bee2f83061040cd7a993c7d129d3b2446
--- /dev/null
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/custom_operation.py
@@ -0,0 +1,158 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from published_apis.models.base_model_ import Model
+from published_apis.models.communication_type import CommunicationType
+from published_apis.models.operation import Operation
+from published_apis import util
+
+from published_apis.models.communication_type import CommunicationType  # noqa: E501
+from published_apis.models.operation import Operation  # noqa: E501
+
+class CustomOperation(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, comm_type=None, cust_op_name=None, operations=None, description=None):  # noqa: E501
+        """CustomOperation - a model defined in OpenAPI
+
+        :param comm_type: The comm_type of this CustomOperation.  # noqa: E501
+        :type comm_type: CommunicationType
+        :param cust_op_name: The cust_op_name of this CustomOperation.  # noqa: E501
+        :type cust_op_name: str
+        :param operations: The operations of this CustomOperation.  # noqa: E501
+        :type operations: List[Operation]
+        :param description: The description of this CustomOperation.  # noqa: E501
+        :type description: str
+        """
+        self.openapi_types = {
+            'comm_type': CommunicationType,
+            'cust_op_name': str,
+            'operations': List[Operation],
+            'description': str
+        }
+
+        self.attribute_map = {
+            'comm_type': 'commType',
+            'cust_op_name': 'custOpName',
+            'operations': 'operations',
+            'description': 'description'
+        }
+
+        self._comm_type = comm_type
+        self._cust_op_name = cust_op_name
+        self._operations = operations
+        self._description = description
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'CustomOperation':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The CustomOperation of this CustomOperation.  # noqa: E501
+        :rtype: CustomOperation
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def comm_type(self):
+        """Gets the comm_type of this CustomOperation.
+
+
+        :return: The comm_type of this CustomOperation.
+        :rtype: CommunicationType
+        """
+        return self._comm_type
+
+    @comm_type.setter
+    def comm_type(self, comm_type):
+        """Sets the comm_type of this CustomOperation.
+
+
+        :param comm_type: The comm_type of this CustomOperation.
+        :type comm_type: CommunicationType
+        """
+        if comm_type is None:
+            raise ValueError("Invalid value for `comm_type`, must not be `None`")  # noqa: E501
+
+        self._comm_type = comm_type
+
+    @property
+    def cust_op_name(self):
+        """Gets the cust_op_name of this CustomOperation.
+
+        it is set as {custOpName} part of the URI structure for a custom operation without resource association as defined in subclause 4.4 of 3GPP TS 29.501.  # noqa: E501
+
+        :return: The cust_op_name of this CustomOperation.
+        :rtype: str
+        """
+        return self._cust_op_name
+
+    @cust_op_name.setter
+    def cust_op_name(self, cust_op_name):
+        """Sets the cust_op_name of this CustomOperation.
+
+        it is set as {custOpName} part of the URI structure for a custom operation without resource association as defined in subclause 4.4 of 3GPP TS 29.501.  # noqa: E501
+
+        :param cust_op_name: The cust_op_name of this CustomOperation.
+        :type cust_op_name: str
+        """
+        if cust_op_name is None:
+            raise ValueError("Invalid value for `cust_op_name`, must not be `None`")  # noqa: E501
+
+        self._cust_op_name = cust_op_name
+
+    @property
+    def operations(self):
+        """Gets the operations of this CustomOperation.
+
+        Supported HTTP methods for the API resource. Only applicable when the protocol in AefProfile indicates HTTP.  # noqa: E501
+
+        :return: The operations of this CustomOperation.
+        :rtype: List[Operation]
+        """
+        return self._operations
+
+    @operations.setter
+    def operations(self, operations):
+        """Sets the operations of this CustomOperation.
+
+        Supported HTTP methods for the API resource. Only applicable when the protocol in AefProfile indicates HTTP.  # noqa: E501
+
+        :param operations: The operations of this CustomOperation.
+        :type operations: List[Operation]
+        """
+        if operations is not None and len(operations) < 1:
+            raise ValueError("Invalid value for `operations`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._operations = operations
+
+    @property
+    def description(self):
+        """Gets the description of this CustomOperation.
+
+        Text description of the custom operation  # noqa: E501
+
+        :return: The description of this CustomOperation.
+        :rtype: str
+        """
+        return self._description
+
+    @description.setter
+    def description(self, description):
+        """Sets the description of this CustomOperation.
+
+        Text description of the custom operation  # noqa: E501
+
+        :param description: The description of this CustomOperation.
+        :type description: str
+        """
+
+        self._description = description
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/data_format.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/data_format.py
new file mode 100644
index 0000000000000000000000000000000000000000..72e3f151d4e4d02d8be20644ca33f4b9dc1e197b
--- /dev/null
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/data_format.py
@@ -0,0 +1,39 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from published_apis.models.base_model_ import Model
+from published_apis.models.data_format_any_of import DataFormatAnyOf
+from published_apis import util
+
+from published_apis.models.data_format_any_of import DataFormatAnyOf  # noqa: E501
+
+class DataFormat(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self):  # noqa: E501
+        """DataFormat - a model defined in OpenAPI
+
+        """
+        self.openapi_types = {
+        }
+
+        self.attribute_map = {
+        }
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'DataFormat':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The DataFormat of this DataFormat.  # noqa: E501
+        :rtype: DataFormat
+        """
+        return util.deserialize_model(dikt, cls)
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/data_format_any_of.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/data_format_any_of.py
new file mode 100644
index 0000000000000000000000000000000000000000..726b386d7958ba4256cd9cc372258f2aa6708a0d
--- /dev/null
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/data_format_any_of.py
@@ -0,0 +1,41 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from published_apis.models.base_model_ import Model
+from published_apis import util
+
+
+class DataFormatAnyOf(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    """
+    allowed enum values
+    """
+    JSON = "JSON"
+    def __init__(self):  # noqa: E501
+        """DataFormatAnyOf - a model defined in OpenAPI
+
+        """
+        self.openapi_types = {
+        }
+
+        self.attribute_map = {
+        }
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'DataFormatAnyOf':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The DataFormat_anyOf of this DataFormatAnyOf.  # noqa: E501
+        :rtype: DataFormatAnyOf
+        """
+        return util.deserialize_model(dikt, cls)
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/interface_description.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/interface_description.py
new file mode 100644
index 0000000000000000000000000000000000000000..fd7e5b50fbec40fca391af92c96101f7763bf8c0
--- /dev/null
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/interface_description.py
@@ -0,0 +1,158 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from published_apis.models.base_model_ import Model
+from published_apis.models.security_method import SecurityMethod
+from published_apis import util
+
+from published_apis.models.security_method import SecurityMethod  # noqa: E501
+
+class InterfaceDescription(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, ipv4_addr=None, ipv6_addr=None, port=None, security_methods=None):  # noqa: E501
+        """InterfaceDescription - a model defined in OpenAPI
+
+        :param ipv4_addr: The ipv4_addr of this InterfaceDescription.  # noqa: E501
+        :type ipv4_addr: str
+        :param ipv6_addr: The ipv6_addr of this InterfaceDescription.  # noqa: E501
+        :type ipv6_addr: str
+        :param port: The port of this InterfaceDescription.  # noqa: E501
+        :type port: int
+        :param security_methods: The security_methods of this InterfaceDescription.  # noqa: E501
+        :type security_methods: List[SecurityMethod]
+        """
+        self.openapi_types = {
+            'ipv4_addr': str,
+            'ipv6_addr': str,
+            'port': int,
+            'security_methods': List[SecurityMethod]
+        }
+
+        self.attribute_map = {
+            'ipv4_addr': 'ipv4Addr',
+            'ipv6_addr': 'ipv6Addr',
+            'port': 'port',
+            'security_methods': 'securityMethods'
+        }
+
+        self._ipv4_addr = ipv4_addr
+        self._ipv6_addr = ipv6_addr
+        self._port = port
+        self._security_methods = security_methods
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'InterfaceDescription':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The InterfaceDescription of this InterfaceDescription.  # noqa: E501
+        :rtype: InterfaceDescription
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def ipv4_addr(self):
+        """Gets the ipv4_addr of this InterfaceDescription.
+
+        string identifying a Ipv4 address formatted in the \"dotted decimal\" notation as defined in IETF RFC 1166.  # noqa: E501
+
+        :return: The ipv4_addr of this InterfaceDescription.
+        :rtype: str
+        """
+        return self._ipv4_addr
+
+    @ipv4_addr.setter
+    def ipv4_addr(self, ipv4_addr):
+        """Sets the ipv4_addr of this InterfaceDescription.
+
+        string identifying a Ipv4 address formatted in the \"dotted decimal\" notation as defined in IETF RFC 1166.  # noqa: E501
+
+        :param ipv4_addr: The ipv4_addr of this InterfaceDescription.
+        :type ipv4_addr: str
+        """
+
+        self._ipv4_addr = ipv4_addr
+
+    @property
+    def ipv6_addr(self):
+        """Gets the ipv6_addr of this InterfaceDescription.
+
+        string identifying a Ipv6 address formatted according to clause 4 in IETF RFC 5952. The mixed Ipv4 Ipv6 notation according to clause 5 of IETF RFC 5952 shall not be used.  # noqa: E501
+
+        :return: The ipv6_addr of this InterfaceDescription.
+        :rtype: str
+        """
+        return self._ipv6_addr
+
+    @ipv6_addr.setter
+    def ipv6_addr(self, ipv6_addr):
+        """Sets the ipv6_addr of this InterfaceDescription.
+
+        string identifying a Ipv6 address formatted according to clause 4 in IETF RFC 5952. The mixed Ipv4 Ipv6 notation according to clause 5 of IETF RFC 5952 shall not be used.  # noqa: E501
+
+        :param ipv6_addr: The ipv6_addr of this InterfaceDescription.
+        :type ipv6_addr: str
+        """
+
+        self._ipv6_addr = ipv6_addr
+
+    @property
+    def port(self):
+        """Gets the port of this InterfaceDescription.
+
+        Unsigned integer with valid values between 0 and 65535.  # noqa: E501
+
+        :return: The port of this InterfaceDescription.
+        :rtype: int
+        """
+        return self._port
+
+    @port.setter
+    def port(self, port):
+        """Sets the port of this InterfaceDescription.
+
+        Unsigned integer with valid values between 0 and 65535.  # noqa: E501
+
+        :param port: The port of this InterfaceDescription.
+        :type port: int
+        """
+        if port is not None and port > 65535:  # noqa: E501
+            raise ValueError("Invalid value for `port`, must be a value less than or equal to `65535`")  # noqa: E501
+        if port is not None and port < 0:  # noqa: E501
+            raise ValueError("Invalid value for `port`, must be a value greater than or equal to `0`")  # noqa: E501
+
+        self._port = port
+
+    @property
+    def security_methods(self):
+        """Gets the security_methods of this InterfaceDescription.
+
+        Security methods supported by the interface, it take precedence over the security methods provided in AefProfile, for this specific interface.  # noqa: E501
+
+        :return: The security_methods of this InterfaceDescription.
+        :rtype: List[SecurityMethod]
+        """
+        return self._security_methods
+
+    @security_methods.setter
+    def security_methods(self, security_methods):
+        """Sets the security_methods of this InterfaceDescription.
+
+        Security methods supported by the interface, it take precedence over the security methods provided in AefProfile, for this specific interface.  # noqa: E501
+
+        :param security_methods: The security_methods of this InterfaceDescription.
+        :type security_methods: List[SecurityMethod]
+        """
+        if security_methods is not None and len(security_methods) < 1:
+            raise ValueError("Invalid value for `security_methods`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._security_methods = security_methods
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/invalid_param.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/invalid_param.py
new file mode 100644
index 0000000000000000000000000000000000000000..8e794cf1f92f0771fedbf100d7ee7ce763349712
--- /dev/null
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/invalid_param.py
@@ -0,0 +1,96 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from published_apis.models.base_model_ import Model
+from published_apis import util
+
+
+class InvalidParam(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, param=None, reason=None):  # noqa: E501
+        """InvalidParam - a model defined in OpenAPI
+
+        :param param: The param of this InvalidParam.  # noqa: E501
+        :type param: str
+        :param reason: The reason of this InvalidParam.  # noqa: E501
+        :type reason: str
+        """
+        self.openapi_types = {
+            'param': str,
+            'reason': str
+        }
+
+        self.attribute_map = {
+            'param': 'param',
+            'reason': 'reason'
+        }
+
+        self._param = param
+        self._reason = reason
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'InvalidParam':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The InvalidParam of this InvalidParam.  # noqa: E501
+        :rtype: InvalidParam
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def param(self):
+        """Gets the param of this InvalidParam.
+
+        Attribute's name encoded as a JSON Pointer, or header's name.  # noqa: E501
+
+        :return: The param of this InvalidParam.
+        :rtype: str
+        """
+        return self._param
+
+    @param.setter
+    def param(self, param):
+        """Sets the param of this InvalidParam.
+
+        Attribute's name encoded as a JSON Pointer, or header's name.  # noqa: E501
+
+        :param param: The param of this InvalidParam.
+        :type param: str
+        """
+        if param is None:
+            raise ValueError("Invalid value for `param`, must not be `None`")  # noqa: E501
+
+        self._param = param
+
+    @property
+    def reason(self):
+        """Gets the reason of this InvalidParam.
+
+        A human-readable reason, e.g. \"must be a positive integer\".  # noqa: E501
+
+        :return: The reason of this InvalidParam.
+        :rtype: str
+        """
+        return self._reason
+
+    @reason.setter
+    def reason(self, reason):
+        """Sets the reason of this InvalidParam.
+
+        A human-readable reason, e.g. \"must be a positive integer\".  # noqa: E501
+
+        :param reason: The reason of this InvalidParam.
+        :type reason: str
+        """
+
+        self._reason = reason
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/operation.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/operation.py
new file mode 100644
index 0000000000000000000000000000000000000000..b985c08d9da5fdd1befa3e1ac6aed8bf289c6e22
--- /dev/null
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/operation.py
@@ -0,0 +1,39 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from published_apis.models.base_model_ import Model
+from published_apis.models.operation_any_of import OperationAnyOf
+from published_apis import util
+
+from published_apis.models.operation_any_of import OperationAnyOf  # noqa: E501
+
+class Operation(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self):  # noqa: E501
+        """Operation - a model defined in OpenAPI
+
+        """
+        self.openapi_types = {
+        }
+
+        self.attribute_map = {
+        }
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'Operation':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The Operation of this Operation.  # noqa: E501
+        :rtype: Operation
+        """
+        return util.deserialize_model(dikt, cls)
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/operation_any_of.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/operation_any_of.py
new file mode 100644
index 0000000000000000000000000000000000000000..0e9b63fb8defa976274e92752a865a52f9e6caab
--- /dev/null
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/operation_any_of.py
@@ -0,0 +1,45 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from published_apis.models.base_model_ import Model
+from published_apis import util
+
+
+class OperationAnyOf(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    """
+    allowed enum values
+    """
+    GET = "GET"
+    POST = "POST"
+    PUT = "PUT"
+    PATCH = "PATCH"
+    DELETE = "DELETE"
+    def __init__(self):  # noqa: E501
+        """OperationAnyOf - a model defined in OpenAPI
+
+        """
+        self.openapi_types = {
+        }
+
+        self.attribute_map = {
+        }
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'OperationAnyOf':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The Operation_anyOf of this OperationAnyOf.  # noqa: E501
+        :rtype: OperationAnyOf
+        """
+        return util.deserialize_model(dikt, cls)
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/problem_details.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/problem_details.py
new file mode 100644
index 0000000000000000000000000000000000000000..2f5151f7712bc7103d53ef5a71d765b5c1b7b61d
--- /dev/null
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/problem_details.py
@@ -0,0 +1,270 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from published_apis.models.base_model_ import Model
+from published_apis.models.invalid_param import InvalidParam
+import re
+from published_apis import util
+
+from published_apis.models.invalid_param import InvalidParam  # noqa: E501
+import re  # noqa: E501
+
+class ProblemDetails(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, type=None, title=None, status=None, detail=None, instance=None, cause=None, invalid_params=None, supported_features=None):  # noqa: E501
+        """ProblemDetails - a model defined in OpenAPI
+
+        :param type: The type of this ProblemDetails.  # noqa: E501
+        :type type: str
+        :param title: The title of this ProblemDetails.  # noqa: E501
+        :type title: str
+        :param status: The status of this ProblemDetails.  # noqa: E501
+        :type status: int
+        :param detail: The detail of this ProblemDetails.  # noqa: E501
+        :type detail: str
+        :param instance: The instance of this ProblemDetails.  # noqa: E501
+        :type instance: str
+        :param cause: The cause of this ProblemDetails.  # noqa: E501
+        :type cause: str
+        :param invalid_params: The invalid_params of this ProblemDetails.  # noqa: E501
+        :type invalid_params: List[InvalidParam]
+        :param supported_features: The supported_features of this ProblemDetails.  # noqa: E501
+        :type supported_features: str
+        """
+        self.openapi_types = {
+            'type': str,
+            'title': str,
+            'status': int,
+            'detail': str,
+            'instance': str,
+            'cause': str,
+            'invalid_params': List[InvalidParam],
+            'supported_features': str
+        }
+
+        self.attribute_map = {
+            'type': 'type',
+            'title': 'title',
+            'status': 'status',
+            'detail': 'detail',
+            'instance': 'instance',
+            'cause': 'cause',
+            'invalid_params': 'invalidParams',
+            'supported_features': 'supportedFeatures'
+        }
+
+        self._type = type
+        self._title = title
+        self._status = status
+        self._detail = detail
+        self._instance = instance
+        self._cause = cause
+        self._invalid_params = invalid_params
+        self._supported_features = supported_features
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'ProblemDetails':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The ProblemDetails of this ProblemDetails.  # noqa: E501
+        :rtype: ProblemDetails
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def type(self):
+        """Gets the type of this ProblemDetails.
+
+        string providing an URI formatted according to IETF RFC 3986.  # noqa: E501
+
+        :return: The type of this ProblemDetails.
+        :rtype: str
+        """
+        return self._type
+
+    @type.setter
+    def type(self, type):
+        """Sets the type of this ProblemDetails.
+
+        string providing an URI formatted according to IETF RFC 3986.  # noqa: E501
+
+        :param type: The type of this ProblemDetails.
+        :type type: str
+        """
+
+        self._type = type
+
+    @property
+    def title(self):
+        """Gets the title of this ProblemDetails.
+
+        A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem.  # noqa: E501
+
+        :return: The title of this ProblemDetails.
+        :rtype: str
+        """
+        return self._title
+
+    @title.setter
+    def title(self, title):
+        """Sets the title of this ProblemDetails.
+
+        A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem.  # noqa: E501
+
+        :param title: The title of this ProblemDetails.
+        :type title: str
+        """
+
+        self._title = title
+
+    @property
+    def status(self):
+        """Gets the status of this ProblemDetails.
+
+        The HTTP status code for this occurrence of the problem.  # noqa: E501
+
+        :return: The status of this ProblemDetails.
+        :rtype: int
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """Sets the status of this ProblemDetails.
+
+        The HTTP status code for this occurrence of the problem.  # noqa: E501
+
+        :param status: The status of this ProblemDetails.
+        :type status: int
+        """
+
+        self._status = status
+
+    @property
+    def detail(self):
+        """Gets the detail of this ProblemDetails.
+
+        A human-readable explanation specific to this occurrence of the problem.  # noqa: E501
+
+        :return: The detail of this ProblemDetails.
+        :rtype: str
+        """
+        return self._detail
+
+    @detail.setter
+    def detail(self, detail):
+        """Sets the detail of this ProblemDetails.
+
+        A human-readable explanation specific to this occurrence of the problem.  # noqa: E501
+
+        :param detail: The detail of this ProblemDetails.
+        :type detail: str
+        """
+
+        self._detail = detail
+
+    @property
+    def instance(self):
+        """Gets the instance of this ProblemDetails.
+
+        string providing an URI formatted according to IETF RFC 3986.  # noqa: E501
+
+        :return: The instance of this ProblemDetails.
+        :rtype: str
+        """
+        return self._instance
+
+    @instance.setter
+    def instance(self, instance):
+        """Sets the instance of this ProblemDetails.
+
+        string providing an URI formatted according to IETF RFC 3986.  # noqa: E501
+
+        :param instance: The instance of this ProblemDetails.
+        :type instance: str
+        """
+
+        self._instance = instance
+
+    @property
+    def cause(self):
+        """Gets the cause of this ProblemDetails.
+
+        A machine-readable application error cause specific to this occurrence of the problem. This IE should be present and provide application-related error information, if available.  # noqa: E501
+
+        :return: The cause of this ProblemDetails.
+        :rtype: str
+        """
+        return self._cause
+
+    @cause.setter
+    def cause(self, cause):
+        """Sets the cause of this ProblemDetails.
+
+        A machine-readable application error cause specific to this occurrence of the problem. This IE should be present and provide application-related error information, if available.  # noqa: E501
+
+        :param cause: The cause of this ProblemDetails.
+        :type cause: str
+        """
+
+        self._cause = cause
+
+    @property
+    def invalid_params(self):
+        """Gets the invalid_params of this ProblemDetails.
+
+        Description of invalid parameters, for a request rejected due to invalid parameters.  # noqa: E501
+
+        :return: The invalid_params of this ProblemDetails.
+        :rtype: List[InvalidParam]
+        """
+        return self._invalid_params
+
+    @invalid_params.setter
+    def invalid_params(self, invalid_params):
+        """Sets the invalid_params of this ProblemDetails.
+
+        Description of invalid parameters, for a request rejected due to invalid parameters.  # noqa: E501
+
+        :param invalid_params: The invalid_params of this ProblemDetails.
+        :type invalid_params: List[InvalidParam]
+        """
+        if invalid_params is not None and len(invalid_params) < 1:
+            raise ValueError("Invalid value for `invalid_params`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._invalid_params = invalid_params
+
+    @property
+    def supported_features(self):
+        """Gets the supported_features of this ProblemDetails.
+
+        A string used to indicate the features supported by an API that is used as defined in clause 6.6 in 3GPP TS 29.500. The string shall contain a bitmask indicating supported features in hexadecimal representation Each character in the string shall take a value of \"0\" to \"9\", \"a\" to \"f\" or \"A\" to \"F\" and shall represent the support of 4 features as described in table 5.2.2-3. The most significant character representing the highest-numbered features shall appear first in the string, and the character representing features 1 to 4 shall appear last in the string. The list of features and their numbering (starting with 1) are defined separately for each API. If the string contains a lower number of characters than there are defined features for an API, all features that would be represented by characters that are not present in the string are not supported  # noqa: E501
+
+        :return: The supported_features of this ProblemDetails.
+        :rtype: str
+        """
+        return self._supported_features
+
+    @supported_features.setter
+    def supported_features(self, supported_features):
+        """Sets the supported_features of this ProblemDetails.
+
+        A string used to indicate the features supported by an API that is used as defined in clause 6.6 in 3GPP TS 29.500. The string shall contain a bitmask indicating supported features in hexadecimal representation Each character in the string shall take a value of \"0\" to \"9\", \"a\" to \"f\" or \"A\" to \"F\" and shall represent the support of 4 features as described in table 5.2.2-3. The most significant character representing the highest-numbered features shall appear first in the string, and the character representing features 1 to 4 shall appear last in the string. The list of features and their numbering (starting with 1) are defined separately for each API. If the string contains a lower number of characters than there are defined features for an API, all features that would be represented by characters that are not present in the string are not supported  # noqa: E501
+
+        :param supported_features: The supported_features of this ProblemDetails.
+        :type supported_features: str
+        """
+        if supported_features is not None and not re.search(r'^[A-Fa-f0-9]*$', supported_features):  # noqa: E501
+            raise ValueError("Invalid value for `supported_features`, must be a follow pattern or equal to `/^[A-Fa-f0-9]*$/`")  # noqa: E501
+
+        self._supported_features = supported_features
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/protocol.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/protocol.py
new file mode 100644
index 0000000000000000000000000000000000000000..6bb623c0fbd36fe613e798b5c6dfb468c5928493
--- /dev/null
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/protocol.py
@@ -0,0 +1,39 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from published_apis.models.base_model_ import Model
+from published_apis.models.protocol_any_of import ProtocolAnyOf
+from published_apis import util
+
+from published_apis.models.protocol_any_of import ProtocolAnyOf  # noqa: E501
+
+class Protocol(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self):  # noqa: E501
+        """Protocol - a model defined in OpenAPI
+
+        """
+        self.openapi_types = {
+        }
+
+        self.attribute_map = {
+        }
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'Protocol':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The Protocol of this Protocol.  # noqa: E501
+        :rtype: Protocol
+        """
+        return util.deserialize_model(dikt, cls)
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/protocol_any_of.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/protocol_any_of.py
new file mode 100644
index 0000000000000000000000000000000000000000..cbbfd46e7b3ea88eb82e3b005bfe5bdf01a74c1b
--- /dev/null
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/protocol_any_of.py
@@ -0,0 +1,42 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from published_apis.models.base_model_ import Model
+from published_apis import util
+
+
+class ProtocolAnyOf(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    """
+    allowed enum values
+    """
+    _1_1 = "HTTP_1_1"
+    _2 = "HTTP_2"
+    def __init__(self):  # noqa: E501
+        """ProtocolAnyOf - a model defined in OpenAPI
+
+        """
+        self.openapi_types = {
+        }
+
+        self.attribute_map = {
+        }
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'ProtocolAnyOf':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The Protocol_anyOf of this ProtocolAnyOf.  # noqa: E501
+        :rtype: ProtocolAnyOf
+        """
+        return util.deserialize_model(dikt, cls)
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/published_api_path.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/published_api_path.py
new file mode 100644
index 0000000000000000000000000000000000000000..0a347780223d0e76b8c682e203e726c89b2aadd8
--- /dev/null
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/published_api_path.py
@@ -0,0 +1,68 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from published_apis.models.base_model_ import Model
+from published_apis import util
+
+
+class PublishedApiPath(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, ccf_ids=None):  # noqa: E501
+        """PublishedApiPath - a model defined in OpenAPI
+
+        :param ccf_ids: The ccf_ids of this PublishedApiPath.  # noqa: E501
+        :type ccf_ids: List[str]
+        """
+        self.openapi_types = {
+            'ccf_ids': List[str]
+        }
+
+        self.attribute_map = {
+            'ccf_ids': 'ccfIds'
+        }
+
+        self._ccf_ids = ccf_ids
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'PublishedApiPath':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The PublishedApiPath of this PublishedApiPath.  # noqa: E501
+        :rtype: PublishedApiPath
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def ccf_ids(self):
+        """Gets the ccf_ids of this PublishedApiPath.
+
+        A list of CCF identifiers where the service API is already published.  # noqa: E501
+
+        :return: The ccf_ids of this PublishedApiPath.
+        :rtype: List[str]
+        """
+        return self._ccf_ids
+
+    @ccf_ids.setter
+    def ccf_ids(self, ccf_ids):
+        """Sets the ccf_ids of this PublishedApiPath.
+
+        A list of CCF identifiers where the service API is already published.  # noqa: E501
+
+        :param ccf_ids: The ccf_ids of this PublishedApiPath.
+        :type ccf_ids: List[str]
+        """
+        if ccf_ids is not None and len(ccf_ids) < 1:
+            raise ValueError("Invalid value for `ccf_ids`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._ccf_ids = ccf_ids
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/resource.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/resource.py
new file mode 100644
index 0000000000000000000000000000000000000000..ef8bebe821da645734ae22310392d8c482d0b270
--- /dev/null
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/resource.py
@@ -0,0 +1,216 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from published_apis.models.base_model_ import Model
+from published_apis.models.communication_type import CommunicationType
+from published_apis.models.operation import Operation
+from published_apis import util
+
+from published_apis.models.communication_type import CommunicationType  # noqa: E501
+from published_apis.models.operation import Operation  # noqa: E501
+
+class Resource(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, resource_name=None, comm_type=None, uri=None, cust_op_name=None, operations=None, description=None):  # noqa: E501
+        """Resource - a model defined in OpenAPI
+
+        :param resource_name: The resource_name of this Resource.  # noqa: E501
+        :type resource_name: str
+        :param comm_type: The comm_type of this Resource.  # noqa: E501
+        :type comm_type: CommunicationType
+        :param uri: The uri of this Resource.  # noqa: E501
+        :type uri: str
+        :param cust_op_name: The cust_op_name of this Resource.  # noqa: E501
+        :type cust_op_name: str
+        :param operations: The operations of this Resource.  # noqa: E501
+        :type operations: List[Operation]
+        :param description: The description of this Resource.  # noqa: E501
+        :type description: str
+        """
+        self.openapi_types = {
+            'resource_name': str,
+            'comm_type': CommunicationType,
+            'uri': str,
+            'cust_op_name': str,
+            'operations': List[Operation],
+            'description': str
+        }
+
+        self.attribute_map = {
+            'resource_name': 'resourceName',
+            'comm_type': 'commType',
+            'uri': 'uri',
+            'cust_op_name': 'custOpName',
+            'operations': 'operations',
+            'description': 'description'
+        }
+
+        self._resource_name = resource_name
+        self._comm_type = comm_type
+        self._uri = uri
+        self._cust_op_name = cust_op_name
+        self._operations = operations
+        self._description = description
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'Resource':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The Resource of this Resource.  # noqa: E501
+        :rtype: Resource
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def resource_name(self):
+        """Gets the resource_name of this Resource.
+
+        Resource name  # noqa: E501
+
+        :return: The resource_name of this Resource.
+        :rtype: str
+        """
+        return self._resource_name
+
+    @resource_name.setter
+    def resource_name(self, resource_name):
+        """Sets the resource_name of this Resource.
+
+        Resource name  # noqa: E501
+
+        :param resource_name: The resource_name of this Resource.
+        :type resource_name: str
+        """
+        if resource_name is None:
+            raise ValueError("Invalid value for `resource_name`, must not be `None`")  # noqa: E501
+
+        self._resource_name = resource_name
+
+    @property
+    def comm_type(self):
+        """Gets the comm_type of this Resource.
+
+
+        :return: The comm_type of this Resource.
+        :rtype: CommunicationType
+        """
+        return self._comm_type
+
+    @comm_type.setter
+    def comm_type(self, comm_type):
+        """Sets the comm_type of this Resource.
+
+
+        :param comm_type: The comm_type of this Resource.
+        :type comm_type: CommunicationType
+        """
+        if comm_type is None:
+            raise ValueError("Invalid value for `comm_type`, must not be `None`")  # noqa: E501
+
+        self._comm_type = comm_type
+
+    @property
+    def uri(self):
+        """Gets the uri of this Resource.
+
+        Relative URI of the API resource, it is set as {apiSpecificResourceUriPart} part of the URI structure as defined in subclause 4.4 of 3GPP TS 29.501.  # noqa: E501
+
+        :return: The uri of this Resource.
+        :rtype: str
+        """
+        return self._uri
+
+    @uri.setter
+    def uri(self, uri):
+        """Sets the uri of this Resource.
+
+        Relative URI of the API resource, it is set as {apiSpecificResourceUriPart} part of the URI structure as defined in subclause 4.4 of 3GPP TS 29.501.  # noqa: E501
+
+        :param uri: The uri of this Resource.
+        :type uri: str
+        """
+        if uri is None:
+            raise ValueError("Invalid value for `uri`, must not be `None`")  # noqa: E501
+
+        self._uri = uri
+
+    @property
+    def cust_op_name(self):
+        """Gets the cust_op_name of this Resource.
+
+        it is set as {custOpName} part of the URI structure for a custom operation associated with a resource as defined in subclause 4.4 of 3GPP TS 29.501.  # noqa: E501
+
+        :return: The cust_op_name of this Resource.
+        :rtype: str
+        """
+        return self._cust_op_name
+
+    @cust_op_name.setter
+    def cust_op_name(self, cust_op_name):
+        """Sets the cust_op_name of this Resource.
+
+        it is set as {custOpName} part of the URI structure for a custom operation associated with a resource as defined in subclause 4.4 of 3GPP TS 29.501.  # noqa: E501
+
+        :param cust_op_name: The cust_op_name of this Resource.
+        :type cust_op_name: str
+        """
+
+        self._cust_op_name = cust_op_name
+
+    @property
+    def operations(self):
+        """Gets the operations of this Resource.
+
+        Supported HTTP methods for the API resource. Only applicable when the protocol in AefProfile indicates HTTP.  # noqa: E501
+
+        :return: The operations of this Resource.
+        :rtype: List[Operation]
+        """
+        return self._operations
+
+    @operations.setter
+    def operations(self, operations):
+        """Sets the operations of this Resource.
+
+        Supported HTTP methods for the API resource. Only applicable when the protocol in AefProfile indicates HTTP.  # noqa: E501
+
+        :param operations: The operations of this Resource.
+        :type operations: List[Operation]
+        """
+        if operations is not None and len(operations) < 1:
+            raise ValueError("Invalid value for `operations`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._operations = operations
+
+    @property
+    def description(self):
+        """Gets the description of this Resource.
+
+        Text description of the API resource  # noqa: E501
+
+        :return: The description of this Resource.
+        :rtype: str
+        """
+        return self._description
+
+    @description.setter
+    def description(self, description):
+        """Sets the description of this Resource.
+
+        Text description of the API resource  # noqa: E501
+
+        :param description: The description of this Resource.
+        :type description: str
+        """
+
+        self._description = description
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/security_method.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/security_method.py
new file mode 100644
index 0000000000000000000000000000000000000000..643e41de0aa648d2121d8246731809baf74df552
--- /dev/null
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/security_method.py
@@ -0,0 +1,39 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from published_apis.models.base_model_ import Model
+from published_apis.models.security_method_any_of import SecurityMethodAnyOf
+from published_apis import util
+
+from published_apis.models.security_method_any_of import SecurityMethodAnyOf  # noqa: E501
+
+class SecurityMethod(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self):  # noqa: E501
+        """SecurityMethod - a model defined in OpenAPI
+
+        """
+        self.openapi_types = {
+        }
+
+        self.attribute_map = {
+        }
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'SecurityMethod':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The SecurityMethod of this SecurityMethod.  # noqa: E501
+        :rtype: SecurityMethod
+        """
+        return util.deserialize_model(dikt, cls)
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/security_method_any_of.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/security_method_any_of.py
new file mode 100644
index 0000000000000000000000000000000000000000..061d64c6df3d70892d7b7603c161da26308d345e
--- /dev/null
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/security_method_any_of.py
@@ -0,0 +1,43 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from published_apis.models.base_model_ import Model
+from published_apis import util
+
+
+class SecurityMethodAnyOf(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    """
+    allowed enum values
+    """
+    PSK = "PSK"
+    PKI = "PKI"
+    OAUTH = "OAUTH"
+    def __init__(self):  # noqa: E501
+        """SecurityMethodAnyOf - a model defined in OpenAPI
+
+        """
+        self.openapi_types = {
+        }
+
+        self.attribute_map = {
+        }
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'SecurityMethodAnyOf':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The SecurityMethod_anyOf of this SecurityMethodAnyOf.  # noqa: E501
+        :rtype: SecurityMethodAnyOf
+        """
+        return util.deserialize_model(dikt, cls)
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/service_api_description.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/service_api_description.py
new file mode 100644
index 0000000000000000000000000000000000000000..e098f0bd2f4e1fe1b6ddcefb80163f3340e22739
--- /dev/null
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/service_api_description.py
@@ -0,0 +1,328 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from published_apis.models.base_model_ import Model
+from published_apis.models.aef_profile import AefProfile
+from published_apis.models.published_api_path import PublishedApiPath
+from published_apis.models.shareable_information import ShareableInformation
+import re
+from published_apis import util
+
+from published_apis.models.aef_profile import AefProfile  # noqa: E501
+from published_apis.models.published_api_path import PublishedApiPath  # noqa: E501
+from published_apis.models.shareable_information import ShareableInformation  # noqa: E501
+import re  # noqa: E501
+
+class ServiceAPIDescription(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, api_name=None, api_id=None, aef_profiles=None, description=None, supported_features=None, shareable_info=None, service_api_category=None, api_supp_feats=None, pub_api_path=None, ccf_id=None):  # noqa: E501
+        """ServiceAPIDescription - a model defined in OpenAPI
+
+        :param api_name: The api_name of this ServiceAPIDescription.  # noqa: E501
+        :type api_name: str
+        :param api_id: The api_id of this ServiceAPIDescription.  # noqa: E501
+        :type api_id: str
+        :param aef_profiles: The aef_profiles of this ServiceAPIDescription.  # noqa: E501
+        :type aef_profiles: List[AefProfile]
+        :param description: The description of this ServiceAPIDescription.  # noqa: E501
+        :type description: str
+        :param supported_features: The supported_features of this ServiceAPIDescription.  # noqa: E501
+        :type supported_features: str
+        :param shareable_info: The shareable_info of this ServiceAPIDescription.  # noqa: E501
+        :type shareable_info: ShareableInformation
+        :param service_api_category: The service_api_category of this ServiceAPIDescription.  # noqa: E501
+        :type service_api_category: str
+        :param api_supp_feats: The api_supp_feats of this ServiceAPIDescription.  # noqa: E501
+        :type api_supp_feats: str
+        :param pub_api_path: The pub_api_path of this ServiceAPIDescription.  # noqa: E501
+        :type pub_api_path: PublishedApiPath
+        :param ccf_id: The ccf_id of this ServiceAPIDescription.  # noqa: E501
+        :type ccf_id: str
+        """
+        self.openapi_types = {
+            'api_name': str,
+            'api_id': str,
+            'aef_profiles': List[AefProfile],
+            'description': str,
+            'supported_features': str,
+            'shareable_info': ShareableInformation,
+            'service_api_category': str,
+            'api_supp_feats': str,
+            'pub_api_path': PublishedApiPath,
+            'ccf_id': str
+        }
+
+        self.attribute_map = {
+            'api_name': 'apiName',
+            'api_id': 'apiId',
+            'aef_profiles': 'aefProfiles',
+            'description': 'description',
+            'supported_features': 'supportedFeatures',
+            'shareable_info': 'shareableInfo',
+            'service_api_category': 'serviceAPICategory',
+            'api_supp_feats': 'apiSuppFeats',
+            'pub_api_path': 'pubApiPath',
+            'ccf_id': 'ccfId'
+        }
+
+        self._api_name = api_name
+        self._api_id = api_id
+        self._aef_profiles = aef_profiles
+        self._description = description
+        self._supported_features = supported_features
+        self._shareable_info = shareable_info
+        self._service_api_category = service_api_category
+        self._api_supp_feats = api_supp_feats
+        self._pub_api_path = pub_api_path
+        self._ccf_id = ccf_id
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'ServiceAPIDescription':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The ServiceAPIDescription of this ServiceAPIDescription.  # noqa: E501
+        :rtype: ServiceAPIDescription
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def api_name(self):
+        """Gets the api_name of this ServiceAPIDescription.
+
+        API name, it is set as {apiName} part of the URI structure as defined in subclause 4.4 of 3GPP TS 29.501.  # noqa: E501
+
+        :return: The api_name of this ServiceAPIDescription.
+        :rtype: str
+        """
+        return self._api_name
+
+    @api_name.setter
+    def api_name(self, api_name):
+        """Sets the api_name of this ServiceAPIDescription.
+
+        API name, it is set as {apiName} part of the URI structure as defined in subclause 4.4 of 3GPP TS 29.501.  # noqa: E501
+
+        :param api_name: The api_name of this ServiceAPIDescription.
+        :type api_name: str
+        """
+        if api_name is None:
+            raise ValueError("Invalid value for `api_name`, must not be `None`")  # noqa: E501
+
+        self._api_name = api_name
+
+    @property
+    def api_id(self):
+        """Gets the api_id of this ServiceAPIDescription.
+
+        API identifier assigned by the CAPIF core function to the published service API. Shall not be present in the HTTP POST request from the API publishing function to the CAPIF core function. Shall be present in the HTTP POST response from the CAPIF core function to the API publishing function and in the HTTP GET response from the CAPIF core function to the API invoker (discovery API).  # noqa: E501
+
+        :return: The api_id of this ServiceAPIDescription.
+        :rtype: str
+        """
+        return self._api_id
+
+    @api_id.setter
+    def api_id(self, api_id):
+        """Sets the api_id of this ServiceAPIDescription.
+
+        API identifier assigned by the CAPIF core function to the published service API. Shall not be present in the HTTP POST request from the API publishing function to the CAPIF core function. Shall be present in the HTTP POST response from the CAPIF core function to the API publishing function and in the HTTP GET response from the CAPIF core function to the API invoker (discovery API).  # noqa: E501
+
+        :param api_id: The api_id of this ServiceAPIDescription.
+        :type api_id: str
+        """
+
+        self._api_id = api_id
+
+    @property
+    def aef_profiles(self):
+        """Gets the aef_profiles of this ServiceAPIDescription.
+
+        AEF profile information, which includes the exposed API details (e.g. protocol).  # noqa: E501
+
+        :return: The aef_profiles of this ServiceAPIDescription.
+        :rtype: List[AefProfile]
+        """
+        return self._aef_profiles
+
+    @aef_profiles.setter
+    def aef_profiles(self, aef_profiles):
+        """Sets the aef_profiles of this ServiceAPIDescription.
+
+        AEF profile information, which includes the exposed API details (e.g. protocol).  # noqa: E501
+
+        :param aef_profiles: The aef_profiles of this ServiceAPIDescription.
+        :type aef_profiles: List[AefProfile]
+        """
+        if aef_profiles is not None and len(aef_profiles) < 1:
+            raise ValueError("Invalid value for `aef_profiles`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._aef_profiles = aef_profiles
+
+    @property
+    def description(self):
+        """Gets the description of this ServiceAPIDescription.
+
+        Text description of the API  # noqa: E501
+
+        :return: The description of this ServiceAPIDescription.
+        :rtype: str
+        """
+        return self._description
+
+    @description.setter
+    def description(self, description):
+        """Sets the description of this ServiceAPIDescription.
+
+        Text description of the API  # noqa: E501
+
+        :param description: The description of this ServiceAPIDescription.
+        :type description: str
+        """
+
+        self._description = description
+
+    @property
+    def supported_features(self):
+        """Gets the supported_features of this ServiceAPIDescription.
+
+        A string used to indicate the features supported by an API that is used as defined in clause 6.6 in 3GPP TS 29.500. The string shall contain a bitmask indicating supported features in hexadecimal representation Each character in the string shall take a value of \"0\" to \"9\", \"a\" to \"f\" or \"A\" to \"F\" and shall represent the support of 4 features as described in table 5.2.2-3. The most significant character representing the highest-numbered features shall appear first in the string, and the character representing features 1 to 4 shall appear last in the string. The list of features and their numbering (starting with 1) are defined separately for each API. If the string contains a lower number of characters than there are defined features for an API, all features that would be represented by characters that are not present in the string are not supported  # noqa: E501
+
+        :return: The supported_features of this ServiceAPIDescription.
+        :rtype: str
+        """
+        return self._supported_features
+
+    @supported_features.setter
+    def supported_features(self, supported_features):
+        """Sets the supported_features of this ServiceAPIDescription.
+
+        A string used to indicate the features supported by an API that is used as defined in clause 6.6 in 3GPP TS 29.500. The string shall contain a bitmask indicating supported features in hexadecimal representation Each character in the string shall take a value of \"0\" to \"9\", \"a\" to \"f\" or \"A\" to \"F\" and shall represent the support of 4 features as described in table 5.2.2-3. The most significant character representing the highest-numbered features shall appear first in the string, and the character representing features 1 to 4 shall appear last in the string. The list of features and their numbering (starting with 1) are defined separately for each API. If the string contains a lower number of characters than there are defined features for an API, all features that would be represented by characters that are not present in the string are not supported  # noqa: E501
+
+        :param supported_features: The supported_features of this ServiceAPIDescription.
+        :type supported_features: str
+        """
+        if supported_features is not None and not re.search(r'^[A-Fa-f0-9]*$', supported_features):  # noqa: E501
+            raise ValueError("Invalid value for `supported_features`, must be a follow pattern or equal to `/^[A-Fa-f0-9]*$/`")  # noqa: E501
+
+        self._supported_features = supported_features
+
+    @property
+    def shareable_info(self):
+        """Gets the shareable_info of this ServiceAPIDescription.
+
+
+        :return: The shareable_info of this ServiceAPIDescription.
+        :rtype: ShareableInformation
+        """
+        return self._shareable_info
+
+    @shareable_info.setter
+    def shareable_info(self, shareable_info):
+        """Sets the shareable_info of this ServiceAPIDescription.
+
+
+        :param shareable_info: The shareable_info of this ServiceAPIDescription.
+        :type shareable_info: ShareableInformation
+        """
+
+        self._shareable_info = shareable_info
+
+    @property
+    def service_api_category(self):
+        """Gets the service_api_category of this ServiceAPIDescription.
+
+
+        :return: The service_api_category of this ServiceAPIDescription.
+        :rtype: str
+        """
+        return self._service_api_category
+
+    @service_api_category.setter
+    def service_api_category(self, service_api_category):
+        """Sets the service_api_category of this ServiceAPIDescription.
+
+
+        :param service_api_category: The service_api_category of this ServiceAPIDescription.
+        :type service_api_category: str
+        """
+
+        self._service_api_category = service_api_category
+
+    @property
+    def api_supp_feats(self):
+        """Gets the api_supp_feats of this ServiceAPIDescription.
+
+        A string used to indicate the features supported by an API that is used as defined in clause 6.6 in 3GPP TS 29.500. The string shall contain a bitmask indicating supported features in hexadecimal representation Each character in the string shall take a value of \"0\" to \"9\", \"a\" to \"f\" or \"A\" to \"F\" and shall represent the support of 4 features as described in table 5.2.2-3. The most significant character representing the highest-numbered features shall appear first in the string, and the character representing features 1 to 4 shall appear last in the string. The list of features and their numbering (starting with 1) are defined separately for each API. If the string contains a lower number of characters than there are defined features for an API, all features that would be represented by characters that are not present in the string are not supported  # noqa: E501
+
+        :return: The api_supp_feats of this ServiceAPIDescription.
+        :rtype: str
+        """
+        return self._api_supp_feats
+
+    @api_supp_feats.setter
+    def api_supp_feats(self, api_supp_feats):
+        """Sets the api_supp_feats of this ServiceAPIDescription.
+
+        A string used to indicate the features supported by an API that is used as defined in clause 6.6 in 3GPP TS 29.500. The string shall contain a bitmask indicating supported features in hexadecimal representation Each character in the string shall take a value of \"0\" to \"9\", \"a\" to \"f\" or \"A\" to \"F\" and shall represent the support of 4 features as described in table 5.2.2-3. The most significant character representing the highest-numbered features shall appear first in the string, and the character representing features 1 to 4 shall appear last in the string. The list of features and their numbering (starting with 1) are defined separately for each API. If the string contains a lower number of characters than there are defined features for an API, all features that would be represented by characters that are not present in the string are not supported  # noqa: E501
+
+        :param api_supp_feats: The api_supp_feats of this ServiceAPIDescription.
+        :type api_supp_feats: str
+        """
+        if api_supp_feats is not None and not re.search(r'^[A-Fa-f0-9]*$', api_supp_feats):  # noqa: E501
+            raise ValueError("Invalid value for `api_supp_feats`, must be a follow pattern or equal to `/^[A-Fa-f0-9]*$/`")  # noqa: E501
+
+        self._api_supp_feats = api_supp_feats
+
+    @property
+    def pub_api_path(self):
+        """Gets the pub_api_path of this ServiceAPIDescription.
+
+
+        :return: The pub_api_path of this ServiceAPIDescription.
+        :rtype: PublishedApiPath
+        """
+        return self._pub_api_path
+
+    @pub_api_path.setter
+    def pub_api_path(self, pub_api_path):
+        """Sets the pub_api_path of this ServiceAPIDescription.
+
+
+        :param pub_api_path: The pub_api_path of this ServiceAPIDescription.
+        :type pub_api_path: PublishedApiPath
+        """
+
+        self._pub_api_path = pub_api_path
+
+    @property
+    def ccf_id(self):
+        """Gets the ccf_id of this ServiceAPIDescription.
+
+        CAPIF core function identifier.  # noqa: E501
+
+        :return: The ccf_id of this ServiceAPIDescription.
+        :rtype: str
+        """
+        return self._ccf_id
+
+    @ccf_id.setter
+    def ccf_id(self, ccf_id):
+        """Sets the ccf_id of this ServiceAPIDescription.
+
+        CAPIF core function identifier.  # noqa: E501
+
+        :param ccf_id: The ccf_id of this ServiceAPIDescription.
+        :type ccf_id: str
+        """
+
+        self._ccf_id = ccf_id
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/shareable_information.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/shareable_information.py
new file mode 100644
index 0000000000000000000000000000000000000000..c8bdc259517b83d9b55377981252cb3b7b4aeac9
--- /dev/null
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/shareable_information.py
@@ -0,0 +1,98 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from published_apis.models.base_model_ import Model
+from published_apis import util
+
+
+class ShareableInformation(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, is_shareable=None, capif_prov_doms=None):  # noqa: E501
+        """ShareableInformation - a model defined in OpenAPI
+
+        :param is_shareable: The is_shareable of this ShareableInformation.  # noqa: E501
+        :type is_shareable: bool
+        :param capif_prov_doms: The capif_prov_doms of this ShareableInformation.  # noqa: E501
+        :type capif_prov_doms: List[str]
+        """
+        self.openapi_types = {
+            'is_shareable': bool,
+            'capif_prov_doms': List[str]
+        }
+
+        self.attribute_map = {
+            'is_shareable': 'isShareable',
+            'capif_prov_doms': 'capifProvDoms'
+        }
+
+        self._is_shareable = is_shareable
+        self._capif_prov_doms = capif_prov_doms
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'ShareableInformation':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The ShareableInformation of this ShareableInformation.  # noqa: E501
+        :rtype: ShareableInformation
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def is_shareable(self):
+        """Gets the is_shareable of this ShareableInformation.
+
+        Set to \"true\" indicates that the service API and/or the service API category can be shared to the list of CAPIF provider domain information. Otherwise set to \"false\".  # noqa: E501
+
+        :return: The is_shareable of this ShareableInformation.
+        :rtype: bool
+        """
+        return self._is_shareable
+
+    @is_shareable.setter
+    def is_shareable(self, is_shareable):
+        """Sets the is_shareable of this ShareableInformation.
+
+        Set to \"true\" indicates that the service API and/or the service API category can be shared to the list of CAPIF provider domain information. Otherwise set to \"false\".  # noqa: E501
+
+        :param is_shareable: The is_shareable of this ShareableInformation.
+        :type is_shareable: bool
+        """
+        if is_shareable is None:
+            raise ValueError("Invalid value for `is_shareable`, must not be `None`")  # noqa: E501
+
+        self._is_shareable = is_shareable
+
+    @property
+    def capif_prov_doms(self):
+        """Gets the capif_prov_doms of this ShareableInformation.
+
+        List of CAPIF provider domains to which the service API information to be shared.  # noqa: E501
+
+        :return: The capif_prov_doms of this ShareableInformation.
+        :rtype: List[str]
+        """
+        return self._capif_prov_doms
+
+    @capif_prov_doms.setter
+    def capif_prov_doms(self, capif_prov_doms):
+        """Sets the capif_prov_doms of this ShareableInformation.
+
+        List of CAPIF provider domains to which the service API information to be shared.  # noqa: E501
+
+        :param capif_prov_doms: The capif_prov_doms of this ShareableInformation.
+        :type capif_prov_doms: List[str]
+        """
+        if capif_prov_doms is not None and len(capif_prov_doms) < 1:
+            raise ValueError("Invalid value for `capif_prov_doms`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._capif_prov_doms = capif_prov_doms
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/version.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/version.py
new file mode 100644
index 0000000000000000000000000000000000000000..6c7bc20efb9014c8fdccd6e66c9c270e3460bfd3
--- /dev/null
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/models/version.py
@@ -0,0 +1,160 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from published_apis.models.base_model_ import Model
+from published_apis.models.custom_operation import CustomOperation
+from published_apis.models.resource import Resource
+from published_apis import util
+
+from published_apis.models.custom_operation import CustomOperation  # noqa: E501
+from published_apis.models.resource import Resource  # noqa: E501
+
+class Version(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, api_version=None, expiry=None, resources=None, cust_operations=None):  # noqa: E501
+        """Version - a model defined in OpenAPI
+
+        :param api_version: The api_version of this Version.  # noqa: E501
+        :type api_version: str
+        :param expiry: The expiry of this Version.  # noqa: E501
+        :type expiry: datetime
+        :param resources: The resources of this Version.  # noqa: E501
+        :type resources: List[Resource]
+        :param cust_operations: The cust_operations of this Version.  # noqa: E501
+        :type cust_operations: List[CustomOperation]
+        """
+        self.openapi_types = {
+            'api_version': str,
+            'expiry': datetime,
+            'resources': List[Resource],
+            'cust_operations': List[CustomOperation]
+        }
+
+        self.attribute_map = {
+            'api_version': 'apiVersion',
+            'expiry': 'expiry',
+            'resources': 'resources',
+            'cust_operations': 'custOperations'
+        }
+
+        self._api_version = api_version
+        self._expiry = expiry
+        self._resources = resources
+        self._cust_operations = cust_operations
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'Version':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The Version of this Version.  # noqa: E501
+        :rtype: Version
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def api_version(self):
+        """Gets the api_version of this Version.
+
+        API major version in URI (e.g. v1)  # noqa: E501
+
+        :return: The api_version of this Version.
+        :rtype: str
+        """
+        return self._api_version
+
+    @api_version.setter
+    def api_version(self, api_version):
+        """Sets the api_version of this Version.
+
+        API major version in URI (e.g. v1)  # noqa: E501
+
+        :param api_version: The api_version of this Version.
+        :type api_version: str
+        """
+        if api_version is None:
+            raise ValueError("Invalid value for `api_version`, must not be `None`")  # noqa: E501
+
+        self._api_version = api_version
+
+    @property
+    def expiry(self):
+        """Gets the expiry of this Version.
+
+        string with format \"date-time\" as defined in OpenAPI.  # noqa: E501
+
+        :return: The expiry of this Version.
+        :rtype: datetime
+        """
+        return self._expiry
+
+    @expiry.setter
+    def expiry(self, expiry):
+        """Sets the expiry of this Version.
+
+        string with format \"date-time\" as defined in OpenAPI.  # noqa: E501
+
+        :param expiry: The expiry of this Version.
+        :type expiry: datetime
+        """
+
+        self._expiry = expiry
+
+    @property
+    def resources(self):
+        """Gets the resources of this Version.
+
+        Resources supported by the API.  # noqa: E501
+
+        :return: The resources of this Version.
+        :rtype: List[Resource]
+        """
+        return self._resources
+
+    @resources.setter
+    def resources(self, resources):
+        """Sets the resources of this Version.
+
+        Resources supported by the API.  # noqa: E501
+
+        :param resources: The resources of this Version.
+        :type resources: List[Resource]
+        """
+        if resources is not None and len(resources) < 1:
+            raise ValueError("Invalid value for `resources`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._resources = resources
+
+    @property
+    def cust_operations(self):
+        """Gets the cust_operations of this Version.
+
+        Custom operations without resource association.  # noqa: E501
+
+        :return: The cust_operations of this Version.
+        :rtype: List[CustomOperation]
+        """
+        return self._cust_operations
+
+    @cust_operations.setter
+    def cust_operations(self, cust_operations):
+        """Sets the cust_operations of this Version.
+
+        Custom operations without resource association.  # noqa: E501
+
+        :param cust_operations: The cust_operations of this Version.
+        :type cust_operations: List[CustomOperation]
+        """
+        if cust_operations is not None and len(cust_operations) < 1:
+            raise ValueError("Invalid value for `cust_operations`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._cust_operations = cust_operations
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/openapi/openapi.yaml b/services/TS29222_CAPIF_Publish_Service_API/published_apis/openapi/openapi.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..6c2012ff5c284e0d3fdd9491bd6a86d879508a1e
--- /dev/null
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/openapi/openapi.yaml
@@ -0,0 +1,1285 @@
+openapi: 3.0.0
+info:
+  description: |
+    API for publishing service APIs.
+    © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
+    All rights reserved.
+  title: CAPIF_Publish_Service_API
+  version: 1.2.0-alpha.2
+externalDocs:
+  description: 3GPP TS 29.222 V17.2.0 Common API Framework for 3GPP Northbound APIs
+  url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.222/
+servers:
+- url: '{apiRoot}/published-apis/v1'
+  variables:
+    apiRoot:
+      default: https://example.com
+      description: apiRoot as defined in subclause 7.5 of 3GPP TS 29.222.
+paths:
+  /{apfId}/service-apis:
+    get:
+      description: Retrieve all published APIs.
+      operationId: apf_id_service_apis_get
+      parameters:
+      - explode: false
+        in: path
+        name: apfId
+        required: true
+        schema:
+          $ref: '#/components/schemas/apfId'
+        style: simple
+      responses:
+        "200":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ServiceAPIDescription'
+          description: Definition of all service API(s) published by the API publishing
+            function.
+        "307":
+          description: Temporary Redirect
+          headers:
+            Location:
+              description: An alternative URI of the resource.
+              required: true
+              schema:
+                type: string
+        "308":
+          description: Permanent Redirect
+          headers:
+            Location:
+              description: An alternative URI of the resource.
+              required: true
+              schema:
+                type: string
+        "400":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Bad request
+        "401":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Unauthorized
+        "403":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Forbidden
+        "404":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Not Found
+        "406":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Not Acceptable
+        "429":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Too Many Requests
+        "500":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Internal Server Error
+        "503":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Service Unavailable
+        default:
+          description: Generic Error
+      x-openapi-router-controller: published_apis.controllers.default_controller
+    post:
+      description: Publish a new API.
+      operationId: apf_id_service_apis_post
+      parameters:
+      - explode: false
+        in: path
+        name: apfId
+        required: true
+        schema:
+          $ref: '#/components/schemas/apfId'
+        style: simple
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/ServiceAPIDescription'
+        required: true
+      responses:
+        "201":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ServiceAPIDescription'
+          description: Service API published successfully The URI of the created resource
+            shall be returned in the "Location" HTTP header.
+          headers:
+            Location:
+              description: 'Contains the URI of the newly created resource, according
+                to the structure: {apiRoot}/published-apis/v1/{apfId}/service-apis/{serviceApiId}'
+              explode: false
+              required: true
+              schema:
+                type: string
+              style: simple
+        "400":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Bad request
+        "401":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Unauthorized
+        "403":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Forbidden
+        "404":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Not Found
+        "411":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Length Required
+        "413":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Payload Too Large
+        "415":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Unsupported Media Type
+        "429":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Too Many Requests
+        "500":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Internal Server Error
+        "503":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Service Unavailable
+        default:
+          description: Generic Error
+      x-openapi-router-controller: published_apis.controllers.default_controller
+  /{apfId}/service-apis/{serviceApiId}:
+    delete:
+      description: Unpublish a published service API.
+      operationId: apf_id_service_apis_service_api_id_delete
+      parameters:
+      - explode: false
+        in: path
+        name: serviceApiId
+        required: true
+        schema:
+          $ref: '#/components/schemas/serviceApiId'
+        style: simple
+      - explode: false
+        in: path
+        name: apfId
+        required: true
+        schema:
+          $ref: '#/components/schemas/apfId'
+        style: simple
+      responses:
+        "204":
+          description: The individual published service API matching the serviceAPiId
+            is deleted.
+        "307":
+          description: Temporary Redirect
+          headers:
+            Location:
+              description: An alternative URI of the resource.
+              required: true
+              schema:
+                type: string
+        "308":
+          description: Permanent Redirect
+          headers:
+            Location:
+              description: An alternative URI of the resource.
+              required: true
+              schema:
+                type: string
+        "400":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Bad request
+        "401":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Unauthorized
+        "403":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Forbidden
+        "404":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Not Found
+        "429":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Too Many Requests
+        "500":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Internal Server Error
+        "503":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Service Unavailable
+        default:
+          description: Generic Error
+      x-openapi-router-controller: published_apis.controllers.default_controller
+    get:
+      description: Retrieve a published service API.
+      operationId: apf_id_service_apis_service_api_id_get
+      parameters:
+      - explode: false
+        in: path
+        name: serviceApiId
+        required: true
+        schema:
+          $ref: '#/components/schemas/serviceApiId'
+        style: simple
+      - explode: false
+        in: path
+        name: apfId
+        required: true
+        schema:
+          $ref: '#/components/schemas/apfId'
+        style: simple
+      responses:
+        "200":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ServiceAPIDescription'
+          description: Definition of all service API published by the API publishing
+            function.
+        "307":
+          description: Temporary Redirect
+          headers:
+            Location:
+              description: An alternative URI of the resource.
+              required: true
+              schema:
+                type: string
+        "308":
+          description: Permanent Redirect
+          headers:
+            Location:
+              description: An alternative URI of the resource.
+              required: true
+              schema:
+                type: string
+        "400":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Bad request
+        "401":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Unauthorized
+        "403":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Forbidden
+        "404":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Not Found
+        "406":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Not Acceptable
+        "429":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Too Many Requests
+        "500":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Internal Server Error
+        "503":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Service Unavailable
+        default:
+          description: Generic Error
+      x-openapi-router-controller: published_apis.controllers.default_controller
+    put:
+      description: Update a published service API.
+      operationId: apf_id_service_apis_service_api_id_put
+      parameters:
+      - explode: false
+        in: path
+        name: serviceApiId
+        required: true
+        schema:
+          $ref: '#/components/schemas/serviceApiId'
+        style: simple
+      - explode: false
+        in: path
+        name: apfId
+        required: true
+        schema:
+          $ref: '#/components/schemas/apfId'
+        style: simple
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/ServiceAPIDescription'
+        required: true
+      responses:
+        "200":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ServiceAPIDescription'
+          description: Definition of service API updated successfully.
+        "204":
+          description: No Content
+        "307":
+          description: Temporary Redirect
+          headers:
+            Location:
+              description: An alternative URI of the resource.
+              required: true
+              schema:
+                type: string
+        "308":
+          description: Permanent Redirect
+          headers:
+            Location:
+              description: An alternative URI of the resource.
+              required: true
+              schema:
+                type: string
+        "400":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Bad request
+        "401":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Unauthorized
+        "403":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Forbidden
+        "404":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Not Found
+        "411":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Length Required
+        "413":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Payload Too Large
+        "415":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Unsupported Media Type
+        "429":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Too Many Requests
+        "500":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Internal Server Error
+        "503":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Service Unavailable
+        default:
+          description: Generic Error
+      x-openapi-router-controller: published_apis.controllers.default_controller
+components:
+  schemas:
+    apfId:
+      description: Identification of the API publishing function.
+      type: string
+    serviceApiId:
+      description: String identifying an individual published service API.
+      type: string
+    ServiceAPIDescription:
+      description: Represents the description of a service API as published by the
+        APF.
+      example:
+        serviceAPICategory: serviceAPICategory
+        ccfId: ccfId
+        apiName: apiName
+        shareableInfo:
+          capifProvDoms:
+          - capifProvDoms
+          - capifProvDoms
+          isShareable: true
+        supportedFeatures: supportedFeatures
+        description: description
+        apiSuppFeats: apiSuppFeats
+        apiId: apiId
+        aefProfiles:
+        - securityMethods:
+          - null
+          - null
+          versions:
+          - apiVersion: apiVersion
+            resources:
+            - operations:
+              - null
+              - null
+              description: description
+              resourceName: resourceName
+              custOpName: custOpName
+              uri: uri
+            - operations:
+              - null
+              - null
+              description: description
+              resourceName: resourceName
+              custOpName: custOpName
+              uri: uri
+            custOperations:
+            - operations:
+              - null
+              - null
+              description: description
+              custOpName: custOpName
+            - operations:
+              - null
+              - null
+              description: description
+              custOpName: custOpName
+            expiry: 2000-01-23T04:56:07.000+00:00
+          - apiVersion: apiVersion
+            resources:
+            - operations:
+              - null
+              - null
+              description: description
+              resourceName: resourceName
+              custOpName: custOpName
+              uri: uri
+            - operations:
+              - null
+              - null
+              description: description
+              resourceName: resourceName
+              custOpName: custOpName
+              uri: uri
+            custOperations:
+            - operations:
+              - null
+              - null
+              description: description
+              custOpName: custOpName
+            - operations:
+              - null
+              - null
+              description: description
+              custOpName: custOpName
+            expiry: 2000-01-23T04:56:07.000+00:00
+          domainName: domainName
+          aefId: aefId
+          interfaceDescriptions:
+          - ipv6Addr: ipv6Addr
+            securityMethods:
+            - null
+            - null
+            port: 5248
+            ipv4Addr: ipv4Addr
+          - ipv6Addr: ipv6Addr
+            securityMethods:
+            - null
+            - null
+            port: 5248
+            ipv4Addr: ipv4Addr
+        - securityMethods:
+          - null
+          - null
+          versions:
+          - apiVersion: apiVersion
+            resources:
+            - operations:
+              - null
+              - null
+              description: description
+              resourceName: resourceName
+              custOpName: custOpName
+              uri: uri
+            - operations:
+              - null
+              - null
+              description: description
+              resourceName: resourceName
+              custOpName: custOpName
+              uri: uri
+            custOperations:
+            - operations:
+              - null
+              - null
+              description: description
+              custOpName: custOpName
+            - operations:
+              - null
+              - null
+              description: description
+              custOpName: custOpName
+            expiry: 2000-01-23T04:56:07.000+00:00
+          - apiVersion: apiVersion
+            resources:
+            - operations:
+              - null
+              - null
+              description: description
+              resourceName: resourceName
+              custOpName: custOpName
+              uri: uri
+            - operations:
+              - null
+              - null
+              description: description
+              resourceName: resourceName
+              custOpName: custOpName
+              uri: uri
+            custOperations:
+            - operations:
+              - null
+              - null
+              description: description
+              custOpName: custOpName
+            - operations:
+              - null
+              - null
+              description: description
+              custOpName: custOpName
+            expiry: 2000-01-23T04:56:07.000+00:00
+          domainName: domainName
+          aefId: aefId
+          interfaceDescriptions:
+          - ipv6Addr: ipv6Addr
+            securityMethods:
+            - null
+            - null
+            port: 5248
+            ipv4Addr: ipv4Addr
+          - ipv6Addr: ipv6Addr
+            securityMethods:
+            - null
+            - null
+            port: 5248
+            ipv4Addr: ipv4Addr
+        pubApiPath:
+          ccfIds:
+          - ccfIds
+          - ccfIds
+      properties:
+        apiName:
+          description: API name, it is set as {apiName} part of the URI structure
+            as defined in subclause 4.4 of 3GPP TS 29.501.
+          title: apiName
+          type: string
+        apiId:
+          description: API identifier assigned by the CAPIF core function to the published
+            service API. Shall not be present in the HTTP POST request from the API
+            publishing function to the CAPIF core function. Shall be present in the
+            HTTP POST response from the CAPIF core function to the API publishing
+            function and in the HTTP GET response from the CAPIF core function to
+            the API invoker (discovery API).
+          title: apiId
+          type: string
+        aefProfiles:
+          description: AEF profile information, which includes the exposed API details
+            (e.g. protocol).
+          items:
+            $ref: '#/components/schemas/AefProfile'
+          minItems: 1
+          title: aefProfiles
+          type: array
+        description:
+          description: Text description of the API
+          title: description
+          type: string
+        supportedFeatures:
+          description: A string used to indicate the features supported by an API
+            that is used as defined in clause 6.6 in 3GPP TS 29.500. The string shall
+            contain a bitmask indicating supported features in hexadecimal representation
+            Each character in the string shall take a value of "0" to "9", "a" to
+            "f" or "A" to "F" and shall represent the support of 4 features as described
+            in table 5.2.2-3. The most significant character representing the highest-numbered
+            features shall appear first in the string, and the character representing
+            features 1 to 4 shall appear last in the string. The list of features
+            and their numbering (starting with 1) are defined separately for each
+            API. If the string contains a lower number of characters than there are
+            defined features for an API, all features that would be represented by
+            characters that are not present in the string are not supported
+          pattern: ^[A-Fa-f0-9]*$
+          title: supportedFeatures
+          type: string
+        shareableInfo:
+          $ref: '#/components/schemas/ShareableInformation'
+        serviceAPICategory:
+          title: serviceAPICategory
+          type: string
+        apiSuppFeats:
+          description: A string used to indicate the features supported by an API
+            that is used as defined in clause 6.6 in 3GPP TS 29.500. The string shall
+            contain a bitmask indicating supported features in hexadecimal representation
+            Each character in the string shall take a value of "0" to "9", "a" to
+            "f" or "A" to "F" and shall represent the support of 4 features as described
+            in table 5.2.2-3. The most significant character representing the highest-numbered
+            features shall appear first in the string, and the character representing
+            features 1 to 4 shall appear last in the string. The list of features
+            and their numbering (starting with 1) are defined separately for each
+            API. If the string contains a lower number of characters than there are
+            defined features for an API, all features that would be represented by
+            characters that are not present in the string are not supported
+          pattern: ^[A-Fa-f0-9]*$
+          title: supportedFeatures
+          type: string
+        pubApiPath:
+          $ref: '#/components/schemas/PublishedApiPath'
+        ccfId:
+          description: CAPIF core function identifier.
+          title: ccfId
+          type: string
+      required:
+      - apiName
+      title: ServiceAPIDescription
+      type: object
+    InterfaceDescription:
+      description: Represents the description of an API's interface.
+      example:
+        ipv6Addr: ipv6Addr
+        securityMethods:
+        - null
+        - null
+        port: 5248
+        ipv4Addr: ipv4Addr
+      oneOf:
+      - required:
+        - ipv4Addr
+      - required:
+        - ipv6Addr
+      properties:
+        ipv4Addr:
+          description: string identifying a Ipv4 address formatted in the "dotted
+            decimal" notation as defined in IETF RFC 1166.
+          title: Ipv4Addr
+          type: string
+        ipv6Addr:
+          description: string identifying a Ipv6 address formatted according to clause
+            4 in IETF RFC 5952. The mixed Ipv4 Ipv6 notation according to clause 5
+            of IETF RFC 5952 shall not be used.
+          title: Ipv6Addr
+          type: string
+        port:
+          description: Unsigned integer with valid values between 0 and 65535.
+          maximum: 65535
+          minimum: 0
+          title: Port
+          type: integer
+        securityMethods:
+          description: Security methods supported by the interface, it take precedence
+            over the security methods provided in AefProfile, for this specific interface.
+          items:
+            $ref: '#/components/schemas/SecurityMethod'
+          minItems: 1
+          title: securityMethods
+          type: array
+      title: InterfaceDescription
+      type: object
+    AefProfile:
+      description: Represents the AEF profile data.
+      example:
+        securityMethods:
+        - null
+        - null
+        versions:
+        - apiVersion: apiVersion
+          resources:
+          - operations:
+            - null
+            - null
+            description: description
+            resourceName: resourceName
+            custOpName: custOpName
+            uri: uri
+          - operations:
+            - null
+            - null
+            description: description
+            resourceName: resourceName
+            custOpName: custOpName
+            uri: uri
+          custOperations:
+          - operations:
+            - null
+            - null
+            description: description
+            custOpName: custOpName
+          - operations:
+            - null
+            - null
+            description: description
+            custOpName: custOpName
+          expiry: 2000-01-23T04:56:07.000+00:00
+        - apiVersion: apiVersion
+          resources:
+          - operations:
+            - null
+            - null
+            description: description
+            resourceName: resourceName
+            custOpName: custOpName
+            uri: uri
+          - operations:
+            - null
+            - null
+            description: description
+            resourceName: resourceName
+            custOpName: custOpName
+            uri: uri
+          custOperations:
+          - operations:
+            - null
+            - null
+            description: description
+            custOpName: custOpName
+          - operations:
+            - null
+            - null
+            description: description
+            custOpName: custOpName
+          expiry: 2000-01-23T04:56:07.000+00:00
+        domainName: domainName
+        aefId: aefId
+        interfaceDescriptions:
+        - ipv6Addr: ipv6Addr
+          securityMethods:
+          - null
+          - null
+          port: 5248
+          ipv4Addr: ipv4Addr
+        - ipv6Addr: ipv6Addr
+          securityMethods:
+          - null
+          - null
+          port: 5248
+          ipv4Addr: ipv4Addr
+      oneOf:
+      - required:
+        - domainName
+      - required:
+        - interfaceDescriptions
+      properties:
+        aefId:
+          description: Identifier of the API exposing function
+          title: aefId
+          type: string
+        versions:
+          description: API version
+          items:
+            $ref: '#/components/schemas/Version'
+          minItems: 1
+          title: versions
+          type: array
+        protocol:
+          $ref: '#/components/schemas/Protocol'
+        dataFormat:
+          $ref: '#/components/schemas/DataFormat'
+        securityMethods:
+          description: Security methods supported by the AEF
+          items:
+            $ref: '#/components/schemas/SecurityMethod'
+          minItems: 1
+          title: securityMethods
+          type: array
+        domainName:
+          description: Domain to which API belongs to
+          title: domainName
+          type: string
+        interfaceDescriptions:
+          description: Interface details
+          items:
+            $ref: '#/components/schemas/InterfaceDescription'
+          minItems: 1
+          title: interfaceDescriptions
+          type: array
+      required:
+      - aefId
+      - versions
+      title: AefProfile
+      type: object
+    Resource:
+      description: Represents the API resource data.
+      example:
+        operations:
+        - null
+        - null
+        description: description
+        resourceName: resourceName
+        custOpName: custOpName
+        uri: uri
+      properties:
+        resourceName:
+          description: Resource name
+          title: resourceName
+          type: string
+        commType:
+          $ref: '#/components/schemas/CommunicationType'
+        uri:
+          description: Relative URI of the API resource, it is set as {apiSpecificResourceUriPart}
+            part of the URI structure as defined in subclause 4.4 of 3GPP TS 29.501.
+          title: uri
+          type: string
+        custOpName:
+          description: it is set as {custOpName} part of the URI structure for a custom
+            operation associated with a resource as defined in subclause 4.4 of 3GPP
+            TS 29.501.
+          title: custOpName
+          type: string
+        operations:
+          description: Supported HTTP methods for the API resource. Only applicable
+            when the protocol in AefProfile indicates HTTP.
+          items:
+            $ref: '#/components/schemas/Operation'
+          minItems: 1
+          title: operations
+          type: array
+        description:
+          description: Text description of the API resource
+          title: description
+          type: string
+      required:
+      - commType
+      - resourceName
+      - uri
+      title: Resource
+      type: object
+    CustomOperation:
+      description: Represents the description of a custom operation.
+      example:
+        operations:
+        - null
+        - null
+        description: description
+        custOpName: custOpName
+      properties:
+        commType:
+          $ref: '#/components/schemas/CommunicationType'
+        custOpName:
+          description: it is set as {custOpName} part of the URI structure for a custom
+            operation without resource association as defined in subclause 4.4 of
+            3GPP TS 29.501.
+          title: custOpName
+          type: string
+        operations:
+          description: Supported HTTP methods for the API resource. Only applicable
+            when the protocol in AefProfile indicates HTTP.
+          items:
+            $ref: '#/components/schemas/Operation'
+          minItems: 1
+          title: operations
+          type: array
+        description:
+          description: Text description of the custom operation
+          title: description
+          type: string
+      required:
+      - commType
+      - custOpName
+      title: CustomOperation
+      type: object
+    Version:
+      description: Represents the API version information.
+      example:
+        apiVersion: apiVersion
+        resources:
+        - operations:
+          - null
+          - null
+          description: description
+          resourceName: resourceName
+          custOpName: custOpName
+          uri: uri
+        - operations:
+          - null
+          - null
+          description: description
+          resourceName: resourceName
+          custOpName: custOpName
+          uri: uri
+        custOperations:
+        - operations:
+          - null
+          - null
+          description: description
+          custOpName: custOpName
+        - operations:
+          - null
+          - null
+          description: description
+          custOpName: custOpName
+        expiry: 2000-01-23T04:56:07.000+00:00
+      properties:
+        apiVersion:
+          description: API major version in URI (e.g. v1)
+          title: apiVersion
+          type: string
+        expiry:
+          description: string with format "date-time" as defined in OpenAPI.
+          format: date-time
+          title: DateTime
+          type: string
+        resources:
+          description: Resources supported by the API.
+          items:
+            $ref: '#/components/schemas/Resource'
+          minItems: 1
+          title: resources
+          type: array
+        custOperations:
+          description: Custom operations without resource association.
+          items:
+            $ref: '#/components/schemas/CustomOperation'
+          minItems: 1
+          title: custOperations
+          type: array
+      required:
+      - apiVersion
+      title: Version
+      type: object
+    ShareableInformation:
+      description: Indicates whether the service API and/or the service API category
+        can be shared to the list of CAPIF provider domains.
+      example:
+        capifProvDoms:
+        - capifProvDoms
+        - capifProvDoms
+        isShareable: true
+      properties:
+        isShareable:
+          description: Set to "true" indicates that the service API and/or the service
+            API category can be shared to the list of CAPIF provider domain information.
+            Otherwise set to "false".
+          title: isShareable
+          type: boolean
+        capifProvDoms:
+          description: List of CAPIF provider domains to which the service API information
+            to be shared.
+          items:
+            type: string
+          minItems: 1
+          title: capifProvDoms
+          type: array
+      required:
+      - isShareable
+      title: ShareableInformation
+      type: object
+    PublishedApiPath:
+      description: Represents the published API path within the same CAPIF provider
+        domain.
+      example:
+        ccfIds:
+        - ccfIds
+        - ccfIds
+      properties:
+        ccfIds:
+          description: A list of CCF identifiers where the service API is already
+            published.
+          items:
+            type: string
+          minItems: 1
+          title: ccfIds
+          type: array
+      title: PublishedApiPath
+      type: object
+    Protocol:
+      anyOf:
+      - $ref: '#/components/schemas/Protocol_anyOf'
+      - description: |
+          This string provides forward-compatibility with future extensions to the enumeration but is not used to encode content defined in the present version of this API.
+        type: string
+      description: |
+        Possible values are - HTTP_1_1: HTTP version 1.1 - HTTP_2: HTTP version 2
+      title: Protocol
+    CommunicationType:
+      anyOf:
+      - $ref: '#/components/schemas/CommunicationType_anyOf'
+      - description: |
+          This string provides forward-compatibility with future extensions to the enumeration but is not used to encode content defined in the present version of this API.
+        type: string
+      description: |
+        Possible values are - REQUEST_RESPONSE: The communication is of the type request-response - SUBSCRIBE_NOTIFY: The communication is of the type subscribe-notify
+      title: CommunicationType
+    DataFormat:
+      anyOf:
+      - $ref: '#/components/schemas/DataFormat_anyOf'
+      - description: |
+          This string provides forward-compatibility with future extensions to the enumeration but is not used to encode content defined in the present version of this API.
+        type: string
+      description: |
+        Possible values are - JSON: JavaScript Object Notation
+      title: DataFormat
+    SecurityMethod:
+      anyOf:
+      - $ref: '#/components/schemas/SecurityMethod_anyOf'
+      - description: |
+          This string provides forward-compatibility with future extensions to the enumeration but is not used to encode content defined in the present version of this API.
+        type: string
+      description: |
+        Possible values are - PSK: Security method 1 (Using TLS-PSK) as described in 3GPP TS 33.122 - PKI: Security method 2 (Using PKI) as described in 3GPP TS 33.122 - OAUTH: Security method 3 (TLS with OAuth token) as described in 3GPP TS 33.122
+      title: SecurityMethod
+    Operation:
+      anyOf:
+      - $ref: '#/components/schemas/Operation_anyOf'
+      - description: |
+          This string provides forward-compatibility with future extensions to the enumeration but is not used to encode content defined in the present version of this API.
+        type: string
+      description: |
+        Possible values are - GET: HTTP GET method - POST: HTTP POST method - PUT: HTTP PUT method - PATCH: HTTP PATCH method - DELETE: HTTP DELETE method
+      title: Operation
+    ProblemDetails:
+      description: Represents additional information and details on an error response.
+      properties:
+        type:
+          description: string providing an URI formatted according to IETF RFC 3986.
+          title: type
+          type: string
+        title:
+          description: A short, human-readable summary of the problem type. It should
+            not change from occurrence to occurrence of the problem.
+          title: title
+          type: string
+        status:
+          description: The HTTP status code for this occurrence of the problem.
+          title: status
+          type: integer
+        detail:
+          description: A human-readable explanation specific to this occurrence of
+            the problem.
+          title: detail
+          type: string
+        instance:
+          description: string providing an URI formatted according to IETF RFC 3986.
+          title: type
+          type: string
+        cause:
+          description: A machine-readable application error cause specific to this
+            occurrence of the problem. This IE should be present and provide application-related
+            error information, if available.
+          title: cause
+          type: string
+        invalidParams:
+          description: Description of invalid parameters, for a request rejected due
+            to invalid parameters.
+          items:
+            $ref: '#/components/schemas/InvalidParam'
+          minItems: 1
+          title: invalidParams
+          type: array
+        supportedFeatures:
+          description: A string used to indicate the features supported by an API
+            that is used as defined in clause 6.6 in 3GPP TS 29.500. The string shall
+            contain a bitmask indicating supported features in hexadecimal representation
+            Each character in the string shall take a value of "0" to "9", "a" to
+            "f" or "A" to "F" and shall represent the support of 4 features as described
+            in table 5.2.2-3. The most significant character representing the highest-numbered
+            features shall appear first in the string, and the character representing
+            features 1 to 4 shall appear last in the string. The list of features
+            and their numbering (starting with 1) are defined separately for each
+            API. If the string contains a lower number of characters than there are
+            defined features for an API, all features that would be represented by
+            characters that are not present in the string are not supported
+          pattern: ^[A-Fa-f0-9]*$
+          title: supportedFeatures
+          type: string
+      title: ProblemDetails
+      type: object
+    Uri:
+      description: string providing an URI formatted according to IETF RFC 3986.
+      title: type
+      type: string
+    InvalidParam:
+      description: Represents the description of invalid parameters, for a request
+        rejected due to invalid parameters.
+      properties:
+        param:
+          description: Attribute's name encoded as a JSON Pointer, or header's name.
+          title: param
+          type: string
+        reason:
+          description: A human-readable reason, e.g. "must be a positive integer".
+          title: reason
+          type: string
+      required:
+      - param
+      title: InvalidParam
+      type: object
+    SupportedFeatures:
+      description: A string used to indicate the features supported by an API that
+        is used as defined in clause 6.6 in 3GPP TS 29.500. The string shall contain
+        a bitmask indicating supported features in hexadecimal representation Each
+        character in the string shall take a value of "0" to "9", "a" to "f" or "A"
+        to "F" and shall represent the support of 4 features as described in table 5.2.2-3.
+        The most significant character representing the highest-numbered features
+        shall appear first in the string, and the character representing features
+        1 to 4 shall appear last in the string. The list of features and their numbering
+        (starting with 1) are defined separately for each API. If the string contains
+        a lower number of characters than there are defined features for an API, all
+        features that would be represented by characters that are not present in the
+        string are not supported
+      pattern: ^[A-Fa-f0-9]*$
+      title: supportedFeatures
+      type: string
+    Ipv4Addr:
+      description: string identifying a Ipv4 address formatted in the "dotted decimal"
+        notation as defined in IETF RFC 1166.
+      title: Ipv4Addr
+      type: string
+    Ipv6Addr:
+      description: string identifying a Ipv6 address formatted according to clause
+        4 in IETF RFC 5952. The mixed Ipv4 Ipv6 notation according to clause 5 of
+        IETF RFC 5952 shall not be used.
+      title: Ipv6Addr
+      type: string
+    Port:
+      description: Unsigned integer with valid values between 0 and 65535.
+      maximum: 65535
+      minimum: 0
+      title: Port
+      type: integer
+    DateTime:
+      description: string with format "date-time" as defined in OpenAPI.
+      format: date-time
+      title: DateTime
+      type: string
+    Protocol_anyOf:
+      enum:
+      - HTTP_1_1
+      - HTTP_2
+      title: Protocol_anyOf
+      type: string
+    CommunicationType_anyOf:
+      enum:
+      - REQUEST_RESPONSE
+      - SUBSCRIBE_NOTIFY
+      title: CommunicationType_anyOf
+      type: string
+    DataFormat_anyOf:
+      enum:
+      - JSON
+      title: DataFormat_anyOf
+      type: string
+    SecurityMethod_anyOf:
+      enum:
+      - PSK
+      - PKI
+      - OAUTH
+      title: SecurityMethod_anyOf
+      type: string
+    Operation_anyOf:
+      enum:
+      - GET
+      - POST
+      - PUT
+      - PATCH
+      - DELETE
+      title: Operation_anyOf
+      type: string
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/typing_utils.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/typing_utils.py
new file mode 100644
index 0000000000000000000000000000000000000000..0563f81fd5345282a33705038dfa77fdcaa15872
--- /dev/null
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/typing_utils.py
@@ -0,0 +1,32 @@
+# coding: utf-8
+
+import sys
+
+if sys.version_info < (3, 7):
+    import typing
+
+    def is_generic(klass):
+        """ Determine whether klass is a generic class """
+        return type(klass) == typing.GenericMeta
+
+    def is_dict(klass):
+        """ Determine whether klass is a Dict """
+        return klass.__extra__ == dict
+
+    def is_list(klass):
+        """ Determine whether klass is a List """
+        return klass.__extra__ == list
+
+else:
+
+    def is_generic(klass):
+        """ Determine whether klass is a generic class """
+        return hasattr(klass, '__origin__')
+
+    def is_dict(klass):
+        """ Determine whether klass is a Dict """
+        return klass.__origin__ == dict
+
+    def is_list(klass):
+        """ Determine whether klass is a List """
+        return klass.__origin__ == list
diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/util.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/util.py
new file mode 100644
index 0000000000000000000000000000000000000000..3f53de6f85ebf9316a86066e36089d73a96bd886
--- /dev/null
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/util.py
@@ -0,0 +1,187 @@
+import datetime
+
+import six
+import typing
+from published_apis import typing_utils
+
+
+def clean_empty(d):
+    if isinstance(d, dict):
+        return {
+            k: v
+            for k, v in ((k, clean_empty(v)) for k, v in d.items())
+            if v
+        }
+    if isinstance(d, list):
+        return [v for v in map(clean_empty, d) if v]
+    return d
+
+def dict_to_camel_case(my_dict):
+
+
+        result = {}
+
+        for attr, value in my_dict.items():
+
+            my_key = ''.join(word.title() for word in attr.split('_'))
+            my_key= ''.join([my_key[0].lower(), my_key[1:]])
+            if my_key == "serviceApiCategory":
+                my_key = "serviceAPICategory"
+
+            if isinstance(value, list):
+                result[my_key] = list(map(
+                    lambda x: dict_to_camel_case(x) if isinstance(x, dict) else x, value ))
+
+            elif hasattr(value, "to_dict"):
+                result[my_key] = dict_to_camel_case(value)
+
+            elif isinstance(value, dict):
+                value = dict_to_camel_case(value)
+                result[my_key] = value
+            else:
+                result[my_key] = value
+
+        return result
+
+
+def _deserialize(data, klass):
+    """Deserializes dict, list, str into an object.
+
+    :param data: dict, list or str.
+    :param klass: class literal, or string of class name.
+
+    :return: object.
+    """
+    if data is None:
+        return None
+
+    if klass in six.integer_types or klass in (float, str, bool, bytearray):
+        return _deserialize_primitive(data, klass)
+    elif klass == object:
+        return _deserialize_object(data)
+    elif klass == datetime.date:
+        return deserialize_date(data)
+    elif klass == datetime.datetime:
+        return deserialize_datetime(data)
+    elif typing_utils.is_generic(klass):
+        if typing_utils.is_list(klass):
+            return _deserialize_list(data, klass.__args__[0])
+        if typing_utils.is_dict(klass):
+            return _deserialize_dict(data, klass.__args__[1])
+    else:
+        return deserialize_model(data, klass)
+
+
+def _deserialize_primitive(data, klass):
+    """Deserializes to primitive type.
+
+    :param data: data to deserialize.
+    :param klass: class literal.
+
+    :return: int, long, float, str, bool.
+    :rtype: int | long | float | str | bool
+    """
+    try:
+        value = klass(data)
+    except UnicodeEncodeError:
+        value = six.u(data)
+    except TypeError:
+        value = data
+    return value
+
+
+def _deserialize_object(value):
+    """Return an original value.
+
+    :return: object.
+    """
+    return value
+
+
+def deserialize_date(string):
+    """Deserializes string to date.
+
+    :param string: str.
+    :type string: str
+    :return: date.
+    :rtype: date
+    """
+    if string is None:
+      return None
+
+    try:
+        from dateutil.parser import parse
+        return parse(string).date()
+    except ImportError:
+        return string
+
+
+def deserialize_datetime(string):
+    """Deserializes string to datetime.
+
+    The string should be in iso8601 datetime format.
+
+    :param string: str.
+    :type string: str
+    :return: datetime.
+    :rtype: datetime
+    """
+    if string is None:
+      return None
+    
+    try:
+        from dateutil.parser import parse
+        return parse(string)
+    except ImportError:
+        return string
+
+
+def deserialize_model(data, klass):
+    """Deserializes list or dict to model.
+
+    :param data: dict, list.
+    :type data: dict | list
+    :param klass: class literal.
+    :return: model object.
+    """
+    instance = klass()
+
+    if not instance.openapi_types:
+        return data
+
+    for attr, attr_type in six.iteritems(instance.openapi_types):
+        if data is not None \
+                and instance.attribute_map[attr] in data \
+                and isinstance(data, (list, dict)):
+            value = data[instance.attribute_map[attr]]
+            setattr(instance, attr, _deserialize(value, attr_type))
+
+    return instance
+
+
+def _deserialize_list(data, boxed_type):
+    """Deserializes a list and its elements.
+
+    :param data: list to deserialize.
+    :type data: list
+    :param boxed_type: class literal.
+
+    :return: deserialized list.
+    :rtype: list
+    """
+    return [_deserialize(sub_data, boxed_type)
+            for sub_data in data]
+
+
+def _deserialize_dict(data, boxed_type):
+    """Deserializes a dict and its elements.
+
+    :param data: dict to deserialize.
+    :type data: dict
+    :param boxed_type: class literal.
+
+    :return: deserialized dict.
+    :rtype: dict
+    """
+    return {k: _deserialize(v, boxed_type)
+            for k, v in six.iteritems(data)}
diff --git a/services/TS29222_CAPIF_Publish_Service_API/requirements.txt b/services/TS29222_CAPIF_Publish_Service_API/requirements.txt
new file mode 100644
index 0000000000000000000000000000000000000000..0ba8fb534606696f9f5e2cd5164563a048709b67
--- /dev/null
+++ b/services/TS29222_CAPIF_Publish_Service_API/requirements.txt
@@ -0,0 +1,21 @@
+connexion[swagger-ui] == 2.14.2; python_version>="3.6"
+swagger-ui-bundle >= 0.0.2
+python_dateutil >= 2.6.0
+setuptools >= 21.0.0
+Flask == 2.0.3
+pymongo == 4.0.1
+flask_jwt_extended == 4.4.4
+opentelemetry-instrumentation == 0.38b0
+opentelemetry-instrumentation-flask == 0.38b0
+opentelemetry-instrumentation-redis == 0.38b0
+opentelemetry-instrumentation-pymongo == 0.38b0
+opentelemetry-exporter-otlp == 1.17.0
+opentelemetry-exporter-jaeger==1.17.0
+fluent == 0.10.0
+fluent-logger == 0.10.0
+opentelemetry-api == 1.17.0
+opentelemetry-sdk == 1.17.0
+flask_executor == 1.0.0
+pyopenssl == 23.0.0
+redis ==  4.5.4
+flask_executor == 1.0.0
diff --git a/services/TS29222_CAPIF_Publish_Service_API/setup.py b/services/TS29222_CAPIF_Publish_Service_API/setup.py
new file mode 100644
index 0000000000000000000000000000000000000000..0b21a836f9c212c49a3e346e9c529bee53dd469f
--- /dev/null
+++ b/services/TS29222_CAPIF_Publish_Service_API/setup.py
@@ -0,0 +1,39 @@
+# coding: utf-8
+
+import sys
+from setuptools import setup, find_packages
+
+NAME = "published_apis"
+VERSION = "1.0.0"
+
+# To install the library, run the following
+#
+# python setup.py install
+#
+# prerequisite: setuptools
+# http://pypi.python.org/pypi/setuptools
+
+REQUIRES = [
+    "connexion>=2.0.2",
+    "swagger-ui-bundle>=0.0.2",
+    "python_dateutil>=2.6.0"
+]
+
+setup(
+    name=NAME,
+    version=VERSION,
+    description="CAPIF_Publish_Service_API",
+    author_email="",
+    url="",
+    keywords=["OpenAPI", "CAPIF_Publish_Service_API"],
+    install_requires=REQUIRES,
+    packages=find_packages(),
+    package_data={'': ['openapi/openapi.yaml']},
+    include_package_data=True,
+    entry_points={
+        'console_scripts': ['published_apis=published_apis.__main__:main']},
+    long_description="""\
+    API for publishing service APIs. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. 
+    """
+)
+
diff --git a/services/TS29222_CAPIF_Publish_Service_API/test-requirements.txt b/services/TS29222_CAPIF_Publish_Service_API/test-requirements.txt
new file mode 100644
index 0000000000000000000000000000000000000000..0970f28c7c5a344d7fd9b9c893c584e7336df266
--- /dev/null
+++ b/services/TS29222_CAPIF_Publish_Service_API/test-requirements.txt
@@ -0,0 +1,4 @@
+pytest~=4.6.7 # needed for python 2.7+3.4
+pytest-cov>=2.8.1
+pytest-randomly==1.2.3 # needed for python 2.7+3.4
+Flask-Testing==0.8.0
diff --git a/services/TS29222_CAPIF_Publish_Service_API/tox.ini b/services/TS29222_CAPIF_Publish_Service_API/tox.ini
new file mode 100644
index 0000000000000000000000000000000000000000..17663abb51c05a354a07eedf89a94700a0f9902b
--- /dev/null
+++ b/services/TS29222_CAPIF_Publish_Service_API/tox.ini
@@ -0,0 +1,11 @@
+[tox]
+envlist = py3
+skipsdist=True
+
+[testenv]
+deps=-r{toxinidir}/requirements.txt
+     -r{toxinidir}/test-requirements.txt
+	 {toxinidir}
+
+commands=
+   pytest --cov=published_apis
diff --git a/services/TS29222_CAPIF_Routing_Info_API/.dockerignore b/services/TS29222_CAPIF_Routing_Info_API/.dockerignore
new file mode 100644
index 0000000000000000000000000000000000000000..f9619601908b43d5d90c9befea5aa6ef6a732fa9
--- /dev/null
+++ b/services/TS29222_CAPIF_Routing_Info_API/.dockerignore
@@ -0,0 +1,72 @@
+.travis.yaml
+.openapi-generator-ignore
+README.md
+tox.ini
+git_push.sh
+test-requirements.txt
+setup.py
+
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+env/
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*,cover
+.hypothesis/
+venv/
+.python-version
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+#Ipython Notebook
+.ipynb_checkpoints
diff --git a/services/TS29222_CAPIF_Routing_Info_API/.gitignore b/services/TS29222_CAPIF_Routing_Info_API/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..43995bd42fa23bbc4c3a59d5fb9da99042fcf139
--- /dev/null
+++ b/services/TS29222_CAPIF_Routing_Info_API/.gitignore
@@ -0,0 +1,66 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+env/
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*,cover
+.hypothesis/
+venv/
+.venv/
+.python-version
+.pytest_cache
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+#Ipython Notebook
+.ipynb_checkpoints
diff --git a/services/TS29222_CAPIF_Routing_Info_API/.openapi-generator-ignore b/services/TS29222_CAPIF_Routing_Info_API/.openapi-generator-ignore
new file mode 100644
index 0000000000000000000000000000000000000000..7484ee590a3894506cf063799b885428f95a71be
--- /dev/null
+++ b/services/TS29222_CAPIF_Routing_Info_API/.openapi-generator-ignore
@@ -0,0 +1,23 @@
+# OpenAPI Generator Ignore
+# Generated by openapi-generator https://github.com/openapitools/openapi-generator
+
+# Use this file to prevent files from being overwritten by the generator.
+# The patterns follow closely to .gitignore or .dockerignore.
+
+# As an example, the C# client generator defines ApiClient.cs.
+# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line:
+#ApiClient.cs
+
+# You can match any string of characters against a directory, file or extension with a single asterisk (*):
+#foo/*/qux
+# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
+
+# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
+#foo/**/qux
+# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
+
+# You can also negate patterns with an exclamation (!).
+# For example, you can ignore all files in a docs folder with the file extension .md:
+#docs/*.md
+# Then explicitly reverse the ignore rule for a single file:
+#!docs/README.md
diff --git a/services/TS29222_CAPIF_Routing_Info_API/.openapi-generator/FILES b/services/TS29222_CAPIF_Routing_Info_API/.openapi-generator/FILES
new file mode 100644
index 0000000000000000000000000000000000000000..ddc37ec369377d3c3adc57a862078246ab953012
--- /dev/null
+++ b/services/TS29222_CAPIF_Routing_Info_API/.openapi-generator/FILES
@@ -0,0 +1,43 @@
+.dockerignore
+.gitignore
+.travis.yml
+Dockerfile
+README.md
+capif_routing_info/__init__.py
+capif_routing_info/__main__.py
+capif_routing_info/controllers/__init__.py
+capif_routing_info/controllers/default_controller.py
+capif_routing_info/controllers/security_controller_.py
+capif_routing_info/encoder.py
+capif_routing_info/models/__init__.py
+capif_routing_info/models/aef_profile.py
+capif_routing_info/models/base_model_.py
+capif_routing_info/models/communication_type.py
+capif_routing_info/models/communication_type_any_of.py
+capif_routing_info/models/custom_operation.py
+capif_routing_info/models/data_format.py
+capif_routing_info/models/data_format_any_of.py
+capif_routing_info/models/interface_description.py
+capif_routing_info/models/invalid_param.py
+capif_routing_info/models/ipv4_address_range.py
+capif_routing_info/models/ipv6_address_range.py
+capif_routing_info/models/operation.py
+capif_routing_info/models/operation_any_of.py
+capif_routing_info/models/problem_details.py
+capif_routing_info/models/protocol.py
+capif_routing_info/models/protocol_any_of.py
+capif_routing_info/models/resource.py
+capif_routing_info/models/routing_info.py
+capif_routing_info/models/routing_rule.py
+capif_routing_info/models/security_method.py
+capif_routing_info/models/security_method_any_of.py
+capif_routing_info/models/version.py
+capif_routing_info/openapi/openapi.yaml
+capif_routing_info/test/__init__.py
+capif_routing_info/typing_utils.py
+capif_routing_info/util.py
+git_push.sh
+requirements.txt
+setup.py
+test-requirements.txt
+tox.ini
diff --git a/services/TS29222_CAPIF_Routing_Info_API/.openapi-generator/VERSION b/services/TS29222_CAPIF_Routing_Info_API/.openapi-generator/VERSION
new file mode 100644
index 0000000000000000000000000000000000000000..4b448de535c7dd619da0df6d8221995dbd5d118a
--- /dev/null
+++ b/services/TS29222_CAPIF_Routing_Info_API/.openapi-generator/VERSION
@@ -0,0 +1 @@
+5.3.0-SNAPSHOT
\ No newline at end of file
diff --git a/services/TS29222_CAPIF_Routing_Info_API/.travis.yml b/services/TS29222_CAPIF_Routing_Info_API/.travis.yml
new file mode 100644
index 0000000000000000000000000000000000000000..ad71ee5ca083a6923c91104533c5c7b86f297f3f
--- /dev/null
+++ b/services/TS29222_CAPIF_Routing_Info_API/.travis.yml
@@ -0,0 +1,14 @@
+# ref: https://docs.travis-ci.com/user/languages/python
+language: python
+python:
+  - "3.2"
+  - "3.3"
+  - "3.4"
+  - "3.5"
+  - "3.6"
+  - "3.7"
+  - "3.8"
+# command to install dependencies
+install: "pip install -r requirements.txt"
+# command to run tests
+script: nosetests
diff --git a/services/TS29222_CAPIF_Routing_Info_API/Dockerfile b/services/TS29222_CAPIF_Routing_Info_API/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..9911d06b662dc1890945b8ec73c862a5ae5a2fab
--- /dev/null
+++ b/services/TS29222_CAPIF_Routing_Info_API/Dockerfile
@@ -0,0 +1,16 @@
+FROM public.ecr.aws/o2v4a8t6/opencapif/python:3-alpine
+
+RUN mkdir -p /usr/src/app
+WORKDIR /usr/src/app
+
+COPY requirements.txt /usr/src/app/
+
+RUN pip3 install --no-cache-dir -r requirements.txt
+
+COPY . /usr/src/app
+
+EXPOSE 8080
+
+ENTRYPOINT ["python3"]
+
+CMD ["-m", "capif_routing_info"]
\ No newline at end of file
diff --git a/services/TS29222_CAPIF_Routing_Info_API/README.md b/services/TS29222_CAPIF_Routing_Info_API/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..b239418e6ca48afcab32df49aeb265a57a253a3c
--- /dev/null
+++ b/services/TS29222_CAPIF_Routing_Info_API/README.md
@@ -0,0 +1,49 @@
+# OpenAPI generated server
+
+## Overview
+This server was generated by the [OpenAPI Generator](https://openapi-generator.tech) project. By using the
+[OpenAPI-Spec](https://openapis.org) from a remote server, you can easily generate a server stub.  This
+is an example of building a OpenAPI-enabled Flask server.
+
+This example uses the [Connexion](https://github.com/zalando/connexion) library on top of Flask.
+
+## Requirements
+Python 3.5.2+
+
+## Usage
+To run the server, please execute the following from the root directory:
+
+```
+pip3 install -r requirements.txt
+python3 -m capif_routing_info
+```
+
+and open your browser to here:
+
+```
+http://localhost:8080/capif-routing-info/v1/ui/
+```
+
+Your OpenAPI definition lives here:
+
+```
+http://localhost:8080/capif-routing-info/v1/openapi.json
+```
+
+To launch the integration tests, use tox:
+```
+sudo pip install tox
+tox
+```
+
+## Running with Docker
+
+To run the server on a Docker container, please execute the following from the root directory:
+
+```bash
+# building the image
+docker build -t capif_routing_info .
+
+# starting up a container
+docker run -p 8080:8080 capif_routing_info
+```
\ No newline at end of file
diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/__init__.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/__main__.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/__main__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e595fa02106ed80d620b8eb00f1d2a421bb1ee5f
--- /dev/null
+++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/__main__.py
@@ -0,0 +1,19 @@
+#!/usr/bin/env python3
+
+import connexion
+
+from capif_routing_info import encoder
+
+
+def main():
+    app = connexion.App(__name__, specification_dir='./openapi/')
+    app.app.json_encoder = encoder.JSONEncoder
+    app.add_api('openapi.yaml',
+                arguments={'title': 'CAPIF_Routing_Info_API'},
+                pythonic_params=True)
+
+    app.run(port=8080)
+
+
+if __name__ == '__main__':
+    main()
diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/controllers/__init__.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/controllers/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/controllers/default_controller.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/controllers/default_controller.py
new file mode 100644
index 0000000000000000000000000000000000000000..7cd07dd74ff2634a9487083283cad4ef354c61ae
--- /dev/null
+++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/controllers/default_controller.py
@@ -0,0 +1,23 @@
+import connexion
+import six
+
+from capif_routing_info.models.problem_details import ProblemDetails  # noqa: E501
+from capif_routing_info.models.routing_info import RoutingInfo  # noqa: E501
+from capif_routing_info import util
+
+
+def service_apis_service_api_id_get(service_api_id, aef_id, supp_feat=None):  # noqa: E501
+    """service_apis_service_api_id_get
+
+    Retrieves the API routing information. # noqa: E501
+
+    :param service_api_id: Identifier of a published service API
+    :type service_api_id: str
+    :param aef_id: Identifier of the AEF
+    :type aef_id: str
+    :param supp_feat: To filter irrelevant responses related to unsupported features
+    :type supp_feat: str
+
+    :rtype: RoutingInfo
+    """
+    return 'do some magic!'
diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/controllers/security_controller_.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/controllers/security_controller_.py
new file mode 100644
index 0000000000000000000000000000000000000000..6d294ffd6df1a26a469dbb4e72533b01503468dd
--- /dev/null
+++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/controllers/security_controller_.py
@@ -0,0 +1,2 @@
+from typing import List
+
diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/encoder.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/encoder.py
new file mode 100644
index 0000000000000000000000000000000000000000..b53647004a14457d83693f5909b69425d927d3c8
--- /dev/null
+++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/encoder.py
@@ -0,0 +1,20 @@
+from connexion.apps.flask_app import FlaskJSONEncoder
+import six
+
+from capif_routing_info.models.base_model_ import Model
+
+
+class JSONEncoder(FlaskJSONEncoder):
+    include_nulls = False
+
+    def default(self, o):
+        if isinstance(o, Model):
+            dikt = {}
+            for attr, _ in six.iteritems(o.openapi_types):
+                value = getattr(o, attr)
+                if value is None and not self.include_nulls:
+                    continue
+                attr = o.attribute_map[attr]
+                dikt[attr] = value
+            return dikt
+        return FlaskJSONEncoder.default(self, o)
diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/__init__.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..68aa16c325023522d4355c315d2f92f0508ff0d6
--- /dev/null
+++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/__init__.py
@@ -0,0 +1,26 @@
+# coding: utf-8
+
+# flake8: noqa
+from __future__ import absolute_import
+# import models into model package
+from capif_routing_info.models.aef_profile import AefProfile
+from capif_routing_info.models.communication_type import CommunicationType
+from capif_routing_info.models.communication_type_any_of import CommunicationTypeAnyOf
+from capif_routing_info.models.custom_operation import CustomOperation
+from capif_routing_info.models.data_format import DataFormat
+from capif_routing_info.models.data_format_any_of import DataFormatAnyOf
+from capif_routing_info.models.interface_description import InterfaceDescription
+from capif_routing_info.models.invalid_param import InvalidParam
+from capif_routing_info.models.ipv4_address_range import Ipv4AddressRange
+from capif_routing_info.models.ipv6_address_range import Ipv6AddressRange
+from capif_routing_info.models.operation import Operation
+from capif_routing_info.models.operation_any_of import OperationAnyOf
+from capif_routing_info.models.problem_details import ProblemDetails
+from capif_routing_info.models.protocol import Protocol
+from capif_routing_info.models.protocol_any_of import ProtocolAnyOf
+from capif_routing_info.models.resource import Resource
+from capif_routing_info.models.routing_info import RoutingInfo
+from capif_routing_info.models.routing_rule import RoutingRule
+from capif_routing_info.models.security_method import SecurityMethod
+from capif_routing_info.models.security_method_any_of import SecurityMethodAnyOf
+from capif_routing_info.models.version import Version
diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/aef_profile.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/aef_profile.py
new file mode 100644
index 0000000000000000000000000000000000000000..9a7e083dd4ee6f28bb42ac2cd94e3e778b72a011
--- /dev/null
+++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/aef_profile.py
@@ -0,0 +1,250 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_routing_info.models.base_model_ import Model
+from capif_routing_info.models.data_format import DataFormat
+from capif_routing_info.models.interface_description import InterfaceDescription
+from capif_routing_info.models.protocol import Protocol
+from capif_routing_info.models.security_method import SecurityMethod
+from capif_routing_info.models.version import Version
+from capif_routing_info import util
+
+from capif_routing_info.models.data_format import DataFormat  # noqa: E501
+from capif_routing_info.models.interface_description import InterfaceDescription  # noqa: E501
+from capif_routing_info.models.protocol import Protocol  # noqa: E501
+from capif_routing_info.models.security_method import SecurityMethod  # noqa: E501
+from capif_routing_info.models.version import Version  # noqa: E501
+
+class AefProfile(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, aef_id=None, versions=None, protocol=None, data_format=None, security_methods=None, domain_name=None, interface_descriptions=None):  # noqa: E501
+        """AefProfile - a model defined in OpenAPI
+
+        :param aef_id: The aef_id of this AefProfile.  # noqa: E501
+        :type aef_id: str
+        :param versions: The versions of this AefProfile.  # noqa: E501
+        :type versions: List[Version]
+        :param protocol: The protocol of this AefProfile.  # noqa: E501
+        :type protocol: Protocol
+        :param data_format: The data_format of this AefProfile.  # noqa: E501
+        :type data_format: DataFormat
+        :param security_methods: The security_methods of this AefProfile.  # noqa: E501
+        :type security_methods: List[SecurityMethod]
+        :param domain_name: The domain_name of this AefProfile.  # noqa: E501
+        :type domain_name: str
+        :param interface_descriptions: The interface_descriptions of this AefProfile.  # noqa: E501
+        :type interface_descriptions: List[InterfaceDescription]
+        """
+        self.openapi_types = {
+            'aef_id': str,
+            'versions': List[Version],
+            'protocol': Protocol,
+            'data_format': DataFormat,
+            'security_methods': List[SecurityMethod],
+            'domain_name': str,
+            'interface_descriptions': List[InterfaceDescription]
+        }
+
+        self.attribute_map = {
+            'aef_id': 'aefId',
+            'versions': 'versions',
+            'protocol': 'protocol',
+            'data_format': 'dataFormat',
+            'security_methods': 'securityMethods',
+            'domain_name': 'domainName',
+            'interface_descriptions': 'interfaceDescriptions'
+        }
+
+        self._aef_id = aef_id
+        self._versions = versions
+        self._protocol = protocol
+        self._data_format = data_format
+        self._security_methods = security_methods
+        self._domain_name = domain_name
+        self._interface_descriptions = interface_descriptions
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'AefProfile':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The AefProfile of this AefProfile.  # noqa: E501
+        :rtype: AefProfile
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def aef_id(self):
+        """Gets the aef_id of this AefProfile.
+
+        Identifier of the API exposing function  # noqa: E501
+
+        :return: The aef_id of this AefProfile.
+        :rtype: str
+        """
+        return self._aef_id
+
+    @aef_id.setter
+    def aef_id(self, aef_id):
+        """Sets the aef_id of this AefProfile.
+
+        Identifier of the API exposing function  # noqa: E501
+
+        :param aef_id: The aef_id of this AefProfile.
+        :type aef_id: str
+        """
+        if aef_id is None:
+            raise ValueError("Invalid value for `aef_id`, must not be `None`")  # noqa: E501
+
+        self._aef_id = aef_id
+
+    @property
+    def versions(self):
+        """Gets the versions of this AefProfile.
+
+        API version  # noqa: E501
+
+        :return: The versions of this AefProfile.
+        :rtype: List[Version]
+        """
+        return self._versions
+
+    @versions.setter
+    def versions(self, versions):
+        """Sets the versions of this AefProfile.
+
+        API version  # noqa: E501
+
+        :param versions: The versions of this AefProfile.
+        :type versions: List[Version]
+        """
+        if versions is None:
+            raise ValueError("Invalid value for `versions`, must not be `None`")  # noqa: E501
+        if versions is not None and len(versions) < 1:
+            raise ValueError("Invalid value for `versions`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._versions = versions
+
+    @property
+    def protocol(self):
+        """Gets the protocol of this AefProfile.
+
+
+        :return: The protocol of this AefProfile.
+        :rtype: Protocol
+        """
+        return self._protocol
+
+    @protocol.setter
+    def protocol(self, protocol):
+        """Sets the protocol of this AefProfile.
+
+
+        :param protocol: The protocol of this AefProfile.
+        :type protocol: Protocol
+        """
+
+        self._protocol = protocol
+
+    @property
+    def data_format(self):
+        """Gets the data_format of this AefProfile.
+
+
+        :return: The data_format of this AefProfile.
+        :rtype: DataFormat
+        """
+        return self._data_format
+
+    @data_format.setter
+    def data_format(self, data_format):
+        """Sets the data_format of this AefProfile.
+
+
+        :param data_format: The data_format of this AefProfile.
+        :type data_format: DataFormat
+        """
+
+        self._data_format = data_format
+
+    @property
+    def security_methods(self):
+        """Gets the security_methods of this AefProfile.
+
+        Security methods supported by the AEF  # noqa: E501
+
+        :return: The security_methods of this AefProfile.
+        :rtype: List[SecurityMethod]
+        """
+        return self._security_methods
+
+    @security_methods.setter
+    def security_methods(self, security_methods):
+        """Sets the security_methods of this AefProfile.
+
+        Security methods supported by the AEF  # noqa: E501
+
+        :param security_methods: The security_methods of this AefProfile.
+        :type security_methods: List[SecurityMethod]
+        """
+        if security_methods is not None and len(security_methods) < 1:
+            raise ValueError("Invalid value for `security_methods`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._security_methods = security_methods
+
+    @property
+    def domain_name(self):
+        """Gets the domain_name of this AefProfile.
+
+        Domain to which API belongs to  # noqa: E501
+
+        :return: The domain_name of this AefProfile.
+        :rtype: str
+        """
+        return self._domain_name
+
+    @domain_name.setter
+    def domain_name(self, domain_name):
+        """Sets the domain_name of this AefProfile.
+
+        Domain to which API belongs to  # noqa: E501
+
+        :param domain_name: The domain_name of this AefProfile.
+        :type domain_name: str
+        """
+
+        self._domain_name = domain_name
+
+    @property
+    def interface_descriptions(self):
+        """Gets the interface_descriptions of this AefProfile.
+
+        Interface details  # noqa: E501
+
+        :return: The interface_descriptions of this AefProfile.
+        :rtype: List[InterfaceDescription]
+        """
+        return self._interface_descriptions
+
+    @interface_descriptions.setter
+    def interface_descriptions(self, interface_descriptions):
+        """Sets the interface_descriptions of this AefProfile.
+
+        Interface details  # noqa: E501
+
+        :param interface_descriptions: The interface_descriptions of this AefProfile.
+        :type interface_descriptions: List[InterfaceDescription]
+        """
+        if interface_descriptions is not None and len(interface_descriptions) < 1:
+            raise ValueError("Invalid value for `interface_descriptions`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._interface_descriptions = interface_descriptions
diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/base_model_.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/base_model_.py
new file mode 100644
index 0000000000000000000000000000000000000000..4f38e97ff28a52c226a0c4e6293e9f8dcab7786f
--- /dev/null
+++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/base_model_.py
@@ -0,0 +1,69 @@
+import pprint
+
+import six
+import typing
+
+from capif_routing_info import util
+
+T = typing.TypeVar('T')
+
+
+class Model(object):
+    # openapiTypes: The key is attribute name and the
+    # value is attribute type.
+    openapi_types = {}
+
+    # attributeMap: The key is attribute name and the
+    # value is json key in definition.
+    attribute_map = {}
+
+    @classmethod
+    def from_dict(cls: typing.Type[T], dikt) -> T:
+        """Returns the dict as a model"""
+        return util.deserialize_model(dikt, cls)
+
+    def to_dict(self):
+        """Returns the model properties as a dict
+
+        :rtype: dict
+        """
+        result = {}
+
+        for attr, _ in six.iteritems(self.openapi_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model
+
+        :rtype: str
+        """
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/communication_type.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/communication_type.py
new file mode 100644
index 0000000000000000000000000000000000000000..090173b4c55081395d1fc7b03149f3580fab073e
--- /dev/null
+++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/communication_type.py
@@ -0,0 +1,39 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_routing_info.models.base_model_ import Model
+from capif_routing_info.models.communication_type_any_of import CommunicationTypeAnyOf
+from capif_routing_info import util
+
+from capif_routing_info.models.communication_type_any_of import CommunicationTypeAnyOf  # noqa: E501
+
+class CommunicationType(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self):  # noqa: E501
+        """CommunicationType - a model defined in OpenAPI
+
+        """
+        self.openapi_types = {
+        }
+
+        self.attribute_map = {
+        }
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'CommunicationType':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The CommunicationType of this CommunicationType.  # noqa: E501
+        :rtype: CommunicationType
+        """
+        return util.deserialize_model(dikt, cls)
diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/communication_type_any_of.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/communication_type_any_of.py
new file mode 100644
index 0000000000000000000000000000000000000000..439089433582ef08f02f32d911b6c1f09a4cf6ab
--- /dev/null
+++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/communication_type_any_of.py
@@ -0,0 +1,42 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_routing_info.models.base_model_ import Model
+from capif_routing_info import util
+
+
+class CommunicationTypeAnyOf(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    """
+    allowed enum values
+    """
+    REQUEST_RESPONSE = "REQUEST_RESPONSE"
+    SUBSCRIBE_NOTIFY = "SUBSCRIBE_NOTIFY"
+    def __init__(self):  # noqa: E501
+        """CommunicationTypeAnyOf - a model defined in OpenAPI
+
+        """
+        self.openapi_types = {
+        }
+
+        self.attribute_map = {
+        }
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'CommunicationTypeAnyOf':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The CommunicationType_anyOf of this CommunicationTypeAnyOf.  # noqa: E501
+        :rtype: CommunicationTypeAnyOf
+        """
+        return util.deserialize_model(dikt, cls)
diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/custom_operation.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/custom_operation.py
new file mode 100644
index 0000000000000000000000000000000000000000..fe5a6e9c93f9e881b35ea14cb196dcbc1da6cc54
--- /dev/null
+++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/custom_operation.py
@@ -0,0 +1,158 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_routing_info.models.base_model_ import Model
+from capif_routing_info.models.communication_type import CommunicationType
+from capif_routing_info.models.operation import Operation
+from capif_routing_info import util
+
+from capif_routing_info.models.communication_type import CommunicationType  # noqa: E501
+from capif_routing_info.models.operation import Operation  # noqa: E501
+
+class CustomOperation(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, comm_type=None, cust_op_name=None, operations=None, description=None):  # noqa: E501
+        """CustomOperation - a model defined in OpenAPI
+
+        :param comm_type: The comm_type of this CustomOperation.  # noqa: E501
+        :type comm_type: CommunicationType
+        :param cust_op_name: The cust_op_name of this CustomOperation.  # noqa: E501
+        :type cust_op_name: str
+        :param operations: The operations of this CustomOperation.  # noqa: E501
+        :type operations: List[Operation]
+        :param description: The description of this CustomOperation.  # noqa: E501
+        :type description: str
+        """
+        self.openapi_types = {
+            'comm_type': CommunicationType,
+            'cust_op_name': str,
+            'operations': List[Operation],
+            'description': str
+        }
+
+        self.attribute_map = {
+            'comm_type': 'commType',
+            'cust_op_name': 'custOpName',
+            'operations': 'operations',
+            'description': 'description'
+        }
+
+        self._comm_type = comm_type
+        self._cust_op_name = cust_op_name
+        self._operations = operations
+        self._description = description
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'CustomOperation':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The CustomOperation of this CustomOperation.  # noqa: E501
+        :rtype: CustomOperation
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def comm_type(self):
+        """Gets the comm_type of this CustomOperation.
+
+
+        :return: The comm_type of this CustomOperation.
+        :rtype: CommunicationType
+        """
+        return self._comm_type
+
+    @comm_type.setter
+    def comm_type(self, comm_type):
+        """Sets the comm_type of this CustomOperation.
+
+
+        :param comm_type: The comm_type of this CustomOperation.
+        :type comm_type: CommunicationType
+        """
+        if comm_type is None:
+            raise ValueError("Invalid value for `comm_type`, must not be `None`")  # noqa: E501
+
+        self._comm_type = comm_type
+
+    @property
+    def cust_op_name(self):
+        """Gets the cust_op_name of this CustomOperation.
+
+        it is set as {custOpName} part of the URI structure for a custom operation without resource association as defined in subclause 4.4 of 3GPP TS 29.501.  # noqa: E501
+
+        :return: The cust_op_name of this CustomOperation.
+        :rtype: str
+        """
+        return self._cust_op_name
+
+    @cust_op_name.setter
+    def cust_op_name(self, cust_op_name):
+        """Sets the cust_op_name of this CustomOperation.
+
+        it is set as {custOpName} part of the URI structure for a custom operation without resource association as defined in subclause 4.4 of 3GPP TS 29.501.  # noqa: E501
+
+        :param cust_op_name: The cust_op_name of this CustomOperation.
+        :type cust_op_name: str
+        """
+        if cust_op_name is None:
+            raise ValueError("Invalid value for `cust_op_name`, must not be `None`")  # noqa: E501
+
+        self._cust_op_name = cust_op_name
+
+    @property
+    def operations(self):
+        """Gets the operations of this CustomOperation.
+
+        Supported HTTP methods for the API resource. Only applicable when the protocol in AefProfile indicates HTTP.  # noqa: E501
+
+        :return: The operations of this CustomOperation.
+        :rtype: List[Operation]
+        """
+        return self._operations
+
+    @operations.setter
+    def operations(self, operations):
+        """Sets the operations of this CustomOperation.
+
+        Supported HTTP methods for the API resource. Only applicable when the protocol in AefProfile indicates HTTP.  # noqa: E501
+
+        :param operations: The operations of this CustomOperation.
+        :type operations: List[Operation]
+        """
+        if operations is not None and len(operations) < 1:
+            raise ValueError("Invalid value for `operations`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._operations = operations
+
+    @property
+    def description(self):
+        """Gets the description of this CustomOperation.
+
+        Text description of the custom operation  # noqa: E501
+
+        :return: The description of this CustomOperation.
+        :rtype: str
+        """
+        return self._description
+
+    @description.setter
+    def description(self, description):
+        """Sets the description of this CustomOperation.
+
+        Text description of the custom operation  # noqa: E501
+
+        :param description: The description of this CustomOperation.
+        :type description: str
+        """
+
+        self._description = description
diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/data_format.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/data_format.py
new file mode 100644
index 0000000000000000000000000000000000000000..61a086c4b1ccb00e8fb3c2c71773297134ddeceb
--- /dev/null
+++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/data_format.py
@@ -0,0 +1,39 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_routing_info.models.base_model_ import Model
+from capif_routing_info.models.data_format_any_of import DataFormatAnyOf
+from capif_routing_info import util
+
+from capif_routing_info.models.data_format_any_of import DataFormatAnyOf  # noqa: E501
+
+class DataFormat(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self):  # noqa: E501
+        """DataFormat - a model defined in OpenAPI
+
+        """
+        self.openapi_types = {
+        }
+
+        self.attribute_map = {
+        }
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'DataFormat':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The DataFormat of this DataFormat.  # noqa: E501
+        :rtype: DataFormat
+        """
+        return util.deserialize_model(dikt, cls)
diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/data_format_any_of.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/data_format_any_of.py
new file mode 100644
index 0000000000000000000000000000000000000000..97da8ffcf6a7d1ef3556aac9487522eef841e812
--- /dev/null
+++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/data_format_any_of.py
@@ -0,0 +1,41 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_routing_info.models.base_model_ import Model
+from capif_routing_info import util
+
+
+class DataFormatAnyOf(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    """
+    allowed enum values
+    """
+    JSON = "JSON"
+    def __init__(self):  # noqa: E501
+        """DataFormatAnyOf - a model defined in OpenAPI
+
+        """
+        self.openapi_types = {
+        }
+
+        self.attribute_map = {
+        }
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'DataFormatAnyOf':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The DataFormat_anyOf of this DataFormatAnyOf.  # noqa: E501
+        :rtype: DataFormatAnyOf
+        """
+        return util.deserialize_model(dikt, cls)
diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/interface_description.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/interface_description.py
new file mode 100644
index 0000000000000000000000000000000000000000..1350c6ff66e92fe1aa0ac80deb708154e5b13bbb
--- /dev/null
+++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/interface_description.py
@@ -0,0 +1,158 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_routing_info.models.base_model_ import Model
+from capif_routing_info.models.security_method import SecurityMethod
+from capif_routing_info import util
+
+from capif_routing_info.models.security_method import SecurityMethod  # noqa: E501
+
+class InterfaceDescription(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, ipv4_addr=None, ipv6_addr=None, port=None, security_methods=None):  # noqa: E501
+        """InterfaceDescription - a model defined in OpenAPI
+
+        :param ipv4_addr: The ipv4_addr of this InterfaceDescription.  # noqa: E501
+        :type ipv4_addr: str
+        :param ipv6_addr: The ipv6_addr of this InterfaceDescription.  # noqa: E501
+        :type ipv6_addr: str
+        :param port: The port of this InterfaceDescription.  # noqa: E501
+        :type port: int
+        :param security_methods: The security_methods of this InterfaceDescription.  # noqa: E501
+        :type security_methods: List[SecurityMethod]
+        """
+        self.openapi_types = {
+            'ipv4_addr': str,
+            'ipv6_addr': str,
+            'port': int,
+            'security_methods': List[SecurityMethod]
+        }
+
+        self.attribute_map = {
+            'ipv4_addr': 'ipv4Addr',
+            'ipv6_addr': 'ipv6Addr',
+            'port': 'port',
+            'security_methods': 'securityMethods'
+        }
+
+        self._ipv4_addr = ipv4_addr
+        self._ipv6_addr = ipv6_addr
+        self._port = port
+        self._security_methods = security_methods
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'InterfaceDescription':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The InterfaceDescription of this InterfaceDescription.  # noqa: E501
+        :rtype: InterfaceDescription
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def ipv4_addr(self):
+        """Gets the ipv4_addr of this InterfaceDescription.
+
+        string identifying a Ipv4 address formatted in the \"dotted decimal\" notation as defined in IETF RFC 1166.  # noqa: E501
+
+        :return: The ipv4_addr of this InterfaceDescription.
+        :rtype: str
+        """
+        return self._ipv4_addr
+
+    @ipv4_addr.setter
+    def ipv4_addr(self, ipv4_addr):
+        """Sets the ipv4_addr of this InterfaceDescription.
+
+        string identifying a Ipv4 address formatted in the \"dotted decimal\" notation as defined in IETF RFC 1166.  # noqa: E501
+
+        :param ipv4_addr: The ipv4_addr of this InterfaceDescription.
+        :type ipv4_addr: str
+        """
+
+        self._ipv4_addr = ipv4_addr
+
+    @property
+    def ipv6_addr(self):
+        """Gets the ipv6_addr of this InterfaceDescription.
+
+        string identifying a Ipv6 address formatted according to clause 4 in IETF RFC 5952. The mixed Ipv4 Ipv6 notation according to clause 5 of IETF RFC 5952 shall not be used.  # noqa: E501
+
+        :return: The ipv6_addr of this InterfaceDescription.
+        :rtype: str
+        """
+        return self._ipv6_addr
+
+    @ipv6_addr.setter
+    def ipv6_addr(self, ipv6_addr):
+        """Sets the ipv6_addr of this InterfaceDescription.
+
+        string identifying a Ipv6 address formatted according to clause 4 in IETF RFC 5952. The mixed Ipv4 Ipv6 notation according to clause 5 of IETF RFC 5952 shall not be used.  # noqa: E501
+
+        :param ipv6_addr: The ipv6_addr of this InterfaceDescription.
+        :type ipv6_addr: str
+        """
+
+        self._ipv6_addr = ipv6_addr
+
+    @property
+    def port(self):
+        """Gets the port of this InterfaceDescription.
+
+        Unsigned integer with valid values between 0 and 65535.  # noqa: E501
+
+        :return: The port of this InterfaceDescription.
+        :rtype: int
+        """
+        return self._port
+
+    @port.setter
+    def port(self, port):
+        """Sets the port of this InterfaceDescription.
+
+        Unsigned integer with valid values between 0 and 65535.  # noqa: E501
+
+        :param port: The port of this InterfaceDescription.
+        :type port: int
+        """
+        if port is not None and port > 65535:  # noqa: E501
+            raise ValueError("Invalid value for `port`, must be a value less than or equal to `65535`")  # noqa: E501
+        if port is not None and port < 0:  # noqa: E501
+            raise ValueError("Invalid value for `port`, must be a value greater than or equal to `0`")  # noqa: E501
+
+        self._port = port
+
+    @property
+    def security_methods(self):
+        """Gets the security_methods of this InterfaceDescription.
+
+        Security methods supported by the interface, it take precedence over the security methods provided in AefProfile, for this specific interface.  # noqa: E501
+
+        :return: The security_methods of this InterfaceDescription.
+        :rtype: List[SecurityMethod]
+        """
+        return self._security_methods
+
+    @security_methods.setter
+    def security_methods(self, security_methods):
+        """Sets the security_methods of this InterfaceDescription.
+
+        Security methods supported by the interface, it take precedence over the security methods provided in AefProfile, for this specific interface.  # noqa: E501
+
+        :param security_methods: The security_methods of this InterfaceDescription.
+        :type security_methods: List[SecurityMethod]
+        """
+        if security_methods is not None and len(security_methods) < 1:
+            raise ValueError("Invalid value for `security_methods`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._security_methods = security_methods
diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/invalid_param.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/invalid_param.py
new file mode 100644
index 0000000000000000000000000000000000000000..020db5d8f74f916536b4b4c8d7e328ba619c4dfb
--- /dev/null
+++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/invalid_param.py
@@ -0,0 +1,96 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_routing_info.models.base_model_ import Model
+from capif_routing_info import util
+
+
+class InvalidParam(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, param=None, reason=None):  # noqa: E501
+        """InvalidParam - a model defined in OpenAPI
+
+        :param param: The param of this InvalidParam.  # noqa: E501
+        :type param: str
+        :param reason: The reason of this InvalidParam.  # noqa: E501
+        :type reason: str
+        """
+        self.openapi_types = {
+            'param': str,
+            'reason': str
+        }
+
+        self.attribute_map = {
+            'param': 'param',
+            'reason': 'reason'
+        }
+
+        self._param = param
+        self._reason = reason
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'InvalidParam':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The InvalidParam of this InvalidParam.  # noqa: E501
+        :rtype: InvalidParam
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def param(self):
+        """Gets the param of this InvalidParam.
+
+        Attribute's name encoded as a JSON Pointer, or header's name.  # noqa: E501
+
+        :return: The param of this InvalidParam.
+        :rtype: str
+        """
+        return self._param
+
+    @param.setter
+    def param(self, param):
+        """Sets the param of this InvalidParam.
+
+        Attribute's name encoded as a JSON Pointer, or header's name.  # noqa: E501
+
+        :param param: The param of this InvalidParam.
+        :type param: str
+        """
+        if param is None:
+            raise ValueError("Invalid value for `param`, must not be `None`")  # noqa: E501
+
+        self._param = param
+
+    @property
+    def reason(self):
+        """Gets the reason of this InvalidParam.
+
+        A human-readable reason, e.g. \"must be a positive integer\".  # noqa: E501
+
+        :return: The reason of this InvalidParam.
+        :rtype: str
+        """
+        return self._reason
+
+    @reason.setter
+    def reason(self, reason):
+        """Sets the reason of this InvalidParam.
+
+        A human-readable reason, e.g. \"must be a positive integer\".  # noqa: E501
+
+        :param reason: The reason of this InvalidParam.
+        :type reason: str
+        """
+
+        self._reason = reason
diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/ipv4_address_range.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/ipv4_address_range.py
new file mode 100644
index 0000000000000000000000000000000000000000..8bf453284830c0d9696da8ccd2b8deea4ae98178
--- /dev/null
+++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/ipv4_address_range.py
@@ -0,0 +1,100 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_routing_info.models.base_model_ import Model
+import re
+from capif_routing_info import util
+
+import re  # noqa: E501
+
+class Ipv4AddressRange(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, start=None, end=None):  # noqa: E501
+        """Ipv4AddressRange - a model defined in OpenAPI
+
+        :param start: The start of this Ipv4AddressRange.  # noqa: E501
+        :type start: str
+        :param end: The end of this Ipv4AddressRange.  # noqa: E501
+        :type end: str
+        """
+        self.openapi_types = {
+            'start': str,
+            'end': str
+        }
+
+        self.attribute_map = {
+            'start': 'start',
+            'end': 'end'
+        }
+
+        self._start = start
+        self._end = end
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'Ipv4AddressRange':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The Ipv4AddressRange of this Ipv4AddressRange.  # noqa: E501
+        :rtype: Ipv4AddressRange
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def start(self):
+        """Gets the start of this Ipv4AddressRange.
+
+        String identifying a IPv4 address formatted in the \"dotted decimal\" notation as defined in RFC 1166.  # noqa: E501
+
+        :return: The start of this Ipv4AddressRange.
+        :rtype: str
+        """
+        return self._start
+
+    @start.setter
+    def start(self, start):
+        """Sets the start of this Ipv4AddressRange.
+
+        String identifying a IPv4 address formatted in the \"dotted decimal\" notation as defined in RFC 1166.  # noqa: E501
+
+        :param start: The start of this Ipv4AddressRange.
+        :type start: str
+        """
+        if start is not None and not re.search(r'^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])$', start):  # noqa: E501
+            raise ValueError("Invalid value for `start`, must be a follow pattern or equal to `/^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])$/`")  # noqa: E501
+
+        self._start = start
+
+    @property
+    def end(self):
+        """Gets the end of this Ipv4AddressRange.
+
+        String identifying a IPv4 address formatted in the \"dotted decimal\" notation as defined in RFC 1166.  # noqa: E501
+
+        :return: The end of this Ipv4AddressRange.
+        :rtype: str
+        """
+        return self._end
+
+    @end.setter
+    def end(self, end):
+        """Sets the end of this Ipv4AddressRange.
+
+        String identifying a IPv4 address formatted in the \"dotted decimal\" notation as defined in RFC 1166.  # noqa: E501
+
+        :param end: The end of this Ipv4AddressRange.
+        :type end: str
+        """
+        if end is not None and not re.search(r'^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])$', end):  # noqa: E501
+            raise ValueError("Invalid value for `end`, must be a follow pattern or equal to `/^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])$/`")  # noqa: E501
+
+        self._end = end
diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/ipv6_address_range.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/ipv6_address_range.py
new file mode 100644
index 0000000000000000000000000000000000000000..d2afb78af33989d71782f6db814bd24cd1a61c35
--- /dev/null
+++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/ipv6_address_range.py
@@ -0,0 +1,98 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_routing_info.models.base_model_ import Model
+from capif_routing_info import util
+
+
+class Ipv6AddressRange(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, start=None, end=None):  # noqa: E501
+        """Ipv6AddressRange - a model defined in OpenAPI
+
+        :param start: The start of this Ipv6AddressRange.  # noqa: E501
+        :type start: str
+        :param end: The end of this Ipv6AddressRange.  # noqa: E501
+        :type end: str
+        """
+        self.openapi_types = {
+            'start': str,
+            'end': str
+        }
+
+        self.attribute_map = {
+            'start': 'start',
+            'end': 'end'
+        }
+
+        self._start = start
+        self._end = end
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'Ipv6AddressRange':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The Ipv6AddressRange of this Ipv6AddressRange.  # noqa: E501
+        :rtype: Ipv6AddressRange
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def start(self):
+        """Gets the start of this Ipv6AddressRange.
+
+        string identifying a Ipv6 address formatted according to clause 4 in IETF RFC 5952. The mixed Ipv4 Ipv6 notation according to clause 5 of IETF RFC 5952 shall not be used.  # noqa: E501
+
+        :return: The start of this Ipv6AddressRange.
+        :rtype: str
+        """
+        return self._start
+
+    @start.setter
+    def start(self, start):
+        """Sets the start of this Ipv6AddressRange.
+
+        string identifying a Ipv6 address formatted according to clause 4 in IETF RFC 5952. The mixed Ipv4 Ipv6 notation according to clause 5 of IETF RFC 5952 shall not be used.  # noqa: E501
+
+        :param start: The start of this Ipv6AddressRange.
+        :type start: str
+        """
+        if start is None:
+            raise ValueError("Invalid value for `start`, must not be `None`")  # noqa: E501
+
+        self._start = start
+
+    @property
+    def end(self):
+        """Gets the end of this Ipv6AddressRange.
+
+        string identifying a Ipv6 address formatted according to clause 4 in IETF RFC 5952. The mixed Ipv4 Ipv6 notation according to clause 5 of IETF RFC 5952 shall not be used.  # noqa: E501
+
+        :return: The end of this Ipv6AddressRange.
+        :rtype: str
+        """
+        return self._end
+
+    @end.setter
+    def end(self, end):
+        """Sets the end of this Ipv6AddressRange.
+
+        string identifying a Ipv6 address formatted according to clause 4 in IETF RFC 5952. The mixed Ipv4 Ipv6 notation according to clause 5 of IETF RFC 5952 shall not be used.  # noqa: E501
+
+        :param end: The end of this Ipv6AddressRange.
+        :type end: str
+        """
+        if end is None:
+            raise ValueError("Invalid value for `end`, must not be `None`")  # noqa: E501
+
+        self._end = end
diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/operation.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/operation.py
new file mode 100644
index 0000000000000000000000000000000000000000..d54629b5b8bfc4728c5285d77fd169a8753fa7c7
--- /dev/null
+++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/operation.py
@@ -0,0 +1,39 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_routing_info.models.base_model_ import Model
+from capif_routing_info.models.operation_any_of import OperationAnyOf
+from capif_routing_info import util
+
+from capif_routing_info.models.operation_any_of import OperationAnyOf  # noqa: E501
+
+class Operation(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self):  # noqa: E501
+        """Operation - a model defined in OpenAPI
+
+        """
+        self.openapi_types = {
+        }
+
+        self.attribute_map = {
+        }
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'Operation':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The Operation of this Operation.  # noqa: E501
+        :rtype: Operation
+        """
+        return util.deserialize_model(dikt, cls)
diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/operation_any_of.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/operation_any_of.py
new file mode 100644
index 0000000000000000000000000000000000000000..d92e4952132d37ebf616b085e7b48d260078ec38
--- /dev/null
+++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/operation_any_of.py
@@ -0,0 +1,45 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_routing_info.models.base_model_ import Model
+from capif_routing_info import util
+
+
+class OperationAnyOf(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    """
+    allowed enum values
+    """
+    GET = "GET"
+    POST = "POST"
+    PUT = "PUT"
+    PATCH = "PATCH"
+    DELETE = "DELETE"
+    def __init__(self):  # noqa: E501
+        """OperationAnyOf - a model defined in OpenAPI
+
+        """
+        self.openapi_types = {
+        }
+
+        self.attribute_map = {
+        }
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'OperationAnyOf':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The Operation_anyOf of this OperationAnyOf.  # noqa: E501
+        :rtype: OperationAnyOf
+        """
+        return util.deserialize_model(dikt, cls)
diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/problem_details.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/problem_details.py
new file mode 100644
index 0000000000000000000000000000000000000000..b661b722e7f57dc11595b3df7fae6a0f0443f31a
--- /dev/null
+++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/problem_details.py
@@ -0,0 +1,270 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_routing_info.models.base_model_ import Model
+from capif_routing_info.models.invalid_param import InvalidParam
+import re
+from capif_routing_info import util
+
+from capif_routing_info.models.invalid_param import InvalidParam  # noqa: E501
+import re  # noqa: E501
+
+class ProblemDetails(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, type=None, title=None, status=None, detail=None, instance=None, cause=None, invalid_params=None, supported_features=None):  # noqa: E501
+        """ProblemDetails - a model defined in OpenAPI
+
+        :param type: The type of this ProblemDetails.  # noqa: E501
+        :type type: str
+        :param title: The title of this ProblemDetails.  # noqa: E501
+        :type title: str
+        :param status: The status of this ProblemDetails.  # noqa: E501
+        :type status: int
+        :param detail: The detail of this ProblemDetails.  # noqa: E501
+        :type detail: str
+        :param instance: The instance of this ProblemDetails.  # noqa: E501
+        :type instance: str
+        :param cause: The cause of this ProblemDetails.  # noqa: E501
+        :type cause: str
+        :param invalid_params: The invalid_params of this ProblemDetails.  # noqa: E501
+        :type invalid_params: List[InvalidParam]
+        :param supported_features: The supported_features of this ProblemDetails.  # noqa: E501
+        :type supported_features: str
+        """
+        self.openapi_types = {
+            'type': str,
+            'title': str,
+            'status': int,
+            'detail': str,
+            'instance': str,
+            'cause': str,
+            'invalid_params': List[InvalidParam],
+            'supported_features': str
+        }
+
+        self.attribute_map = {
+            'type': 'type',
+            'title': 'title',
+            'status': 'status',
+            'detail': 'detail',
+            'instance': 'instance',
+            'cause': 'cause',
+            'invalid_params': 'invalidParams',
+            'supported_features': 'supportedFeatures'
+        }
+
+        self._type = type
+        self._title = title
+        self._status = status
+        self._detail = detail
+        self._instance = instance
+        self._cause = cause
+        self._invalid_params = invalid_params
+        self._supported_features = supported_features
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'ProblemDetails':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The ProblemDetails of this ProblemDetails.  # noqa: E501
+        :rtype: ProblemDetails
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def type(self):
+        """Gets the type of this ProblemDetails.
+
+        string providing an URI formatted according to IETF RFC 3986.  # noqa: E501
+
+        :return: The type of this ProblemDetails.
+        :rtype: str
+        """
+        return self._type
+
+    @type.setter
+    def type(self, type):
+        """Sets the type of this ProblemDetails.
+
+        string providing an URI formatted according to IETF RFC 3986.  # noqa: E501
+
+        :param type: The type of this ProblemDetails.
+        :type type: str
+        """
+
+        self._type = type
+
+    @property
+    def title(self):
+        """Gets the title of this ProblemDetails.
+
+        A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem.  # noqa: E501
+
+        :return: The title of this ProblemDetails.
+        :rtype: str
+        """
+        return self._title
+
+    @title.setter
+    def title(self, title):
+        """Sets the title of this ProblemDetails.
+
+        A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem.  # noqa: E501
+
+        :param title: The title of this ProblemDetails.
+        :type title: str
+        """
+
+        self._title = title
+
+    @property
+    def status(self):
+        """Gets the status of this ProblemDetails.
+
+        The HTTP status code for this occurrence of the problem.  # noqa: E501
+
+        :return: The status of this ProblemDetails.
+        :rtype: int
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """Sets the status of this ProblemDetails.
+
+        The HTTP status code for this occurrence of the problem.  # noqa: E501
+
+        :param status: The status of this ProblemDetails.
+        :type status: int
+        """
+
+        self._status = status
+
+    @property
+    def detail(self):
+        """Gets the detail of this ProblemDetails.
+
+        A human-readable explanation specific to this occurrence of the problem.  # noqa: E501
+
+        :return: The detail of this ProblemDetails.
+        :rtype: str
+        """
+        return self._detail
+
+    @detail.setter
+    def detail(self, detail):
+        """Sets the detail of this ProblemDetails.
+
+        A human-readable explanation specific to this occurrence of the problem.  # noqa: E501
+
+        :param detail: The detail of this ProblemDetails.
+        :type detail: str
+        """
+
+        self._detail = detail
+
+    @property
+    def instance(self):
+        """Gets the instance of this ProblemDetails.
+
+        string providing an URI formatted according to IETF RFC 3986.  # noqa: E501
+
+        :return: The instance of this ProblemDetails.
+        :rtype: str
+        """
+        return self._instance
+
+    @instance.setter
+    def instance(self, instance):
+        """Sets the instance of this ProblemDetails.
+
+        string providing an URI formatted according to IETF RFC 3986.  # noqa: E501
+
+        :param instance: The instance of this ProblemDetails.
+        :type instance: str
+        """
+
+        self._instance = instance
+
+    @property
+    def cause(self):
+        """Gets the cause of this ProblemDetails.
+
+        A machine-readable application error cause specific to this occurrence of the problem. This IE should be present and provide application-related error information, if available.  # noqa: E501
+
+        :return: The cause of this ProblemDetails.
+        :rtype: str
+        """
+        return self._cause
+
+    @cause.setter
+    def cause(self, cause):
+        """Sets the cause of this ProblemDetails.
+
+        A machine-readable application error cause specific to this occurrence of the problem. This IE should be present and provide application-related error information, if available.  # noqa: E501
+
+        :param cause: The cause of this ProblemDetails.
+        :type cause: str
+        """
+
+        self._cause = cause
+
+    @property
+    def invalid_params(self):
+        """Gets the invalid_params of this ProblemDetails.
+
+        Description of invalid parameters, for a request rejected due to invalid parameters.  # noqa: E501
+
+        :return: The invalid_params of this ProblemDetails.
+        :rtype: List[InvalidParam]
+        """
+        return self._invalid_params
+
+    @invalid_params.setter
+    def invalid_params(self, invalid_params):
+        """Sets the invalid_params of this ProblemDetails.
+
+        Description of invalid parameters, for a request rejected due to invalid parameters.  # noqa: E501
+
+        :param invalid_params: The invalid_params of this ProblemDetails.
+        :type invalid_params: List[InvalidParam]
+        """
+        if invalid_params is not None and len(invalid_params) < 1:
+            raise ValueError("Invalid value for `invalid_params`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._invalid_params = invalid_params
+
+    @property
+    def supported_features(self):
+        """Gets the supported_features of this ProblemDetails.
+
+        A string used to indicate the features supported by an API that is used as defined in clause 6.6 in 3GPP TS 29.500. The string shall contain a bitmask indicating supported features in hexadecimal representation Each character in the string shall take a value of \"0\" to \"9\", \"a\" to \"f\" or \"A\" to \"F\" and shall represent the support of 4 features as described in table 5.2.2-3. The most significant character representing the highest-numbered features shall appear first in the string, and the character representing features 1 to 4 shall appear last in the string. The list of features and their numbering (starting with 1) are defined separately for each API. If the string contains a lower number of characters than there are defined features for an API, all features that would be represented by characters that are not present in the string are not supported  # noqa: E501
+
+        :return: The supported_features of this ProblemDetails.
+        :rtype: str
+        """
+        return self._supported_features
+
+    @supported_features.setter
+    def supported_features(self, supported_features):
+        """Sets the supported_features of this ProblemDetails.
+
+        A string used to indicate the features supported by an API that is used as defined in clause 6.6 in 3GPP TS 29.500. The string shall contain a bitmask indicating supported features in hexadecimal representation Each character in the string shall take a value of \"0\" to \"9\", \"a\" to \"f\" or \"A\" to \"F\" and shall represent the support of 4 features as described in table 5.2.2-3. The most significant character representing the highest-numbered features shall appear first in the string, and the character representing features 1 to 4 shall appear last in the string. The list of features and their numbering (starting with 1) are defined separately for each API. If the string contains a lower number of characters than there are defined features for an API, all features that would be represented by characters that are not present in the string are not supported  # noqa: E501
+
+        :param supported_features: The supported_features of this ProblemDetails.
+        :type supported_features: str
+        """
+        if supported_features is not None and not re.search(r'^[A-Fa-f0-9]*$', supported_features):  # noqa: E501
+            raise ValueError("Invalid value for `supported_features`, must be a follow pattern or equal to `/^[A-Fa-f0-9]*$/`")  # noqa: E501
+
+        self._supported_features = supported_features
diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/protocol.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/protocol.py
new file mode 100644
index 0000000000000000000000000000000000000000..da612eca37af79f881b70a092faab9b0c7d41315
--- /dev/null
+++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/protocol.py
@@ -0,0 +1,39 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_routing_info.models.base_model_ import Model
+from capif_routing_info.models.protocol_any_of import ProtocolAnyOf
+from capif_routing_info import util
+
+from capif_routing_info.models.protocol_any_of import ProtocolAnyOf  # noqa: E501
+
+class Protocol(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self):  # noqa: E501
+        """Protocol - a model defined in OpenAPI
+
+        """
+        self.openapi_types = {
+        }
+
+        self.attribute_map = {
+        }
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'Protocol':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The Protocol of this Protocol.  # noqa: E501
+        :rtype: Protocol
+        """
+        return util.deserialize_model(dikt, cls)
diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/protocol_any_of.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/protocol_any_of.py
new file mode 100644
index 0000000000000000000000000000000000000000..add5527fdf33d42dc0b22c724eb6d8e57f1c0bdb
--- /dev/null
+++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/protocol_any_of.py
@@ -0,0 +1,42 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_routing_info.models.base_model_ import Model
+from capif_routing_info import util
+
+
+class ProtocolAnyOf(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    """
+    allowed enum values
+    """
+    _1_1 = "HTTP_1_1"
+    _2 = "HTTP_2"
+    def __init__(self):  # noqa: E501
+        """ProtocolAnyOf - a model defined in OpenAPI
+
+        """
+        self.openapi_types = {
+        }
+
+        self.attribute_map = {
+        }
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'ProtocolAnyOf':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The Protocol_anyOf of this ProtocolAnyOf.  # noqa: E501
+        :rtype: ProtocolAnyOf
+        """
+        return util.deserialize_model(dikt, cls)
diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/resource.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/resource.py
new file mode 100644
index 0000000000000000000000000000000000000000..e4eb5b847d68b8997a8a0bc757c6d8bba46b2532
--- /dev/null
+++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/resource.py
@@ -0,0 +1,216 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_routing_info.models.base_model_ import Model
+from capif_routing_info.models.communication_type import CommunicationType
+from capif_routing_info.models.operation import Operation
+from capif_routing_info import util
+
+from capif_routing_info.models.communication_type import CommunicationType  # noqa: E501
+from capif_routing_info.models.operation import Operation  # noqa: E501
+
+class Resource(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, resource_name=None, comm_type=None, uri=None, cust_op_name=None, operations=None, description=None):  # noqa: E501
+        """Resource - a model defined in OpenAPI
+
+        :param resource_name: The resource_name of this Resource.  # noqa: E501
+        :type resource_name: str
+        :param comm_type: The comm_type of this Resource.  # noqa: E501
+        :type comm_type: CommunicationType
+        :param uri: The uri of this Resource.  # noqa: E501
+        :type uri: str
+        :param cust_op_name: The cust_op_name of this Resource.  # noqa: E501
+        :type cust_op_name: str
+        :param operations: The operations of this Resource.  # noqa: E501
+        :type operations: List[Operation]
+        :param description: The description of this Resource.  # noqa: E501
+        :type description: str
+        """
+        self.openapi_types = {
+            'resource_name': str,
+            'comm_type': CommunicationType,
+            'uri': str,
+            'cust_op_name': str,
+            'operations': List[Operation],
+            'description': str
+        }
+
+        self.attribute_map = {
+            'resource_name': 'resourceName',
+            'comm_type': 'commType',
+            'uri': 'uri',
+            'cust_op_name': 'custOpName',
+            'operations': 'operations',
+            'description': 'description'
+        }
+
+        self._resource_name = resource_name
+        self._comm_type = comm_type
+        self._uri = uri
+        self._cust_op_name = cust_op_name
+        self._operations = operations
+        self._description = description
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'Resource':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The Resource of this Resource.  # noqa: E501
+        :rtype: Resource
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def resource_name(self):
+        """Gets the resource_name of this Resource.
+
+        Resource name  # noqa: E501
+
+        :return: The resource_name of this Resource.
+        :rtype: str
+        """
+        return self._resource_name
+
+    @resource_name.setter
+    def resource_name(self, resource_name):
+        """Sets the resource_name of this Resource.
+
+        Resource name  # noqa: E501
+
+        :param resource_name: The resource_name of this Resource.
+        :type resource_name: str
+        """
+        if resource_name is None:
+            raise ValueError("Invalid value for `resource_name`, must not be `None`")  # noqa: E501
+
+        self._resource_name = resource_name
+
+    @property
+    def comm_type(self):
+        """Gets the comm_type of this Resource.
+
+
+        :return: The comm_type of this Resource.
+        :rtype: CommunicationType
+        """
+        return self._comm_type
+
+    @comm_type.setter
+    def comm_type(self, comm_type):
+        """Sets the comm_type of this Resource.
+
+
+        :param comm_type: The comm_type of this Resource.
+        :type comm_type: CommunicationType
+        """
+        if comm_type is None:
+            raise ValueError("Invalid value for `comm_type`, must not be `None`")  # noqa: E501
+
+        self._comm_type = comm_type
+
+    @property
+    def uri(self):
+        """Gets the uri of this Resource.
+
+        Relative URI of the API resource, it is set as {apiSpecificResourceUriPart} part of the URI structure as defined in subclause 4.4 of 3GPP TS 29.501.  # noqa: E501
+
+        :return: The uri of this Resource.
+        :rtype: str
+        """
+        return self._uri
+
+    @uri.setter
+    def uri(self, uri):
+        """Sets the uri of this Resource.
+
+        Relative URI of the API resource, it is set as {apiSpecificResourceUriPart} part of the URI structure as defined in subclause 4.4 of 3GPP TS 29.501.  # noqa: E501
+
+        :param uri: The uri of this Resource.
+        :type uri: str
+        """
+        if uri is None:
+            raise ValueError("Invalid value for `uri`, must not be `None`")  # noqa: E501
+
+        self._uri = uri
+
+    @property
+    def cust_op_name(self):
+        """Gets the cust_op_name of this Resource.
+
+        it is set as {custOpName} part of the URI structure for a custom operation associated with a resource as defined in subclause 4.4 of 3GPP TS 29.501.  # noqa: E501
+
+        :return: The cust_op_name of this Resource.
+        :rtype: str
+        """
+        return self._cust_op_name
+
+    @cust_op_name.setter
+    def cust_op_name(self, cust_op_name):
+        """Sets the cust_op_name of this Resource.
+
+        it is set as {custOpName} part of the URI structure for a custom operation associated with a resource as defined in subclause 4.4 of 3GPP TS 29.501.  # noqa: E501
+
+        :param cust_op_name: The cust_op_name of this Resource.
+        :type cust_op_name: str
+        """
+
+        self._cust_op_name = cust_op_name
+
+    @property
+    def operations(self):
+        """Gets the operations of this Resource.
+
+        Supported HTTP methods for the API resource. Only applicable when the protocol in AefProfile indicates HTTP.  # noqa: E501
+
+        :return: The operations of this Resource.
+        :rtype: List[Operation]
+        """
+        return self._operations
+
+    @operations.setter
+    def operations(self, operations):
+        """Sets the operations of this Resource.
+
+        Supported HTTP methods for the API resource. Only applicable when the protocol in AefProfile indicates HTTP.  # noqa: E501
+
+        :param operations: The operations of this Resource.
+        :type operations: List[Operation]
+        """
+        if operations is not None and len(operations) < 1:
+            raise ValueError("Invalid value for `operations`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._operations = operations
+
+    @property
+    def description(self):
+        """Gets the description of this Resource.
+
+        Text description of the API resource  # noqa: E501
+
+        :return: The description of this Resource.
+        :rtype: str
+        """
+        return self._description
+
+    @description.setter
+    def description(self, description):
+        """Sets the description of this Resource.
+
+        Text description of the API resource  # noqa: E501
+
+        :param description: The description of this Resource.
+        :type description: str
+        """
+
+        self._description = description
diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/routing_info.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/routing_info.py
new file mode 100644
index 0000000000000000000000000000000000000000..34b5b73153f23fb850c0ee97e8023526049759c8
--- /dev/null
+++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/routing_info.py
@@ -0,0 +1,70 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_routing_info.models.base_model_ import Model
+from capif_routing_info.models.routing_rule import RoutingRule
+from capif_routing_info import util
+
+from capif_routing_info.models.routing_rule import RoutingRule  # noqa: E501
+
+class RoutingInfo(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, routing_rules=None):  # noqa: E501
+        """RoutingInfo - a model defined in OpenAPI
+
+        :param routing_rules: The routing_rules of this RoutingInfo.  # noqa: E501
+        :type routing_rules: List[RoutingRule]
+        """
+        self.openapi_types = {
+            'routing_rules': List[RoutingRule]
+        }
+
+        self.attribute_map = {
+            'routing_rules': 'routingRules'
+        }
+
+        self._routing_rules = routing_rules
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'RoutingInfo':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The RoutingInfo of this RoutingInfo.  # noqa: E501
+        :rtype: RoutingInfo
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def routing_rules(self):
+        """Gets the routing_rules of this RoutingInfo.
+
+
+        :return: The routing_rules of this RoutingInfo.
+        :rtype: List[RoutingRule]
+        """
+        return self._routing_rules
+
+    @routing_rules.setter
+    def routing_rules(self, routing_rules):
+        """Sets the routing_rules of this RoutingInfo.
+
+
+        :param routing_rules: The routing_rules of this RoutingInfo.
+        :type routing_rules: List[RoutingRule]
+        """
+        if routing_rules is None:
+            raise ValueError("Invalid value for `routing_rules`, must not be `None`")  # noqa: E501
+        if routing_rules is not None and len(routing_rules) < 1:
+            raise ValueError("Invalid value for `routing_rules`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._routing_rules = routing_rules
diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/routing_rule.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/routing_rule.py
new file mode 100644
index 0000000000000000000000000000000000000000..f177670a723ccc3594611b7ee85a8f6bbfff6e90
--- /dev/null
+++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/routing_rule.py
@@ -0,0 +1,128 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_routing_info.models.base_model_ import Model
+from capif_routing_info.models.aef_profile import AefProfile
+from capif_routing_info.models.ipv4_address_range import Ipv4AddressRange
+from capif_routing_info.models.ipv6_address_range import Ipv6AddressRange
+from capif_routing_info import util
+
+from capif_routing_info.models.aef_profile import AefProfile  # noqa: E501
+from capif_routing_info.models.ipv4_address_range import Ipv4AddressRange  # noqa: E501
+from capif_routing_info.models.ipv6_address_range import Ipv6AddressRange  # noqa: E501
+
+class RoutingRule(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, ipv4_addr_ranges=None, ipv6_addr_ranges=None, aef_profile=None):  # noqa: E501
+        """RoutingRule - a model defined in OpenAPI
+
+        :param ipv4_addr_ranges: The ipv4_addr_ranges of this RoutingRule.  # noqa: E501
+        :type ipv4_addr_ranges: List[Ipv4AddressRange]
+        :param ipv6_addr_ranges: The ipv6_addr_ranges of this RoutingRule.  # noqa: E501
+        :type ipv6_addr_ranges: List[Ipv6AddressRange]
+        :param aef_profile: The aef_profile of this RoutingRule.  # noqa: E501
+        :type aef_profile: AefProfile
+        """
+        self.openapi_types = {
+            'ipv4_addr_ranges': List[Ipv4AddressRange],
+            'ipv6_addr_ranges': List[Ipv6AddressRange],
+            'aef_profile': AefProfile
+        }
+
+        self.attribute_map = {
+            'ipv4_addr_ranges': 'ipv4AddrRanges',
+            'ipv6_addr_ranges': 'ipv6AddrRanges',
+            'aef_profile': 'aefProfile'
+        }
+
+        self._ipv4_addr_ranges = ipv4_addr_ranges
+        self._ipv6_addr_ranges = ipv6_addr_ranges
+        self._aef_profile = aef_profile
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'RoutingRule':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The RoutingRule of this RoutingRule.  # noqa: E501
+        :rtype: RoutingRule
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def ipv4_addr_ranges(self):
+        """Gets the ipv4_addr_ranges of this RoutingRule.
+
+
+        :return: The ipv4_addr_ranges of this RoutingRule.
+        :rtype: List[Ipv4AddressRange]
+        """
+        return self._ipv4_addr_ranges
+
+    @ipv4_addr_ranges.setter
+    def ipv4_addr_ranges(self, ipv4_addr_ranges):
+        """Sets the ipv4_addr_ranges of this RoutingRule.
+
+
+        :param ipv4_addr_ranges: The ipv4_addr_ranges of this RoutingRule.
+        :type ipv4_addr_ranges: List[Ipv4AddressRange]
+        """
+        if ipv4_addr_ranges is not None and len(ipv4_addr_ranges) < 1:
+            raise ValueError("Invalid value for `ipv4_addr_ranges`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._ipv4_addr_ranges = ipv4_addr_ranges
+
+    @property
+    def ipv6_addr_ranges(self):
+        """Gets the ipv6_addr_ranges of this RoutingRule.
+
+
+        :return: The ipv6_addr_ranges of this RoutingRule.
+        :rtype: List[Ipv6AddressRange]
+        """
+        return self._ipv6_addr_ranges
+
+    @ipv6_addr_ranges.setter
+    def ipv6_addr_ranges(self, ipv6_addr_ranges):
+        """Sets the ipv6_addr_ranges of this RoutingRule.
+
+
+        :param ipv6_addr_ranges: The ipv6_addr_ranges of this RoutingRule.
+        :type ipv6_addr_ranges: List[Ipv6AddressRange]
+        """
+        if ipv6_addr_ranges is not None and len(ipv6_addr_ranges) < 1:
+            raise ValueError("Invalid value for `ipv6_addr_ranges`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._ipv6_addr_ranges = ipv6_addr_ranges
+
+    @property
+    def aef_profile(self):
+        """Gets the aef_profile of this RoutingRule.
+
+
+        :return: The aef_profile of this RoutingRule.
+        :rtype: AefProfile
+        """
+        return self._aef_profile
+
+    @aef_profile.setter
+    def aef_profile(self, aef_profile):
+        """Sets the aef_profile of this RoutingRule.
+
+
+        :param aef_profile: The aef_profile of this RoutingRule.
+        :type aef_profile: AefProfile
+        """
+        if aef_profile is None:
+            raise ValueError("Invalid value for `aef_profile`, must not be `None`")  # noqa: E501
+
+        self._aef_profile = aef_profile
diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/security_method.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/security_method.py
new file mode 100644
index 0000000000000000000000000000000000000000..7de25824778f068b8b9076b7b574b4dd830b1045
--- /dev/null
+++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/security_method.py
@@ -0,0 +1,39 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_routing_info.models.base_model_ import Model
+from capif_routing_info.models.security_method_any_of import SecurityMethodAnyOf
+from capif_routing_info import util
+
+from capif_routing_info.models.security_method_any_of import SecurityMethodAnyOf  # noqa: E501
+
+class SecurityMethod(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self):  # noqa: E501
+        """SecurityMethod - a model defined in OpenAPI
+
+        """
+        self.openapi_types = {
+        }
+
+        self.attribute_map = {
+        }
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'SecurityMethod':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The SecurityMethod of this SecurityMethod.  # noqa: E501
+        :rtype: SecurityMethod
+        """
+        return util.deserialize_model(dikt, cls)
diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/security_method_any_of.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/security_method_any_of.py
new file mode 100644
index 0000000000000000000000000000000000000000..00fd8e292bde1877e4106afcbecf7ebfa71aa004
--- /dev/null
+++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/security_method_any_of.py
@@ -0,0 +1,43 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_routing_info.models.base_model_ import Model
+from capif_routing_info import util
+
+
+class SecurityMethodAnyOf(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    """
+    allowed enum values
+    """
+    PSK = "PSK"
+    PKI = "PKI"
+    OAUTH = "OAUTH"
+    def __init__(self):  # noqa: E501
+        """SecurityMethodAnyOf - a model defined in OpenAPI
+
+        """
+        self.openapi_types = {
+        }
+
+        self.attribute_map = {
+        }
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'SecurityMethodAnyOf':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The SecurityMethod_anyOf of this SecurityMethodAnyOf.  # noqa: E501
+        :rtype: SecurityMethodAnyOf
+        """
+        return util.deserialize_model(dikt, cls)
diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/version.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/version.py
new file mode 100644
index 0000000000000000000000000000000000000000..fa60f0295290c6e4a98492059a106acdafc01b2d
--- /dev/null
+++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/version.py
@@ -0,0 +1,160 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_routing_info.models.base_model_ import Model
+from capif_routing_info.models.custom_operation import CustomOperation
+from capif_routing_info.models.resource import Resource
+from capif_routing_info import util
+
+from capif_routing_info.models.custom_operation import CustomOperation  # noqa: E501
+from capif_routing_info.models.resource import Resource  # noqa: E501
+
+class Version(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, api_version=None, expiry=None, resources=None, cust_operations=None):  # noqa: E501
+        """Version - a model defined in OpenAPI
+
+        :param api_version: The api_version of this Version.  # noqa: E501
+        :type api_version: str
+        :param expiry: The expiry of this Version.  # noqa: E501
+        :type expiry: datetime
+        :param resources: The resources of this Version.  # noqa: E501
+        :type resources: List[Resource]
+        :param cust_operations: The cust_operations of this Version.  # noqa: E501
+        :type cust_operations: List[CustomOperation]
+        """
+        self.openapi_types = {
+            'api_version': str,
+            'expiry': datetime,
+            'resources': List[Resource],
+            'cust_operations': List[CustomOperation]
+        }
+
+        self.attribute_map = {
+            'api_version': 'apiVersion',
+            'expiry': 'expiry',
+            'resources': 'resources',
+            'cust_operations': 'custOperations'
+        }
+
+        self._api_version = api_version
+        self._expiry = expiry
+        self._resources = resources
+        self._cust_operations = cust_operations
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'Version':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The Version of this Version.  # noqa: E501
+        :rtype: Version
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def api_version(self):
+        """Gets the api_version of this Version.
+
+        API major version in URI (e.g. v1)  # noqa: E501
+
+        :return: The api_version of this Version.
+        :rtype: str
+        """
+        return self._api_version
+
+    @api_version.setter
+    def api_version(self, api_version):
+        """Sets the api_version of this Version.
+
+        API major version in URI (e.g. v1)  # noqa: E501
+
+        :param api_version: The api_version of this Version.
+        :type api_version: str
+        """
+        if api_version is None:
+            raise ValueError("Invalid value for `api_version`, must not be `None`")  # noqa: E501
+
+        self._api_version = api_version
+
+    @property
+    def expiry(self):
+        """Gets the expiry of this Version.
+
+        string with format \"date-time\" as defined in OpenAPI.  # noqa: E501
+
+        :return: The expiry of this Version.
+        :rtype: datetime
+        """
+        return self._expiry
+
+    @expiry.setter
+    def expiry(self, expiry):
+        """Sets the expiry of this Version.
+
+        string with format \"date-time\" as defined in OpenAPI.  # noqa: E501
+
+        :param expiry: The expiry of this Version.
+        :type expiry: datetime
+        """
+
+        self._expiry = expiry
+
+    @property
+    def resources(self):
+        """Gets the resources of this Version.
+
+        Resources supported by the API.  # noqa: E501
+
+        :return: The resources of this Version.
+        :rtype: List[Resource]
+        """
+        return self._resources
+
+    @resources.setter
+    def resources(self, resources):
+        """Sets the resources of this Version.
+
+        Resources supported by the API.  # noqa: E501
+
+        :param resources: The resources of this Version.
+        :type resources: List[Resource]
+        """
+        if resources is not None and len(resources) < 1:
+            raise ValueError("Invalid value for `resources`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._resources = resources
+
+    @property
+    def cust_operations(self):
+        """Gets the cust_operations of this Version.
+
+        Custom operations without resource association.  # noqa: E501
+
+        :return: The cust_operations of this Version.
+        :rtype: List[CustomOperation]
+        """
+        return self._cust_operations
+
+    @cust_operations.setter
+    def cust_operations(self, cust_operations):
+        """Sets the cust_operations of this Version.
+
+        Custom operations without resource association.  # noqa: E501
+
+        :param cust_operations: The cust_operations of this Version.
+        :type cust_operations: List[CustomOperation]
+        """
+        if cust_operations is not None and len(cust_operations) < 1:
+            raise ValueError("Invalid value for `cust_operations`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._cust_operations = cust_operations
diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/openapi/openapi.yaml b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/openapi/openapi.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..53446f2be3b9d165ff05cac7ec7dde41050c348f
--- /dev/null
+++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/openapi/openapi.yaml
@@ -0,0 +1,972 @@
+openapi: 3.0.0
+info:
+  description: |
+    API for Routing information.
+    © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
+    All rights reserved.
+  title: CAPIF_Routing_Info_API
+  version: 1.1.0-alpha.1
+externalDocs:
+  description: 3GPP TS 29.222 V17.1.0 Common API Framework for 3GPP Northbound APIs
+  url: http://www.3gpp.org/ftp/Specs/archive/29_series/29.222/
+servers:
+- url: '{apiRoot}/capif-routing-info/v1'
+  variables:
+    apiRoot:
+      default: https://example.com
+      description: apiRoot as defined in subclause 7.5 of 3GPP TS 29.222
+paths:
+  /service-apis/{serviceApiId}:
+    get:
+      description: Retrieves the API routing information.
+      operationId: service_apis_service_api_id_get
+      parameters:
+      - description: Identifier of a published service API
+        explode: false
+        in: path
+        name: serviceApiId
+        required: true
+        schema:
+          type: string
+        style: simple
+      - description: Identifier of the AEF
+        explode: true
+        in: query
+        name: aef-id
+        required: true
+        schema:
+          type: string
+        style: form
+      - description: To filter irrelevant responses related to unsupported features
+        explode: true
+        in: query
+        name: supp-feat
+        required: false
+        schema:
+          $ref: '#/components/schemas/SupportedFeatures'
+        style: form
+      responses:
+        "200":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/RoutingInfo'
+          description: OK.
+        "307":
+          description: Temporary Redirect
+          headers:
+            Location:
+              description: An alternative URI of the resource.
+              required: true
+              schema:
+                type: string
+        "308":
+          description: Permanent Redirect
+          headers:
+            Location:
+              description: An alternative URI of the resource.
+              required: true
+              schema:
+                type: string
+        "400":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Bad request
+        "401":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Unauthorized
+        "403":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Forbidden
+        "404":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Not Found
+        "406":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Not Acceptable
+        "414":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: URI Too Long
+        "429":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Too Many Requests
+        "500":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Internal Server Error
+        "503":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Service Unavailable
+        default:
+          description: Generic Error
+      x-openapi-router-controller: capif_routing_info.controllers.default_controller
+components:
+  schemas:
+    RoutingInfo:
+      description: Represents an API routing information.
+      example:
+        routingRules:
+        - ipv6AddrRanges:
+          - start: start
+            end: end
+          - start: start
+            end: end
+          aefProfile:
+            securityMethods:
+            - null
+            - null
+            versions:
+            - apiVersion: apiVersion
+              resources:
+              - operations:
+                - null
+                - null
+                description: description
+                resourceName: resourceName
+                custOpName: custOpName
+                uri: uri
+              - operations:
+                - null
+                - null
+                description: description
+                resourceName: resourceName
+                custOpName: custOpName
+                uri: uri
+              custOperations:
+              - operations:
+                - null
+                - null
+                description: description
+                custOpName: custOpName
+              - operations:
+                - null
+                - null
+                description: description
+                custOpName: custOpName
+              expiry: 2000-01-23T04:56:07.000+00:00
+            - apiVersion: apiVersion
+              resources:
+              - operations:
+                - null
+                - null
+                description: description
+                resourceName: resourceName
+                custOpName: custOpName
+                uri: uri
+              - operations:
+                - null
+                - null
+                description: description
+                resourceName: resourceName
+                custOpName: custOpName
+                uri: uri
+              custOperations:
+              - operations:
+                - null
+                - null
+                description: description
+                custOpName: custOpName
+              - operations:
+                - null
+                - null
+                description: description
+                custOpName: custOpName
+              expiry: 2000-01-23T04:56:07.000+00:00
+            domainName: domainName
+            aefId: aefId
+            interfaceDescriptions:
+            - ipv6Addr: ipv6Addr
+              securityMethods:
+              - null
+              - null
+              port: 5248
+              ipv4Addr: ipv4Addr
+            - ipv6Addr: ipv6Addr
+              securityMethods:
+              - null
+              - null
+              port: 5248
+              ipv4Addr: ipv4Addr
+          ipv4AddrRanges:
+          - start: 198.51.100.1
+            end: 198.51.100.1
+          - start: 198.51.100.1
+            end: 198.51.100.1
+        - ipv6AddrRanges:
+          - start: start
+            end: end
+          - start: start
+            end: end
+          aefProfile:
+            securityMethods:
+            - null
+            - null
+            versions:
+            - apiVersion: apiVersion
+              resources:
+              - operations:
+                - null
+                - null
+                description: description
+                resourceName: resourceName
+                custOpName: custOpName
+                uri: uri
+              - operations:
+                - null
+                - null
+                description: description
+                resourceName: resourceName
+                custOpName: custOpName
+                uri: uri
+              custOperations:
+              - operations:
+                - null
+                - null
+                description: description
+                custOpName: custOpName
+              - operations:
+                - null
+                - null
+                description: description
+                custOpName: custOpName
+              expiry: 2000-01-23T04:56:07.000+00:00
+            - apiVersion: apiVersion
+              resources:
+              - operations:
+                - null
+                - null
+                description: description
+                resourceName: resourceName
+                custOpName: custOpName
+                uri: uri
+              - operations:
+                - null
+                - null
+                description: description
+                resourceName: resourceName
+                custOpName: custOpName
+                uri: uri
+              custOperations:
+              - operations:
+                - null
+                - null
+                description: description
+                custOpName: custOpName
+              - operations:
+                - null
+                - null
+                description: description
+                custOpName: custOpName
+              expiry: 2000-01-23T04:56:07.000+00:00
+            domainName: domainName
+            aefId: aefId
+            interfaceDescriptions:
+            - ipv6Addr: ipv6Addr
+              securityMethods:
+              - null
+              - null
+              port: 5248
+              ipv4Addr: ipv4Addr
+            - ipv6Addr: ipv6Addr
+              securityMethods:
+              - null
+              - null
+              port: 5248
+              ipv4Addr: ipv4Addr
+          ipv4AddrRanges:
+          - start: 198.51.100.1
+            end: 198.51.100.1
+          - start: 198.51.100.1
+            end: 198.51.100.1
+      properties:
+        routingRules:
+          items:
+            $ref: '#/components/schemas/RoutingRule'
+          minItems: 1
+          title: routingRules
+          type: array
+      required:
+      - routingRules
+      title: RoutingInfo
+      type: object
+    RoutingRule:
+      description: Represents an API routing rule.
+      example:
+        ipv6AddrRanges:
+        - start: start
+          end: end
+        - start: start
+          end: end
+        aefProfile:
+          securityMethods:
+          - null
+          - null
+          versions:
+          - apiVersion: apiVersion
+            resources:
+            - operations:
+              - null
+              - null
+              description: description
+              resourceName: resourceName
+              custOpName: custOpName
+              uri: uri
+            - operations:
+              - null
+              - null
+              description: description
+              resourceName: resourceName
+              custOpName: custOpName
+              uri: uri
+            custOperations:
+            - operations:
+              - null
+              - null
+              description: description
+              custOpName: custOpName
+            - operations:
+              - null
+              - null
+              description: description
+              custOpName: custOpName
+            expiry: 2000-01-23T04:56:07.000+00:00
+          - apiVersion: apiVersion
+            resources:
+            - operations:
+              - null
+              - null
+              description: description
+              resourceName: resourceName
+              custOpName: custOpName
+              uri: uri
+            - operations:
+              - null
+              - null
+              description: description
+              resourceName: resourceName
+              custOpName: custOpName
+              uri: uri
+            custOperations:
+            - operations:
+              - null
+              - null
+              description: description
+              custOpName: custOpName
+            - operations:
+              - null
+              - null
+              description: description
+              custOpName: custOpName
+            expiry: 2000-01-23T04:56:07.000+00:00
+          domainName: domainName
+          aefId: aefId
+          interfaceDescriptions:
+          - ipv6Addr: ipv6Addr
+            securityMethods:
+            - null
+            - null
+            port: 5248
+            ipv4Addr: ipv4Addr
+          - ipv6Addr: ipv6Addr
+            securityMethods:
+            - null
+            - null
+            port: 5248
+            ipv4Addr: ipv4Addr
+        ipv4AddrRanges:
+        - start: 198.51.100.1
+          end: 198.51.100.1
+        - start: 198.51.100.1
+          end: 198.51.100.1
+      properties:
+        ipv4AddrRanges:
+          items:
+            $ref: '#/components/schemas/Ipv4AddressRange'
+          minItems: 1
+          title: ipv4AddrRanges
+          type: array
+        ipv6AddrRanges:
+          items:
+            $ref: '#/components/schemas/Ipv6AddressRange'
+          minItems: 1
+          title: ipv6AddrRanges
+          type: array
+        aefProfile:
+          $ref: '#/components/schemas/AefProfile'
+      required:
+      - aefProfile
+      title: RoutingRule
+      type: object
+    Ipv6AddressRange:
+      description: Represents IPv6 address range.
+      example:
+        start: start
+        end: end
+      properties:
+        start:
+          description: string identifying a Ipv6 address formatted according to clause
+            4 in IETF RFC 5952. The mixed Ipv4 Ipv6 notation according to clause 5
+            of IETF RFC 5952 shall not be used.
+          title: Ipv6Addr
+          type: string
+        end:
+          description: string identifying a Ipv6 address formatted according to clause
+            4 in IETF RFC 5952. The mixed Ipv4 Ipv6 notation according to clause 5
+            of IETF RFC 5952 shall not be used.
+          title: Ipv6Addr
+          type: string
+      required:
+      - end
+      - start
+      title: Ipv6AddressRange
+      type: object
+    SupportedFeatures:
+      description: A string used to indicate the features supported by an API that
+        is used as defined in clause 6.6 in 3GPP TS 29.500. The string shall contain
+        a bitmask indicating supported features in hexadecimal representation Each
+        character in the string shall take a value of "0" to "9", "a" to "f" or "A"
+        to "F" and shall represent the support of 4 features as described in table 5.2.2-3.
+        The most significant character representing the highest-numbered features
+        shall appear first in the string, and the character representing features
+        1 to 4 shall appear last in the string. The list of features and their numbering
+        (starting with 1) are defined separately for each API. If the string contains
+        a lower number of characters than there are defined features for an API, all
+        features that would be represented by characters that are not present in the
+        string are not supported
+      pattern: ^[A-Fa-f0-9]*$
+      title: supportedFeatures
+      type: string
+    ProblemDetails:
+      description: Represents additional information and details on an error response.
+      properties:
+        type:
+          description: string providing an URI formatted according to IETF RFC 3986.
+          title: type
+          type: string
+        title:
+          description: A short, human-readable summary of the problem type. It should
+            not change from occurrence to occurrence of the problem.
+          title: title
+          type: string
+        status:
+          description: The HTTP status code for this occurrence of the problem.
+          title: status
+          type: integer
+        detail:
+          description: A human-readable explanation specific to this occurrence of
+            the problem.
+          title: detail
+          type: string
+        instance:
+          description: string providing an URI formatted according to IETF RFC 3986.
+          title: type
+          type: string
+        cause:
+          description: A machine-readable application error cause specific to this
+            occurrence of the problem. This IE should be present and provide application-related
+            error information, if available.
+          title: cause
+          type: string
+        invalidParams:
+          description: Description of invalid parameters, for a request rejected due
+            to invalid parameters.
+          items:
+            $ref: '#/components/schemas/InvalidParam'
+          minItems: 1
+          title: invalidParams
+          type: array
+        supportedFeatures:
+          description: A string used to indicate the features supported by an API
+            that is used as defined in clause 6.6 in 3GPP TS 29.500. The string shall
+            contain a bitmask indicating supported features in hexadecimal representation
+            Each character in the string shall take a value of "0" to "9", "a" to
+            "f" or "A" to "F" and shall represent the support of 4 features as described
+            in table 5.2.2-3. The most significant character representing the highest-numbered
+            features shall appear first in the string, and the character representing
+            features 1 to 4 shall appear last in the string. The list of features
+            and their numbering (starting with 1) are defined separately for each
+            API. If the string contains a lower number of characters than there are
+            defined features for an API, all features that would be represented by
+            characters that are not present in the string are not supported
+          pattern: ^[A-Fa-f0-9]*$
+          title: supportedFeatures
+          type: string
+      title: ProblemDetails
+      type: object
+    Uri:
+      description: string providing an URI formatted according to IETF RFC 3986.
+      title: type
+      type: string
+    InvalidParam:
+      description: Represents the description of invalid parameters, for a request
+        rejected due to invalid parameters.
+      properties:
+        param:
+          description: Attribute's name encoded as a JSON Pointer, or header's name.
+          title: param
+          type: string
+        reason:
+          description: A human-readable reason, e.g. "must be a positive integer".
+          title: reason
+          type: string
+      required:
+      - param
+      title: InvalidParam
+      type: object
+    Ipv4AddressRange:
+      description: Range of IPv4 addresses
+      example:
+        start: 198.51.100.1
+        end: 198.51.100.1
+      properties:
+        start:
+          description: String identifying a IPv4 address formatted in the "dotted
+            decimal" notation as defined in RFC 1166.
+          example: 198.51.100.1
+          pattern: ^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])$
+          title: Ipv4Addr
+          type: string
+        end:
+          description: String identifying a IPv4 address formatted in the "dotted
+            decimal" notation as defined in RFC 1166.
+          example: 198.51.100.1
+          pattern: ^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])$
+          title: Ipv4Addr
+          type: string
+      title: Ipv4AddressRange
+      type: object
+    AefProfile:
+      description: Represents the AEF profile data.
+      example:
+        securityMethods:
+        - null
+        - null
+        versions:
+        - apiVersion: apiVersion
+          resources:
+          - operations:
+            - null
+            - null
+            description: description
+            resourceName: resourceName
+            custOpName: custOpName
+            uri: uri
+          - operations:
+            - null
+            - null
+            description: description
+            resourceName: resourceName
+            custOpName: custOpName
+            uri: uri
+          custOperations:
+          - operations:
+            - null
+            - null
+            description: description
+            custOpName: custOpName
+          - operations:
+            - null
+            - null
+            description: description
+            custOpName: custOpName
+          expiry: 2000-01-23T04:56:07.000+00:00
+        - apiVersion: apiVersion
+          resources:
+          - operations:
+            - null
+            - null
+            description: description
+            resourceName: resourceName
+            custOpName: custOpName
+            uri: uri
+          - operations:
+            - null
+            - null
+            description: description
+            resourceName: resourceName
+            custOpName: custOpName
+            uri: uri
+          custOperations:
+          - operations:
+            - null
+            - null
+            description: description
+            custOpName: custOpName
+          - operations:
+            - null
+            - null
+            description: description
+            custOpName: custOpName
+          expiry: 2000-01-23T04:56:07.000+00:00
+        domainName: domainName
+        aefId: aefId
+        interfaceDescriptions:
+        - ipv6Addr: ipv6Addr
+          securityMethods:
+          - null
+          - null
+          port: 5248
+          ipv4Addr: ipv4Addr
+        - ipv6Addr: ipv6Addr
+          securityMethods:
+          - null
+          - null
+          port: 5248
+          ipv4Addr: ipv4Addr
+      oneOf:
+      - required:
+        - domainName
+      - required:
+        - interfaceDescriptions
+      properties:
+        aefId:
+          description: Identifier of the API exposing function
+          title: aefId
+          type: string
+        versions:
+          description: API version
+          items:
+            $ref: '#/components/schemas/Version'
+          minItems: 1
+          title: versions
+          type: array
+        protocol:
+          $ref: '#/components/schemas/Protocol'
+        dataFormat:
+          $ref: '#/components/schemas/DataFormat'
+        securityMethods:
+          description: Security methods supported by the AEF
+          items:
+            $ref: '#/components/schemas/SecurityMethod'
+          minItems: 1
+          title: securityMethods
+          type: array
+        domainName:
+          description: Domain to which API belongs to
+          title: domainName
+          type: string
+        interfaceDescriptions:
+          description: Interface details
+          items:
+            $ref: '#/components/schemas/InterfaceDescription'
+          minItems: 1
+          title: interfaceDescriptions
+          type: array
+      required:
+      - aefId
+      - versions
+      title: AefProfile
+      type: object
+    Version:
+      description: Represents the API version information.
+      example:
+        apiVersion: apiVersion
+        resources:
+        - operations:
+          - null
+          - null
+          description: description
+          resourceName: resourceName
+          custOpName: custOpName
+          uri: uri
+        - operations:
+          - null
+          - null
+          description: description
+          resourceName: resourceName
+          custOpName: custOpName
+          uri: uri
+        custOperations:
+        - operations:
+          - null
+          - null
+          description: description
+          custOpName: custOpName
+        - operations:
+          - null
+          - null
+          description: description
+          custOpName: custOpName
+        expiry: 2000-01-23T04:56:07.000+00:00
+      properties:
+        apiVersion:
+          description: API major version in URI (e.g. v1)
+          title: apiVersion
+          type: string
+        expiry:
+          description: string with format "date-time" as defined in OpenAPI.
+          format: date-time
+          title: DateTime
+          type: string
+        resources:
+          description: Resources supported by the API.
+          items:
+            $ref: '#/components/schemas/Resource'
+          minItems: 1
+          title: resources
+          type: array
+        custOperations:
+          description: Custom operations without resource association.
+          items:
+            $ref: '#/components/schemas/CustomOperation'
+          minItems: 1
+          title: custOperations
+          type: array
+      required:
+      - apiVersion
+      title: Version
+      type: object
+    Resource:
+      description: Represents the API resource data.
+      example:
+        operations:
+        - null
+        - null
+        description: description
+        resourceName: resourceName
+        custOpName: custOpName
+        uri: uri
+      properties:
+        resourceName:
+          description: Resource name
+          title: resourceName
+          type: string
+        commType:
+          $ref: '#/components/schemas/CommunicationType'
+        uri:
+          description: Relative URI of the API resource, it is set as {apiSpecificResourceUriPart}
+            part of the URI structure as defined in subclause 4.4 of 3GPP TS 29.501.
+          title: uri
+          type: string
+        custOpName:
+          description: it is set as {custOpName} part of the URI structure for a custom
+            operation associated with a resource as defined in subclause 4.4 of 3GPP
+            TS 29.501.
+          title: custOpName
+          type: string
+        operations:
+          description: Supported HTTP methods for the API resource. Only applicable
+            when the protocol in AefProfile indicates HTTP.
+          items:
+            $ref: '#/components/schemas/Operation'
+          minItems: 1
+          title: operations
+          type: array
+        description:
+          description: Text description of the API resource
+          title: description
+          type: string
+      required:
+      - commType
+      - resourceName
+      - uri
+      title: Resource
+      type: object
+    CommunicationType:
+      anyOf:
+      - $ref: '#/components/schemas/CommunicationType_anyOf'
+      - description: |
+          This string provides forward-compatibility with future extensions to the enumeration but is not used to encode content defined in the present version of this API.
+        type: string
+      description: |
+        Possible values are - REQUEST_RESPONSE: The communication is of the type request-response - SUBSCRIBE_NOTIFY: The communication is of the type subscribe-notify
+      title: CommunicationType
+    Operation:
+      anyOf:
+      - $ref: '#/components/schemas/Operation_anyOf'
+      - description: |
+          This string provides forward-compatibility with future extensions to the enumeration but is not used to encode content defined in the present version of this API.
+        type: string
+      description: |
+        Possible values are - GET: HTTP GET method - POST: HTTP POST method - PUT: HTTP PUT method - PATCH: HTTP PATCH method - DELETE: HTTP DELETE method
+      title: Operation
+    CustomOperation:
+      description: Represents the description of a custom operation.
+      example:
+        operations:
+        - null
+        - null
+        description: description
+        custOpName: custOpName
+      properties:
+        commType:
+          $ref: '#/components/schemas/CommunicationType'
+        custOpName:
+          description: it is set as {custOpName} part of the URI structure for a custom
+            operation without resource association as defined in subclause 4.4 of
+            3GPP TS 29.501.
+          title: custOpName
+          type: string
+        operations:
+          description: Supported HTTP methods for the API resource. Only applicable
+            when the protocol in AefProfile indicates HTTP.
+          items:
+            $ref: '#/components/schemas/Operation'
+          minItems: 1
+          title: operations
+          type: array
+        description:
+          description: Text description of the custom operation
+          title: description
+          type: string
+      required:
+      - commType
+      - custOpName
+      title: CustomOperation
+      type: object
+    Protocol:
+      anyOf:
+      - $ref: '#/components/schemas/Protocol_anyOf'
+      - description: |
+          This string provides forward-compatibility with future extensions to the enumeration but is not used to encode content defined in the present version of this API.
+        type: string
+      description: |
+        Possible values are - HTTP_1_1: HTTP version 1.1 - HTTP_2: HTTP version 2
+      title: Protocol
+    DataFormat:
+      anyOf:
+      - $ref: '#/components/schemas/DataFormat_anyOf'
+      - description: |
+          This string provides forward-compatibility with future extensions to the enumeration but is not used to encode content defined in the present version of this API.
+        type: string
+      description: |
+        Possible values are - JSON: JavaScript Object Notation
+      title: DataFormat
+    SecurityMethod:
+      anyOf:
+      - $ref: '#/components/schemas/SecurityMethod_anyOf'
+      - description: |
+          This string provides forward-compatibility with future extensions to the enumeration but is not used to encode content defined in the present version of this API.
+        type: string
+      description: |
+        Possible values are - PSK: Security method 1 (Using TLS-PSK) as described in 3GPP TS 33.122 - PKI: Security method 2 (Using PKI) as described in 3GPP TS 33.122 - OAUTH: Security method 3 (TLS with OAuth token) as described in 3GPP TS 33.122
+      title: SecurityMethod
+    InterfaceDescription:
+      description: Represents the description of an API's interface.
+      example:
+        ipv6Addr: ipv6Addr
+        securityMethods:
+        - null
+        - null
+        port: 5248
+        ipv4Addr: ipv4Addr
+      oneOf:
+      - required:
+        - ipv4Addr
+      - required:
+        - ipv6Addr
+      properties:
+        ipv4Addr:
+          description: string identifying a Ipv4 address formatted in the "dotted
+            decimal" notation as defined in IETF RFC 1166.
+          title: Ipv4Addr_1
+          type: string
+        ipv6Addr:
+          description: string identifying a Ipv6 address formatted according to clause
+            4 in IETF RFC 5952. The mixed Ipv4 Ipv6 notation according to clause 5
+            of IETF RFC 5952 shall not be used.
+          title: Ipv6Addr
+          type: string
+        port:
+          description: Unsigned integer with valid values between 0 and 65535.
+          maximum: 65535
+          minimum: 0
+          title: Port
+          type: integer
+        securityMethods:
+          description: Security methods supported by the interface, it take precedence
+            over the security methods provided in AefProfile, for this specific interface.
+          items:
+            $ref: '#/components/schemas/SecurityMethod'
+          minItems: 1
+          title: securityMethods
+          type: array
+      title: InterfaceDescription
+      type: object
+    Ipv6Addr:
+      description: string identifying a Ipv6 address formatted according to clause
+        4 in IETF RFC 5952. The mixed Ipv4 Ipv6 notation according to clause 5 of
+        IETF RFC 5952 shall not be used.
+      title: Ipv6Addr
+      type: string
+    Ipv4Addr:
+      description: String identifying a IPv4 address formatted in the "dotted decimal"
+        notation as defined in RFC 1166.
+      example: 198.51.100.1
+      pattern: ^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])$
+      title: Ipv4Addr
+      type: string
+    DateTime:
+      description: string with format "date-time" as defined in OpenAPI.
+      format: date-time
+      title: DateTime
+      type: string
+    Ipv4Addr_1:
+      description: string identifying a Ipv4 address formatted in the "dotted decimal"
+        notation as defined in IETF RFC 1166.
+      title: Ipv4Addr_1
+      type: string
+    Port:
+      description: Unsigned integer with valid values between 0 and 65535.
+      maximum: 65535
+      minimum: 0
+      title: Port
+      type: integer
+    CommunicationType_anyOf:
+      enum:
+      - REQUEST_RESPONSE
+      - SUBSCRIBE_NOTIFY
+      title: CommunicationType_anyOf
+      type: string
+    Operation_anyOf:
+      enum:
+      - GET
+      - POST
+      - PUT
+      - PATCH
+      - DELETE
+      title: Operation_anyOf
+      type: string
+    Protocol_anyOf:
+      enum:
+      - HTTP_1_1
+      - HTTP_2
+      title: Protocol_anyOf
+      type: string
+    DataFormat_anyOf:
+      enum:
+      - JSON
+      title: DataFormat_anyOf
+      type: string
+    SecurityMethod_anyOf:
+      enum:
+      - PSK
+      - PKI
+      - OAUTH
+      title: SecurityMethod_anyOf
+      type: string
diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/test/__init__.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/test/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e95f59cf4b47c3789207ccf04683ef89e3a4ff3f
--- /dev/null
+++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/test/__init__.py
@@ -0,0 +1,16 @@
+import logging
+
+import connexion
+from flask_testing import TestCase
+
+from capif_routing_info.encoder import JSONEncoder
+
+
+class BaseTestCase(TestCase):
+
+    def create_app(self):
+        logging.getLogger('connexion.operation').setLevel('ERROR')
+        app = connexion.App(__name__, specification_dir='../openapi/')
+        app.app.json_encoder = JSONEncoder
+        app.add_api('openapi.yaml', pythonic_params=True)
+        return app.app
diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/test/test_default_controller.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/test/test_default_controller.py
new file mode 100644
index 0000000000000000000000000000000000000000..e602d5dd04a7885146196c7a6b9872f0b7dc0a14
--- /dev/null
+++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/test/test_default_controller.py
@@ -0,0 +1,37 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+import unittest
+
+from flask import json
+from six import BytesIO
+
+from capif_routing_info.models.problem_details import ProblemDetails  # noqa: E501
+from capif_routing_info.models.routing_info import RoutingInfo  # noqa: E501
+from capif_routing_info.test import BaseTestCase
+
+
+class TestDefaultController(BaseTestCase):
+    """DefaultController integration test stubs"""
+
+    def test_service_apis_service_api_id_get(self):
+        """Test case for service_apis_service_api_id_get
+
+        
+        """
+        query_string = [('aef-id', 'aef_id_example'),
+                        ('supp-feat', 'supp_feat_example')]
+        headers = { 
+            'Accept': 'application/json',
+        }
+        response = self.client.open(
+            '/capif-routing-info/v1/service-apis/{service_api_id}'.format(service_api_id='service_api_id_example'),
+            method='GET',
+            headers=headers,
+            query_string=query_string)
+        self.assert200(response,
+                       'Response body is : ' + response.data.decode('utf-8'))
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/typing_utils.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/typing_utils.py
new file mode 100644
index 0000000000000000000000000000000000000000..0563f81fd5345282a33705038dfa77fdcaa15872
--- /dev/null
+++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/typing_utils.py
@@ -0,0 +1,32 @@
+# coding: utf-8
+
+import sys
+
+if sys.version_info < (3, 7):
+    import typing
+
+    def is_generic(klass):
+        """ Determine whether klass is a generic class """
+        return type(klass) == typing.GenericMeta
+
+    def is_dict(klass):
+        """ Determine whether klass is a Dict """
+        return klass.__extra__ == dict
+
+    def is_list(klass):
+        """ Determine whether klass is a List """
+        return klass.__extra__ == list
+
+else:
+
+    def is_generic(klass):
+        """ Determine whether klass is a generic class """
+        return hasattr(klass, '__origin__')
+
+    def is_dict(klass):
+        """ Determine whether klass is a Dict """
+        return klass.__origin__ == dict
+
+    def is_list(klass):
+        """ Determine whether klass is a List """
+        return klass.__origin__ == list
diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/util.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/util.py
new file mode 100644
index 0000000000000000000000000000000000000000..227076550fea5acb4f1f167a777f366215563261
--- /dev/null
+++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/util.py
@@ -0,0 +1,148 @@
+import datetime
+
+import six
+import typing
+from capif_routing_info import typing_utils
+
+
+def _deserialize(data, klass):
+    """Deserializes dict, list, str into an object.
+
+    :param data: dict, list or str.
+    :param klass: class literal, or string of class name.
+
+    :return: object.
+    """
+    if data is None:
+        return None
+
+    if klass in six.integer_types or klass in (float, str, bool, bytearray):
+        return _deserialize_primitive(data, klass)
+    elif klass == object:
+        return _deserialize_object(data)
+    elif klass == datetime.date:
+        return deserialize_date(data)
+    elif klass == datetime.datetime:
+        return deserialize_datetime(data)
+    elif typing_utils.is_generic(klass):
+        if typing_utils.is_list(klass):
+            return _deserialize_list(data, klass.__args__[0])
+        if typing_utils.is_dict(klass):
+            return _deserialize_dict(data, klass.__args__[1])
+    else:
+        return deserialize_model(data, klass)
+
+
+def _deserialize_primitive(data, klass):
+    """Deserializes to primitive type.
+
+    :param data: data to deserialize.
+    :param klass: class literal.
+
+    :return: int, long, float, str, bool.
+    :rtype: int | long | float | str | bool
+    """
+    try:
+        value = klass(data)
+    except UnicodeEncodeError:
+        value = six.u(data)
+    except TypeError:
+        value = data
+    return value
+
+
+def _deserialize_object(value):
+    """Return an original value.
+
+    :return: object.
+    """
+    return value
+
+
+def deserialize_date(string):
+    """Deserializes string to date.
+
+    :param string: str.
+    :type string: str
+    :return: date.
+    :rtype: date
+    """
+    if string is None:
+      return None
+    
+    try:
+        from dateutil.parser import parse
+        return parse(string).date()
+    except ImportError:
+        return string
+
+
+def deserialize_datetime(string):
+    """Deserializes string to datetime.
+
+    The string should be in iso8601 datetime format.
+
+    :param string: str.
+    :type string: str
+    :return: datetime.
+    :rtype: datetime
+    """
+    if string is None:
+      return None
+    
+    try:
+        from dateutil.parser import parse
+        return parse(string)
+    except ImportError:
+        return string
+
+
+def deserialize_model(data, klass):
+    """Deserializes list or dict to model.
+
+    :param data: dict, list.
+    :type data: dict | list
+    :param klass: class literal.
+    :return: model object.
+    """
+    instance = klass()
+
+    if not instance.openapi_types:
+        return data
+
+    for attr, attr_type in six.iteritems(instance.openapi_types):
+        if data is not None \
+                and instance.attribute_map[attr] in data \
+                and isinstance(data, (list, dict)):
+            value = data[instance.attribute_map[attr]]
+            setattr(instance, attr, _deserialize(value, attr_type))
+
+    return instance
+
+
+def _deserialize_list(data, boxed_type):
+    """Deserializes a list and its elements.
+
+    :param data: list to deserialize.
+    :type data: list
+    :param boxed_type: class literal.
+
+    :return: deserialized list.
+    :rtype: list
+    """
+    return [_deserialize(sub_data, boxed_type)
+            for sub_data in data]
+
+
+def _deserialize_dict(data, boxed_type):
+    """Deserializes a dict and its elements.
+
+    :param data: dict to deserialize.
+    :type data: dict
+    :param boxed_type: class literal.
+
+    :return: deserialized dict.
+    :rtype: dict
+    """
+    return {k: _deserialize(v, boxed_type)
+            for k, v in six.iteritems(data)}
diff --git a/services/TS29222_CAPIF_Routing_Info_API/git_push.sh b/services/TS29222_CAPIF_Routing_Info_API/git_push.sh
new file mode 100644
index 0000000000000000000000000000000000000000..9405f72e950cdb8ca24c3cf4d15cee7eac62fde7
--- /dev/null
+++ b/services/TS29222_CAPIF_Routing_Info_API/git_push.sh
@@ -0,0 +1,57 @@
+#!/bin/sh
+# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
+#
+# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl "minor update" "gitlab.com"
+
+git_user_id=$1
+git_repo_id=$2
+release_note=$3
+git_host=$4
+
+if [ "$git_host" = "" ]; then
+    git_host="github.com"
+    echo "[INFO] No command line input provided. Set \$git_host to $git_host"
+fi
+
+if [ "$git_user_id" = "" ]; then
+    git_user_id="GIT_USER_ID"
+    echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id"
+fi
+
+if [ "$git_repo_id" = "" ]; then
+    git_repo_id="GIT_REPO_ID"
+    echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id"
+fi
+
+if [ "$release_note" = "" ]; then
+    release_note="Minor update"
+    echo "[INFO] No command line input provided. Set \$release_note to $release_note"
+fi
+
+# Initialize the local directory as a Git repository
+git init
+
+# Adds the files in the local repository and stages them for commit.
+git add .
+
+# Commits the tracked changes and prepares them to be pushed to a remote repository.
+git commit -m "$release_note"
+
+# Sets the new remote
+git_remote=`git remote`
+if [ "$git_remote" = "" ]; then # git remote not defined
+
+    if [ "$GIT_TOKEN" = "" ]; then
+        echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git credential in your environment."
+        git remote add origin https://${git_host}/${git_user_id}/${git_repo_id}.git
+    else
+        git remote add origin https://${git_user_id}:${GIT_TOKEN}@${git_host}/${git_user_id}/${git_repo_id}.git
+    fi
+
+fi
+
+git pull origin master
+
+# Pushes (Forces) the changes in the local repository up to the remote repository
+echo "Git pushing to https://${git_host}/${git_user_id}/${git_repo_id}.git"
+git push origin master 2>&1 | grep -v 'To https'
diff --git a/services/TS29222_CAPIF_Routing_Info_API/requirements.txt b/services/TS29222_CAPIF_Routing_Info_API/requirements.txt
new file mode 100644
index 0000000000000000000000000000000000000000..1be0346f149043abdcafbd540c98c73eca75275e
--- /dev/null
+++ b/services/TS29222_CAPIF_Routing_Info_API/requirements.txt
@@ -0,0 +1,5 @@
+connexion[swagger-ui] == 2.14.2; python_version>="3.6"
+swagger-ui-bundle >= 0.0.2
+python_dateutil >= 2.6.0
+setuptools >= 21.0.0
+Flask == 2.0.3
diff --git a/services/TS29222_CAPIF_Routing_Info_API/setup.py b/services/TS29222_CAPIF_Routing_Info_API/setup.py
new file mode 100644
index 0000000000000000000000000000000000000000..58c68e21a1455e377e7f10142105a3486e84f178
--- /dev/null
+++ b/services/TS29222_CAPIF_Routing_Info_API/setup.py
@@ -0,0 +1,39 @@
+# coding: utf-8
+
+import sys
+from setuptools import setup, find_packages
+
+NAME = "capif_routing_info"
+VERSION = "1.0.0"
+
+# To install the library, run the following
+#
+# python setup.py install
+#
+# prerequisite: setuptools
+# http://pypi.python.org/pypi/setuptools
+
+REQUIRES = [
+    "connexion>=2.0.2",
+    "swagger-ui-bundle>=0.0.2",
+    "python_dateutil>=2.6.0"
+]
+
+setup(
+    name=NAME,
+    version=VERSION,
+    description="CAPIF_Routing_Info_API",
+    author_email="",
+    url="",
+    keywords=["OpenAPI", "CAPIF_Routing_Info_API"],
+    install_requires=REQUIRES,
+    packages=find_packages(),
+    package_data={'': ['openapi/openapi.yaml']},
+    include_package_data=True,
+    entry_points={
+        'console_scripts': ['capif_routing_info=capif_routing_info.__main__:main']},
+    long_description="""\
+    API for Routing information. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. 
+    """
+)
+
diff --git a/services/TS29222_CAPIF_Routing_Info_API/test-requirements.txt b/services/TS29222_CAPIF_Routing_Info_API/test-requirements.txt
new file mode 100644
index 0000000000000000000000000000000000000000..0970f28c7c5a344d7fd9b9c893c584e7336df266
--- /dev/null
+++ b/services/TS29222_CAPIF_Routing_Info_API/test-requirements.txt
@@ -0,0 +1,4 @@
+pytest~=4.6.7 # needed for python 2.7+3.4
+pytest-cov>=2.8.1
+pytest-randomly==1.2.3 # needed for python 2.7+3.4
+Flask-Testing==0.8.0
diff --git a/services/TS29222_CAPIF_Routing_Info_API/tox.ini b/services/TS29222_CAPIF_Routing_Info_API/tox.ini
new file mode 100644
index 0000000000000000000000000000000000000000..6e0e6e7cc22b04f3c663a65687adfd06f801dcca
--- /dev/null
+++ b/services/TS29222_CAPIF_Routing_Info_API/tox.ini
@@ -0,0 +1,11 @@
+[tox]
+envlist = py3
+skipsdist=True
+
+[testenv]
+deps=-r{toxinidir}/requirements.txt
+     -r{toxinidir}/test-requirements.txt
+	 {toxinidir}
+
+commands=
+   pytest --cov=capif_routing_info
diff --git a/services/TS29222_CAPIF_Security_API/.dockerignore b/services/TS29222_CAPIF_Security_API/.dockerignore
new file mode 100644
index 0000000000000000000000000000000000000000..f9619601908b43d5d90c9befea5aa6ef6a732fa9
--- /dev/null
+++ b/services/TS29222_CAPIF_Security_API/.dockerignore
@@ -0,0 +1,72 @@
+.travis.yaml
+.openapi-generator-ignore
+README.md
+tox.ini
+git_push.sh
+test-requirements.txt
+setup.py
+
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+env/
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*,cover
+.hypothesis/
+venv/
+.python-version
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+#Ipython Notebook
+.ipynb_checkpoints
diff --git a/services/TS29222_CAPIF_Security_API/.gitignore b/services/TS29222_CAPIF_Security_API/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..43995bd42fa23bbc4c3a59d5fb9da99042fcf139
--- /dev/null
+++ b/services/TS29222_CAPIF_Security_API/.gitignore
@@ -0,0 +1,66 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+env/
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*,cover
+.hypothesis/
+venv/
+.venv/
+.python-version
+.pytest_cache
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+#Ipython Notebook
+.ipynb_checkpoints
diff --git a/services/TS29222_CAPIF_Security_API/.openapi-generator-ignore b/services/TS29222_CAPIF_Security_API/.openapi-generator-ignore
new file mode 100644
index 0000000000000000000000000000000000000000..7484ee590a3894506cf063799b885428f95a71be
--- /dev/null
+++ b/services/TS29222_CAPIF_Security_API/.openapi-generator-ignore
@@ -0,0 +1,23 @@
+# OpenAPI Generator Ignore
+# Generated by openapi-generator https://github.com/openapitools/openapi-generator
+
+# Use this file to prevent files from being overwritten by the generator.
+# The patterns follow closely to .gitignore or .dockerignore.
+
+# As an example, the C# client generator defines ApiClient.cs.
+# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line:
+#ApiClient.cs
+
+# You can match any string of characters against a directory, file or extension with a single asterisk (*):
+#foo/*/qux
+# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
+
+# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
+#foo/**/qux
+# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
+
+# You can also negate patterns with an exclamation (!).
+# For example, you can ignore all files in a docs folder with the file extension .md:
+#docs/*.md
+# Then explicitly reverse the ignore rule for a single file:
+#!docs/README.md
diff --git a/services/TS29222_CAPIF_Security_API/.openapi-generator/FILES b/services/TS29222_CAPIF_Security_API/.openapi-generator/FILES
new file mode 100644
index 0000000000000000000000000000000000000000..80c09cfea715e19922db62051c3460c62c22948a
--- /dev/null
+++ b/services/TS29222_CAPIF_Security_API/.openapi-generator/FILES
@@ -0,0 +1,36 @@
+.dockerignore
+.gitignore
+.travis.yml
+Dockerfile
+README.md
+capif_security/__init__.py
+capif_security/__main__.py
+capif_security/controllers/__init__.py
+capif_security/controllers/default_controller.py
+capif_security/controllers/security_controller_.py
+capif_security/encoder.py
+capif_security/models/__init__.py
+capif_security/models/access_token_claims.py
+capif_security/models/access_token_err.py
+capif_security/models/access_token_rsp.py
+capif_security/models/base_model_.py
+capif_security/models/cause.py
+capif_security/models/cause_any_of.py
+capif_security/models/interface_description.py
+capif_security/models/invalid_param.py
+capif_security/models/problem_details.py
+capif_security/models/security_information.py
+capif_security/models/security_method.py
+capif_security/models/security_method_any_of.py
+capif_security/models/security_notification.py
+capif_security/models/service_security.py
+capif_security/models/websock_notif_config.py
+capif_security/openapi/openapi.yaml
+capif_security/test/__init__.py
+capif_security/typing_utils.py
+capif_security/util.py
+git_push.sh
+requirements.txt
+setup.py
+test-requirements.txt
+tox.ini
diff --git a/services/TS29222_CAPIF_Security_API/.openapi-generator/VERSION b/services/TS29222_CAPIF_Security_API/.openapi-generator/VERSION
new file mode 100644
index 0000000000000000000000000000000000000000..4b448de535c7dd619da0df6d8221995dbd5d118a
--- /dev/null
+++ b/services/TS29222_CAPIF_Security_API/.openapi-generator/VERSION
@@ -0,0 +1 @@
+5.3.0-SNAPSHOT
\ No newline at end of file
diff --git a/services/TS29222_CAPIF_Security_API/.travis.yml b/services/TS29222_CAPIF_Security_API/.travis.yml
new file mode 100644
index 0000000000000000000000000000000000000000..ad71ee5ca083a6923c91104533c5c7b86f297f3f
--- /dev/null
+++ b/services/TS29222_CAPIF_Security_API/.travis.yml
@@ -0,0 +1,14 @@
+# ref: https://docs.travis-ci.com/user/languages/python
+language: python
+python:
+  - "3.2"
+  - "3.3"
+  - "3.4"
+  - "3.5"
+  - "3.6"
+  - "3.7"
+  - "3.8"
+# command to install dependencies
+install: "pip install -r requirements.txt"
+# command to run tests
+script: nosetests
diff --git a/services/TS29222_CAPIF_Security_API/Dockerfile b/services/TS29222_CAPIF_Security_API/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..9566c752eaa135a135faeb70c812db1d2d997c0a
--- /dev/null
+++ b/services/TS29222_CAPIF_Security_API/Dockerfile
@@ -0,0 +1,18 @@
+FROM public.ecr.aws/o2v4a8t6/opencapif/python:3-alpine
+
+RUN mkdir -p /usr/src/app
+WORKDIR /usr/src/app
+
+COPY requirements.txt /usr/src/app/requirements.txt
+
+RUN apk add -U --no-cache gcc build-base linux-headers ca-certificates libffi-dev libressl-dev libxslt-dev
+RUN apk add redis
+RUN apk add jq
+RUN apk add curl
+RUN pip3 install --no-cache-dir -r requirements.txt
+
+COPY . /usr/src/app
+
+EXPOSE 8080
+
+CMD ["sh", "security_prepare.sh"]
diff --git a/services/TS29222_CAPIF_Security_API/README.md b/services/TS29222_CAPIF_Security_API/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..66df10994ad85cbdf33b6eda4b8bfcf0d0ca940b
--- /dev/null
+++ b/services/TS29222_CAPIF_Security_API/README.md
@@ -0,0 +1,49 @@
+# OpenAPI generated server
+
+## Overview
+This server was generated by the [OpenAPI Generator](https://openapi-generator.tech) project. By using the
+[OpenAPI-Spec](https://openapis.org) from a remote server, you can easily generate a server stub.  This
+is an example of building a OpenAPI-enabled Flask server.
+
+This example uses the [Connexion](https://github.com/zalando/connexion) library on top of Flask.
+
+## Requirements
+Python 3.5.2+
+
+## Usage
+To run the server, please execute the following from the root directory:
+
+```
+pip3 install -r requirements.txt
+python3 -m capif_security
+```
+
+and open your browser to here:
+
+```
+http://localhost:8080/capif-security/v1/ui/
+```
+
+Your OpenAPI definition lives here:
+
+```
+http://localhost:8080/capif-security/v1/openapi.json
+```
+
+To launch the integration tests, use tox:
+```
+sudo pip install tox
+tox
+```
+
+## Running with Docker
+
+To run the server on a Docker container, please execute the following from the root directory:
+
+```bash
+# building the image
+docker build -t capif_security .
+
+# starting up a container
+docker run -p 8080:8080 capif_security
+```
\ No newline at end of file
diff --git a/services/TS29222_CAPIF_Security_API/capif_security/__init__.py b/services/TS29222_CAPIF_Security_API/capif_security/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/services/TS29222_CAPIF_Security_API/capif_security/__main__.py b/services/TS29222_CAPIF_Security_API/capif_security/__main__.py
new file mode 100644
index 0000000000000000000000000000000000000000..98d396499dd9e5b056d1d63d9fbaa3dcf8fae442
--- /dev/null
+++ b/services/TS29222_CAPIF_Security_API/capif_security/__main__.py
@@ -0,0 +1,148 @@
+#!/usr/bin/env python3
+
+import connexion
+import logging
+from capif_security import encoder
+from flask_jwt_extended import JWTManager
+from .config import Config
+from .core.consumer_messager import Subscriber
+from threading import Thread
+from flask_executor import Executor
+from logging.handlers import RotatingFileHandler
+import sys
+import os
+from fluent import sender
+from flask_executor import Executor
+from opentelemetry.instrumentation.flask import FlaskInstrumentor
+from opentelemetry import trace
+from opentelemetry.exporter.otlp.proto.grpc.trace_exporter import OTLPSpanExporter
+from opentelemetry.trace.propagation.tracecontext import TraceContextTextMapPropagator
+from opentelemetry.sdk.resources import Resource
+from opentelemetry.sdk.trace import TracerProvider
+from opentelemetry.sdk.trace.export import BatchSpanProcessor
+from opentelemetry.instrumentation.redis import RedisInstrumentor
+
+
+
+NAME = "Security-Service"
+
+def configure_monitoring(app, config):
+
+    resource = Resource(attributes={"service.name": NAME})
+
+    fluent_bit_host = config['monitoring']['fluent_bit_host']
+    fluent_bit_port = config['monitoring']['fluent_bit_port']
+    fluent_bit_sender = sender.FluentSender('Security-Service', host=fluent_bit_host, port=fluent_bit_port)
+    propagator = TraceContextTextMapPropagator()
+
+    tracer_provider = TracerProvider(resource=resource)
+    trace.set_tracer_provider(tracer_provider)
+    exporter = OTLPSpanExporter(endpoint=f"http://{config['monitoring']['opentelemetry_url']}:{config['monitoring']['opentelemetry_port']}", insecure=True)
+    span_processor = BatchSpanProcessor(
+        exporter,
+        max_queue_size=config['monitoring']['opentelemetry_max_queue_size'],
+        schedule_delay_millis=config['monitoring']['opentelemetry_schedule_delay_millis'],
+        max_export_batch_size=config['monitoring']['opentelemetry_max_export_batch_size'],
+        export_timeout_millis=config['monitoring']['opentelemetry_export_timeout_millis'],
+    )
+
+    trace.get_tracer_provider().add_span_processor(span_processor)
+
+    FlaskInstrumentor().instrument_app(app)
+
+    RedisInstrumentor().instrument()
+
+    class FluentBitHandler(logging.Handler):
+
+        def __init__(self):
+            logging.Handler.__init__(self)
+
+        def emit(self, record):
+            log_entry = self.format(record)
+            log_data = {
+                'message': log_entry,
+                'level': record.levelname,
+                'timestamp': record.created,
+                'logger': record.name,
+                'function': record.funcName,
+                'line': record.lineno,
+                'container_name': os.environ.get('CONTAINER_NAME', ''),
+            }
+
+            # # Obtener el trace ID actual
+            current_context = trace.get_current_span().get_span_context()
+
+            trace_id = current_context.trace_id
+            traceparent_id = current_context.span_id
+            log_data['traceID'] = hex(trace_id)[2:]
+            if traceparent_id != None:
+                log_data['traceparent'] = hex(traceparent_id)[2:]
+            fluent_bit_sender.emit('Security-Service', log_data)
+
+    loggers = [app.logger, ]
+    for l in loggers:
+         l.addHandler(FluentBitHandler())
+
+
+def configure_logging(app):
+    del app.logger.handlers[:]
+    loggers = [app.logger, ]
+    handlers = []
+    console_handler = logging.StreamHandler()
+    console_handler.setLevel(logging.DEBUG)
+    console_handler.setFormatter(verbose_formatter())
+    file_handler = RotatingFileHandler(filename="security_logs.log", maxBytes=1024 * 1024 * 100, backupCount=20)
+    file_handler.setLevel(logging.DEBUG)
+    file_handler.setFormatter(verbose_formatter())
+    handlers.append(console_handler)
+    handlers.append(file_handler)
+
+    for l in loggers:
+        for handler in handlers:
+            l.addHandler(handler)
+        l.propagate = False
+        l.setLevel(logging.DEBUG)
+
+
+def verbose_formatter():
+    return logging.Formatter(
+        '{"timestamp": "%(asctime)s", "level": "%(levelname)s", "logger": "%(name)s", "function": "%(funcName)s", "line": %(lineno)d, "message": %(message)s}',
+        datefmt='%d/%m/%Y %H:%M:%S'
+    )
+
+def main():
+
+    with open("/usr/src/app/capif_security/server.key", "rb") as key_file:
+            key_data = key_file.read()
+
+    app = connexion.App(__name__, specification_dir='./openapi/')
+    app.app.json_encoder = encoder.JSONEncoder
+
+
+    app.app.config['JWT_ALGORITHM'] = 'RS256'
+    app.app.config['JWT_PRIVATE_KEY'] = key_data
+    app.add_api('openapi.yaml',
+                arguments={'title': 'CAPIF_Security_API'},
+                pythonic_params=True)
+
+    JWTManager(app.app)
+    subscriber = Subscriber()
+
+    config = Config()
+    configure_logging(app.app)
+
+    if eval(os.environ.get("MONITORING").lower().capitalize()):
+        configure_monitoring(app.app, config.get_config())
+
+    executor = Executor(app.app)
+
+    @app.app.before_first_request
+    def up_listener():
+        executor.submit(subscriber.listen)
+
+
+    app.run(port=8080, debug=True)
+
+if __name__ == '__main__':
+    main()
+
diff --git a/services/TS29222_CAPIF_Security_API/capif_security/config.py b/services/TS29222_CAPIF_Security_API/capif_security/config.py
new file mode 100644
index 0000000000000000000000000000000000000000..11e1c4f3626d7440c6cd999ed118afb3c93caa2e
--- /dev/null
+++ b/services/TS29222_CAPIF_Security_API/capif_security/config.py
@@ -0,0 +1,21 @@
+import yaml
+import os
+
+#Config class to get config
+class Config:
+	def __init__(self):
+		self.cached = 0
+		self.file="./config.yaml"
+		self.my_config = {}
+
+		stamp = os.stat(self.file).st_mtime
+		if stamp != self.cached:
+			self.cached = stamp
+			f = open(self.file)
+			self.my_config = yaml.safe_load(f)
+			f.close()
+
+	def get_config(self):
+		return self.my_config
+
+
diff --git a/services/TS29222_CAPIF_Security_API/capif_security/controllers/__init__.py b/services/TS29222_CAPIF_Security_API/capif_security/controllers/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/services/TS29222_CAPIF_Security_API/capif_security/controllers/default_controller.py b/services/TS29222_CAPIF_Security_API/capif_security/controllers/default_controller.py
new file mode 100644
index 0000000000000000000000000000000000000000..aee7098c5de2963bb41ce27b110b5e0fbbd6394a
--- /dev/null
+++ b/services/TS29222_CAPIF_Security_API/capif_security/controllers/default_controller.py
@@ -0,0 +1,191 @@
+import connexion
+import six
+
+from capif_security.models.access_token_err import AccessTokenErr  # noqa: E501
+from capif_security.models.access_token_rsp import AccessTokenRsp  # noqa: E501
+from capif_security.models.access_token_req import AccessTokenReq  # noqa: E501
+from capif_security.models.security_notification import SecurityNotification  # noqa: E501
+from capif_security.models.service_security import ServiceSecurity  # noqa: E501
+from capif_security import util
+from ..core.servicesecurity import SecurityOperations
+from ..core.consumer_messager import Subscriber
+from ..core.publisher import Publisher
+import json
+from flask import Response, request, current_app
+from flask_jwt_extended import jwt_required, get_jwt_identity
+from ..encoder import JSONEncoder
+from ..models.problem_details import ProblemDetails
+import sys
+from cryptography import x509
+from cryptography.hazmat.backends import default_backend
+from ..core.validate_user import ControlAccess
+from functools import wraps
+import pymongo
+
+service_security_ops = SecurityOperations()
+publish_ops = Publisher()
+
+valid_user = ControlAccess()
+
+def cert_validation():
+    def _cert_validation(f):
+        @wraps(f)
+        def __cert_validation(*args, **kwargs):
+
+            args = request.view_args
+            cert_tmp = request.headers['X-Ssl-Client-Cert']
+            cert_raw = cert_tmp.replace('\t', '')
+
+            cert = x509.load_pem_x509_certificate(str.encode(cert_raw), default_backend())
+
+            cn = cert.subject.get_attributes_for_oid(x509.OID_COMMON_NAME)[0].value.strip()
+            current_app.logger.info(f"CN: {cn}")
+            if cn != "superadmin" and "AEF" not in cn :
+                cert_signature = cert.signature.hex()
+
+                if "securityId" in args:
+                    result = valid_user.validate_user_cert(args["securityId"], cert_signature)
+                else:
+                    result = valid_user.validate_user_cert(args["apiInvokerId"], cert_signature)
+
+                if result is not None:
+                    return result
+
+            result = f(**kwargs)
+            return result
+        return __cert_validation
+    return _cert_validation
+
+@cert_validation()
+def securities_security_id_token_post(security_id, body):  # noqa: E501
+    """securities_security_id_token_post
+
+     # noqa: E501
+
+    :param security_id: Identifier of an individual API invoker
+    :type security_id: str
+    :param grant_type:
+    :type grant_type: str
+    :param client_id:
+    :type client_id: str
+    :param client_secret:
+    :type client_secret: str
+    :param scope:
+    :type scope: str
+
+    :rtype: AccessTokenRsp
+    """
+
+    current_app.logger.info("Creating security token")
+    if connexion.request.is_json:
+        body = AccessTokenReq.from_dict(connexion.request.get_json())  # noqa: E501
+    res = service_security_ops.return_token(security_id, body)
+
+
+    return res
+
+@cert_validation()
+def trusted_invokers_api_invoker_id_delete(api_invoker_id):  # noqa: E501
+    """trusted_invokers_api_invoker_id_delete
+
+     # noqa: E501
+
+    :param api_invoker_id: Identifier of an individual API invoker
+    :type api_invoker_id: str
+
+    :rtype: None
+    """
+    current_app.logger.info("Removing security context")
+    return service_security_ops.delete_servicesecurity(api_invoker_id)
+
+@cert_validation()
+def trusted_invokers_api_invoker_id_delete_post(api_invoker_id, body):  # noqa: E501
+    """trusted_invokers_api_invoker_id_delete_post
+
+     # noqa: E501
+
+    :param api_invoker_id: Identifier of an individual API invoker
+    :type api_invoker_id: str
+    :param security_notification: Revoke the authorization of the API invoker for APIs.
+    :type security_notification: dict | bytes
+
+    :rtype: None
+    """
+
+    if connexion.request.is_json:
+        body = SecurityNotification.from_dict(connexion.request.get_json())  # noqa: E501
+
+    current_app.logger.info("Revoking permissions")
+    res = service_security_ops.revoke_api_authorization(api_invoker_id, body)
+    if res.status_code == 204:
+        current_app.logger.info("Permissions revoked")
+        publish_ops.publish_message("events", "API_INVOKER_AUTHORIZATION_REVOKED")
+
+    return res
+
+@cert_validation()
+def trusted_invokers_api_invoker_id_get(api_invoker_id, authentication_info=False, authorization_info=False):  # noqa: E501
+    """trusted_invokers_api_invoker_id_get
+
+     # noqa: E501
+
+    :param api_invoker_id: Identifier of an individual API invoker
+    :type api_invoker_id: str
+    :param authentication_info: When set to &#39;true&#39;, it indicates the CAPIF core function to send the authentication information of the API invoker. Set to false or omitted otherwise.
+    :type authentication_info: bool
+    :param authorization_info: When set to &#39;true&#39;, it indicates the CAPIF core function to send the authorization information of the API invoker. Set to false or omitted otherwise.
+    :type authorization_info: bool
+
+    :rtype: Union[ServiceSecurity, Tuple[ServiceSecurity, int], Tuple[ServiceSecurity, int, Dict[str, str]]
+    """
+
+    current_app.logger.info("Obtaining security context")
+    res = service_security_ops.get_servicesecurity(api_invoker_id, authentication_info, authorization_info)
+
+    return res
+
+@cert_validation()
+def trusted_invokers_api_invoker_id_put(api_invoker_id, body):  # noqa: E501
+    """trusted_invokers_api_invoker_id_put
+
+     # noqa: E501
+
+    :param api_invoker_id: Identifier of an individual API invoker
+    :type api_invoker_id: str
+    :param service_security: create a security context for an API invoker
+    :type service_security: dict | bytes
+
+    :rtype: Union[ServiceSecurity, Tuple[ServiceSecurity, int], Tuple[ServiceSecurity, int, Dict[str, str]]
+    """
+    current_app.logger.info("Creating security context")
+
+    if connexion.request.is_json:
+        body = ServiceSecurity.from_dict(connexion.request.get_json())  # noqa: E501
+    res = service_security_ops.create_servicesecurity(api_invoker_id, body)
+
+    if res.status_code == 201:
+        for service_instance in body.security_info:
+            if service_instance.api_id is not None:
+                publish_ops.publish_message("internal-messages", "security-context-created:"+api_invoker_id+":"+service_instance.api_id )
+
+    return res
+
+@cert_validation()
+def trusted_invokers_api_invoker_id_update_post(api_invoker_id, body):  # noqa: E501
+    """trusted_invokers_api_invoker_id_update_post
+
+     # noqa: E501
+
+    :param api_invoker_id: Identifier of an individual API invoker
+    :type api_invoker_id: str
+    :param service_security: Update the security context (e.g. re-negotiate the security methods).
+    :type service_security: dict | bytes
+
+    :rtype: ServiceSecurity
+    """
+    current_app.logger.info("Updating security context")
+
+    if connexion.request.is_json:
+        body = ServiceSecurity.from_dict(connexion.request.get_json())  # noqa: E501
+    res = service_security_ops.update_servicesecurity(api_invoker_id, body)
+    return res
diff --git a/services/TS29222_CAPIF_Security_API/capif_security/controllers/security_controller_.py b/services/TS29222_CAPIF_Security_API/capif_security/controllers/security_controller_.py
new file mode 100644
index 0000000000000000000000000000000000000000..6d294ffd6df1a26a469dbb4e72533b01503468dd
--- /dev/null
+++ b/services/TS29222_CAPIF_Security_API/capif_security/controllers/security_controller_.py
@@ -0,0 +1,2 @@
+from typing import List
+
diff --git a/services/TS29222_CAPIF_Security_API/capif_security/core/consumer_messager.py b/services/TS29222_CAPIF_Security_API/capif_security/core/consumer_messager.py
new file mode 100644
index 0000000000000000000000000000000000000000..fd9c328e47b82191780c4b88d69f4ab9fdd5b524
--- /dev/null
+++ b/services/TS29222_CAPIF_Security_API/capif_security/core/consumer_messager.py
@@ -0,0 +1,32 @@
+# subscriber.py
+import redis
+import time
+import sys
+import json
+import asyncio
+from threading import Thread
+from .internal_security_ops import InternalSecurityOps
+from flask import current_app
+
+class Subscriber():
+
+    def __init__(self):
+        self.r = redis.Redis(host='redis', port=6379, db=0)
+        self.security_ops = InternalSecurityOps()
+        self.p = self.r.pubsub()
+        self.p.subscribe("internal-messages", "acls-messages")
+
+    def listen(self):
+        current_app.logger.info("Listening security context messages")
+        for raw_message in self.p.listen():
+            if raw_message["type"] == "message" and raw_message["channel"].decode('utf-8') == "internal-messages":
+                message, *ids = raw_message["data"].decode('utf-8').split(":")
+                if message == "invoker-removed" and len(ids)>0:
+                    self.security_ops.delete_intern_servicesecurity(ids[0])
+                if message == "provider-removed" or message == "service-removed" and len(ids) > 0:
+                    self.security_ops.update_intern_servicesecurity(ids[0])
+                
+
+
+
+
diff --git a/services/TS29222_CAPIF_Security_API/capif_security/core/internal_security_ops.py b/services/TS29222_CAPIF_Security_API/capif_security/core/internal_security_ops.py
new file mode 100644
index 0000000000000000000000000000000000000000..d5cbd968beee2cae29b63b8ad679f0e6d776da1f
--- /dev/null
+++ b/services/TS29222_CAPIF_Security_API/capif_security/core/internal_security_ops.py
@@ -0,0 +1,22 @@
+
+from flask import current_app
+from .resources import Resource
+
+class InternalSecurityOps(Resource):
+
+    def delete_intern_servicesecurity(self, api_invoker_id):
+
+        mycol = self.db.get_col_by_name(self.db.security_info)
+        my_query = {'api_invoker_id': api_invoker_id}
+        mycol.delete_many(my_query)
+
+    def update_intern_servicesecurity(self, id):
+
+        security_col = self.db.get_col_by_name(self.db.security_info)
+
+        security_contexts = security_col.find({"$or":[{"security_info.aef_id":id}, {"security_info.api_id":id}]})
+
+        for security_context in security_contexts:
+            new_security_info = [info for info  in security_context["security_info"] if info["aef_id"]!=id and info["api_id"] != id]
+            security_context["security_info"] = new_security_info
+            security_col.update_one({'api_invoker_id':security_context["api_invoker_id"]}, {"$set":security_context})
diff --git a/services/TS29222_CAPIF_Security_API/capif_security/core/notification.py b/services/TS29222_CAPIF_Security_API/capif_security/core/notification.py
new file mode 100644
index 0000000000000000000000000000000000000000..5d69adc7b79d47ce637309e3046f3937856e58cc
--- /dev/null
+++ b/services/TS29222_CAPIF_Security_API/capif_security/core/notification.py
@@ -0,0 +1,14 @@
+import requests
+from ..encoder import JSONEncoder
+import sys
+import json
+
+class Notifications():
+
+    def send_notification(self, url, data):
+
+        self.request_post(url, data)
+
+    def request_post(self, url, data):
+        headers = {'content-type': 'application/json'}
+        return requests.post(url, json={'text': str(data.to_str())}, headers=headers)
\ No newline at end of file
diff --git a/services/TS29222_CAPIF_Security_API/capif_security/core/publisher.py b/services/TS29222_CAPIF_Security_API/capif_security/core/publisher.py
new file mode 100644
index 0000000000000000000000000000000000000000..f7b0c3c4b25f9abbe24d2dc734a72a93ffe0af01
--- /dev/null
+++ b/services/TS29222_CAPIF_Security_API/capif_security/core/publisher.py
@@ -0,0 +1,10 @@
+import redis
+import sys
+
+class Publisher():
+
+    def __init__(self):
+        self. r = redis.Redis(host='redis', port=6379, db=0)
+
+    def publish_message(self, channel, message):
+        self.r.publish(channel, message)
diff --git a/services/TS29222_CAPIF_Security_API/capif_security/core/resources.py b/services/TS29222_CAPIF_Security_API/capif_security/core/resources.py
new file mode 100644
index 0000000000000000000000000000000000000000..2ba2a0f944c9ff47009a2d461aafde25751fcd88
--- /dev/null
+++ b/services/TS29222_CAPIF_Security_API/capif_security/core/resources.py
@@ -0,0 +1,9 @@
+from abc import ABC, abstractmethod
+from ..db.db import MongoDatabse
+from .notification import Notifications
+
+class Resource(ABC):
+
+    def __init__(self):
+        self.db = MongoDatabse()
+        self.notification = Notifications()
\ No newline at end of file
diff --git a/services/TS29222_CAPIF_Security_API/capif_security/core/responses.py b/services/TS29222_CAPIF_Security_API/capif_security/core/responses.py
new file mode 100644
index 0000000000000000000000000000000000000000..26e82b68c92cc01fbd9682f119d5d6e3d58711a8
--- /dev/null
+++ b/services/TS29222_CAPIF_Security_API/capif_security/core/responses.py
@@ -0,0 +1,37 @@
+from ..models.problem_details import ProblemDetails
+from ..encoder import JSONEncoder
+from flask import Response
+import json
+from bson import json_util
+
+mimetype = "application/json"
+
+def make_response(object, status):
+    res = Response(json.dumps(object,  cls=JSONEncoder), status=status, mimetype=mimetype)
+
+    return res
+
+def internal_server_error(detail, cause):
+    prob = ProblemDetails(title="Internal Server Error", status=500, detail=detail, cause=cause)
+
+    return Response(json.dumps(prob, cls=JSONEncoder), status=500, mimetype=mimetype)
+
+def forbidden_error(detail, cause):
+    prob = ProblemDetails(title="Forbidden", status=403, detail=detail, cause=cause)
+
+    return Response(json.dumps(prob, cls=JSONEncoder), status=403, mimetype=mimetype)
+
+def bad_request_error(detail, cause, invalid_params):
+    prob = ProblemDetails(title="Bad Request", status=400, detail=detail, cause=cause, invalid_params=invalid_params)
+
+    return Response(json.dumps(prob, cls=JSONEncoder), status=400, mimetype=cause)
+
+def not_found_error(detail, cause):
+    prob = ProblemDetails(title="Not Found", status=404, detail=detail, cause=cause)
+
+    return Response(json.dumps(prob, cls=JSONEncoder), status=404, mimetype=mimetype)
+
+def unauthorized_error(detail, cause):
+    prob = ProblemDetails(title="Unauthorized", status=401, detail=detail, cause=cause)
+
+    return Response(json.dumps(prob, cls=JSONEncoder), status=401, mimetype=mimetype)
\ No newline at end of file
diff --git a/services/TS29222_CAPIF_Security_API/capif_security/core/servicesecurity.py b/services/TS29222_CAPIF_Security_API/capif_security/core/servicesecurity.py
new file mode 100644
index 0000000000000000000000000000000000000000..69475ac99a1d3fd4fca004bea2e98913571e2e68
--- /dev/null
+++ b/services/TS29222_CAPIF_Security_API/capif_security/core/servicesecurity.py
@@ -0,0 +1,376 @@
+import sys
+
+import pymongo
+from pymongo import ReturnDocument
+import secrets
+import re
+import rfc3987
+from flask import current_app, Flask, Response
+from flask_jwt_extended import create_access_token
+from datetime import datetime, timedelta
+import json
+
+from ..db.db import MongoDatabse
+from ..encoder import JSONEncoder
+from ..models.problem_details import ProblemDetails
+from ..models.access_token_rsp import AccessTokenRsp
+from ..models.access_token_claims import AccessTokenClaims
+from bson import json_util
+import requests
+from ..core.publisher import Publisher
+from ..models.access_token_err import AccessTokenErr
+from ..models.service_security import ServiceSecurity
+from ..util import dict_to_camel_case, clean_empty
+from .responses import not_found_error, make_response, bad_request_error, internal_server_error, forbidden_error
+from .notification import Notifications
+from .resources import Resource
+import os
+
+publish_ops = Publisher()
+
+security_context_not_found_detail = "Security context not found"
+api_invoker_no_context_cause = "API Invoker has no security context"
+
+class SecurityOperations(Resource):
+
+    def __check_invoker(self, api_invoker_id):
+        invokers_col = self.db.get_col_by_name(self.db.capif_invokers)
+
+        current_app.logger.debug("Checking api invoker with id: " + api_invoker_id)
+        invoker =  invokers_col.find_one({"api_invoker_id": api_invoker_id})
+        if invoker is None:
+            current_app.logger.error("Invoker not found")
+            return not_found_error(detail="Invoker not found", cause="API Invoker not exists or invalid ID")
+
+        return None
+
+    def __check_scope(self, scope, security_context):
+
+        try:
+
+            current_app.logger.debug("Checking scope")
+            header = scope[0:4]
+            if header != "3gpp":
+                current_app.logger.error("Bad format scope")
+                token_error = AccessTokenErr(error="invalid_scope", error_description="The first characters must be '3gpp'")
+                return make_response(object=token_error, status=400)
+
+            _, body = scope.split("#")
+
+            capif_service_col = self.db.get_col_by_name(self.db.capif_service_col)
+            security_info = security_context["security_info"]
+            aef_security_context = [info["aef_id"] for info in security_info]
+
+            groups = body.split(";")
+            for group in groups:
+                aef_id, api_names = group.split(":")
+                if aef_id not in aef_security_context:
+                    current_app.logger.error("Bad format Scope, not valid aef id ")
+                    token_error = AccessTokenErr(error="invalid_scope", error_description="One of aef_id not belongs of your security context")
+                    return make_response(object=token_error, status=400)
+                api_names = api_names.split(",")
+                for api_name in api_names:
+                    service = capif_service_col.find_one({"$and": [{"api_name":api_name},{self.filter_aef_id:aef_id}]})
+                    if service is None:
+                        current_app.logger.error("Bad format Scope, not valid api name")
+                        token_error = AccessTokenErr(error="invalid_scope", error_description="One of the api names does not exist or is not associated with the aef id provided")
+                        return make_response(object=token_error, status=400)
+
+            return None
+
+        except Exception as e:
+            current_app.logger.error("Bad format Scope: " + e)
+            token_error = AccessTokenErr(error="invalid_scope", error_description="malformed scope")
+            return make_response(object=token_error, status=400)
+
+    def __init__(self):
+        Resource.__init__(self)
+        self.filter_aef_id = "aef_profiles.aef_id"
+
+    def get_servicesecurity(self, api_invoker_id, authentication_info=True, authorization_info=True):
+
+        mycol = self.db.get_col_by_name(self.db.security_info)
+
+        try:
+
+            current_app.logger.debug("Obtainig security context with id: " + api_invoker_id)
+            result = self.__check_invoker(api_invoker_id)
+            if result != None:
+                return result
+            else:
+                services_security_object = mycol.find_one({"api_invoker_id": api_invoker_id}, {"_id":0, "api_invoker_id":0})
+
+                if services_security_object is None:
+                    current_app.logger.error("Not found security context")
+                    return not_found_error(detail= security_context_not_found_detail, cause=api_invoker_no_context_cause)
+
+                if not authentication_info:
+                    for security_info_obj in services_security_object['security_info']:
+                        del security_info_obj['authentication_info']
+                if not authorization_info:
+                    for security_info_obj in services_security_object['security_info']:
+                        del security_info_obj['authorization_info']
+
+                properyly_json= json.dumps(services_security_object, default=json_util.default)
+                my_service_security = dict_to_camel_case(json.loads(properyly_json))
+                my_service_security = clean_empty(my_service_security)
+
+                current_app.logger.debug("Obtained security context from database")
+        
+                res = make_response(object=my_service_security, status=200)
+
+                return res
+        except Exception as e:
+            exception = "An exception occurred in get security info"
+            current_app.logger.error(exception + "::" + str(e))
+            return internal_server_error(detail=exception, cause=str(e))
+
+
+    def create_servicesecurity(self, api_invoker_id, service_security):
+
+        mycol = self.db.get_col_by_name(self.db.security_info)
+
+        try:
+
+            current_app.logger.debug("Creating security context")
+            result = self.__check_invoker(api_invoker_id)
+            if result != None:
+                return result
+
+            if rfc3987.match(service_security.notification_destination, rule="URI") is None:
+                current_app.logger.error("Bad url format")
+                return bad_request_error(detail="Bad Param", cause = "Detected Bad format of param", invalid_params=[{"param": "notificationDestination", "reason": "Not valid URL format"}])
+
+            services_security_object = mycol.find_one({"api_invoker_id": api_invoker_id})
+
+            if services_security_object is not None:
+
+                current_app.logger.error("Already security context defined with same api invoker id")
+                return forbidden_error(detail="Security method already defined", cause="Identical AEF Profile IDs")
+
+
+            for service_instance in service_security.security_info:
+                if service_instance.interface_details is not None:
+                    security_methods = service_instance.interface_details.security_methods
+                    pref_security_methods = service_instance.pref_security_methods
+                    valid_security_method = set(security_methods) & set(pref_security_methods)
+
+                else:
+                    capif_service_col = self.db.get_col_by_name(self.db.capif_service_col)
+                    services_security_object = capif_service_col.find_one({"api_id":service_instance.api_id, self.filter_aef_id: service_instance.aef_id}, {"aef_profiles.security_methods.$":1})
+
+                    if services_security_object is None:
+                        current_app.logger.error("Not found service with this aef id: " + service_instance.aef_id)
+                        return not_found_error(detail="Service with this aefId not found", cause="Not found Service")
+
+                    pref_security_methods = service_instance.pref_security_methods
+                    valid_security_methods = [security_method for array_methods in services_security_object["aef_profiles"] for security_method in array_methods["security_methods"]]
+                    valid_security_method = set(valid_security_methods) & set(pref_security_methods)
+
+                if len(list(valid_security_method)) == 0:
+                    current_app.logger.error("Not found comptaible security method with pref security method")
+                    return bad_request_error(detail="Not found compatible security method with pref security method", cause="Error pref security method", invalid_params=[{"param": "prefSecurityMethods", "reason": "pref security method not compatible with security method available"}])
+
+                service_instance.sel_security_method = list(valid_security_method)[0]
+                # Send service instance to ACL
+                current_app.logger.debug("Sending message to create ACL")
+                publish_ops.publish_message("acls-messages", "create-acl:"+str(api_invoker_id)+":"+str(service_instance.api_id)+":"+str(service_instance.aef_id))
+                current_app.logger.debug("Inserted security context in database")
+
+            rec = dict()
+            rec['api_invoker_id'] = api_invoker_id
+            rec.update(service_security.to_dict())
+            mycol.insert_one(rec)
+
+            res = make_response(object=service_security, status=201)
+            res.headers['Location'] = "https://{}/capif-security/v1/trustedInvokers/{}".format(os.getenv('CAPIF_HOSTNAME'),str(api_invoker_id))
+            return res
+
+        except Exception as e:
+            exception = "An exception occurred in create security info"
+            current_app.logger.error(exception + "::" + str(e))
+            return internal_server_error(detail=exception, cause=str(e))
+
+
+    def delete_servicesecurity(self, api_invoker_id):
+
+        mycol = self.db.get_col_by_name(self.db.security_info)
+
+        try:
+
+            current_app.logger.debug("Removing security context")
+
+            result = self.__check_invoker(api_invoker_id)
+            if result != None:
+                return result
+            else:
+                my_query = {'api_invoker_id': api_invoker_id}
+                services_security_count = mycol.count_documents(my_query)
+
+                if services_security_count == 0:
+                    current_app.logger.error(security_context_not_found_detail)
+                    return not_found_error(detail=security_context_not_found_detail, cause=api_invoker_no_context_cause)
+                
+                mycol.delete_many(my_query)
+
+                publish_ops.publish_message("acls-messages", "remove-acl:"+api_invoker_id)
+
+                current_app.logger.debug("Removed security context from database")
+                out= "The security info of Netapp with Netapp ID " + api_invoker_id + " were deleted.", 204
+                return make_response(out, status=204)
+
+        except Exception as e:
+            exception = "An exception occurred in create security info"
+            current_app.logger.error(exception + "::" + str(e))
+            return internal_server_error(detail=exception, cause = str(e))
+
+    def delete_intern_servicesecurity(self, api_invoker_id):
+
+        mycol = self.db.get_col_by_name(self.db.security_info)
+        my_query = {'api_invoker_id': api_invoker_id}
+        mycol.delete_many(my_query)
+
+    def return_token(self, security_id, access_token_req):
+
+        mycol = self.db.get_col_by_name(self.db.security_info)
+
+        try:
+
+            current_app.logger.debug("Generating access token")
+
+            invokers_col = self.db.get_col_by_name(self.db.capif_invokers)
+
+            current_app.logger.debug("Checking api invoker with id: " + access_token_req["client_id"])
+            invoker =  invokers_col.find_one({"api_invoker_id": access_token_req["client_id"]})
+            if invoker is None:
+                client_id_error =  AccessTokenErr(error="invalid_client", error_description="Client Id not found")
+                return make_response(object=client_id_error, status=400)
+
+
+            if access_token_req["grant_type"] != "client_credentials":
+                client_id_error =  AccessTokenErr(error="unsupported_grant_type", error_description="Invalid value for `grant_type` ({0}), must be one of ['client_credentials'] - 'grant_type'"
+                .format(access_token_req["grant_type"]))
+                return make_response(object=client_id_error, status=400)
+
+            service_security = mycol.find_one({"api_invoker_id": security_id})
+            if service_security is None:
+                current_app.logger.error("Not found securoty context with id: " + security_id)
+                return not_found_error(detail= security_context_not_found_detail, cause=api_invoker_no_context_cause)
+
+            result = self.__check_scope(access_token_req["scope"], service_security)
+
+            if result != None:
+                return result
+
+            expire_time = timedelta(minutes=10)
+            now=datetime.now()
+
+            claims = AccessTokenClaims(iss = access_token_req["client_id"], scope=access_token_req["scope"], exp=int((now+expire_time).timestamp()))
+            access_token = create_access_token(identity = access_token_req["client_id"] , additional_claims=claims.to_dict())
+            access_token_resp = AccessTokenRsp(access_token=access_token, token_type="Bearer", expires_in=int(expire_time.total_seconds()), scope=access_token_req["scope"])
+
+            current_app.logger.debug("Created access token")
+
+            res = make_response(object=access_token_resp, status=200)
+            return res
+        except Exception as e:
+            exception = "An exception occurred in return token"
+            current_app.logger.error(exception + "::" + str(e))
+            return internal_server_error(detail=exception, cause=str(e))
+
+
+    def update_servicesecurity(self, api_invoker_id, service_security):
+        mycol = self.db.get_col_by_name(self.db.security_info)
+        try:
+
+            current_app.logger.debug("Updating security context")
+            result = self.__check_invoker(api_invoker_id)
+            if result != None:
+                return result
+
+            old_object = mycol.find_one({"api_invoker_id": api_invoker_id})
+
+            if old_object is None:
+                current_app.logger.error("Service api not found with id: " + api_invoker_id)
+                return not_found_error(detail="Service API not existing", cause="Not exist securiy information for this invoker")
+
+            for service_instance in service_security.security_info:
+                if service_instance.interface_details is not None:
+                    security_methods = service_instance.interface_details.security_methods
+                    pref_security_methods = service_instance.pref_security_methods
+                    valid_security_method = set(security_methods) & set(pref_security_methods)
+                    service_instance.sel_security_method = list(valid_security_method)[0]
+                else:
+                    capif_service_col = self.db.get_col_by_name(self.db.capif_service_col)
+                    services_security_object = capif_service_col.find_one({self.filter_aef_id: service_instance.aef_id}, {"aef_profiles.security_methods.$":1})
+
+                    if services_security_object is None:
+                        current_app.logger.error("Service api with this aefId not found: " + service_instance.aef_id)
+                        return not_found_error(detail="Service with this aefId not found", cause="Not found Service")
+
+                    pref_security_methods = service_instance.pref_security_methods
+                    valid_security_methods = [security_method for array_methods in services_security_object["aef_profiles"] for security_method in array_methods["security_methods"]]
+                    valid_security_method = set(valid_security_methods) & set(pref_security_methods)
+                    service_instance.sel_security_method = list(valid_security_method)[0]
+
+            service_security = service_security.to_dict()
+            service_security = clean_empty(service_security)
+
+            result = mycol.find_one_and_update(old_object, {"$set":service_security}, projection={'_id': 0, "api_invoker_id":0},return_document=ReturnDocument.AFTER ,upsert=False)
+
+            result = clean_empty(result)
+
+            current_app.logger.debug("Updated security context")
+
+            res= make_response(object=dict_to_camel_case(result), status=200)
+            res.headers['Location'] = "https://${CAPIF_HOSTNAME}/capif-security/v1/trustedInvokers/" + str(
+                api_invoker_id)
+            return res
+        except Exception as e:
+            exception = "An exception occurred in update security info"
+            current_app.logger.error(exception + "::" + str(e))
+            return internal_server_error(detail=exception, cause=str(e))
+
+
+    def revoke_api_authorization(self, api_invoker_id, security_notification):
+
+        mycol = self.db.get_col_by_name(self.db.security_info)
+
+        try:
+
+            current_app.logger.debug("Revoking security context")
+            result = self.__check_invoker(api_invoker_id)
+            if result != None:
+                return result
+
+            my_query = {'api_invoker_id': api_invoker_id}
+            services_security_context = mycol.find_one(my_query)
+
+            if services_security_context is None:
+                current_app.logger.error(security_context_not_found_detail)
+                return not_found_error(detail=security_context_not_found_detail, cause=api_invoker_no_context_cause)
+
+            updated_security_context = services_security_context.copy()
+            for context in services_security_context["security_info"]:
+                index = services_security_context["security_info"].index(context)
+                if security_notification.aef_id == context["aef_id"] or context["api_id"] in security_notification.api_ids:
+                    current_app.logger.debug("Sending message.")
+                    publish_ops.publish_message("acls-messages", "remove-acl:"+str(api_invoker_id)+":"+str(context["api_id"])+":"+str(security_notification.aef_id))
+                    current_app.logger.debug("message sended.")
+                    updated_security_context["security_info"].pop(index)
+
+            mycol.replace_one(my_query, updated_security_context)
+
+            if len(updated_security_context["security_info"]) == 0:
+                mycol.delete_many(my_query)
+
+            #self.notification.send_notification(services_security_context["notification_destination"], security_notification)
+
+            current_app.logger.debug("Revoked security context")
+            out= "Netapp with ID " + api_invoker_id + " was revoked by some APIs.", 204
+            return make_response(out, status=204)
+
+        except Exception as e:
+            exception = "An exception occurred in revoke security auth"
+            current_app.logger.error(exception + "::" + str(e))
+            return internal_server_error(detail=exception, cause=str(e))
\ No newline at end of file
diff --git a/services/TS29222_CAPIF_Security_API/capif_security/core/validate_user.py b/services/TS29222_CAPIF_Security_API/capif_security/core/validate_user.py
new file mode 100644
index 0000000000000000000000000000000000000000..45ec5184b5dee5a886ddbe16fa3f00eeb5172a57
--- /dev/null
+++ b/services/TS29222_CAPIF_Security_API/capif_security/core/validate_user.py
@@ -0,0 +1,26 @@
+from flask import current_app, Response
+import json
+from ..models.problem_details import ProblemDetails
+from ..encoder import JSONEncoder
+from .resources import Resource
+from .responses import internal_server_error
+
+class ControlAccess(Resource):
+
+    def validate_user_cert(self, invoker_id, cert_signature):
+
+        cert_col = self.db.get_col_by_name(self.db.certs_col)
+
+        try:
+            my_query = {'id':invoker_id}
+            cert_entry = cert_col.find_one(my_query)
+
+            if cert_entry is not None:
+                if cert_entry["cert_signature"] != cert_signature:
+                    prob = ProblemDetails(title="Unauthorized", detail="User not authorized", cause="You are not the owner of this resource")
+                    return Response(json.dumps(prob, cls=JSONEncoder), status=401, mimetype="application/json")
+
+        except Exception as e:
+            exception = "An exception occurred in validate invoker"
+            current_app.logger.error(exception + "::" + str(e))
+            return internal_server_error(detail=exception, cause=str(e))
\ No newline at end of file
diff --git a/services/TS29222_CAPIF_Security_API/capif_security/db/db.py b/services/TS29222_CAPIF_Security_API/capif_security/db/db.py
new file mode 100644
index 0000000000000000000000000000000000000000..dbbb99e7899c2bb68867f1c3f99b869e578c1efa
--- /dev/null
+++ b/services/TS29222_CAPIF_Security_API/capif_security/db/db.py
@@ -0,0 +1,46 @@
+import atexit
+import time
+from pymongo import MongoClient
+from pymongo.errors import AutoReconnect
+from ..config import Config
+from bson.codec_options import CodecOptions
+import os
+from opentelemetry.instrumentation.pymongo import PymongoInstrumentor
+
+if eval(os.environ.get("MONITORING").lower().capitalize()):
+    PymongoInstrumentor().instrument()
+
+
+class MongoDatabse():
+
+    def __init__(self):
+        self.config = Config().get_config()
+        self.db = self.__connect()
+        self.security_info = self.config['mongo']['col']
+        self.capif_service_col = self.config['mongo']['capif_service_col']
+        self.capif_invokers = self.config['mongo']['capif_invokers']
+        self.certs_col = self.config['mongo']['certs_col']
+
+
+    def get_col_by_name(self, name):
+        return self.db[name].with_options(codec_options=CodecOptions(tz_aware=True))
+
+    def __connect(self, max_retries=3, retry_delay=1):
+        retries = 0
+        while retries < max_retries:
+            try:
+                uri = f"mongodb://{self.config['mongo']['user']}:{self.config['mongo']['password']}@" \
+                      f"{self.config['mongo']['host']}:{self.config['mongo']['port']}"
+                client = MongoClient(uri)
+                mydb = client[self.config['mongo']['db']]
+                mydb.command("ping")
+                return mydb
+            except AutoReconnect:
+                retries += 1
+                print(f"Reconnecting... Retry {retries} of {max_retries}")
+                time.sleep(retry_delay)
+        return None
+
+    def close_connection(self):
+        if self.db.client:
+            self.db.client.close()
diff --git a/services/TS29222_CAPIF_Security_API/capif_security/encoder.py b/services/TS29222_CAPIF_Security_API/capif_security/encoder.py
new file mode 100644
index 0000000000000000000000000000000000000000..9d6964e4ccb171ae9174d22c6d790d186f42cebf
--- /dev/null
+++ b/services/TS29222_CAPIF_Security_API/capif_security/encoder.py
@@ -0,0 +1,20 @@
+from connexion.apps.flask_app import FlaskJSONEncoder
+import six
+
+from capif_security.models.base_model_ import Model
+
+
+class JSONEncoder(FlaskJSONEncoder):
+    include_nulls = False
+
+    def default(self, o):
+        if isinstance(o, Model):
+            dikt = {}
+            for attr, _ in six.iteritems(o.openapi_types):
+                value = getattr(o, attr)
+                if value is None and not self.include_nulls:
+                    continue
+                attr = o.attribute_map[attr]
+                dikt[attr] = value
+            return dikt
+        return FlaskJSONEncoder.default(self, o)
diff --git a/services/TS29222_CAPIF_Security_API/capif_security/models/__init__.py b/services/TS29222_CAPIF_Security_API/capif_security/models/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..b6f04f81d8734f7d201c616cec329be0a4f775e5
--- /dev/null
+++ b/services/TS29222_CAPIF_Security_API/capif_security/models/__init__.py
@@ -0,0 +1,28 @@
+# coding: utf-8
+
+# flake8: noqa
+from __future__ import absolute_import
+# import models into model package
+from capif_security.models.access_token_claims import AccessTokenClaims
+from capif_security.models.access_token_err import AccessTokenErr
+from capif_security.models.access_token_err1 import AccessTokenErr1
+from capif_security.models.access_token_req1 import AccessTokenReq1
+from capif_security.models.access_token_rsp import AccessTokenRsp
+from capif_security.models.cause import Cause
+from capif_security.models.cause_any_of import CauseAnyOf
+from capif_security.models.interface_description import InterfaceDescription
+from capif_security.models.invalid_param import InvalidParam
+from capif_security.models.invalid_param1 import InvalidParam1
+from capif_security.models.nf_type import NFType
+from capif_security.models.nf_type_any_of import NFTypeAnyOf
+from capif_security.models.plmn_id import PlmnId
+from capif_security.models.plmn_id_nid import PlmnIdNid
+from capif_security.models.problem_details import ProblemDetails
+from capif_security.models.problem_details1 import ProblemDetails1
+from capif_security.models.security_information import SecurityInformation
+from capif_security.models.security_method import SecurityMethod
+from capif_security.models.security_method_any_of import SecurityMethodAnyOf
+from capif_security.models.security_notification import SecurityNotification
+from capif_security.models.service_security import ServiceSecurity
+from capif_security.models.snssai import Snssai
+from capif_security.models.websock_notif_config import WebsockNotifConfig
diff --git a/services/TS29222_CAPIF_Security_API/capif_security/models/access_token_claims.py b/services/TS29222_CAPIF_Security_API/capif_security/models/access_token_claims.py
new file mode 100644
index 0000000000000000000000000000000000000000..fc19f939827f68ed25c3bab7430346c56595944f
--- /dev/null
+++ b/services/TS29222_CAPIF_Security_API/capif_security/models/access_token_claims.py
@@ -0,0 +1,126 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_security.models.base_model_ import Model
+from capif_security import util
+
+
+class AccessTokenClaims(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, iss=None, scope=None, exp=None):  # noqa: E501
+        """AccessTokenClaims - a model defined in OpenAPI
+
+        :param iss: The iss of this AccessTokenClaims.  # noqa: E501
+        :type iss: str
+        :param scope: The scope of this AccessTokenClaims.  # noqa: E501
+        :type scope: str
+        :param exp: The exp of this AccessTokenClaims.  # noqa: E501
+        :type exp: int
+        """
+        self.openapi_types = {
+            'iss': str,
+            'scope': str,
+            'exp': int
+        }
+
+        self.attribute_map = {
+            'iss': 'iss',
+            'scope': 'scope',
+            'exp': 'exp'
+        }
+
+        self._iss = iss
+        self._scope = scope
+        self._exp = exp
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'AccessTokenClaims':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The AccessTokenClaims of this AccessTokenClaims.  # noqa: E501
+        :rtype: AccessTokenClaims
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def iss(self):
+        """Gets the iss of this AccessTokenClaims.
+
+
+        :return: The iss of this AccessTokenClaims.
+        :rtype: str
+        """
+        return self._iss
+
+    @iss.setter
+    def iss(self, iss):
+        """Sets the iss of this AccessTokenClaims.
+
+
+        :param iss: The iss of this AccessTokenClaims.
+        :type iss: str
+        """
+        if iss is None:
+            raise ValueError("Invalid value for `iss`, must not be `None`")  # noqa: E501
+
+        self._iss = iss
+
+    @property
+    def scope(self):
+        """Gets the scope of this AccessTokenClaims.
+
+
+        :return: The scope of this AccessTokenClaims.
+        :rtype: str
+        """
+        return self._scope
+
+    @scope.setter
+    def scope(self, scope):
+        """Sets the scope of this AccessTokenClaims.
+
+
+        :param scope: The scope of this AccessTokenClaims.
+        :type scope: str
+        """
+        if scope is None:
+            raise ValueError("Invalid value for `scope`, must not be `None`")  # noqa: E501
+
+        self._scope = scope
+
+    @property
+    def exp(self):
+        """Gets the exp of this AccessTokenClaims.
+
+        Unsigned integer identifying a period of time in units of seconds.  # noqa: E501
+
+        :return: The exp of this AccessTokenClaims.
+        :rtype: int
+        """
+        return self._exp
+
+    @exp.setter
+    def exp(self, exp):
+        """Sets the exp of this AccessTokenClaims.
+
+        Unsigned integer identifying a period of time in units of seconds.  # noqa: E501
+
+        :param exp: The exp of this AccessTokenClaims.
+        :type exp: int
+        """
+        if exp is None:
+            raise ValueError("Invalid value for `exp`, must not be `None`")  # noqa: E501
+        if exp is not None and exp < 0:  # noqa: E501
+            raise ValueError("Invalid value for `exp`, must be a value greater than or equal to `0`")  # noqa: E501
+
+        self._exp = exp
diff --git a/services/TS29222_CAPIF_Security_API/capif_security/models/access_token_err.py b/services/TS29222_CAPIF_Security_API/capif_security/models/access_token_err.py
new file mode 100644
index 0000000000000000000000000000000000000000..4423dcc7589123ad1064c573e97466ff5ab07103
--- /dev/null
+++ b/services/TS29222_CAPIF_Security_API/capif_security/models/access_token_err.py
@@ -0,0 +1,122 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_security.models.base_model_ import Model
+from capif_security import util
+
+
+class AccessTokenErr(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, error=None, error_description=None, error_uri=None):  # noqa: E501
+        """AccessTokenErr - a model defined in OpenAPI
+
+        :param error: The error of this AccessTokenErr.  # noqa: E501
+        :type error: str
+        :param error_description: The error_description of this AccessTokenErr.  # noqa: E501
+        :type error_description: str
+        :param error_uri: The error_uri of this AccessTokenErr.  # noqa: E501
+        :type error_uri: str
+        """
+        self.openapi_types = {
+            'error': str,
+            'error_description': str,
+            'error_uri': str
+        }
+
+        self.attribute_map = {
+            'error': 'error',
+            'error_description': 'error_description',
+            'error_uri': 'error_uri'
+        }
+
+        self._error = error
+        self._error_description = error_description
+        self._error_uri = error_uri
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'AccessTokenErr':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The AccessTokenErr of this AccessTokenErr.  # noqa: E501
+        :rtype: AccessTokenErr
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def error(self):
+        """Gets the error of this AccessTokenErr.
+
+
+        :return: The error of this AccessTokenErr.
+        :rtype: str
+        """
+        return self._error
+
+    @error.setter
+    def error(self, error):
+        """Sets the error of this AccessTokenErr.
+
+
+        :param error: The error of this AccessTokenErr.
+        :type error: str
+        """
+        allowed_values = ["invalid_request", "invalid_client", "invalid_grant", "unauthorized_client", "unsupported_grant_type", "invalid_scope"]  # noqa: E501
+        if error not in allowed_values:
+            raise ValueError(
+                "Invalid value for `error` ({0}), must be one of {1}"
+                .format(error, allowed_values)
+            )
+
+        self._error = error
+
+    @property
+    def error_description(self):
+        """Gets the error_description of this AccessTokenErr.
+
+
+        :return: The error_description of this AccessTokenErr.
+        :rtype: str
+        """
+        return self._error_description
+
+    @error_description.setter
+    def error_description(self, error_description):
+        """Sets the error_description of this AccessTokenErr.
+
+
+        :param error_description: The error_description of this AccessTokenErr.
+        :type error_description: str
+        """
+
+        self._error_description = error_description
+
+    @property
+    def error_uri(self):
+        """Gets the error_uri of this AccessTokenErr.
+
+
+        :return: The error_uri of this AccessTokenErr.
+        :rtype: str
+        """
+        return self._error_uri
+
+    @error_uri.setter
+    def error_uri(self, error_uri):
+        """Sets the error_uri of this AccessTokenErr.
+
+
+        :param error_uri: The error_uri of this AccessTokenErr.
+        :type error_uri: str
+        """
+
+        self._error_uri = error_uri
diff --git a/services/TS29222_CAPIF_Security_API/capif_security/models/access_token_err1.py b/services/TS29222_CAPIF_Security_API/capif_security/models/access_token_err1.py
new file mode 100644
index 0000000000000000000000000000000000000000..8d2253f8f01efc4ac4e01c25877b79ca40e6583d
--- /dev/null
+++ b/services/TS29222_CAPIF_Security_API/capif_security/models/access_token_err1.py
@@ -0,0 +1,122 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_security.models.base_model_ import Model
+from capif_security import util
+
+
+class AccessTokenErr1(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, error=None, error_description=None, error_uri=None):  # noqa: E501
+        """AccessTokenErr1 - a model defined in OpenAPI
+
+        :param error: The error of this AccessTokenErr1.  # noqa: E501
+        :type error: str
+        :param error_description: The error_description of this AccessTokenErr1.  # noqa: E501
+        :type error_description: str
+        :param error_uri: The error_uri of this AccessTokenErr1.  # noqa: E501
+        :type error_uri: str
+        """
+        self.openapi_types = {
+            'error': str,
+            'error_description': str,
+            'error_uri': str
+        }
+
+        self.attribute_map = {
+            'error': 'error',
+            'error_description': 'error_description',
+            'error_uri': 'error_uri'
+        }
+
+        self._error = error
+        self._error_description = error_description
+        self._error_uri = error_uri
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'AccessTokenErr1':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The AccessTokenErr_1 of this AccessTokenErr1.  # noqa: E501
+        :rtype: AccessTokenErr1
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def error(self):
+        """Gets the error of this AccessTokenErr1.
+
+
+        :return: The error of this AccessTokenErr1.
+        :rtype: str
+        """
+        return self._error
+
+    @error.setter
+    def error(self, error):
+        """Sets the error of this AccessTokenErr1.
+
+
+        :param error: The error of this AccessTokenErr1.
+        :type error: str
+        """
+        allowed_values = ["invalid_request", "invalid_client", "invalid_grant", "unauthorized_client", "unsupported_grant_type", "invalid_scope"]  # noqa: E501
+        if error not in allowed_values:
+            raise ValueError(
+                "Invalid value for `error` ({0}), must be one of {1}"
+                .format(error, allowed_values)
+            )
+
+        self._error = error
+
+    @property
+    def error_description(self):
+        """Gets the error_description of this AccessTokenErr1.
+
+
+        :return: The error_description of this AccessTokenErr1.
+        :rtype: str
+        """
+        return self._error_description
+
+    @error_description.setter
+    def error_description(self, error_description):
+        """Sets the error_description of this AccessTokenErr1.
+
+
+        :param error_description: The error_description of this AccessTokenErr1.
+        :type error_description: str
+        """
+
+        self._error_description = error_description
+
+    @property
+    def error_uri(self):
+        """Gets the error_uri of this AccessTokenErr1.
+
+
+        :return: The error_uri of this AccessTokenErr1.
+        :rtype: str
+        """
+        return self._error_uri
+
+    @error_uri.setter
+    def error_uri(self, error_uri):
+        """Sets the error_uri of this AccessTokenErr1.
+
+
+        :param error_uri: The error_uri of this AccessTokenErr1.
+        :type error_uri: str
+        """
+
+        self._error_uri = error_uri
diff --git a/services/TS29222_CAPIF_Security_API/capif_security/models/access_token_req.py b/services/TS29222_CAPIF_Security_API/capif_security/models/access_token_req.py
new file mode 100644
index 0000000000000000000000000000000000000000..5a8ec226809a1e5b63f8785413ed0966f78fe018
--- /dev/null
+++ b/services/TS29222_CAPIF_Security_API/capif_security/models/access_token_req.py
@@ -0,0 +1,151 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_security.models.base_model_ import Model
+from capif_security.models.access_token_err import AccessTokenErr
+from capif_security import util
+
+
+class AccessTokenReq(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, grant_type=None, client_id=None, client_secret=None, scope=None):  # noqa: E501
+        """AccessTokenReq - a model defined in OpenAPI
+
+        :param grant_type: The grant_type of this AccessTokenReq.  # noqa: E501
+        :type grant_type: str
+        :param client_id: The client_id of this AccessTokenReq.  # noqa: E501
+        :type client_id: str
+        :param client_secret: The client_secret of this AccessTokenReq.  # noqa: E501
+        :type client_secret: str
+        :param scope: The scope of this AccessTokenReq.  # noqa: E501
+        :type scope: str
+        """
+        self.openapi_types = {
+            'grant_type': str,
+            'client_id': str,
+            'client_secret': str,
+            'scope': str
+        }
+
+        self.attribute_map = {
+            'grant_type': 'grant_type',
+            'client_id': 'client_id',
+            'client_secret': 'client_secret',
+            'scope': 'scope'
+        }
+
+        self._grant_type = grant_type
+        self._client_id = client_id
+        self._client_secret = client_secret
+        self._scope = scope
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'AccessTokenReq':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The AccessTokenReq of this AccessTokenReq.  # noqa: E501
+        :rtype: AccessTokenReq
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def grant_type(self):
+        """Gets the grant_type of this AccessTokenReq.
+
+
+        :return: The grant_type of this AccessTokenReq.
+        :rtype: str
+        """
+        return self._grant_type
+
+    @grant_type.setter
+    def grant_type(self, grant_type):
+        """Sets the grant_type of this AccessTokenReq.
+
+
+        :param grant_type: The grant_type of this AccessTokenReq.
+        :type grant_type: str
+        """
+        allowed_values = ["client_credentials"]  # noqa: E501
+        if grant_type not in allowed_values:
+            raise ValueError(
+                "Invalid value for `grant_type` ({0}), must be one of {1}"
+                .format(grant_type, allowed_values)
+            )
+
+        self._grant_type = grant_type
+
+    @property
+    def client_id(self):
+        """Gets the client_id of this AccessTokenReq.
+
+
+        :return: The client_id of this AccessTokenReq.
+        :rtype: str
+        """
+        return self._client_id
+
+    @client_id.setter
+    def client_id(self, client_id):
+        """Sets the client_id of this AccessTokenReq.
+
+
+        :param client_id: The client_id of this AccessTokenReq.
+        :type client_id: str
+        """
+        if client_id is None:
+            raise ValueError("Invalid value for `client_id`, must not be `None`")  # noqa: E501
+
+        self._client_id = client_id
+
+    @property
+    def client_secret(self):
+        """Gets the client_secret of this AccessTokenReq.
+
+
+        :return: The client_secret of this AccessTokenReq.
+        :rtype: str
+        """
+        return self._client_secret
+
+    @client_secret.setter
+    def client_secret(self, client_secret):
+        """Sets the client_secret of this AccessTokenReq.
+
+
+        :param client_secret: The client_secret of this AccessTokenReq.
+        :type client_secret: str
+        """
+
+        self._client_secret = client_secret
+
+    @property
+    def scope(self):
+        """Gets the scope of this AccessTokenReq.
+
+
+        :return: The scope of this AccessTokenReq.
+        :rtype: str
+        """
+        return self._scope
+
+    @scope.setter
+    def scope(self, scope):
+        """Sets the scope of this AccessTokenReq.
+
+
+        :param scope: The scope of this AccessTokenReq.
+        :type scope: str
+        """
+
+        self._scope = scope
diff --git a/services/TS29222_CAPIF_Security_API/capif_security/models/access_token_req1.py b/services/TS29222_CAPIF_Security_API/capif_security/models/access_token_req1.py
new file mode 100644
index 0000000000000000000000000000000000000000..b119e9c138d87e776a3dd8210fda8751fb35c43c
--- /dev/null
+++ b/services/TS29222_CAPIF_Security_API/capif_security/models/access_token_req1.py
@@ -0,0 +1,559 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_security.models.base_model_ import Model
+from capif_security.models.nf_type import NFType
+from capif_security.models.plmn_id import PlmnId
+from capif_security.models.plmn_id_nid import PlmnIdNid
+from capif_security.models.snssai import Snssai
+import re
+from capif_security import util
+
+from capif_security.models.nf_type import NFType  # noqa: E501
+from capif_security.models.access_token_err import  AccessTokenErr
+from capif_security.models.plmn_id import PlmnId  # noqa: E501
+from capif_security.models.plmn_id_nid import PlmnIdNid  # noqa: E501
+from capif_security.models.snssai import Snssai  # noqa: E501
+import re  # noqa: E501
+
+class AccessTokenReq1(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, grant_type=None, nf_instance_id=None, nf_type=None, target_nf_type=None, scope=None, target_nf_instance_id=None, requester_plmn=None, requester_plmn_list=None, requester_snssai_list=None, requester_fqdn=None, requester_snpn_list=None, target_plmn=None, target_snssai_list=None, target_nsi_list=None, target_nf_set_id=None, target_nf_service_set_id=None, hnrf_access_token_uri=None, source_nf_instance_id=None):  # noqa: E501
+        """AccessTokenReq1 - a model defined in OpenAPI
+
+        :param grant_type: The grant_type of this AccessTokenReq1.  # noqa: E501
+        :type grant_type: str
+        :param nf_instance_id: The nf_instance_id of this AccessTokenReq1.  # noqa: E501
+        :type nf_instance_id: str
+        :param nf_type: The nf_type of this AccessTokenReq1.  # noqa: E501
+        :type nf_type: NFType
+        :param target_nf_type: The target_nf_type of this AccessTokenReq1.  # noqa: E501
+        :type target_nf_type: NFType
+        :param scope: The scope of this AccessTokenReq1.  # noqa: E501
+        :type scope: str
+        :param target_nf_instance_id: The target_nf_instance_id of this AccessTokenReq1.  # noqa: E501
+        :type target_nf_instance_id: str
+        :param requester_plmn: The requester_plmn of this AccessTokenReq1.  # noqa: E501
+        :type requester_plmn: PlmnId
+        :param requester_plmn_list: The requester_plmn_list of this AccessTokenReq1.  # noqa: E501
+        :type requester_plmn_list: List[PlmnId]
+        :param requester_snssai_list: The requester_snssai_list of this AccessTokenReq1.  # noqa: E501
+        :type requester_snssai_list: List[Snssai]
+        :param requester_fqdn: The requester_fqdn of this AccessTokenReq1.  # noqa: E501
+        :type requester_fqdn: str
+        :param requester_snpn_list: The requester_snpn_list of this AccessTokenReq1.  # noqa: E501
+        :type requester_snpn_list: List[PlmnIdNid]
+        :param target_plmn: The target_plmn of this AccessTokenReq1.  # noqa: E501
+        :type target_plmn: PlmnId
+        :param target_snssai_list: The target_snssai_list of this AccessTokenReq1.  # noqa: E501
+        :type target_snssai_list: List[Snssai]
+        :param target_nsi_list: The target_nsi_list of this AccessTokenReq1.  # noqa: E501
+        :type target_nsi_list: List[str]
+        :param target_nf_set_id: The target_nf_set_id of this AccessTokenReq1.  # noqa: E501
+        :type target_nf_set_id: str
+        :param target_nf_service_set_id: The target_nf_service_set_id of this AccessTokenReq1.  # noqa: E501
+        :type target_nf_service_set_id: str
+        :param hnrf_access_token_uri: The hnrf_access_token_uri of this AccessTokenReq1.  # noqa: E501
+        :type hnrf_access_token_uri: str
+        :param source_nf_instance_id: The source_nf_instance_id of this AccessTokenReq1.  # noqa: E501
+        :type source_nf_instance_id: str
+        """
+        self.openapi_types = {
+            'grant_type': str,
+            'nf_instance_id': str,
+            'nf_type': NFType,
+            'target_nf_type': NFType,
+            'scope': str,
+            'target_nf_instance_id': str,
+            'requester_plmn': PlmnId,
+            'requester_plmn_list': List[PlmnId],
+            'requester_snssai_list': List[Snssai],
+            'requester_fqdn': str,
+            'requester_snpn_list': List[PlmnIdNid],
+            'target_plmn': PlmnId,
+            'target_snssai_list': List[Snssai],
+            'target_nsi_list': List[str],
+            'target_nf_set_id': str,
+            'target_nf_service_set_id': str,
+            'hnrf_access_token_uri': str,
+            'source_nf_instance_id': str
+        }
+
+        self.attribute_map = {
+            'grant_type': 'grant_type',
+            'nf_instance_id': 'nfInstanceId',
+            'nf_type': 'nfType',
+            'target_nf_type': 'targetNfType',
+            'scope': 'scope',
+            'target_nf_instance_id': 'targetNfInstanceId',
+            'requester_plmn': 'requesterPlmn',
+            'requester_plmn_list': 'requesterPlmnList',
+            'requester_snssai_list': 'requesterSnssaiList',
+            'requester_fqdn': 'requesterFqdn',
+            'requester_snpn_list': 'requesterSnpnList',
+            'target_plmn': 'targetPlmn',
+            'target_snssai_list': 'targetSnssaiList',
+            'target_nsi_list': 'targetNsiList',
+            'target_nf_set_id': 'targetNfSetId',
+            'target_nf_service_set_id': 'targetNfServiceSetId',
+            'hnrf_access_token_uri': 'hnrfAccessTokenUri',
+            'source_nf_instance_id': 'sourceNfInstanceId'
+        }
+
+        self._grant_type = grant_type
+        self._nf_instance_id = nf_instance_id
+        self._nf_type = nf_type
+        self._target_nf_type = target_nf_type
+        self._scope = scope
+        self._target_nf_instance_id = target_nf_instance_id
+        self._requester_plmn = requester_plmn
+        self._requester_plmn_list = requester_plmn_list
+        self._requester_snssai_list = requester_snssai_list
+        self._requester_fqdn = requester_fqdn
+        self._requester_snpn_list = requester_snpn_list
+        self._target_plmn = target_plmn
+        self._target_snssai_list = target_snssai_list
+        self._target_nsi_list = target_nsi_list
+        self._target_nf_set_id = target_nf_set_id
+        self._target_nf_service_set_id = target_nf_service_set_id
+        self._hnrf_access_token_uri = hnrf_access_token_uri
+        self._source_nf_instance_id = source_nf_instance_id
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'AccessTokenReq1':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The AccessTokenReq_1 of this AccessTokenReq1.  # noqa: E501
+        :rtype: AccessTokenReq1
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def grant_type(self):
+        """Gets the grant_type of this AccessTokenReq1.
+
+
+        :return: The grant_type of this AccessTokenReq1.
+        :rtype: str
+        """
+        return self._grant_type
+
+    @grant_type.setter
+    def grant_type(self, grant_type):
+        """Sets the grant_type of this AccessTokenReq1.
+
+
+        :param grant_type: The grant_type of this AccessTokenReq1.
+        :type grant_type: str
+        """
+        allowed_values = ["client_credentials"]  # noqa: E501
+        if grant_type not in allowed_values:
+            raise ValueError(
+                "Invalid value for `grant_type` ({0}), must be one of {1}"
+                .format(grant_type, allowed_values)
+            )
+
+        self._grant_type = grant_type
+
+    @property
+    def nf_instance_id(self):
+        """Gets the nf_instance_id of this AccessTokenReq1.
+
+        String uniquely identifying a NF instance. The format of the NF Instance ID shall be a  Universally Unique Identifier (UUID) version 4, as described in IETF RFC 4122.    # noqa: E501
+
+        :return: The nf_instance_id of this AccessTokenReq1.
+        :rtype: str
+        """
+        return self._nf_instance_id
+
+    @nf_instance_id.setter
+    def nf_instance_id(self, nf_instance_id):
+        """Sets the nf_instance_id of this AccessTokenReq1.
+
+        String uniquely identifying a NF instance. The format of the NF Instance ID shall be a  Universally Unique Identifier (UUID) version 4, as described in IETF RFC 4122.    # noqa: E501
+
+        :param nf_instance_id: The nf_instance_id of this AccessTokenReq1.
+        :type nf_instance_id: str
+        """
+        if nf_instance_id is None:
+            raise ValueError("Invalid value for `nf_instance_id`, must not be `None`")  # noqa: E501
+
+        self._nf_instance_id = nf_instance_id
+
+    @property
+    def nf_type(self):
+        """Gets the nf_type of this AccessTokenReq1.
+
+
+        :return: The nf_type of this AccessTokenReq1.
+        :rtype: NFType
+        """
+        return self._nf_type
+
+    @nf_type.setter
+    def nf_type(self, nf_type):
+        """Sets the nf_type of this AccessTokenReq1.
+
+
+        :param nf_type: The nf_type of this AccessTokenReq1.
+        :type nf_type: NFType
+        """
+
+        self._nf_type = nf_type
+
+    @property
+    def target_nf_type(self):
+        """Gets the target_nf_type of this AccessTokenReq1.
+
+
+        :return: The target_nf_type of this AccessTokenReq1.
+        :rtype: NFType
+        """
+        return self._target_nf_type
+
+    @target_nf_type.setter
+    def target_nf_type(self, target_nf_type):
+        """Sets the target_nf_type of this AccessTokenReq1.
+
+
+        :param target_nf_type: The target_nf_type of this AccessTokenReq1.
+        :type target_nf_type: NFType
+        """
+
+        self._target_nf_type = target_nf_type
+
+    @property
+    def scope(self):
+        """Gets the scope of this AccessTokenReq1.
+
+
+        :return: The scope of this AccessTokenReq1.
+        :rtype: str
+        """
+        return self._scope
+
+    @scope.setter
+    def scope(self, scope):
+        """Sets the scope of this AccessTokenReq1.
+
+
+        :param scope: The scope of this AccessTokenReq1.
+        :type scope: str
+        """
+        if scope is None:
+            raise ValueError("Invalid value for `scope`, must not be `None`")  # noqa: E501
+        if scope is not None and not re.search(r'^([a-zA-Z0-9_:-]+)( [a-zA-Z0-9_:-]+)*$', scope):  # noqa: E501
+            raise ValueError("Invalid value for `scope`, must be a follow pattern or equal to `/^([a-zA-Z0-9_:-]+)( [a-zA-Z0-9_:-]+)*$/`")  # noqa: E501
+
+        self._scope = scope
+
+    @property
+    def target_nf_instance_id(self):
+        """Gets the target_nf_instance_id of this AccessTokenReq1.
+
+        String uniquely identifying a NF instance. The format of the NF Instance ID shall be a  Universally Unique Identifier (UUID) version 4, as described in IETF RFC 4122.    # noqa: E501
+
+        :return: The target_nf_instance_id of this AccessTokenReq1.
+        :rtype: str
+        """
+        return self._target_nf_instance_id
+
+    @target_nf_instance_id.setter
+    def target_nf_instance_id(self, target_nf_instance_id):
+        """Sets the target_nf_instance_id of this AccessTokenReq1.
+
+        String uniquely identifying a NF instance. The format of the NF Instance ID shall be a  Universally Unique Identifier (UUID) version 4, as described in IETF RFC 4122.    # noqa: E501
+
+        :param target_nf_instance_id: The target_nf_instance_id of this AccessTokenReq1.
+        :type target_nf_instance_id: str
+        """
+
+        self._target_nf_instance_id = target_nf_instance_id
+
+    @property
+    def requester_plmn(self):
+        """Gets the requester_plmn of this AccessTokenReq1.
+
+
+        :return: The requester_plmn of this AccessTokenReq1.
+        :rtype: PlmnId
+        """
+        return self._requester_plmn
+
+    @requester_plmn.setter
+    def requester_plmn(self, requester_plmn):
+        """Sets the requester_plmn of this AccessTokenReq1.
+
+
+        :param requester_plmn: The requester_plmn of this AccessTokenReq1.
+        :type requester_plmn: PlmnId
+        """
+
+        self._requester_plmn = requester_plmn
+
+    @property
+    def requester_plmn_list(self):
+        """Gets the requester_plmn_list of this AccessTokenReq1.
+
+
+        :return: The requester_plmn_list of this AccessTokenReq1.
+        :rtype: List[PlmnId]
+        """
+        return self._requester_plmn_list
+
+    @requester_plmn_list.setter
+    def requester_plmn_list(self, requester_plmn_list):
+        """Sets the requester_plmn_list of this AccessTokenReq1.
+
+
+        :param requester_plmn_list: The requester_plmn_list of this AccessTokenReq1.
+        :type requester_plmn_list: List[PlmnId]
+        """
+        if requester_plmn_list is not None and len(requester_plmn_list) < 2:
+            raise ValueError("Invalid value for `requester_plmn_list`, number of items must be greater than or equal to `2`")  # noqa: E501
+
+        self._requester_plmn_list = requester_plmn_list
+
+    @property
+    def requester_snssai_list(self):
+        """Gets the requester_snssai_list of this AccessTokenReq1.
+
+
+        :return: The requester_snssai_list of this AccessTokenReq1.
+        :rtype: List[Snssai]
+        """
+        return self._requester_snssai_list
+
+    @requester_snssai_list.setter
+    def requester_snssai_list(self, requester_snssai_list):
+        """Sets the requester_snssai_list of this AccessTokenReq1.
+
+
+        :param requester_snssai_list: The requester_snssai_list of this AccessTokenReq1.
+        :type requester_snssai_list: List[Snssai]
+        """
+        if requester_snssai_list is not None and len(requester_snssai_list) < 1:
+            raise ValueError("Invalid value for `requester_snssai_list`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._requester_snssai_list = requester_snssai_list
+
+    @property
+    def requester_fqdn(self):
+        """Gets the requester_fqdn of this AccessTokenReq1.
+
+        Fully Qualified Domain Name  # noqa: E501
+
+        :return: The requester_fqdn of this AccessTokenReq1.
+        :rtype: str
+        """
+        return self._requester_fqdn
+
+    @requester_fqdn.setter
+    def requester_fqdn(self, requester_fqdn):
+        """Sets the requester_fqdn of this AccessTokenReq1.
+
+        Fully Qualified Domain Name  # noqa: E501
+
+        :param requester_fqdn: The requester_fqdn of this AccessTokenReq1.
+        :type requester_fqdn: str
+        """
+        if requester_fqdn is not None and len(requester_fqdn) > 253:
+            raise ValueError("Invalid value for `requester_fqdn`, length must be less than or equal to `253`")  # noqa: E501
+        if requester_fqdn is not None and len(requester_fqdn) < 4:
+            raise ValueError("Invalid value for `requester_fqdn`, length must be greater than or equal to `4`")  # noqa: E501
+        if requester_fqdn is not None and not re.search(r'^([0-9A-Za-z]([-0-9A-Za-z]{0,61}[0-9A-Za-z])?\.)+[A-Za-z]{2,63}\.?$', requester_fqdn):  # noqa: E501
+            raise ValueError("Invalid value for `requester_fqdn`, must be a follow pattern or equal to `/^([0-9A-Za-z]([-0-9A-Za-z]{0,61}[0-9A-Za-z])?\.)+[A-Za-z]{2,63}\.?$/`")  # noqa: E501
+
+        self._requester_fqdn = requester_fqdn
+
+    @property
+    def requester_snpn_list(self):
+        """Gets the requester_snpn_list of this AccessTokenReq1.
+
+
+        :return: The requester_snpn_list of this AccessTokenReq1.
+        :rtype: List[PlmnIdNid]
+        """
+        return self._requester_snpn_list
+
+    @requester_snpn_list.setter
+    def requester_snpn_list(self, requester_snpn_list):
+        """Sets the requester_snpn_list of this AccessTokenReq1.
+
+
+        :param requester_snpn_list: The requester_snpn_list of this AccessTokenReq1.
+        :type requester_snpn_list: List[PlmnIdNid]
+        """
+        if requester_snpn_list is not None and len(requester_snpn_list) < 1:
+            raise ValueError("Invalid value for `requester_snpn_list`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._requester_snpn_list = requester_snpn_list
+
+    @property
+    def target_plmn(self):
+        """Gets the target_plmn of this AccessTokenReq1.
+
+
+        :return: The target_plmn of this AccessTokenReq1.
+        :rtype: PlmnId
+        """
+        return self._target_plmn
+
+    @target_plmn.setter
+    def target_plmn(self, target_plmn):
+        """Sets the target_plmn of this AccessTokenReq1.
+
+
+        :param target_plmn: The target_plmn of this AccessTokenReq1.
+        :type target_plmn: PlmnId
+        """
+
+        self._target_plmn = target_plmn
+
+    @property
+    def target_snssai_list(self):
+        """Gets the target_snssai_list of this AccessTokenReq1.
+
+
+        :return: The target_snssai_list of this AccessTokenReq1.
+        :rtype: List[Snssai]
+        """
+        return self._target_snssai_list
+
+    @target_snssai_list.setter
+    def target_snssai_list(self, target_snssai_list):
+        """Sets the target_snssai_list of this AccessTokenReq1.
+
+
+        :param target_snssai_list: The target_snssai_list of this AccessTokenReq1.
+        :type target_snssai_list: List[Snssai]
+        """
+        if target_snssai_list is not None and len(target_snssai_list) < 1:
+            raise ValueError("Invalid value for `target_snssai_list`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._target_snssai_list = target_snssai_list
+
+    @property
+    def target_nsi_list(self):
+        """Gets the target_nsi_list of this AccessTokenReq1.
+
+
+        :return: The target_nsi_list of this AccessTokenReq1.
+        :rtype: List[str]
+        """
+        return self._target_nsi_list
+
+    @target_nsi_list.setter
+    def target_nsi_list(self, target_nsi_list):
+        """Sets the target_nsi_list of this AccessTokenReq1.
+
+
+        :param target_nsi_list: The target_nsi_list of this AccessTokenReq1.
+        :type target_nsi_list: List[str]
+        """
+        if target_nsi_list is not None and len(target_nsi_list) < 1:
+            raise ValueError("Invalid value for `target_nsi_list`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._target_nsi_list = target_nsi_list
+
+    @property
+    def target_nf_set_id(self):
+        """Gets the target_nf_set_id of this AccessTokenReq1.
+
+        NF Set Identifier (see clause 28.12 of 3GPP TS 23.003), formatted as the following string \"set<Set ID>.<nftype>set.5gc.mnc<MNC>.mcc<MCC>\", or  \"set<SetID>.<NFType>set.5gc.nid<NID>.mnc<MNC>.mcc<MCC>\" with  <MCC> encoded as defined in clause 5.4.2 (\"Mcc\" data type definition)  <MNC> encoding the Mobile Network Code part of the PLMN, comprising 3 digits.    If there are only 2 significant digits in the MNC, one \"0\" digit shall be inserted    at the left side to fill the 3 digits coding of MNC.  Pattern: '^[0-9]{3}$' <NFType> encoded as a value defined in Table 6.1.6.3.3-1 of 3GPP TS 29.510 but    with lower case characters <Set ID> encoded as a string of characters consisting of    alphabetic characters (A-Z and a-z), digits (0-9) and/or the hyphen (-) and that    shall end with either an alphabetic character or a digit.    # noqa: E501
+
+        :return: The target_nf_set_id of this AccessTokenReq1.
+        :rtype: str
+        """
+        return self._target_nf_set_id
+
+    @target_nf_set_id.setter
+    def target_nf_set_id(self, target_nf_set_id):
+        """Sets the target_nf_set_id of this AccessTokenReq1.
+
+        NF Set Identifier (see clause 28.12 of 3GPP TS 23.003), formatted as the following string \"set<Set ID>.<nftype>set.5gc.mnc<MNC>.mcc<MCC>\", or  \"set<SetID>.<NFType>set.5gc.nid<NID>.mnc<MNC>.mcc<MCC>\" with  <MCC> encoded as defined in clause 5.4.2 (\"Mcc\" data type definition)  <MNC> encoding the Mobile Network Code part of the PLMN, comprising 3 digits.    If there are only 2 significant digits in the MNC, one \"0\" digit shall be inserted    at the left side to fill the 3 digits coding of MNC.  Pattern: '^[0-9]{3}$' <NFType> encoded as a value defined in Table 6.1.6.3.3-1 of 3GPP TS 29.510 but    with lower case characters <Set ID> encoded as a string of characters consisting of    alphabetic characters (A-Z and a-z), digits (0-9) and/or the hyphen (-) and that    shall end with either an alphabetic character or a digit.    # noqa: E501
+
+        :param target_nf_set_id: The target_nf_set_id of this AccessTokenReq1.
+        :type target_nf_set_id: str
+        """
+
+        self._target_nf_set_id = target_nf_set_id
+
+    @property
+    def target_nf_service_set_id(self):
+        """Gets the target_nf_service_set_id of this AccessTokenReq1.
+
+        NF Service Set Identifier (see clause 28.12 of 3GPP TS 23.003) formatted as the following  string \"set<Set ID>.sn<Service Name>.nfi<NF Instance ID>.5gc.mnc<MNC>.mcc<MCC>\", or  \"set<SetID>.sn<ServiceName>.nfi<NFInstanceID>.5gc.nid<NID>.mnc<MNC>.mcc<MCC>\" with  <MCC> encoded as defined in clause 5.4.2 (\"Mcc\" data type definition)   <MNC> encoding the Mobile Network Code part of the PLMN, comprising 3 digits.    If there are only 2 significant digits in the MNC, one \"0\" digit shall be inserted    at the left side to fill the 3 digits coding of MNC.  Pattern: '^[0-9]{3}$' <NID> encoded as defined in clause 5.4.2 (\"Nid\" data type definition)  <NFInstanceId> encoded as defined in clause 5.3.2  <ServiceName> encoded as defined in 3GPP TS 29.510  <Set ID> encoded as a string of characters consisting of alphabetic    characters (A-Z and a-z), digits (0-9) and/or the hyphen (-) and that shall end    with either an alphabetic character or a digit.   # noqa: E501
+
+        :return: The target_nf_service_set_id of this AccessTokenReq1.
+        :rtype: str
+        """
+        return self._target_nf_service_set_id
+
+    @target_nf_service_set_id.setter
+    def target_nf_service_set_id(self, target_nf_service_set_id):
+        """Sets the target_nf_service_set_id of this AccessTokenReq1.
+
+        NF Service Set Identifier (see clause 28.12 of 3GPP TS 23.003) formatted as the following  string \"set<Set ID>.sn<Service Name>.nfi<NF Instance ID>.5gc.mnc<MNC>.mcc<MCC>\", or  \"set<SetID>.sn<ServiceName>.nfi<NFInstanceID>.5gc.nid<NID>.mnc<MNC>.mcc<MCC>\" with  <MCC> encoded as defined in clause 5.4.2 (\"Mcc\" data type definition)   <MNC> encoding the Mobile Network Code part of the PLMN, comprising 3 digits.    If there are only 2 significant digits in the MNC, one \"0\" digit shall be inserted    at the left side to fill the 3 digits coding of MNC.  Pattern: '^[0-9]{3}$' <NID> encoded as defined in clause 5.4.2 (\"Nid\" data type definition)  <NFInstanceId> encoded as defined in clause 5.3.2  <ServiceName> encoded as defined in 3GPP TS 29.510  <Set ID> encoded as a string of characters consisting of alphabetic    characters (A-Z and a-z), digits (0-9) and/or the hyphen (-) and that shall end    with either an alphabetic character or a digit.   # noqa: E501
+
+        :param target_nf_service_set_id: The target_nf_service_set_id of this AccessTokenReq1.
+        :type target_nf_service_set_id: str
+        """
+
+        self._target_nf_service_set_id = target_nf_service_set_id
+
+    @property
+    def hnrf_access_token_uri(self):
+        """Gets the hnrf_access_token_uri of this AccessTokenReq1.
+
+        String providing an URI formatted according to RFC 3986.  # noqa: E501
+
+        :return: The hnrf_access_token_uri of this AccessTokenReq1.
+        :rtype: str
+        """
+        return self._hnrf_access_token_uri
+
+    @hnrf_access_token_uri.setter
+    def hnrf_access_token_uri(self, hnrf_access_token_uri):
+        """Sets the hnrf_access_token_uri of this AccessTokenReq1.
+
+        String providing an URI formatted according to RFC 3986.  # noqa: E501
+
+        :param hnrf_access_token_uri: The hnrf_access_token_uri of this AccessTokenReq1.
+        :type hnrf_access_token_uri: str
+        """
+
+        self._hnrf_access_token_uri = hnrf_access_token_uri
+
+    @property
+    def source_nf_instance_id(self):
+        """Gets the source_nf_instance_id of this AccessTokenReq1.
+
+        String uniquely identifying a NF instance. The format of the NF Instance ID shall be a  Universally Unique Identifier (UUID) version 4, as described in IETF RFC 4122.    # noqa: E501
+
+        :return: The source_nf_instance_id of this AccessTokenReq1.
+        :rtype: str
+        """
+        return self._source_nf_instance_id
+
+    @source_nf_instance_id.setter
+    def source_nf_instance_id(self, source_nf_instance_id):
+        """Sets the source_nf_instance_id of this AccessTokenReq1.
+
+        String uniquely identifying a NF instance. The format of the NF Instance ID shall be a  Universally Unique Identifier (UUID) version 4, as described in IETF RFC 4122.    # noqa: E501
+
+        :param source_nf_instance_id: The source_nf_instance_id of this AccessTokenReq1.
+        :type source_nf_instance_id: str
+        """
+
+        self._source_nf_instance_id = source_nf_instance_id
diff --git a/services/TS29222_CAPIF_Security_API/capif_security/models/access_token_rsp.py b/services/TS29222_CAPIF_Security_API/capif_security/models/access_token_rsp.py
new file mode 100644
index 0000000000000000000000000000000000000000..57f672091915f03934c60f215bf8e1120c277f92
--- /dev/null
+++ b/services/TS29222_CAPIF_Security_API/capif_security/models/access_token_rsp.py
@@ -0,0 +1,158 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_security.models.base_model_ import Model
+from capif_security import util
+
+
+class AccessTokenRsp(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, access_token=None, token_type=None, expires_in=None, scope=None):  # noqa: E501
+        """AccessTokenRsp - a model defined in OpenAPI
+
+        :param access_token: The access_token of this AccessTokenRsp.  # noqa: E501
+        :type access_token: str
+        :param token_type: The token_type of this AccessTokenRsp.  # noqa: E501
+        :type token_type: str
+        :param expires_in: The expires_in of this AccessTokenRsp.  # noqa: E501
+        :type expires_in: int
+        :param scope: The scope of this AccessTokenRsp.  # noqa: E501
+        :type scope: str
+        """
+        self.openapi_types = {
+            'access_token': str,
+            'token_type': str,
+            'expires_in': int,
+            'scope': str
+        }
+
+        self.attribute_map = {
+            'access_token': 'access_token',
+            'token_type': 'token_type',
+            'expires_in': 'expires_in',
+            'scope': 'scope'
+        }
+
+        self._access_token = access_token
+        self._token_type = token_type
+        self._expires_in = expires_in
+        self._scope = scope
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'AccessTokenRsp':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The AccessTokenRsp of this AccessTokenRsp.  # noqa: E501
+        :rtype: AccessTokenRsp
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def access_token(self):
+        """Gets the access_token of this AccessTokenRsp.
+
+        JWS Compact Serialized representation of JWS signed JSON object (AccessTokenClaims)   # noqa: E501
+
+        :return: The access_token of this AccessTokenRsp.
+        :rtype: str
+        """
+        return self._access_token
+
+    @access_token.setter
+    def access_token(self, access_token):
+        """Sets the access_token of this AccessTokenRsp.
+
+        JWS Compact Serialized representation of JWS signed JSON object (AccessTokenClaims)   # noqa: E501
+
+        :param access_token: The access_token of this AccessTokenRsp.
+        :type access_token: str
+        """
+        if access_token is None:
+            raise ValueError("Invalid value for `access_token`, must not be `None`")  # noqa: E501
+
+        self._access_token = access_token
+
+    @property
+    def token_type(self):
+        """Gets the token_type of this AccessTokenRsp.
+
+
+        :return: The token_type of this AccessTokenRsp.
+        :rtype: str
+        """
+        return self._token_type
+
+    @token_type.setter
+    def token_type(self, token_type):
+        """Sets the token_type of this AccessTokenRsp.
+
+
+        :param token_type: The token_type of this AccessTokenRsp.
+        :type token_type: str
+        """
+        allowed_values = ["Bearer"]  # noqa: E501
+        if token_type not in allowed_values:
+            raise ValueError(
+                "Invalid value for `token_type` ({0}), must be one of {1}"
+                .format(token_type, allowed_values)
+            )
+
+        self._token_type = token_type
+
+    @property
+    def expires_in(self):
+        """Gets the expires_in of this AccessTokenRsp.
+
+        Unsigned integer identifying a period of time in units of seconds.  # noqa: E501
+
+        :return: The expires_in of this AccessTokenRsp.
+        :rtype: int
+        """
+        return self._expires_in
+
+    @expires_in.setter
+    def expires_in(self, expires_in):
+        """Sets the expires_in of this AccessTokenRsp.
+
+        Unsigned integer identifying a period of time in units of seconds.  # noqa: E501
+
+        :param expires_in: The expires_in of this AccessTokenRsp.
+        :type expires_in: int
+        """
+        if expires_in is None:
+            raise ValueError("Invalid value for `expires_in`, must not be `None`")  # noqa: E501
+        if expires_in is not None and expires_in < 0:  # noqa: E501
+            raise ValueError("Invalid value for `expires_in`, must be a value greater than or equal to `0`")  # noqa: E501
+
+        self._expires_in = expires_in
+
+    @property
+    def scope(self):
+        """Gets the scope of this AccessTokenRsp.
+
+
+        :return: The scope of this AccessTokenRsp.
+        :rtype: str
+        """
+        return self._scope
+
+    @scope.setter
+    def scope(self, scope):
+        """Sets the scope of this AccessTokenRsp.
+
+
+        :param scope: The scope of this AccessTokenRsp.
+        :type scope: str
+        """
+
+        self._scope = scope
diff --git a/services/TS29222_CAPIF_Security_API/capif_security/models/base_model_.py b/services/TS29222_CAPIF_Security_API/capif_security/models/base_model_.py
new file mode 100644
index 0000000000000000000000000000000000000000..e8f6832a8fcd634cbce20f587f531f2abf9b9680
--- /dev/null
+++ b/services/TS29222_CAPIF_Security_API/capif_security/models/base_model_.py
@@ -0,0 +1,69 @@
+import pprint
+
+import six
+import typing
+
+from capif_security import util
+
+T = typing.TypeVar('T')
+
+
+class Model():
+    # openapiTypes: The key is attribute name and the
+    # value is attribute type.
+    openapi_types: typing.Dict[str, type] = {}
+
+    # attributeMap: The key is attribute name and the
+    # value is json key in definition.
+    attribute_map: typing.Dict[str, str] = {}
+
+    @classmethod
+    def from_dict(cls: typing.Type[T], dikt) -> T:
+        """Returns the dict as a model"""
+        return util.deserialize_model(dikt, cls)
+
+    def to_dict(self):
+        """Returns the model properties as a dict
+
+        :rtype: dict
+        """
+        result = {}
+
+        for attr, _ in six.iteritems(self.openapi_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model
+
+        :rtype: str
+        """
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
diff --git a/services/TS29222_CAPIF_Security_API/capif_security/models/cause.py b/services/TS29222_CAPIF_Security_API/capif_security/models/cause.py
new file mode 100644
index 0000000000000000000000000000000000000000..a93f5a859ae9ddcb4416418b68404342336319a1
--- /dev/null
+++ b/services/TS29222_CAPIF_Security_API/capif_security/models/cause.py
@@ -0,0 +1,39 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_security.models.base_model_ import Model
+from capif_security.models.cause_any_of import CauseAnyOf
+from capif_security import util
+
+from capif_security.models.cause_any_of import CauseAnyOf  # noqa: E501
+
+class Cause(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self):  # noqa: E501
+        """Cause - a model defined in OpenAPI
+
+        """
+        self.openapi_types = {
+        }
+
+        self.attribute_map = {
+        }
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'Cause':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The Cause of this Cause.  # noqa: E501
+        :rtype: Cause
+        """
+        return util.deserialize_model(dikt, cls)
diff --git a/services/TS29222_CAPIF_Security_API/capif_security/models/cause_any_of.py b/services/TS29222_CAPIF_Security_API/capif_security/models/cause_any_of.py
new file mode 100644
index 0000000000000000000000000000000000000000..64b601ca5e26e34c65b36f65e9178be1965cd49c
--- /dev/null
+++ b/services/TS29222_CAPIF_Security_API/capif_security/models/cause_any_of.py
@@ -0,0 +1,42 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_security.models.base_model_ import Model
+from capif_security import util
+
+
+class CauseAnyOf(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    """
+    allowed enum values
+    """
+    OVERLIMIT_USAGE = "OVERLIMIT_USAGE"
+    UNEXPECTED_REASON = "UNEXPECTED_REASON"
+    def __init__(self):  # noqa: E501
+        """CauseAnyOf - a model defined in OpenAPI
+
+        """
+        self.openapi_types = {
+        }
+
+        self.attribute_map = {
+        }
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'CauseAnyOf':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The Cause_anyOf of this CauseAnyOf.  # noqa: E501
+        :rtype: CauseAnyOf
+        """
+        return util.deserialize_model(dikt, cls)
diff --git a/services/TS29222_CAPIF_Security_API/capif_security/models/interface_description.py b/services/TS29222_CAPIF_Security_API/capif_security/models/interface_description.py
new file mode 100644
index 0000000000000000000000000000000000000000..546ef7f13324cbc6a815a89b38ce0eac4b3fe728
--- /dev/null
+++ b/services/TS29222_CAPIF_Security_API/capif_security/models/interface_description.py
@@ -0,0 +1,158 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_security.models.base_model_ import Model
+from capif_security.models.security_method import SecurityMethod
+from capif_security import util
+
+from capif_security.models.security_method import SecurityMethod  # noqa: E501
+
+class InterfaceDescription(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, ipv4_addr=None, ipv6_addr=None, port=None, security_methods=None):  # noqa: E501
+        """InterfaceDescription - a model defined in OpenAPI
+
+        :param ipv4_addr: The ipv4_addr of this InterfaceDescription.  # noqa: E501
+        :type ipv4_addr: str
+        :param ipv6_addr: The ipv6_addr of this InterfaceDescription.  # noqa: E501
+        :type ipv6_addr: str
+        :param port: The port of this InterfaceDescription.  # noqa: E501
+        :type port: int
+        :param security_methods: The security_methods of this InterfaceDescription.  # noqa: E501
+        :type security_methods: List[SecurityMethod]
+        """
+        self.openapi_types = {
+            'ipv4_addr': str,
+            'ipv6_addr': str,
+            'port': int,
+            'security_methods': List[SecurityMethod]
+        }
+
+        self.attribute_map = {
+            'ipv4_addr': 'ipv4Addr',
+            'ipv6_addr': 'ipv6Addr',
+            'port': 'port',
+            'security_methods': 'securityMethods'
+        }
+
+        self._ipv4_addr = ipv4_addr
+        self._ipv6_addr = ipv6_addr
+        self._port = port
+        self._security_methods = security_methods
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'InterfaceDescription':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The InterfaceDescription of this InterfaceDescription.  # noqa: E501
+        :rtype: InterfaceDescription
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def ipv4_addr(self):
+        """Gets the ipv4_addr of this InterfaceDescription.
+
+        string identifying a Ipv4 address formatted in the \"dotted decimal\" notation as defined in IETF RFC 1166.  # noqa: E501
+
+        :return: The ipv4_addr of this InterfaceDescription.
+        :rtype: str
+        """
+        return self._ipv4_addr
+
+    @ipv4_addr.setter
+    def ipv4_addr(self, ipv4_addr):
+        """Sets the ipv4_addr of this InterfaceDescription.
+
+        string identifying a Ipv4 address formatted in the \"dotted decimal\" notation as defined in IETF RFC 1166.  # noqa: E501
+
+        :param ipv4_addr: The ipv4_addr of this InterfaceDescription.
+        :type ipv4_addr: str
+        """
+
+        self._ipv4_addr = ipv4_addr
+
+    @property
+    def ipv6_addr(self):
+        """Gets the ipv6_addr of this InterfaceDescription.
+
+        string identifying a Ipv6 address formatted according to clause 4 in IETF RFC 5952. The mixed Ipv4 Ipv6 notation according to clause 5 of IETF RFC 5952 shall not be used.  # noqa: E501
+
+        :return: The ipv6_addr of this InterfaceDescription.
+        :rtype: str
+        """
+        return self._ipv6_addr
+
+    @ipv6_addr.setter
+    def ipv6_addr(self, ipv6_addr):
+        """Sets the ipv6_addr of this InterfaceDescription.
+
+        string identifying a Ipv6 address formatted according to clause 4 in IETF RFC 5952. The mixed Ipv4 Ipv6 notation according to clause 5 of IETF RFC 5952 shall not be used.  # noqa: E501
+
+        :param ipv6_addr: The ipv6_addr of this InterfaceDescription.
+        :type ipv6_addr: str
+        """
+
+        self._ipv6_addr = ipv6_addr
+
+    @property
+    def port(self):
+        """Gets the port of this InterfaceDescription.
+
+        Unsigned integer with valid values between 0 and 65535.  # noqa: E501
+
+        :return: The port of this InterfaceDescription.
+        :rtype: int
+        """
+        return self._port
+
+    @port.setter
+    def port(self, port):
+        """Sets the port of this InterfaceDescription.
+
+        Unsigned integer with valid values between 0 and 65535.  # noqa: E501
+
+        :param port: The port of this InterfaceDescription.
+        :type port: int
+        """
+        if port is not None and port > 65535:  # noqa: E501
+            raise ValueError("Invalid value for `port`, must be a value less than or equal to `65535`")  # noqa: E501
+        if port is not None and port < 0:  # noqa: E501
+            raise ValueError("Invalid value for `port`, must be a value greater than or equal to `0`")  # noqa: E501
+
+        self._port = port
+
+    @property
+    def security_methods(self):
+        """Gets the security_methods of this InterfaceDescription.
+
+        Security methods supported by the interface, it take precedence over the security methods provided in AefProfile, for this specific interface.   # noqa: E501
+
+        :return: The security_methods of this InterfaceDescription.
+        :rtype: List[SecurityMethod]
+        """
+        return self._security_methods
+
+    @security_methods.setter
+    def security_methods(self, security_methods):
+        """Sets the security_methods of this InterfaceDescription.
+
+        Security methods supported by the interface, it take precedence over the security methods provided in AefProfile, for this specific interface.   # noqa: E501
+
+        :param security_methods: The security_methods of this InterfaceDescription.
+        :type security_methods: List[SecurityMethod]
+        """
+        if security_methods is not None and len(security_methods) < 1:
+            raise ValueError("Invalid value for `security_methods`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._security_methods = security_methods
diff --git a/services/TS29222_CAPIF_Security_API/capif_security/models/invalid_param.py b/services/TS29222_CAPIF_Security_API/capif_security/models/invalid_param.py
new file mode 100644
index 0000000000000000000000000000000000000000..3cf97a3174d311760870065c071bce2fb8b4d373
--- /dev/null
+++ b/services/TS29222_CAPIF_Security_API/capif_security/models/invalid_param.py
@@ -0,0 +1,96 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_security.models.base_model_ import Model
+from capif_security import util
+
+
+class InvalidParam(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, param=None, reason=None):  # noqa: E501
+        """InvalidParam - a model defined in OpenAPI
+
+        :param param: The param of this InvalidParam.  # noqa: E501
+        :type param: str
+        :param reason: The reason of this InvalidParam.  # noqa: E501
+        :type reason: str
+        """
+        self.openapi_types = {
+            'param': str,
+            'reason': str
+        }
+
+        self.attribute_map = {
+            'param': 'param',
+            'reason': 'reason'
+        }
+
+        self._param = param
+        self._reason = reason
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'InvalidParam':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The InvalidParam of this InvalidParam.  # noqa: E501
+        :rtype: InvalidParam
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def param(self):
+        """Gets the param of this InvalidParam.
+
+        Attribute's name encoded as a JSON Pointer, or header's name.  # noqa: E501
+
+        :return: The param of this InvalidParam.
+        :rtype: str
+        """
+        return self._param
+
+    @param.setter
+    def param(self, param):
+        """Sets the param of this InvalidParam.
+
+        Attribute's name encoded as a JSON Pointer, or header's name.  # noqa: E501
+
+        :param param: The param of this InvalidParam.
+        :type param: str
+        """
+        if param is None:
+            raise ValueError("Invalid value for `param`, must not be `None`")  # noqa: E501
+
+        self._param = param
+
+    @property
+    def reason(self):
+        """Gets the reason of this InvalidParam.
+
+        A human-readable reason, e.g. \"must be a positive integer\".  # noqa: E501
+
+        :return: The reason of this InvalidParam.
+        :rtype: str
+        """
+        return self._reason
+
+    @reason.setter
+    def reason(self, reason):
+        """Sets the reason of this InvalidParam.
+
+        A human-readable reason, e.g. \"must be a positive integer\".  # noqa: E501
+
+        :param reason: The reason of this InvalidParam.
+        :type reason: str
+        """
+
+        self._reason = reason
diff --git a/services/TS29222_CAPIF_Security_API/capif_security/models/invalid_param1.py b/services/TS29222_CAPIF_Security_API/capif_security/models/invalid_param1.py
new file mode 100644
index 0000000000000000000000000000000000000000..93fbd3a8f68884c1927e63632224ea122166101d
--- /dev/null
+++ b/services/TS29222_CAPIF_Security_API/capif_security/models/invalid_param1.py
@@ -0,0 +1,96 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_security.models.base_model_ import Model
+from capif_security import util
+
+
+class InvalidParam1(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, param=None, reason=None):  # noqa: E501
+        """InvalidParam1 - a model defined in OpenAPI
+
+        :param param: The param of this InvalidParam1.  # noqa: E501
+        :type param: str
+        :param reason: The reason of this InvalidParam1.  # noqa: E501
+        :type reason: str
+        """
+        self.openapi_types = {
+            'param': str,
+            'reason': str
+        }
+
+        self.attribute_map = {
+            'param': 'param',
+            'reason': 'reason'
+        }
+
+        self._param = param
+        self._reason = reason
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'InvalidParam1':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The InvalidParam_1 of this InvalidParam1.  # noqa: E501
+        :rtype: InvalidParam1
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def param(self):
+        """Gets the param of this InvalidParam1.
+
+        If the invalid parameter is an attribute in a JSON body, this IE shall contain the  attribute's name and shall be encoded as a JSON Pointer. If the invalid parameter is  an HTTP header, this IE shall be formatted as the concatenation of the string \"header \"  plus the name of such header. If the invalid parameter is a query parameter, this IE  shall be formatted as the concatenation of the string \"query \" plus the name of such  query parameter. If the invalid parameter is a variable part in the path of a resource  URI, this IE shall contain the name of the variable, including the symbols \"{\" and \"}\"  used in OpenAPI specification as the notation to represent variable path segments.   # noqa: E501
+
+        :return: The param of this InvalidParam1.
+        :rtype: str
+        """
+        return self._param
+
+    @param.setter
+    def param(self, param):
+        """Sets the param of this InvalidParam1.
+
+        If the invalid parameter is an attribute in a JSON body, this IE shall contain the  attribute's name and shall be encoded as a JSON Pointer. If the invalid parameter is  an HTTP header, this IE shall be formatted as the concatenation of the string \"header \"  plus the name of such header. If the invalid parameter is a query parameter, this IE  shall be formatted as the concatenation of the string \"query \" plus the name of such  query parameter. If the invalid parameter is a variable part in the path of a resource  URI, this IE shall contain the name of the variable, including the symbols \"{\" and \"}\"  used in OpenAPI specification as the notation to represent variable path segments.   # noqa: E501
+
+        :param param: The param of this InvalidParam1.
+        :type param: str
+        """
+        if param is None:
+            raise ValueError("Invalid value for `param`, must not be `None`")  # noqa: E501
+
+        self._param = param
+
+    @property
+    def reason(self):
+        """Gets the reason of this InvalidParam1.
+
+        A human-readable reason, e.g. \"must be a positive integer\". In cases involving failed  operations in a PATCH request, the reason string should identify the operation that  failed using the operation's array index to assist in correlation of the invalid  parameter with the failed operation, e.g.\" Replacement value invalid for attribute  (failed operation index= 4)\"   # noqa: E501
+
+        :return: The reason of this InvalidParam1.
+        :rtype: str
+        """
+        return self._reason
+
+    @reason.setter
+    def reason(self, reason):
+        """Sets the reason of this InvalidParam1.
+
+        A human-readable reason, e.g. \"must be a positive integer\". In cases involving failed  operations in a PATCH request, the reason string should identify the operation that  failed using the operation's array index to assist in correlation of the invalid  parameter with the failed operation, e.g.\" Replacement value invalid for attribute  (failed operation index= 4)\"   # noqa: E501
+
+        :param reason: The reason of this InvalidParam1.
+        :type reason: str
+        """
+
+        self._reason = reason
diff --git a/services/TS29222_CAPIF_Security_API/capif_security/models/nf_type.py b/services/TS29222_CAPIF_Security_API/capif_security/models/nf_type.py
new file mode 100644
index 0000000000000000000000000000000000000000..78c0598ebad4c74121a61b70b64882299f106777
--- /dev/null
+++ b/services/TS29222_CAPIF_Security_API/capif_security/models/nf_type.py
@@ -0,0 +1,39 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_security.models.base_model_ import Model
+from capif_security.models.nf_type_any_of import NFTypeAnyOf
+from capif_security import util
+
+from capif_security.models.nf_type_any_of import NFTypeAnyOf  # noqa: E501
+
+class NFType(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self):  # noqa: E501
+        """NFType - a model defined in OpenAPI
+
+        """
+        self.openapi_types = {
+        }
+
+        self.attribute_map = {
+        }
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'NFType':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The NFType of this NFType.  # noqa: E501
+        :rtype: NFType
+        """
+        return util.deserialize_model(dikt, cls)
diff --git a/services/TS29222_CAPIF_Security_API/capif_security/models/nf_type_any_of.py b/services/TS29222_CAPIF_Security_API/capif_security/models/nf_type_any_of.py
new file mode 100644
index 0000000000000000000000000000000000000000..5638ef9e24b3775e51cac83331dbb00f471688c7
--- /dev/null
+++ b/services/TS29222_CAPIF_Security_API/capif_security/models/nf_type_any_of.py
@@ -0,0 +1,95 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_security.models.base_model_ import Model
+from capif_security import util
+
+
+class NFTypeAnyOf(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    """
+    allowed enum values
+    """
+    NRF = "NRF"
+    UDM = "UDM"
+    AMF = "AMF"
+    SMF = "SMF"
+    AUSF = "AUSF"
+    NEF = "NEF"
+    PCF = "PCF"
+    SMSF = "SMSF"
+    NSSF = "NSSF"
+    UDR = "UDR"
+    LMF = "LMF"
+    GMLC = "GMLC"
+    _5G_EIR = "5G_EIR"
+    SEPP = "SEPP"
+    UPF = "UPF"
+    N3IWF = "N3IWF"
+    AF = "AF"
+    UDSF = "UDSF"
+    BSF = "BSF"
+    CHF = "CHF"
+    NWDAF = "NWDAF"
+    PCSCF = "PCSCF"
+    CBCF = "CBCF"
+    HSS = "HSS"
+    UCMF = "UCMF"
+    SOR_AF = "SOR_AF"
+    SPAF = "SPAF"
+    MME = "MME"
+    SCSAS = "SCSAS"
+    SCEF = "SCEF"
+    SCP = "SCP"
+    NSSAAF = "NSSAAF"
+    ICSCF = "ICSCF"
+    SCSCF = "SCSCF"
+    DRA = "DRA"
+    IMS_AS = "IMS_AS"
+    AANF = "AANF"
+    _5G_DDNMF = "5G_DDNMF"
+    NSACF = "NSACF"
+    MFAF = "MFAF"
+    EASDF = "EASDF"
+    DCCF = "DCCF"
+    MB_SMF = "MB_SMF"
+    TSCTSF = "TSCTSF"
+    ADRF = "ADRF"
+    GBA_BSF = "GBA_BSF"
+    CEF = "CEF"
+    MB_UPF = "MB_UPF"
+    NSWOF = "NSWOF"
+    PKMF = "PKMF"
+    MNPF = "MNPF"
+    SMS_GMSC = "SMS_GMSC"
+    SMS_IWMSC = "SMS_IWMSC"
+    MBSF = "MBSF"
+    MBSTF = "MBSTF"
+    def __init__(self):  # noqa: E501
+        """NFTypeAnyOf - a model defined in OpenAPI
+
+        """
+        self.openapi_types = {
+        }
+
+        self.attribute_map = {
+        }
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'NFTypeAnyOf':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The NFType_anyOf of this NFTypeAnyOf.  # noqa: E501
+        :rtype: NFTypeAnyOf
+        """
+        return util.deserialize_model(dikt, cls)
diff --git a/services/TS29222_CAPIF_Security_API/capif_security/models/plmn_id.py b/services/TS29222_CAPIF_Security_API/capif_security/models/plmn_id.py
new file mode 100644
index 0000000000000000000000000000000000000000..1a0dfce4c808720e2fbc1dc6f701294045876941
--- /dev/null
+++ b/services/TS29222_CAPIF_Security_API/capif_security/models/plmn_id.py
@@ -0,0 +1,104 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_security.models.base_model_ import Model
+import re
+from capif_security import util
+
+import re  # noqa: E501
+
+class PlmnId(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, mcc=None, mnc=None):  # noqa: E501
+        """PlmnId - a model defined in OpenAPI
+
+        :param mcc: The mcc of this PlmnId.  # noqa: E501
+        :type mcc: str
+        :param mnc: The mnc of this PlmnId.  # noqa: E501
+        :type mnc: str
+        """
+        self.openapi_types = {
+            'mcc': str,
+            'mnc': str
+        }
+
+        self.attribute_map = {
+            'mcc': 'mcc',
+            'mnc': 'mnc'
+        }
+
+        self._mcc = mcc
+        self._mnc = mnc
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'PlmnId':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The PlmnId of this PlmnId.  # noqa: E501
+        :rtype: PlmnId
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def mcc(self):
+        """Gets the mcc of this PlmnId.
+
+        Mobile Country Code part of the PLMN, comprising 3 digits, as defined in clause 9.3.3.5 of 3GPP TS 38.413.    # noqa: E501
+
+        :return: The mcc of this PlmnId.
+        :rtype: str
+        """
+        return self._mcc
+
+    @mcc.setter
+    def mcc(self, mcc):
+        """Sets the mcc of this PlmnId.
+
+        Mobile Country Code part of the PLMN, comprising 3 digits, as defined in clause 9.3.3.5 of 3GPP TS 38.413.    # noqa: E501
+
+        :param mcc: The mcc of this PlmnId.
+        :type mcc: str
+        """
+        if mcc is None:
+            raise ValueError("Invalid value for `mcc`, must not be `None`")  # noqa: E501
+        if mcc is not None and not re.search(r'^\d{3}$', mcc):  # noqa: E501
+            raise ValueError("Invalid value for `mcc`, must be a follow pattern or equal to `/^\d{3}$/`")  # noqa: E501
+
+        self._mcc = mcc
+
+    @property
+    def mnc(self):
+        """Gets the mnc of this PlmnId.
+
+        Mobile Network Code part of the PLMN, comprising 2 or 3 digits, as defined in clause 9.3.3.5 of 3GPP TS 38.413.  # noqa: E501
+
+        :return: The mnc of this PlmnId.
+        :rtype: str
+        """
+        return self._mnc
+
+    @mnc.setter
+    def mnc(self, mnc):
+        """Sets the mnc of this PlmnId.
+
+        Mobile Network Code part of the PLMN, comprising 2 or 3 digits, as defined in clause 9.3.3.5 of 3GPP TS 38.413.  # noqa: E501
+
+        :param mnc: The mnc of this PlmnId.
+        :type mnc: str
+        """
+        if mnc is None:
+            raise ValueError("Invalid value for `mnc`, must not be `None`")  # noqa: E501
+        if mnc is not None and not re.search(r'^\d{2,3}$', mnc):  # noqa: E501
+            raise ValueError("Invalid value for `mnc`, must be a follow pattern or equal to `/^\d{2,3}$/`")  # noqa: E501
+
+        self._mnc = mnc
diff --git a/services/TS29222_CAPIF_Security_API/capif_security/models/plmn_id_nid.py b/services/TS29222_CAPIF_Security_API/capif_security/models/plmn_id_nid.py
new file mode 100644
index 0000000000000000000000000000000000000000..bf2a0a424a21c3d174d0381251c70d97f5fc7c65
--- /dev/null
+++ b/services/TS29222_CAPIF_Security_API/capif_security/models/plmn_id_nid.py
@@ -0,0 +1,134 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_security.models.base_model_ import Model
+import re
+from capif_security import util
+
+import re  # noqa: E501
+
+class PlmnIdNid(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, mcc=None, mnc=None, nid=None):  # noqa: E501
+        """PlmnIdNid - a model defined in OpenAPI
+
+        :param mcc: The mcc of this PlmnIdNid.  # noqa: E501
+        :type mcc: str
+        :param mnc: The mnc of this PlmnIdNid.  # noqa: E501
+        :type mnc: str
+        :param nid: The nid of this PlmnIdNid.  # noqa: E501
+        :type nid: str
+        """
+        self.openapi_types = {
+            'mcc': str,
+            'mnc': str,
+            'nid': str
+        }
+
+        self.attribute_map = {
+            'mcc': 'mcc',
+            'mnc': 'mnc',
+            'nid': 'nid'
+        }
+
+        self._mcc = mcc
+        self._mnc = mnc
+        self._nid = nid
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'PlmnIdNid':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The PlmnIdNid of this PlmnIdNid.  # noqa: E501
+        :rtype: PlmnIdNid
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def mcc(self):
+        """Gets the mcc of this PlmnIdNid.
+
+        Mobile Country Code part of the PLMN, comprising 3 digits, as defined in clause 9.3.3.5 of 3GPP TS 38.413.    # noqa: E501
+
+        :return: The mcc of this PlmnIdNid.
+        :rtype: str
+        """
+        return self._mcc
+
+    @mcc.setter
+    def mcc(self, mcc):
+        """Sets the mcc of this PlmnIdNid.
+
+        Mobile Country Code part of the PLMN, comprising 3 digits, as defined in clause 9.3.3.5 of 3GPP TS 38.413.    # noqa: E501
+
+        :param mcc: The mcc of this PlmnIdNid.
+        :type mcc: str
+        """
+        if mcc is None:
+            raise ValueError("Invalid value for `mcc`, must not be `None`")  # noqa: E501
+        if mcc is not None and not re.search(r'^\d{3}$', mcc):  # noqa: E501
+            raise ValueError("Invalid value for `mcc`, must be a follow pattern or equal to `/^\d{3}$/`")  # noqa: E501
+
+        self._mcc = mcc
+
+    @property
+    def mnc(self):
+        """Gets the mnc of this PlmnIdNid.
+
+        Mobile Network Code part of the PLMN, comprising 2 or 3 digits, as defined in clause 9.3.3.5 of 3GPP TS 38.413.  # noqa: E501
+
+        :return: The mnc of this PlmnIdNid.
+        :rtype: str
+        """
+        return self._mnc
+
+    @mnc.setter
+    def mnc(self, mnc):
+        """Sets the mnc of this PlmnIdNid.
+
+        Mobile Network Code part of the PLMN, comprising 2 or 3 digits, as defined in clause 9.3.3.5 of 3GPP TS 38.413.  # noqa: E501
+
+        :param mnc: The mnc of this PlmnIdNid.
+        :type mnc: str
+        """
+        if mnc is None:
+            raise ValueError("Invalid value for `mnc`, must not be `None`")  # noqa: E501
+        if mnc is not None and not re.search(r'^\d{2,3}$', mnc):  # noqa: E501
+            raise ValueError("Invalid value for `mnc`, must be a follow pattern or equal to `/^\d{2,3}$/`")  # noqa: E501
+
+        self._mnc = mnc
+
+    @property
+    def nid(self):
+        """Gets the nid of this PlmnIdNid.
+
+        This represents the Network Identifier, which together with a PLMN ID is used to identify an SNPN (see 3GPP TS 23.003 and 3GPP TS 23.501 clause 5.30.2.1).    # noqa: E501
+
+        :return: The nid of this PlmnIdNid.
+        :rtype: str
+        """
+        return self._nid
+
+    @nid.setter
+    def nid(self, nid):
+        """Sets the nid of this PlmnIdNid.
+
+        This represents the Network Identifier, which together with a PLMN ID is used to identify an SNPN (see 3GPP TS 23.003 and 3GPP TS 23.501 clause 5.30.2.1).    # noqa: E501
+
+        :param nid: The nid of this PlmnIdNid.
+        :type nid: str
+        """
+        if nid is not None and not re.search(r'^[A-Fa-f0-9]{11}$', nid):  # noqa: E501
+            raise ValueError("Invalid value for `nid`, must be a follow pattern or equal to `/^[A-Fa-f0-9]{11}$/`")  # noqa: E501
+
+        self._nid = nid
diff --git a/services/TS29222_CAPIF_Security_API/capif_security/models/problem_details.py b/services/TS29222_CAPIF_Security_API/capif_security/models/problem_details.py
new file mode 100644
index 0000000000000000000000000000000000000000..e0708a28cc39caf494608faba1ef65bc507ead43
--- /dev/null
+++ b/services/TS29222_CAPIF_Security_API/capif_security/models/problem_details.py
@@ -0,0 +1,270 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_security.models.base_model_ import Model
+from capif_security.models.invalid_param import InvalidParam
+import re
+from capif_security import util
+
+from capif_security.models.invalid_param import InvalidParam  # noqa: E501
+import re  # noqa: E501
+
+class ProblemDetails(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, type=None, title=None, status=None, detail=None, instance=None, cause=None, invalid_params=None, supported_features=None):  # noqa: E501
+        """ProblemDetails - a model defined in OpenAPI
+
+        :param type: The type of this ProblemDetails.  # noqa: E501
+        :type type: str
+        :param title: The title of this ProblemDetails.  # noqa: E501
+        :type title: str
+        :param status: The status of this ProblemDetails.  # noqa: E501
+        :type status: int
+        :param detail: The detail of this ProblemDetails.  # noqa: E501
+        :type detail: str
+        :param instance: The instance of this ProblemDetails.  # noqa: E501
+        :type instance: str
+        :param cause: The cause of this ProblemDetails.  # noqa: E501
+        :type cause: str
+        :param invalid_params: The invalid_params of this ProblemDetails.  # noqa: E501
+        :type invalid_params: List[InvalidParam]
+        :param supported_features: The supported_features of this ProblemDetails.  # noqa: E501
+        :type supported_features: str
+        """
+        self.openapi_types = {
+            'type': str,
+            'title': str,
+            'status': int,
+            'detail': str,
+            'instance': str,
+            'cause': str,
+            'invalid_params': List[InvalidParam],
+            'supported_features': str
+        }
+
+        self.attribute_map = {
+            'type': 'type',
+            'title': 'title',
+            'status': 'status',
+            'detail': 'detail',
+            'instance': 'instance',
+            'cause': 'cause',
+            'invalid_params': 'invalidParams',
+            'supported_features': 'supportedFeatures'
+        }
+
+        self._type = type
+        self._title = title
+        self._status = status
+        self._detail = detail
+        self._instance = instance
+        self._cause = cause
+        self._invalid_params = invalid_params
+        self._supported_features = supported_features
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'ProblemDetails':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The ProblemDetails of this ProblemDetails.  # noqa: E501
+        :rtype: ProblemDetails
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def type(self):
+        """Gets the type of this ProblemDetails.
+
+        string providing an URI formatted according to IETF RFC 3986.  # noqa: E501
+
+        :return: The type of this ProblemDetails.
+        :rtype: str
+        """
+        return self._type
+
+    @type.setter
+    def type(self, type):
+        """Sets the type of this ProblemDetails.
+
+        string providing an URI formatted according to IETF RFC 3986.  # noqa: E501
+
+        :param type: The type of this ProblemDetails.
+        :type type: str
+        """
+
+        self._type = type
+
+    @property
+    def title(self):
+        """Gets the title of this ProblemDetails.
+
+        A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem.  # noqa: E501
+
+        :return: The title of this ProblemDetails.
+        :rtype: str
+        """
+        return self._title
+
+    @title.setter
+    def title(self, title):
+        """Sets the title of this ProblemDetails.
+
+        A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem.  # noqa: E501
+
+        :param title: The title of this ProblemDetails.
+        :type title: str
+        """
+
+        self._title = title
+
+    @property
+    def status(self):
+        """Gets the status of this ProblemDetails.
+
+        The HTTP status code for this occurrence of the problem.  # noqa: E501
+
+        :return: The status of this ProblemDetails.
+        :rtype: int
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """Sets the status of this ProblemDetails.
+
+        The HTTP status code for this occurrence of the problem.  # noqa: E501
+
+        :param status: The status of this ProblemDetails.
+        :type status: int
+        """
+
+        self._status = status
+
+    @property
+    def detail(self):
+        """Gets the detail of this ProblemDetails.
+
+        A human-readable explanation specific to this occurrence of the problem.  # noqa: E501
+
+        :return: The detail of this ProblemDetails.
+        :rtype: str
+        """
+        return self._detail
+
+    @detail.setter
+    def detail(self, detail):
+        """Sets the detail of this ProblemDetails.
+
+        A human-readable explanation specific to this occurrence of the problem.  # noqa: E501
+
+        :param detail: The detail of this ProblemDetails.
+        :type detail: str
+        """
+
+        self._detail = detail
+
+    @property
+    def instance(self):
+        """Gets the instance of this ProblemDetails.
+
+        string providing an URI formatted according to IETF RFC 3986.  # noqa: E501
+
+        :return: The instance of this ProblemDetails.
+        :rtype: str
+        """
+        return self._instance
+
+    @instance.setter
+    def instance(self, instance):
+        """Sets the instance of this ProblemDetails.
+
+        string providing an URI formatted according to IETF RFC 3986.  # noqa: E501
+
+        :param instance: The instance of this ProblemDetails.
+        :type instance: str
+        """
+
+        self._instance = instance
+
+    @property
+    def cause(self):
+        """Gets the cause of this ProblemDetails.
+
+        A machine-readable application error cause specific to this occurrence of the problem. This IE should be present and provide application-related error information, if available.  # noqa: E501
+
+        :return: The cause of this ProblemDetails.
+        :rtype: str
+        """
+        return self._cause
+
+    @cause.setter
+    def cause(self, cause):
+        """Sets the cause of this ProblemDetails.
+
+        A machine-readable application error cause specific to this occurrence of the problem. This IE should be present and provide application-related error information, if available.  # noqa: E501
+
+        :param cause: The cause of this ProblemDetails.
+        :type cause: str
+        """
+
+        self._cause = cause
+
+    @property
+    def invalid_params(self):
+        """Gets the invalid_params of this ProblemDetails.
+
+        Description of invalid parameters, for a request rejected due to invalid parameters.  # noqa: E501
+
+        :return: The invalid_params of this ProblemDetails.
+        :rtype: List[InvalidParam]
+        """
+        return self._invalid_params
+
+    @invalid_params.setter
+    def invalid_params(self, invalid_params):
+        """Sets the invalid_params of this ProblemDetails.
+
+        Description of invalid parameters, for a request rejected due to invalid parameters.  # noqa: E501
+
+        :param invalid_params: The invalid_params of this ProblemDetails.
+        :type invalid_params: List[InvalidParam]
+        """
+        if invalid_params is not None and len(invalid_params) < 1:
+            raise ValueError("Invalid value for `invalid_params`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._invalid_params = invalid_params
+
+    @property
+    def supported_features(self):
+        """Gets the supported_features of this ProblemDetails.
+
+        A string used to indicate the features supported by an API that is used as defined in clause  6.6 in 3GPP TS 29.500. The string shall contain a bitmask indicating supported features in  hexadecimal representation Each character in the string shall take a value of \"0\" to \"9\",  \"a\" to \"f\" or \"A\" to \"F\" and shall represent the support of 4 features as described in  table 5.2.2-3. The most significant character representing the highest-numbered features shall  appear first in the string, and the character representing features 1 to 4 shall appear last  in the string. The list of features and their numbering (starting with 1) are defined  separately for each API. If the string contains a lower number of characters than there are  defined features for an API, all features that would be represented by characters that are not  present in the string are not supported.   # noqa: E501
+
+        :return: The supported_features of this ProblemDetails.
+        :rtype: str
+        """
+        return self._supported_features
+
+    @supported_features.setter
+    def supported_features(self, supported_features):
+        """Sets the supported_features of this ProblemDetails.
+
+        A string used to indicate the features supported by an API that is used as defined in clause  6.6 in 3GPP TS 29.500. The string shall contain a bitmask indicating supported features in  hexadecimal representation Each character in the string shall take a value of \"0\" to \"9\",  \"a\" to \"f\" or \"A\" to \"F\" and shall represent the support of 4 features as described in  table 5.2.2-3. The most significant character representing the highest-numbered features shall  appear first in the string, and the character representing features 1 to 4 shall appear last  in the string. The list of features and their numbering (starting with 1) are defined  separately for each API. If the string contains a lower number of characters than there are  defined features for an API, all features that would be represented by characters that are not  present in the string are not supported.   # noqa: E501
+
+        :param supported_features: The supported_features of this ProblemDetails.
+        :type supported_features: str
+        """
+        if supported_features is not None and not re.search(r'^[A-Fa-f0-9]*$', supported_features):  # noqa: E501
+            raise ValueError("Invalid value for `supported_features`, must be a follow pattern or equal to `/^[A-Fa-f0-9]*$/`")  # noqa: E501
+
+        self._supported_features = supported_features
diff --git a/services/TS29222_CAPIF_Security_API/capif_security/models/problem_details1.py b/services/TS29222_CAPIF_Security_API/capif_security/models/problem_details1.py
new file mode 100644
index 0000000000000000000000000000000000000000..584e1a80d8e848abcb37c4a677be2ed084031049
--- /dev/null
+++ b/services/TS29222_CAPIF_Security_API/capif_security/models/problem_details1.py
@@ -0,0 +1,354 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_security.models.base_model_ import Model
+from capif_security.models.access_token_err1 import AccessTokenErr1
+from capif_security.models.access_token_req1 import AccessTokenReq1
+from capif_security.models.invalid_param1 import InvalidParam1
+import re
+from capif_security import util
+
+from capif_security.models.access_token_err1 import AccessTokenErr1  # noqa: E501
+from capif_security.models.access_token_req1 import AccessTokenReq1  # noqa: E501
+from capif_security.models.invalid_param1 import InvalidParam1  # noqa: E501
+import re  # noqa: E501
+
+class ProblemDetails1(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, type=None, title=None, status=None, detail=None, instance=None, cause=None, invalid_params=None, supported_features=None, access_token_error=None, access_token_request=None, nrf_id=None):  # noqa: E501
+        """ProblemDetails1 - a model defined in OpenAPI
+
+        :param type: The type of this ProblemDetails1.  # noqa: E501
+        :type type: str
+        :param title: The title of this ProblemDetails1.  # noqa: E501
+        :type title: str
+        :param status: The status of this ProblemDetails1.  # noqa: E501
+        :type status: int
+        :param detail: The detail of this ProblemDetails1.  # noqa: E501
+        :type detail: str
+        :param instance: The instance of this ProblemDetails1.  # noqa: E501
+        :type instance: str
+        :param cause: The cause of this ProblemDetails1.  # noqa: E501
+        :type cause: str
+        :param invalid_params: The invalid_params of this ProblemDetails1.  # noqa: E501
+        :type invalid_params: List[InvalidParam1]
+        :param supported_features: The supported_features of this ProblemDetails1.  # noqa: E501
+        :type supported_features: str
+        :param access_token_error: The access_token_error of this ProblemDetails1.  # noqa: E501
+        :type access_token_error: AccessTokenErr1
+        :param access_token_request: The access_token_request of this ProblemDetails1.  # noqa: E501
+        :type access_token_request: AccessTokenReq1
+        :param nrf_id: The nrf_id of this ProblemDetails1.  # noqa: E501
+        :type nrf_id: str
+        """
+        self.openapi_types = {
+            'type': str,
+            'title': str,
+            'status': int,
+            'detail': str,
+            'instance': str,
+            'cause': str,
+            'invalid_params': List[InvalidParam1],
+            'supported_features': str,
+            'access_token_error': AccessTokenErr1,
+            'access_token_request': AccessTokenReq1,
+            'nrf_id': str
+        }
+
+        self.attribute_map = {
+            'type': 'type',
+            'title': 'title',
+            'status': 'status',
+            'detail': 'detail',
+            'instance': 'instance',
+            'cause': 'cause',
+            'invalid_params': 'invalidParams',
+            'supported_features': 'supportedFeatures',
+            'access_token_error': 'accessTokenError',
+            'access_token_request': 'accessTokenRequest',
+            'nrf_id': 'nrfId'
+        }
+
+        self._type = type
+        self._title = title
+        self._status = status
+        self._detail = detail
+        self._instance = instance
+        self._cause = cause
+        self._invalid_params = invalid_params
+        self._supported_features = supported_features
+        self._access_token_error = access_token_error
+        self._access_token_request = access_token_request
+        self._nrf_id = nrf_id
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'ProblemDetails1':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The ProblemDetails_1 of this ProblemDetails1.  # noqa: E501
+        :rtype: ProblemDetails1
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def type(self):
+        """Gets the type of this ProblemDetails1.
+
+        String providing an URI formatted according to RFC 3986.  # noqa: E501
+
+        :return: The type of this ProblemDetails1.
+        :rtype: str
+        """
+        return self._type
+
+    @type.setter
+    def type(self, type):
+        """Sets the type of this ProblemDetails1.
+
+        String providing an URI formatted according to RFC 3986.  # noqa: E501
+
+        :param type: The type of this ProblemDetails1.
+        :type type: str
+        """
+
+        self._type = type
+
+    @property
+    def title(self):
+        """Gets the title of this ProblemDetails1.
+
+
+        :return: The title of this ProblemDetails1.
+        :rtype: str
+        """
+        return self._title
+
+    @title.setter
+    def title(self, title):
+        """Sets the title of this ProblemDetails1.
+
+
+        :param title: The title of this ProblemDetails1.
+        :type title: str
+        """
+
+        self._title = title
+
+    @property
+    def status(self):
+        """Gets the status of this ProblemDetails1.
+
+
+        :return: The status of this ProblemDetails1.
+        :rtype: int
+        """
+        return self._status
+
+    @status.setter
+    def status(self, status):
+        """Sets the status of this ProblemDetails1.
+
+
+        :param status: The status of this ProblemDetails1.
+        :type status: int
+        """
+
+        self._status = status
+
+    @property
+    def detail(self):
+        """Gets the detail of this ProblemDetails1.
+
+        A human-readable explanation specific to this occurrence of the problem.  # noqa: E501
+
+        :return: The detail of this ProblemDetails1.
+        :rtype: str
+        """
+        return self._detail
+
+    @detail.setter
+    def detail(self, detail):
+        """Sets the detail of this ProblemDetails1.
+
+        A human-readable explanation specific to this occurrence of the problem.  # noqa: E501
+
+        :param detail: The detail of this ProblemDetails1.
+        :type detail: str
+        """
+
+        self._detail = detail
+
+    @property
+    def instance(self):
+        """Gets the instance of this ProblemDetails1.
+
+        String providing an URI formatted according to RFC 3986.  # noqa: E501
+
+        :return: The instance of this ProblemDetails1.
+        :rtype: str
+        """
+        return self._instance
+
+    @instance.setter
+    def instance(self, instance):
+        """Sets the instance of this ProblemDetails1.
+
+        String providing an URI formatted according to RFC 3986.  # noqa: E501
+
+        :param instance: The instance of this ProblemDetails1.
+        :type instance: str
+        """
+
+        self._instance = instance
+
+    @property
+    def cause(self):
+        """Gets the cause of this ProblemDetails1.
+
+        A machine-readable application error cause specific to this occurrence of the problem.  This IE should be present and provide application-related error information, if available.   # noqa: E501
+
+        :return: The cause of this ProblemDetails1.
+        :rtype: str
+        """
+        return self._cause
+
+    @cause.setter
+    def cause(self, cause):
+        """Sets the cause of this ProblemDetails1.
+
+        A machine-readable application error cause specific to this occurrence of the problem.  This IE should be present and provide application-related error information, if available.   # noqa: E501
+
+        :param cause: The cause of this ProblemDetails1.
+        :type cause: str
+        """
+
+        self._cause = cause
+
+    @property
+    def invalid_params(self):
+        """Gets the invalid_params of this ProblemDetails1.
+
+
+        :return: The invalid_params of this ProblemDetails1.
+        :rtype: List[InvalidParam1]
+        """
+        return self._invalid_params
+
+    @invalid_params.setter
+    def invalid_params(self, invalid_params):
+        """Sets the invalid_params of this ProblemDetails1.
+
+
+        :param invalid_params: The invalid_params of this ProblemDetails1.
+        :type invalid_params: List[InvalidParam1]
+        """
+        if invalid_params is not None and len(invalid_params) < 1:
+            raise ValueError("Invalid value for `invalid_params`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._invalid_params = invalid_params
+
+    @property
+    def supported_features(self):
+        """Gets the supported_features of this ProblemDetails1.
+
+        A string used to indicate the features supported by an API that is used as defined in clause  6.6 in 3GPP TS 29.500. The string shall contain a bitmask indicating supported features in  hexadecimal representation Each character in the string shall take a value of \"0\" to \"9\",  \"a\" to \"f\" or \"A\" to \"F\" and shall represent the support of 4 features as described in  table 5.2.2-3. The most significant character representing the highest-numbered features shall  appear first in the string, and the character representing features 1 to 4 shall appear last  in the string. The list of features and their numbering (starting with 1) are defined  separately for each API. If the string contains a lower number of characters than there are  defined features for an API, all features that would be represented by characters that are not  present in the string are not supported.   # noqa: E501
+
+        :return: The supported_features of this ProblemDetails1.
+        :rtype: str
+        """
+        return self._supported_features
+
+    @supported_features.setter
+    def supported_features(self, supported_features):
+        """Sets the supported_features of this ProblemDetails1.
+
+        A string used to indicate the features supported by an API that is used as defined in clause  6.6 in 3GPP TS 29.500. The string shall contain a bitmask indicating supported features in  hexadecimal representation Each character in the string shall take a value of \"0\" to \"9\",  \"a\" to \"f\" or \"A\" to \"F\" and shall represent the support of 4 features as described in  table 5.2.2-3. The most significant character representing the highest-numbered features shall  appear first in the string, and the character representing features 1 to 4 shall appear last  in the string. The list of features and their numbering (starting with 1) are defined  separately for each API. If the string contains a lower number of characters than there are  defined features for an API, all features that would be represented by characters that are not  present in the string are not supported.   # noqa: E501
+
+        :param supported_features: The supported_features of this ProblemDetails1.
+        :type supported_features: str
+        """
+        if supported_features is not None and not re.search(r'^[A-Fa-f0-9]*$', supported_features):  # noqa: E501
+            raise ValueError("Invalid value for `supported_features`, must be a follow pattern or equal to `/^[A-Fa-f0-9]*$/`")  # noqa: E501
+
+        self._supported_features = supported_features
+
+    @property
+    def access_token_error(self):
+        """Gets the access_token_error of this ProblemDetails1.
+
+
+        :return: The access_token_error of this ProblemDetails1.
+        :rtype: AccessTokenErr1
+        """
+        return self._access_token_error
+
+    @access_token_error.setter
+    def access_token_error(self, access_token_error):
+        """Sets the access_token_error of this ProblemDetails1.
+
+
+        :param access_token_error: The access_token_error of this ProblemDetails1.
+        :type access_token_error: AccessTokenErr1
+        """
+
+        self._access_token_error = access_token_error
+
+    @property
+    def access_token_request(self):
+        """Gets the access_token_request of this ProblemDetails1.
+
+
+        :return: The access_token_request of this ProblemDetails1.
+        :rtype: AccessTokenReq1
+        """
+        return self._access_token_request
+
+    @access_token_request.setter
+    def access_token_request(self, access_token_request):
+        """Sets the access_token_request of this ProblemDetails1.
+
+
+        :param access_token_request: The access_token_request of this ProblemDetails1.
+        :type access_token_request: AccessTokenReq1
+        """
+
+        self._access_token_request = access_token_request
+
+    @property
+    def nrf_id(self):
+        """Gets the nrf_id of this ProblemDetails1.
+
+        Fully Qualified Domain Name  # noqa: E501
+
+        :return: The nrf_id of this ProblemDetails1.
+        :rtype: str
+        """
+        return self._nrf_id
+
+    @nrf_id.setter
+    def nrf_id(self, nrf_id):
+        """Sets the nrf_id of this ProblemDetails1.
+
+        Fully Qualified Domain Name  # noqa: E501
+
+        :param nrf_id: The nrf_id of this ProblemDetails1.
+        :type nrf_id: str
+        """
+        if nrf_id is not None and len(nrf_id) > 253:
+            raise ValueError("Invalid value for `nrf_id`, length must be less than or equal to `253`")  # noqa: E501
+        if nrf_id is not None and len(nrf_id) < 4:
+            raise ValueError("Invalid value for `nrf_id`, length must be greater than or equal to `4`")  # noqa: E501
+        if nrf_id is not None and not re.search(r'^([0-9A-Za-z]([-0-9A-Za-z]{0,61}[0-9A-Za-z])?\.)+[A-Za-z]{2,63}\.?$', nrf_id):  # noqa: E501
+            raise ValueError("Invalid value for `nrf_id`, must be a follow pattern or equal to `/^([0-9A-Za-z]([-0-9A-Za-z]{0,61}[0-9A-Za-z])?\.)+[A-Za-z]{2,63}\.?$/`")  # noqa: E501
+
+        self._nrf_id = nrf_id
diff --git a/services/TS29222_CAPIF_Security_API/capif_security/models/security_information.py b/services/TS29222_CAPIF_Security_API/capif_security/models/security_information.py
new file mode 100644
index 0000000000000000000000000000000000000000..07368ef2843564adba1a98cda7dd843fb6228b44
--- /dev/null
+++ b/services/TS29222_CAPIF_Security_API/capif_security/models/security_information.py
@@ -0,0 +1,239 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_security.models.base_model_ import Model
+from capif_security.models.interface_description import InterfaceDescription
+from capif_security.models.security_method import SecurityMethod
+from capif_security import util
+
+from capif_security.models.interface_description import InterfaceDescription  # noqa: E501
+from capif_security.models.security_method import SecurityMethod  # noqa: E501
+
+class SecurityInformation(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, interface_details=None, aef_id=None, api_id=None, pref_security_methods=None, sel_security_method=None, authentication_info=None, authorization_info=None):  # noqa: E501
+        """SecurityInformation - a model defined in OpenAPI
+
+        :param interface_details: The interface_details of this SecurityInformation.  # noqa: E501
+        :type interface_details: InterfaceDescription
+        :param aef_id: The aef_id of this SecurityInformation.  # noqa: E501
+        :type aef_id: str
+        :param api_id: The api_id of this SecurityInformation.  # noqa: E501
+        :type api_id: str
+        :param pref_security_methods: The pref_security_methods of this SecurityInformation.  # noqa: E501
+        :type pref_security_methods: List[SecurityMethod]
+        :param sel_security_method: The sel_security_method of this SecurityInformation.  # noqa: E501
+        :type sel_security_method: SecurityMethod
+        :param authentication_info: The authentication_info of this SecurityInformation.  # noqa: E501
+        :type authentication_info: str
+        :param authorization_info: The authorization_info of this SecurityInformation.  # noqa: E501
+        :type authorization_info: str
+        """
+        self.openapi_types = {
+            'interface_details': InterfaceDescription,
+            'aef_id': str,
+            'api_id': str,
+            'pref_security_methods': List[SecurityMethod],
+            'sel_security_method': SecurityMethod,
+            'authentication_info': str,
+            'authorization_info': str
+        }
+
+        self.attribute_map = {
+            'interface_details': 'interfaceDetails',
+            'aef_id': 'aefId',
+            'api_id': 'apiId',
+            'pref_security_methods': 'prefSecurityMethods',
+            'sel_security_method': 'selSecurityMethod',
+            'authentication_info': 'authenticationInfo',
+            'authorization_info': 'authorizationInfo'
+        }
+
+        self._interface_details = interface_details
+        self._aef_id = aef_id
+        self._api_id = api_id
+        self._pref_security_methods = pref_security_methods
+        self._sel_security_method = sel_security_method
+        self._authentication_info = authentication_info
+        self._authorization_info = authorization_info
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'SecurityInformation':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The SecurityInformation of this SecurityInformation.  # noqa: E501
+        :rtype: SecurityInformation
+        """
+        print(dikt)
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def interface_details(self):
+        """Gets the interface_details of this SecurityInformation.
+
+
+        :return: The interface_details of this SecurityInformation.
+        :rtype: InterfaceDescription
+        """
+        return self._interface_details
+
+    @interface_details.setter
+    def interface_details(self, interface_details):
+        """Sets the interface_details of this SecurityInformation.
+
+
+        :param interface_details: The interface_details of this SecurityInformation.
+        :type interface_details: InterfaceDescription
+        """
+
+        self._interface_details = interface_details
+
+    @property
+    def aef_id(self):
+        """Gets the aef_id of this SecurityInformation.
+
+        Identifier of the API exposing function  # noqa: E501
+
+        :return: The aef_id of this SecurityInformation.
+        :rtype: str
+        """
+        return self._aef_id
+
+    @aef_id.setter
+    def aef_id(self, aef_id):
+        """Sets the aef_id of this SecurityInformation.
+
+        Identifier of the API exposing function  # noqa: E501
+
+        :param aef_id: The aef_id of this SecurityInformation.
+        :type aef_id: str
+        """
+
+        self._aef_id = aef_id
+
+    @property
+    def api_id(self):
+        """Gets the api_id of this SecurityInformation.
+
+        API identifier  # noqa: E501
+
+        :return: The api_id of this SecurityInformation.
+        :rtype: str
+        """
+        return self._api_id
+
+    @api_id.setter
+    def api_id(self, api_id):
+        """Sets the api_id of this SecurityInformation.
+
+        API identifier  # noqa: E501
+
+        :param api_id: The api_id of this SecurityInformation.
+        :type api_id: str
+        """
+
+        self._api_id = api_id
+
+    @property
+    def pref_security_methods(self):
+        """Gets the pref_security_methods of this SecurityInformation.
+
+        Security methods preferred by the API invoker for the API interface.  # noqa: E501
+
+        :return: The pref_security_methods of this SecurityInformation.
+        :rtype: List[SecurityMethod]
+        """
+        return self._pref_security_methods
+
+    @pref_security_methods.setter
+    def pref_security_methods(self, pref_security_methods):
+        """Sets the pref_security_methods of this SecurityInformation.
+
+        Security methods preferred by the API invoker for the API interface.  # noqa: E501
+
+        :param pref_security_methods: The pref_security_methods of this SecurityInformation.
+        :type pref_security_methods: List[SecurityMethod]
+        """
+        if pref_security_methods is None:
+            raise ValueError("Invalid value for `pref_security_methods`, must not be `None`")  # noqa: E501
+        if pref_security_methods is not None and len(pref_security_methods) < 1:
+            raise ValueError("Invalid value for `pref_security_methods`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._pref_security_methods = pref_security_methods
+
+    @property
+    def sel_security_method(self):
+        """Gets the sel_security_method of this SecurityInformation.
+
+
+        :return: The sel_security_method of this SecurityInformation.
+        :rtype: SecurityMethod
+        """
+        return self._sel_security_method
+
+    @sel_security_method.setter
+    def sel_security_method(self, sel_security_method):
+        """Sets the sel_security_method of this SecurityInformation.
+
+
+        :param sel_security_method: The sel_security_method of this SecurityInformation.
+        :type sel_security_method: SecurityMethod
+        """
+
+        self._sel_security_method = sel_security_method
+
+    @property
+    def authentication_info(self):
+        """Gets the authentication_info of this SecurityInformation.
+
+        Authentication related information  # noqa: E501
+
+        :return: The authentication_info of this SecurityInformation.
+        :rtype: str
+        """
+        return self._authentication_info
+
+    @authentication_info.setter
+    def authentication_info(self, authentication_info):
+        """Sets the authentication_info of this SecurityInformation.
+
+        Authentication related information  # noqa: E501
+
+        :param authentication_info: The authentication_info of this SecurityInformation.
+        :type authentication_info: str
+        """
+
+        self._authentication_info = authentication_info
+
+    @property
+    def authorization_info(self):
+        """Gets the authorization_info of this SecurityInformation.
+
+        Authorization related information  # noqa: E501
+
+        :return: The authorization_info of this SecurityInformation.
+        :rtype: str
+        """
+        return self._authorization_info
+
+    @authorization_info.setter
+    def authorization_info(self, authorization_info):
+        """Sets the authorization_info of this SecurityInformation.
+
+        Authorization related information  # noqa: E501
+
+        :param authorization_info: The authorization_info of this SecurityInformation.
+        :type authorization_info: str
+        """
+
+        self._authorization_info = authorization_info
diff --git a/services/TS29222_CAPIF_Security_API/capif_security/models/security_method.py b/services/TS29222_CAPIF_Security_API/capif_security/models/security_method.py
new file mode 100644
index 0000000000000000000000000000000000000000..966fcb4f78c95a0784c98f04b059cc00d0152708
--- /dev/null
+++ b/services/TS29222_CAPIF_Security_API/capif_security/models/security_method.py
@@ -0,0 +1,41 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_security.models.base_model_ import Model
+from capif_security.models.security_method_any_of import SecurityMethodAnyOf
+from capif_security import util
+
+from capif_security.models.security_method_any_of import SecurityMethodAnyOf  # noqa: E501
+import sys
+
+class SecurityMethod(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self):  # noqa: E501
+        """SecurityMethod - a model defined in OpenAPI
+
+        """
+        self.openapi_types = {
+        }
+
+        self.attribute_map = {
+        }
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'SecurityMethod':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The SecurityMethod of this SecurityMethod.  # noqa: E501
+        :rtype: SecurityMethod
+        """
+        print(dikt, file=sys.stderr)
+        return util.deserialize_model(dikt, cls)
diff --git a/services/TS29222_CAPIF_Security_API/capif_security/models/security_method_any_of.py b/services/TS29222_CAPIF_Security_API/capif_security/models/security_method_any_of.py
new file mode 100644
index 0000000000000000000000000000000000000000..0b5c3bf40a3ac447059212c34d7d84a82137750b
--- /dev/null
+++ b/services/TS29222_CAPIF_Security_API/capif_security/models/security_method_any_of.py
@@ -0,0 +1,44 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_security.models.base_model_ import Model
+from capif_security import util
+
+
+class SecurityMethodAnyOf(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    """
+    allowed enum values
+    """
+    PSK = "PSK"
+    PKI = "PKI"
+    OAUTH = "OAUTH"
+    def __init__(self):  # noqa: E501
+        """SecurityMethodAnyOf - a model defined in OpenAPI
+
+        """
+        self.openapi_types = {
+        }
+
+        self.attribute_map = {
+        }
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'SecurityMethodAnyOf':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The SecurityMethod_anyOf of this SecurityMethodAnyOf.  # noqa: E501
+        :rtype: SecurityMethodAnyOf
+        """
+        print(dikt)
+        return util.deserialize_model(dikt, cls)
diff --git a/services/TS29222_CAPIF_Security_API/capif_security/models/security_notification.py b/services/TS29222_CAPIF_Security_API/capif_security/models/security_notification.py
new file mode 100644
index 0000000000000000000000000000000000000000..4437f655f14c6fa745447accdf6553a0642efbf2
--- /dev/null
+++ b/services/TS29222_CAPIF_Security_API/capif_security/models/security_notification.py
@@ -0,0 +1,158 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_security.models.base_model_ import Model
+from capif_security.models.cause import Cause
+from capif_security import util
+
+from capif_security.models.cause import Cause  # noqa: E501
+
+class SecurityNotification(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, api_invoker_id=None, aef_id=None, api_ids=None, cause=None):  # noqa: E501
+        """SecurityNotification - a model defined in OpenAPI
+
+        :param api_invoker_id: The api_invoker_id of this SecurityNotification.  # noqa: E501
+        :type api_invoker_id: str
+        :param aef_id: The aef_id of this SecurityNotification.  # noqa: E501
+        :type aef_id: str
+        :param api_ids: The api_ids of this SecurityNotification.  # noqa: E501
+        :type api_ids: List[str]
+        :param cause: The cause of this SecurityNotification.  # noqa: E501
+        :type cause: Cause
+        """
+        self.openapi_types = {
+            'api_invoker_id': str,
+            'aef_id': str,
+            'api_ids': List[str],
+            'cause': Cause
+        }
+
+        self.attribute_map = {
+            'api_invoker_id': 'apiInvokerId',
+            'aef_id': 'aefId',
+            'api_ids': 'apiIds',
+            'cause': 'cause'
+        }
+
+        self._api_invoker_id = api_invoker_id
+        self._aef_id = aef_id
+        self._api_ids = api_ids
+        self._cause = cause
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'SecurityNotification':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The SecurityNotification of this SecurityNotification.  # noqa: E501
+        :rtype: SecurityNotification
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def api_invoker_id(self):
+        """Gets the api_invoker_id of this SecurityNotification.
+
+        String identifying the API invoker assigned by the CAPIF core function.  # noqa: E501
+
+        :return: The api_invoker_id of this SecurityNotification.
+        :rtype: str
+        """
+        return self._api_invoker_id
+
+    @api_invoker_id.setter
+    def api_invoker_id(self, api_invoker_id):
+        """Sets the api_invoker_id of this SecurityNotification.
+
+        String identifying the API invoker assigned by the CAPIF core function.  # noqa: E501
+
+        :param api_invoker_id: The api_invoker_id of this SecurityNotification.
+        :type api_invoker_id: str
+        """
+        if api_invoker_id is None:
+            raise ValueError("Invalid value for `api_invoker_id`, must not be `None`")  # noqa: E501
+
+        self._api_invoker_id = api_invoker_id
+
+    @property
+    def aef_id(self):
+        """Gets the aef_id of this SecurityNotification.
+
+        String identifying the AEF.  # noqa: E501
+
+        :return: The aef_id of this SecurityNotification.
+        :rtype: str
+        """
+        return self._aef_id
+
+    @aef_id.setter
+    def aef_id(self, aef_id):
+        """Sets the aef_id of this SecurityNotification.
+
+        String identifying the AEF.  # noqa: E501
+
+        :param aef_id: The aef_id of this SecurityNotification.
+        :type aef_id: str
+        """
+
+        self._aef_id = aef_id
+
+    @property
+    def api_ids(self):
+        """Gets the api_ids of this SecurityNotification.
+
+        Identifier of the service API  # noqa: E501
+
+        :return: The api_ids of this SecurityNotification.
+        :rtype: List[str]
+        """
+        return self._api_ids
+
+    @api_ids.setter
+    def api_ids(self, api_ids):
+        """Sets the api_ids of this SecurityNotification.
+
+        Identifier of the service API  # noqa: E501
+
+        :param api_ids: The api_ids of this SecurityNotification.
+        :type api_ids: List[str]
+        """
+        if api_ids is None:
+            raise ValueError("Invalid value for `api_ids`, must not be `None`")  # noqa: E501
+        if api_ids is not None and len(api_ids) < 1:
+            raise ValueError("Invalid value for `api_ids`, number of items must be greater than or equal to `1`")  # noqa: E501
+
+        self._api_ids = api_ids
+
+    @property
+    def cause(self):
+        """Gets the cause of this SecurityNotification.
+
+
+        :return: The cause of this SecurityNotification.
+        :rtype: Cause
+        """
+        return self._cause
+
+    @cause.setter
+    def cause(self, cause):
+        """Sets the cause of this SecurityNotification.
+
+
+        :param cause: The cause of this SecurityNotification.
+        :type cause: Cause
+        """
+        if cause is None:
+            raise ValueError("Invalid value for `cause`, must not be `None`")  # noqa: E501
+
+        self._cause = cause
diff --git a/services/TS29222_CAPIF_Security_API/capif_security/models/service_security.py b/services/TS29222_CAPIF_Security_API/capif_security/models/service_security.py
new file mode 100644
index 0000000000000000000000000000000000000000..47014d37fb02244b9ee9e1dd432a1a908c1334e5
--- /dev/null
+++ b/services/TS29222_CAPIF_Security_API/capif_security/models/service_security.py
@@ -0,0 +1,186 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_security.models.base_model_ import Model
+from capif_security.models.security_information import SecurityInformation
+from capif_security.models.websock_notif_config import WebsockNotifConfig
+import re
+from capif_security import util
+
+from capif_security.models.security_information import SecurityInformation  # noqa: E501
+from capif_security.models.websock_notif_config import WebsockNotifConfig  # noqa: E501
+import re  # noqa: E501
+
+class ServiceSecurity(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, security_info=None, notification_destination=None, request_test_notification=None, websock_notif_config=None, supported_features=None):  # noqa: E501
+        """ServiceSecurity - a model defined in OpenAPI
+
+        :param security_info: The security_info of this ServiceSecurity.  # noqa: E501
+        :type security_info: List[SecurityInformation]
+        :param notification_destination: The notification_destination of this ServiceSecurity.  # noqa: E501
+        :type notification_destination: str
+        :param request_test_notification: The request_test_notification of this ServiceSecurity.  # noqa: E501
+        :type request_test_notification: bool
+        :param websock_notif_config: The websock_notif_config of this ServiceSecurity.  # noqa: E501
+        :type websock_notif_config: WebsockNotifConfig
+        :param supported_features: The supported_features of this ServiceSecurity.  # noqa: E501
+        :type supported_features: str
+        """
+        self.openapi_types = {
+            'security_info': List[SecurityInformation],
+            'notification_destination': str,
+            'request_test_notification': bool,
+            'websock_notif_config': WebsockNotifConfig,
+            'supported_features': str
+        }
+
+        self.attribute_map = {
+            'security_info': 'securityInfo',
+            'notification_destination': 'notificationDestination',
+            'request_test_notification': 'requestTestNotification',
+            'websock_notif_config': 'websockNotifConfig',
+            'supported_features': 'supportedFeatures'
+        }
+
+        self._security_info = security_info
+        self._notification_destination = notification_destination
+        self._request_test_notification = request_test_notification
+        self._websock_notif_config = websock_notif_config
+        self._supported_features = supported_features
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'ServiceSecurity':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The ServiceSecurity of this ServiceSecurity.  # noqa: E501
+        :rtype: ServiceSecurity
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def security_info(self):
+        """Gets the security_info of this ServiceSecurity.
+
+
+        :return: The security_info of this ServiceSecurity.
+        :rtype: List[SecurityInformation]
+        """
+        return self._security_info
+
+    @security_info.setter
+    def security_info(self, security_info):
+        """Sets the security_info of this ServiceSecurity.
+
+
+        :param security_info: The security_info of this ServiceSecurity.
+        :type security_info: List[SecurityInformation]
+        """
+        if security_info is None:
+            raise ValueError("Invalid value for `security_info`, must not be `None`")  # noqa: E501
+
+        self._security_info = security_info
+
+    @property
+    def notification_destination(self):
+        """Gets the notification_destination of this ServiceSecurity.
+
+        string providing an URI formatted according to IETF RFC 3986.  # noqa: E501
+
+        :return: The notification_destination of this ServiceSecurity.
+        :rtype: str
+        """
+        return self._notification_destination
+
+    @notification_destination.setter
+    def notification_destination(self, notification_destination):
+        """Sets the notification_destination of this ServiceSecurity.
+
+        string providing an URI formatted according to IETF RFC 3986.  # noqa: E501
+
+        :param notification_destination: The notification_destination of this ServiceSecurity.
+        :type notification_destination: str
+        """
+        if notification_destination is None:
+            raise ValueError("Invalid value for `notification_destination`, must not be `None`")  # noqa: E501
+
+        self._notification_destination = notification_destination
+
+    @property
+    def request_test_notification(self):
+        """Gets the request_test_notification of this ServiceSecurity.
+
+        Set to true by API invoker to request the CAPIF core function to send a test notification as defined in in clause 7.6. Set to false or omitted otherwise.   # noqa: E501
+
+        :return: The request_test_notification of this ServiceSecurity.
+        :rtype: bool
+        """
+        return self._request_test_notification
+
+    @request_test_notification.setter
+    def request_test_notification(self, request_test_notification):
+        """Sets the request_test_notification of this ServiceSecurity.
+
+        Set to true by API invoker to request the CAPIF core function to send a test notification as defined in in clause 7.6. Set to false or omitted otherwise.   # noqa: E501
+
+        :param request_test_notification: The request_test_notification of this ServiceSecurity.
+        :type request_test_notification: bool
+        """
+
+        self._request_test_notification = request_test_notification
+
+    @property
+    def websock_notif_config(self):
+        """Gets the websock_notif_config of this ServiceSecurity.
+
+
+        :return: The websock_notif_config of this ServiceSecurity.
+        :rtype: WebsockNotifConfig
+        """
+        return self._websock_notif_config
+
+    @websock_notif_config.setter
+    def websock_notif_config(self, websock_notif_config):
+        """Sets the websock_notif_config of this ServiceSecurity.
+
+
+        :param websock_notif_config: The websock_notif_config of this ServiceSecurity.
+        :type websock_notif_config: WebsockNotifConfig
+        """
+
+        self._websock_notif_config = websock_notif_config
+
+    @property
+    def supported_features(self):
+        """Gets the supported_features of this ServiceSecurity.
+
+        A string used to indicate the features supported by an API that is used as defined in clause  6.6 in 3GPP TS 29.500. The string shall contain a bitmask indicating supported features in  hexadecimal representation Each character in the string shall take a value of \"0\" to \"9\",  \"a\" to \"f\" or \"A\" to \"F\" and shall represent the support of 4 features as described in  table 5.2.2-3. The most significant character representing the highest-numbered features shall  appear first in the string, and the character representing features 1 to 4 shall appear last  in the string. The list of features and their numbering (starting with 1) are defined  separately for each API. If the string contains a lower number of characters than there are  defined features for an API, all features that would be represented by characters that are not  present in the string are not supported.   # noqa: E501
+
+        :return: The supported_features of this ServiceSecurity.
+        :rtype: str
+        """
+        return self._supported_features
+
+    @supported_features.setter
+    def supported_features(self, supported_features):
+        """Sets the supported_features of this ServiceSecurity.
+
+        A string used to indicate the features supported by an API that is used as defined in clause  6.6 in 3GPP TS 29.500. The string shall contain a bitmask indicating supported features in  hexadecimal representation Each character in the string shall take a value of \"0\" to \"9\",  \"a\" to \"f\" or \"A\" to \"F\" and shall represent the support of 4 features as described in  table 5.2.2-3. The most significant character representing the highest-numbered features shall  appear first in the string, and the character representing features 1 to 4 shall appear last  in the string. The list of features and their numbering (starting with 1) are defined  separately for each API. If the string contains a lower number of characters than there are  defined features for an API, all features that would be represented by characters that are not  present in the string are not supported.   # noqa: E501
+
+        :param supported_features: The supported_features of this ServiceSecurity.
+        :type supported_features: str
+        """
+        if supported_features is not None and not re.search(r'^[A-Fa-f0-9]*$', supported_features):  # noqa: E501
+            raise ValueError("Invalid value for `supported_features`, must be a follow pattern or equal to `/^[A-Fa-f0-9]*$/`")  # noqa: E501
+
+        self._supported_features = supported_features
diff --git a/services/TS29222_CAPIF_Security_API/capif_security/models/snssai.py b/services/TS29222_CAPIF_Security_API/capif_security/models/snssai.py
new file mode 100644
index 0000000000000000000000000000000000000000..89e4257f85efe103707b87d1cb4ef167e9a69835
--- /dev/null
+++ b/services/TS29222_CAPIF_Security_API/capif_security/models/snssai.py
@@ -0,0 +1,104 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_security.models.base_model_ import Model
+import re
+from capif_security import util
+
+import re  # noqa: E501
+
+class Snssai(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, sst=None, sd=None):  # noqa: E501
+        """Snssai - a model defined in OpenAPI
+
+        :param sst: The sst of this Snssai.  # noqa: E501
+        :type sst: int
+        :param sd: The sd of this Snssai.  # noqa: E501
+        :type sd: str
+        """
+        self.openapi_types = {
+            'sst': int,
+            'sd': str
+        }
+
+        self.attribute_map = {
+            'sst': 'sst',
+            'sd': 'sd'
+        }
+
+        self._sst = sst
+        self._sd = sd
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'Snssai':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The Snssai of this Snssai.  # noqa: E501
+        :rtype: Snssai
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def sst(self):
+        """Gets the sst of this Snssai.
+
+        Unsigned integer, within the range 0 to 255, representing the Slice/Service Type.  It indicates the expected Network Slice behaviour in terms of features and services. Values 0 to 127 correspond to the standardized SST range. Values 128 to 255 correspond  to the Operator-specific range. See clause 28.4.2 of 3GPP TS 23.003. Standardized values are defined in clause 5.15.2.2 of 3GPP TS 23.501.    # noqa: E501
+
+        :return: The sst of this Snssai.
+        :rtype: int
+        """
+        return self._sst
+
+    @sst.setter
+    def sst(self, sst):
+        """Sets the sst of this Snssai.
+
+        Unsigned integer, within the range 0 to 255, representing the Slice/Service Type.  It indicates the expected Network Slice behaviour in terms of features and services. Values 0 to 127 correspond to the standardized SST range. Values 128 to 255 correspond  to the Operator-specific range. See clause 28.4.2 of 3GPP TS 23.003. Standardized values are defined in clause 5.15.2.2 of 3GPP TS 23.501.    # noqa: E501
+
+        :param sst: The sst of this Snssai.
+        :type sst: int
+        """
+        if sst is None:
+            raise ValueError("Invalid value for `sst`, must not be `None`")  # noqa: E501
+        if sst is not None and sst > 255:  # noqa: E501
+            raise ValueError("Invalid value for `sst`, must be a value less than or equal to `255`")  # noqa: E501
+        if sst is not None and sst < 0:  # noqa: E501
+            raise ValueError("Invalid value for `sst`, must be a value greater than or equal to `0`")  # noqa: E501
+
+        self._sst = sst
+
+    @property
+    def sd(self):
+        """Gets the sd of this Snssai.
+
+        3-octet string, representing the Slice Differentiator, in hexadecimal representation. Each character in the string shall take a value of \"0\" to \"9\", \"a\" to \"f\" or \"A\" to \"F\" and shall represent 4 bits. The most significant character representing the 4 most significant bits of the SD shall appear first in the string, and the character representing the 4 least significant bit of the SD shall appear last in the string. This is an optional parameter that complements the Slice/Service type(s) to allow to  differentiate amongst multiple Network Slices of the same Slice/Service type. This IE shall be absent if no SD value is associated with the SST.   # noqa: E501
+
+        :return: The sd of this Snssai.
+        :rtype: str
+        """
+        return self._sd
+
+    @sd.setter
+    def sd(self, sd):
+        """Sets the sd of this Snssai.
+
+        3-octet string, representing the Slice Differentiator, in hexadecimal representation. Each character in the string shall take a value of \"0\" to \"9\", \"a\" to \"f\" or \"A\" to \"F\" and shall represent 4 bits. The most significant character representing the 4 most significant bits of the SD shall appear first in the string, and the character representing the 4 least significant bit of the SD shall appear last in the string. This is an optional parameter that complements the Slice/Service type(s) to allow to  differentiate amongst multiple Network Slices of the same Slice/Service type. This IE shall be absent if no SD value is associated with the SST.   # noqa: E501
+
+        :param sd: The sd of this Snssai.
+        :type sd: str
+        """
+        if sd is not None and not re.search(r'^[A-Fa-f0-9]{6}$', sd):  # noqa: E501
+            raise ValueError("Invalid value for `sd`, must be a follow pattern or equal to `/^[A-Fa-f0-9]{6}$/`")  # noqa: E501
+
+        self._sd = sd
diff --git a/services/TS29222_CAPIF_Security_API/capif_security/models/websock_notif_config.py b/services/TS29222_CAPIF_Security_API/capif_security/models/websock_notif_config.py
new file mode 100644
index 0000000000000000000000000000000000000000..434d37190c4dbeb105aaf65bc20bd01fd02239d1
--- /dev/null
+++ b/services/TS29222_CAPIF_Security_API/capif_security/models/websock_notif_config.py
@@ -0,0 +1,94 @@
+# coding: utf-8
+
+from __future__ import absolute_import
+from datetime import date, datetime  # noqa: F401
+
+from typing import List, Dict  # noqa: F401
+
+from capif_security.models.base_model_ import Model
+from capif_security import util
+
+
+class WebsockNotifConfig(Model):
+    """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, websocket_uri=None, request_websocket_uri=None):  # noqa: E501
+        """WebsockNotifConfig - a model defined in OpenAPI
+
+        :param websocket_uri: The websocket_uri of this WebsockNotifConfig.  # noqa: E501
+        :type websocket_uri: str
+        :param request_websocket_uri: The request_websocket_uri of this WebsockNotifConfig.  # noqa: E501
+        :type request_websocket_uri: bool
+        """
+        self.openapi_types = {
+            'websocket_uri': str,
+            'request_websocket_uri': bool
+        }
+
+        self.attribute_map = {
+            'websocket_uri': 'websocketUri',
+            'request_websocket_uri': 'requestWebsocketUri'
+        }
+
+        self._websocket_uri = websocket_uri
+        self._request_websocket_uri = request_websocket_uri
+
+    @classmethod
+    def from_dict(cls, dikt) -> 'WebsockNotifConfig':
+        """Returns the dict as a model
+
+        :param dikt: A dict.
+        :type: dict
+        :return: The WebsockNotifConfig of this WebsockNotifConfig.  # noqa: E501
+        :rtype: WebsockNotifConfig
+        """
+        return util.deserialize_model(dikt, cls)
+
+    @property
+    def websocket_uri(self):
+        """Gets the websocket_uri of this WebsockNotifConfig.
+
+        string formatted according to IETF RFC 3986 identifying a referenced resource.  # noqa: E501
+
+        :return: The websocket_uri of this WebsockNotifConfig.
+        :rtype: str
+        """
+        return self._websocket_uri
+
+    @websocket_uri.setter
+    def websocket_uri(self, websocket_uri):
+        """Sets the websocket_uri of this WebsockNotifConfig.
+
+        string formatted according to IETF RFC 3986 identifying a referenced resource.  # noqa: E501
+
+        :param websocket_uri: The websocket_uri of this WebsockNotifConfig.
+        :type websocket_uri: str
+        """
+
+        self._websocket_uri = websocket_uri
+
+    @property
+    def request_websocket_uri(self):
+        """Gets the request_websocket_uri of this WebsockNotifConfig.
+
+        Set by the SCS/AS to indicate that the Websocket delivery is requested.  # noqa: E501
+
+        :return: The request_websocket_uri of this WebsockNotifConfig.
+        :rtype: bool
+        """
+        return self._request_websocket_uri
+
+    @request_websocket_uri.setter
+    def request_websocket_uri(self, request_websocket_uri):
+        """Sets the request_websocket_uri of this WebsockNotifConfig.
+
+        Set by the SCS/AS to indicate that the Websocket delivery is requested.  # noqa: E501
+
+        :param request_websocket_uri: The request_websocket_uri of this WebsockNotifConfig.
+        :type request_websocket_uri: bool
+        """
+
+        self._request_websocket_uri = request_websocket_uri
diff --git a/services/TS29222_CAPIF_Security_API/capif_security/openapi/openapi.yaml b/services/TS29222_CAPIF_Security_API/capif_security/openapi/openapi.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..321eb2ffc1862911f6c29ed3a89e7add8538c29c
--- /dev/null
+++ b/services/TS29222_CAPIF_Security_API/capif_security/openapi/openapi.yaml
@@ -0,0 +1,1729 @@
+openapi: 3.0.0
+info:
+  description: "API for CAPIF security management.  \n© 2022, 3GPP Organizational\
+    \ Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).  \nAll rights reserved.\n"
+  title: CAPIF_Security_API
+  version: 1.2.0
+externalDocs:
+  description: 3GPP TS 29.222 V17.5.0 Common API Framework for 3GPP Northbound APIs
+  url: https://www.3gpp.org/ftp/Specs/archive/29_series/29.222/
+servers:
+- url: "{apiRoot}/capif-security/v1"
+  variables:
+    apiRoot:
+      default: https://example.com
+      description: apiRoot as defined in clause 7.5 of 3GPP TS 29.222.
+paths:
+  /securities/{securityId}/token:
+    post:
+      operationId: securities_security_id_token_post
+      parameters:
+      - description: Identifier of an individual API invoker
+        explode: false
+        in: path
+        name: securityId
+        required: true
+        schema:
+          type: string
+        style: simple
+      requestBody:
+        content:
+          application/x-www-form-urlencoded:
+            schema:
+              $ref: '#/components/schemas/AccessTokenReq'
+        required: true
+      responses:
+        "200":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/AccessTokenRsp'
+          description: Successful Access Token Request
+        "307":
+          description: Temporary Redirect
+          headers:
+            Location:
+              description: An alternative URI of the resource.
+              required: true
+              schema:
+                type: string
+        "308":
+          description: Permanent Redirect
+          headers:
+            Location:
+              description: An alternative URI of the resource.
+              required: true
+              schema:
+                type: string
+        "400":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/AccessTokenErr'
+          description: Error in the Access Token Request
+        "401":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/AccessTokenErr'
+          description: Unauthorized
+        "403":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Forbidden
+        "404":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Not Found
+        "411":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Length Required
+        "413":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Payload Too Large
+        "415":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Unsupported Media Type
+        "429":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Too Many Requests
+        "500":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Internal Server Error
+        "503":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Service Unavailable
+        default:
+          description: Generic Error
+      x-openapi-router-controller:  capif_security.controllers.default_controller
+  /trustedInvokers/{apiInvokerId}:
+    delete:
+      operationId: trusted_invokers_api_invoker_id_delete
+      parameters:
+      - description: Identifier of an individual API invoker
+        explode: false
+        in: path
+        name: apiInvokerId
+        required: true
+        schema:
+          type: string
+        style: simple
+      responses:
+        "204":
+          description: No Content (Successful deletion of the existing subscription)
+        "307":
+          description: Temporary Redirect
+          headers:
+            Location:
+              description: An alternative URI of the resource.
+              required: true
+              schema:
+                type: string
+        "308":
+          description: Permanent Redirect
+          headers:
+            Location:
+              description: An alternative URI of the resource.
+              required: true
+              schema:
+                type: string
+        "400":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Bad request
+        "401":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Unauthorized
+        "403":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Forbidden
+        "404":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Not Found
+        "429":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Too Many Requests
+        "500":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Internal Server Error
+        "503":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Service Unavailable
+        default:
+          description: Generic Error
+      x-openapi-router-controller:  capif_security.controllers.default_controller
+    get:
+      operationId: trusted_invokers_api_invoker_id_get
+      parameters:
+      - description: Identifier of an individual API invoker
+        explode: false
+        in: path
+        name: apiInvokerId
+        required: true
+        schema:
+          type: string
+        style: simple
+      - description: "When set to 'true', it indicates the CAPIF core function to\
+          \ send the authentication information of the API invoker. Set to false or\
+          \ omitted otherwise.\n"
+        explode: true
+        in: query
+        name: authenticationInfo
+        required: false
+        schema:
+          type: boolean
+        style: form
+      - description: "When set to 'true', it indicates the CAPIF core function to\
+          \ send the authorization information of the API invoker. Set to false or\
+          \ omitted otherwise.\n"
+        explode: true
+        in: query
+        name: authorizationInfo
+        required: false
+        schema:
+          type: boolean
+        style: form
+      responses:
+        "200":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ServiceSecurity'
+          description: |
+            The security related information of the API Invoker based on the request from the API exposing function.
+        "307":
+          description: Temporary Redirect
+          headers:
+            Location:
+              description: An alternative URI of the resource.
+              required: true
+              schema:
+                type: string
+        "308":
+          description: Permanent Redirect
+          headers:
+            Location:
+              description: An alternative URI of the resource.
+              required: true
+              schema:
+                type: string
+        "400":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Bad request
+        "401":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Unauthorized
+        "403":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Forbidden
+        "404":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Not Found
+        "406":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Not Acceptable
+        "414":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: URI Too Long
+        "429":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Too Many Requests
+        "500":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Internal Server Error
+        "503":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Service Unavailable
+        default:
+          description: Generic Error
+      x-openapi-router-controller:  capif_security.controllers.default_controller
+    put:
+      callbacks:
+        notificationDestination:
+          '{request.body#/notificationDestination}':
+            post:
+              operationId: notificationDestination_request_bodyNotificationDestinationPost
+              requestBody:
+                content:
+                  application/json:
+                    schema:
+                      $ref: '#/components/schemas/SecurityNotification'
+                required: true
+              responses:
+                "204":
+                  description: No Content (successful notification)
+                "307":
+                  description: Temporary Redirect
+                  headers:
+                    Location:
+                      description: An alternative URI of the resource.
+                      required: true
+                      schema:
+                        type: string
+                "308":
+                  description: Permanent Redirect
+                  headers:
+                    Location:
+                      description: An alternative URI of the resource.
+                      required: true
+                      schema:
+                        type: string
+                "400":
+                  content:
+                    application/problem+json:
+                      schema:
+                        $ref: '#/components/schemas/ProblemDetails'
+                  description: Bad request
+                "401":
+                  content:
+                    application/problem+json:
+                      schema:
+                        $ref: '#/components/schemas/ProblemDetails'
+                  description: Unauthorized
+                "403":
+                  content:
+                    application/problem+json:
+                      schema:
+                        $ref: '#/components/schemas/ProblemDetails'
+                  description: Forbidden
+                "404":
+                  content:
+                    application/problem+json:
+                      schema:
+                        $ref: '#/components/schemas/ProblemDetails'
+                  description: Not Found
+                "411":
+                  content:
+                    application/problem+json:
+                      schema:
+                        $ref: '#/components/schemas/ProblemDetails'
+                  description: Length Required
+                "413":
+                  content:
+                    application/problem+json:
+                      schema:
+                        $ref: '#/components/schemas/ProblemDetails'
+                  description: Payload Too Large
+                "415":
+                  content:
+                    application/problem+json:
+                      schema:
+                        $ref: '#/components/schemas/ProblemDetails'
+                  description: Unsupported Media Type
+                "429":
+                  content:
+                    application/problem+json:
+                      schema:
+                        $ref: '#/components/schemas/ProblemDetails'
+                  description: Too Many Requests
+                "500":
+                  content:
+                    application/problem+json:
+                      schema:
+                        $ref: '#/components/schemas/ProblemDetails'
+                  description: Internal Server Error
+                "503":
+                  content:
+                    application/problem+json:
+                      schema:
+                        $ref: '#/components/schemas/ProblemDetails'
+                  description: Service Unavailable
+                default:
+                  description: Generic Error
+              x-callback-request: true
+      operationId: trusted_invokers_api_invoker_id_put
+      parameters:
+      - description: Identifier of an individual API invoker
+        explode: false
+        in: path
+        name: apiInvokerId
+        required: true
+        schema:
+          type: string
+        style: simple
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/ServiceSecurity'
+        description: create a security context for an API invoker
+        required: true
+      responses:
+        "201":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ServiceSecurity'
+          description: Successful created.
+          headers:
+            Location:
+              description: "Contains the URI of the newly created resource, according\
+                \ to the structure {apiRoot}/capif-security/v1/trustedInvokers/{apiInvokerId}\n"
+              explode: false
+              required: true
+              schema:
+                type: string
+              style: simple
+        "400":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Bad request
+        "401":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Unauthorized
+        "403":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Forbidden
+        "411":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Length Required
+        "413":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Payload Too Large
+        "414":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: URI Too Long
+        "415":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Unsupported Media Type
+        "429":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Too Many Requests
+        "500":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Internal Server Error
+        "503":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Service Unavailable
+        default:
+          description: Generic Error
+      x-openapi-router-controller:  capif_security.controllers.default_controller
+  /trustedInvokers/{apiInvokerId}/delete:
+    post:
+      operationId: trusted_invokers_api_invoker_id_delete_post
+      parameters:
+      - description: Identifier of an individual API invoker
+        explode: false
+        in: path
+        name: apiInvokerId
+        required: true
+        schema:
+          type: string
+        style: simple
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/SecurityNotification'
+        description: Revoke the authorization of the API invoker for APIs.
+        required: true
+      responses:
+        "204":
+          description: Successful revoked.
+        "307":
+          description: Temporary Redirect
+          headers:
+            Location:
+              description: An alternative URI of the resource.
+              required: true
+              schema:
+                type: string
+        "308":
+          description: Permanent Redirect
+          headers:
+            Location:
+              description: An alternative URI of the resource.
+              required: true
+              schema:
+                type: string
+        "400":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Bad request
+        "401":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Unauthorized
+        "403":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Forbidden
+        "404":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Not Found
+        "411":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Length Required
+        "413":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Payload Too Large
+        "415":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Unsupported Media Type
+        "429":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Too Many Requests
+        "500":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Internal Server Error
+        "503":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Service Unavailable
+        default:
+          description: Generic Error
+      x-openapi-router-controller:  capif_security.controllers.default_controller
+  /trustedInvokers/{apiInvokerId}/update:
+    post:
+      operationId: trusted_invokers_api_invoker_id_update_post
+      parameters:
+      - description: Identifier of an individual API invoker
+        explode: false
+        in: path
+        name: apiInvokerId
+        required: true
+        schema:
+          type: string
+        style: simple
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/ServiceSecurity'
+        description: Update the security context (e.g. re-negotiate the security methods).
+        required: true
+      responses:
+        "200":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ServiceSecurity'
+          description: Successful updated.
+        "307":
+          description: Temporary Redirect
+          headers:
+            Location:
+              description: An alternative URI of the resource.
+              required: true
+              schema:
+                type: string
+        "308":
+          description: Permanent Redirect
+          headers:
+            Location:
+              description: An alternative URI of the resource.
+              required: true
+              schema:
+                type: string
+        "400":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Bad request
+        "401":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Unauthorized
+        "403":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Forbidden
+        "404":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Not Found
+        "411":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Length Required
+        "413":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Payload Too Large
+        "415":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Unsupported Media Type
+        "429":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Too Many Requests
+        "500":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Internal Server Error
+        "503":
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+          description: Service Unavailable
+        default:
+          description: Generic Error
+      x-openapi-router-controller:  capif_security.controllers.default_controller
+components:
+  responses:
+    "307":
+      description: Temporary Redirect
+      headers:
+        Location:
+          description: An alternative URI of the resource.
+          required: true
+          schema:
+            type: string
+    "308":
+      description: Permanent Redirect
+      headers:
+        Location:
+          description: An alternative URI of the resource.
+          required: true
+          schema:
+            type: string
+    "400":
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/ProblemDetails'
+      description: Bad request
+    "401":
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/ProblemDetails'
+      description: Unauthorized
+    "403":
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/ProblemDetails'
+      description: Forbidden
+    "404":
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/ProblemDetails'
+      description: Not Found
+    "406":
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/ProblemDetails'
+      description: Not Acceptable
+    "414":
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/ProblemDetails'
+      description: URI Too Long
+    "429":
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/ProblemDetails'
+      description: Too Many Requests
+    "500":
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/ProblemDetails'
+      description: Internal Server Error
+    "503":
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/ProblemDetails'
+      description: Service Unavailable
+    default:
+      description: Generic Error
+    "411":
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/ProblemDetails'
+      description: Length Required
+    "413":
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/ProblemDetails'
+      description: Payload Too Large
+    "415":
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/ProblemDetails'
+      description: Unsupported Media Type
+  schemas:
+    ServiceSecurity:
+      description: "Represents the details of the security method for each service\
+        \ API interface. When included by the API invoker, it indicates the preferred\
+        \ method of security. When included by the CAPIF core function, it indicates\
+        \ the security method to be used for the service API interface.\n"
+      example:
+        notificationDestination: notificationDestination
+        supportedFeatures: supportedFeatures
+        securityInfo:
+        - selSecurityMethod: null
+          authenticationInfo: authenticationInfo
+          authorizationInfo: authorizationInfo
+          interfaceDetails:
+            ipv6Addr: ipv6Addr
+            securityMethods:
+            - null
+            - null
+            port: 5248
+            ipv4Addr: ipv4Addr
+          prefSecurityMethods:
+          - null
+          - null
+          aefId: aefId
+          apiId: apiId
+        - selSecurityMethod: null
+          authenticationInfo: authenticationInfo
+          authorizationInfo: authorizationInfo
+          interfaceDetails:
+            ipv6Addr: ipv6Addr
+            securityMethods:
+            - null
+            - null
+            port: 5248
+            ipv4Addr: ipv4Addr
+          prefSecurityMethods:
+          - null
+          - null
+          aefId: aefId
+          apiId: apiId
+        websockNotifConfig:
+          requestWebsocketUri: true
+          websocketUri: websocketUri
+        requestTestNotification: true
+      properties:
+        securityInfo:
+          items:
+            $ref: '#/components/schemas/SecurityInformation'
+          minimum: 1
+          title: securityInfo
+          type: array
+        notificationDestination:
+          description: string providing an URI formatted according to IETF RFC 3986.
+          title: type
+          type: string
+        requestTestNotification:
+          description: |
+            Set to true by API invoker to request the CAPIF core function to send a test notification as defined in in clause 7.6. Set to false or omitted otherwise.
+          title: requestTestNotification
+          type: boolean
+        websockNotifConfig:
+          $ref: '#/components/schemas/WebsockNotifConfig'
+        supportedFeatures:
+          description: "A string used to indicate the features supported by an API\
+            \ that is used as defined in clause  6.6 in 3GPP TS 29.500. The string\
+            \ shall contain a bitmask indicating supported features in  hexadecimal\
+            \ representation Each character in the string shall take a value of \"\
+            0\" to \"9\",  \"a\" to \"f\" or \"A\" to \"F\" and shall represent the\
+            \ support of 4 features as described in  table\_5.2.2-3. The most significant\
+            \ character representing the highest-numbered features shall  appear first\
+            \ in the string, and the character representing features 1 to 4 shall\
+            \ appear last  in the string. The list of features and their numbering\
+            \ (starting with 1) are defined  separately for each API. If the string\
+            \ contains a lower number of characters than there are  defined features\
+            \ for an API, all features that would be represented by characters that\
+            \ are not  present in the string are not supported.\n"
+          pattern: "^[A-Fa-f0-9]*$"
+          title: supportedFeatures
+          type: string
+      required:
+      - notificationDestination
+      - securityInfo
+      title: ServiceSecurity
+      type: object
+    SecurityInformation:
+      description: Represents the interface details and the security method.
+      example:
+        selSecurityMethod: null
+        authenticationInfo: authenticationInfo
+        authorizationInfo: authorizationInfo
+        interfaceDetails:
+          ipv6Addr: ipv6Addr
+          securityMethods:
+          - null
+          - null
+          port: 5248
+          ipv4Addr: ipv4Addr
+        prefSecurityMethods:
+        - null
+        - null
+        aefId: aefId
+        apiId: apiId
+      oneOf:
+        - required:
+          - interfaceDetails
+        - required:
+          - aefId
+      properties:
+        interfaceDetails:
+          $ref: '#/components/schemas/InterfaceDescription'
+        aefId:
+          description: Identifier of the API exposing function
+          title: aefId
+          type: string
+        apiId:
+          description: API identifier
+          title: apiId
+          type: string
+        prefSecurityMethods:
+          description: Security methods preferred by the API invoker for the API interface.
+          items:
+            $ref: '#/components/schemas/SecurityMethod'
+          minItems: 1
+          title: prefSecurityMethods
+          type: array
+        selSecurityMethod:
+          $ref: '#/components/schemas/SecurityMethod'
+        authenticationInfo:
+          description: Authentication related information
+          title: authenticationInfo
+          type: string
+        authorizationInfo:
+          description: Authorization related information
+          title: authorizationInfo
+          type: string
+      required:
+      - prefSecurityMethods
+      title: SecurityInformation
+      type: object
+    SecurityNotification:
+      description: Represents revoked authorization notification details.
+      example:
+        apiInvokerId: apiInvokerId
+        cause: null
+        aefId: aefId
+        apiIds:
+        - apiIds
+        - apiIds
+      properties:
+        apiInvokerId:
+          description: String identifying the API invoker assigned by the CAPIF core
+            function.
+          title: apiInvokerId
+          type: string
+        aefId:
+          description: String identifying the AEF.
+          title: aefId
+          type: string
+        apiIds:
+          description: Identifier of the service API
+          items:
+            type: string
+          minItems: 1
+          title: apiIds
+          type: array
+        cause:
+          $ref: '#/components/schemas/Cause'
+      required:
+      - apiIds
+      - apiInvokerId
+      - cause
+      title: SecurityNotification
+      type: object
+    AccessTokenReq:
+      type: object
+      description: Represents the access token request information.
+      format: x-www-form-urlencoded
+      properties:
+        grant_type:
+          # enum:
+          # - client_credentials
+          type: string
+        client_id:
+          type: string
+        client_secret:
+          type: string
+        scope:
+          type: string
+      required:
+      - client_id
+      - grant_type
+      - scope
+    AccessTokenRsp:
+      description: Represents the access token response information.
+      example:
+        access_token: access_token
+        scope: scope
+        token_type: Bearer
+        expires_in: 0
+      properties:
+        access_token:
+          description: |
+            JWS Compact Serialized representation of JWS signed JSON object (AccessTokenClaims)
+          title: access_token
+          type: string
+        token_type:
+          enum:
+          - Bearer
+          title: token_type
+          type: string
+        expires_in:
+          description: Unsigned integer identifying a period of time in units of seconds.
+          minimum: 0
+          title: expires_in
+          type: integer
+        scope:
+          title: scope
+          type: string
+      required:
+      - access_token
+      - expires_in
+      - token_type
+      title: AccessTokenRsp
+      type: object
+    AccessTokenClaims:
+      description: Represents the claims data structure for the access token.
+      properties:
+        iss:
+          type: string
+        scope:
+          type: string
+        exp:
+          description: Unsigned integer identifying a period of time in units of seconds.
+          minimum: 0
+          title: expires_in
+          type: integer
+      required:
+      - exp
+      - iss
+      - scope
+      type: object
+    AccessTokenErr:
+      description: Represents an error in the access token request.
+      properties:
+        error:
+          enum:
+          - invalid_request
+          - invalid_client
+          - invalid_grant
+          - unauthorized_client
+          - unsupported_grant_type
+          - invalid_scope
+          title: error
+          type: string
+        error_description:
+          title: error_description
+          type: string
+        error_uri:
+          title: error_uri
+          type: string
+      required:
+      - error
+      title: AccessTokenErr
+      type: object
+    Cause:
+      anyOf:
+      - $ref: '#/components/schemas/Cause_anyOf'
+      - description: |
+          This string provides forward-compatibility with future extensions to the enumeration but is not used to encode content defined in the present version of this API.
+        type: string
+      description: "Possible values are:\n- OVERLIMIT_USAGE: The revocation of the\
+        \ authorization of the API invoker is due to the overlimit usage of the service\
+        \ API\n- UNEXPECTED_REASON: The revocation of the authorization of the API\
+        \ invoker is due to unexpected reason.\n"
+      title: Cause
+    ProblemDetails:
+      description: Represents additional information and details on an error response.
+      properties:
+        type:
+          description: string providing an URI formatted according to IETF RFC 3986.
+          title: type
+          type: string
+        title:
+          description: "A short, human-readable summary of the problem type. It should\
+            \ not change from occurrence to occurrence of the problem."
+          title: title
+          type: string
+        status:
+          description: The HTTP status code for this occurrence of the problem.
+          title: status
+          type: integer
+        detail:
+          description: A human-readable explanation specific to this occurrence of
+            the problem.
+          title: detail
+          type: string
+        instance:
+          description: string providing an URI formatted according to IETF RFC 3986.
+          title: type
+          type: string
+        cause:
+          description: "A machine-readable application error cause specific to this\
+            \ occurrence of the problem. This IE should be present and provide application-related\
+            \ error information, if available."
+          title: cause
+          type: string
+        invalidParams:
+          description: "Description of invalid parameters, for a request rejected\
+            \ due to invalid parameters."
+          items:
+            $ref: '#/components/schemas/InvalidParam'
+          minItems: 1
+          title: invalidParams
+          type: array
+        supportedFeatures:
+          description: "A string used to indicate the features supported by an API\
+            \ that is used as defined in clause  6.6 in 3GPP TS 29.500. The string\
+            \ shall contain a bitmask indicating supported features in  hexadecimal\
+            \ representation Each character in the string shall take a value of \"\
+            0\" to \"9\",  \"a\" to \"f\" or \"A\" to \"F\" and shall represent the\
+            \ support of 4 features as described in  table\_5.2.2-3. The most significant\
+            \ character representing the highest-numbered features shall  appear first\
+            \ in the string, and the character representing features 1 to 4 shall\
+            \ appear last  in the string. The list of features and their numbering\
+            \ (starting with 1) are defined  separately for each API. If the string\
+            \ contains a lower number of characters than there are  defined features\
+            \ for an API, all features that would be represented by characters that\
+            \ are not  present in the string are not supported.\n"
+          pattern: "^[A-Fa-f0-9]*$"
+          title: supportedFeatures
+          type: string
+      title: ProblemDetails
+      type: object
+    Uri:
+      description: string providing an URI formatted according to IETF RFC 3986.
+      title: type
+      type: string
+    InvalidParam:
+      description: "Represents the description of invalid parameters, for a request\
+        \ rejected due to invalid parameters."
+      properties:
+        param:
+          description: "Attribute's name encoded as a JSON Pointer, or header's name."
+          title: param
+          type: string
+        reason:
+          description: "A human-readable reason, e.g. \"must be a positive integer\"\
+            ."
+          title: reason
+          type: string
+      required:
+      - param
+      title: InvalidParam
+      type: object
+    ProblemDetails_1:
+      description: Provides additional information in an error response.
+      properties:
+        type:
+          description: String providing an URI formatted according to RFC 3986.
+          title: Uri_1
+          type: string
+        title:
+          type: string
+        status:
+          type: integer
+        detail:
+          description: A human-readable explanation specific to this occurrence of
+            the problem.
+          type: string
+        instance:
+          description: String providing an URI formatted according to RFC 3986.
+          title: Uri_1
+          type: string
+        cause:
+          description: "A machine-readable application error cause specific to this\
+            \ occurrence of the problem.  This IE should be present and provide application-related\
+            \ error information, if available.\n"
+          type: string
+        invalidParams:
+          items:
+            $ref: '#/components/schemas/InvalidParam_1'
+          minItems: 1
+          type: array
+        supportedFeatures:
+          description: "A string used to indicate the features supported by an API\
+            \ that is used as defined in clause  6.6 in 3GPP TS 29.500. The string\
+            \ shall contain a bitmask indicating supported features in  hexadecimal\
+            \ representation Each character in the string shall take a value of \"\
+            0\" to \"9\",  \"a\" to \"f\" or \"A\" to \"F\" and shall represent the\
+            \ support of 4 features as described in  table\_5.2.2-3. The most significant\
+            \ character representing the highest-numbered features shall  appear first\
+            \ in the string, and the character representing features 1 to 4 shall\
+            \ appear last  in the string. The list of features and their numbering\
+            \ (starting with 1) are defined  separately for each API. If the string\
+            \ contains a lower number of characters than there are  defined features\
+            \ for an API, all features that would be represented by characters that\
+            \ are not  present in the string are not supported.\n"
+          pattern: "^[A-Fa-f0-9]*$"
+          title: supportedFeatures
+          type: string
+        accessTokenError:
+          $ref: '#/components/schemas/AccessTokenErr_1'
+        accessTokenRequest:
+          $ref: '#/components/schemas/AccessTokenReq_1'
+        nrfId:
+          description: Fully Qualified Domain Name
+          maxLength: 253
+          minLength: 4
+          pattern: "^([0-9A-Za-z]([-0-9A-Za-z]{0,61}[0-9A-Za-z])?\\.)+[A-Za-z]{2,63}\\\
+            .?$"
+          title: Fqdn
+          type: string
+      type: object
+    Uri_1:
+      description: String providing an URI formatted according to RFC 3986.
+      title: Uri_1
+      type: string
+    InvalidParam_1:
+      description: It contains an invalid parameter and a related description.
+      properties:
+        param:
+          description: "If the invalid parameter is an attribute in a JSON body, this\
+            \ IE shall contain the  attribute's name and shall be encoded as a JSON\
+            \ Pointer. If the invalid parameter is  an HTTP header, this IE shall\
+            \ be formatted as the concatenation of the string \"header \"  plus the\
+            \ name of such header. If the invalid parameter is a query parameter,\
+            \ this IE  shall be formatted as the concatenation of the string \"query\
+            \ \" plus the name of such  query parameter. If the invalid parameter\
+            \ is a variable part in the path of a resource  URI, this IE shall contain\
+            \ the name of the variable, including the symbols \"{\" and \"}\"  used\
+            \ in OpenAPI specification as the notation to represent variable path\
+            \ segments.\n"
+          title: param
+          type: string
+        reason:
+          description: "A human-readable reason, e.g. \"must be a positive integer\"\
+            . In cases involving failed  operations in a PATCH request, the reason\
+            \ string should identify the operation that  failed using the operation's\
+            \ array index to assist in correlation of the invalid  parameter with\
+            \ the failed operation, e.g.\" Replacement value invalid for attribute\
+            \  (failed operation index= 4)\"\n"
+          title: reason
+          type: string
+      required:
+      - param
+      title: InvalidParam_1
+      type: object
+    SupportedFeatures:
+      description: "A string used to indicate the features supported by an API that\
+        \ is used as defined in clause  6.6 in 3GPP TS 29.500. The string shall contain\
+        \ a bitmask indicating supported features in  hexadecimal representation Each\
+        \ character in the string shall take a value of \"0\" to \"9\",  \"a\" to\
+        \ \"f\" or \"A\" to \"F\" and shall represent the support of 4 features as\
+        \ described in  table\_5.2.2-3. The most significant character representing\
+        \ the highest-numbered features shall  appear first in the string, and the\
+        \ character representing features 1 to 4 shall appear last  in the string.\
+        \ The list of features and their numbering (starting with 1) are defined \
+        \ separately for each API. If the string contains a lower number of characters\
+        \ than there are  defined features for an API, all features that would be\
+        \ represented by characters that are not  present in the string are not supported.\n"
+      pattern: "^[A-Fa-f0-9]*$"
+      title: supportedFeatures
+      type: string
+    Fqdn:
+      description: Fully Qualified Domain Name
+      maxLength: 253
+      minLength: 4
+      pattern: "^([0-9A-Za-z]([-0-9A-Za-z]{0,61}[0-9A-Za-z])?\\.)+[A-Za-z]{2,63}\\\
+        .?$"
+      title: Fqdn
+      type: string
+    WebsockNotifConfig:
+      description: Represents the configuration information for the delivery of notifications
+        over Websockets.
+      example:
+        requestWebsocketUri: true
+        websocketUri: websocketUri
+      properties:
+        websocketUri:
+          description: string formatted according to IETF RFC 3986 identifying a referenced
+            resource.
+          title: Link
+          type: string
+        requestWebsocketUri:
+          description: Set by the SCS/AS to indicate that the Websocket delivery is
+            requested.
+          title: requestWebsocketUri
+          type: boolean
+      title: WebsockNotifConfig
+      type: object
+    Link:
+      description: string formatted according to IETF RFC 3986 identifying a referenced
+        resource.
+      title: Link
+      type: string
+    InterfaceDescription:
+      description: Represents the description of an API's interface.
+      example:
+        ipv6Addr: ipv6Addr
+        securityMethods:
+        - null
+        - null
+        port: 5248
+        ipv4Addr: ipv4Addr
+      # oneOf:
+      #   - required:
+      #     - ipv4Addr
+      #   - required:
+      #     - ipv6Addr
+      properties:
+        ipv4Addr:
+          description: string identifying a Ipv4 address formatted in the "dotted
+            decimal" notation as defined in IETF RFC 1166.
+          title: Ipv4Addr
+          type: string
+        ipv6Addr:
+          description: string identifying a Ipv6 address formatted according to clause
+            4 in IETF RFC 5952. The mixed Ipv4 Ipv6 notation according to clause 5
+            of IETF RFC 5952 shall not be used.
+          title: Ipv6Addr
+          type: string
+        port:
+          description: Unsigned integer with valid values between 0 and 65535.
+          maximum: 65535
+          minimum: 0
+          title: Port
+          type: integer
+        securityMethods:
+          description: "Security methods supported by the interface, it take precedence\
+            \ over the security methods provided in AefProfile, for this specific\
+            \ interface.\n"
+          items:
+            $ref: '#/components/schemas/SecurityMethod'
+          minItems: 1
+          title: securityMethods
+          type: array
+      title: InterfaceDescription
+      type: object
+    SecurityMethod:
+      anyOf:
+      - $ref: '#/components/schemas/SecurityMethod_anyOf'
+      - description: |
+          This string provides forward-compatibility with future extensions to the enumeration but is not used to encode content defined in the present version of this API.
+        type: string
+      description: "Possible values are:\n- PSK: Security method 1 (Using TLS-PSK)\
+        \ as described in 3GPP TS 33.122\n- PKI: Security method 2 (Using PKI) as\
+        \ described in 3GPP TS 33.122\n- OAUTH: Security method 3 (TLS with OAuth\
+        \ token) as described in 3GPP TS 33.122\n"
+      title: SecurityMethod
+    DurationSec:
+      description: Unsigned integer identifying a period of time in units of seconds.
+      minimum: 0
+      title: expires_in
+      type: integer
+    AccessTokenErr_1:
+      description: Error returned in the access token response message
+      properties:
+        error:
+          enum:
+          - invalid_request
+          - invalid_client
+          - invalid_grant
+          - unauthorized_client
+          - unsupported_grant_type
+          - invalid_scope
+          title: error
+          type: string
+        error_description:
+          title: error_description
+          type: string
+        error_uri:
+          title: error_uri
+          type: string
+      required:
+      - error
+      title: AccessTokenErr_1
+      type: object
+    AccessTokenReq_1:
+      description: Contains information related to the access token request
+      properties:
+        grant_type:
+          # enum:
+          # - client_credentials
+          title: grant_type
+          type: string
+        nfInstanceId:
+          description: "String uniquely identifying a NF instance. The format of the\
+            \ NF Instance ID shall be a  Universally Unique Identifier (UUID) version\
+            \ 4, as described in IETF RFC 4122. \n"
+          format: uuid
+          title: NfInstanceId
+          type: string
+        nfType:
+          $ref: '#/components/schemas/NFType'
+        targetNfType:
+          $ref: '#/components/schemas/NFType'
+        scope:
+          pattern: "^([a-zA-Z0-9_:-]+)( [a-zA-Z0-9_:-]+)*$"
+          title: scope
+          type: string
+        targetNfInstanceId:
+          description: "String uniquely identifying a NF instance. The format of the\
+            \ NF Instance ID shall be a  Universally Unique Identifier (UUID) version\
+            \ 4, as described in IETF RFC 4122. \n"
+          format: uuid
+          title: NfInstanceId
+          type: string
+        requesterPlmn:
+          $ref: '#/components/schemas/PlmnId'
+        requesterPlmnList:
+          items:
+            $ref: '#/components/schemas/PlmnId'
+          minItems: 2
+          title: requesterPlmnList
+          type: array
+        requesterSnssaiList:
+          items:
+            $ref: '#/components/schemas/Snssai'
+          minItems: 1
+          title: requesterSnssaiList
+          type: array
+        requesterFqdn:
+          description: Fully Qualified Domain Name
+          maxLength: 253
+          minLength: 4
+          pattern: "^([0-9A-Za-z]([-0-9A-Za-z]{0,61}[0-9A-Za-z])?\\.)+[A-Za-z]{2,63}\\\
+            .?$"
+          title: Fqdn
+          type: string
+        requesterSnpnList:
+          items:
+            $ref: '#/components/schemas/PlmnIdNid'
+          minItems: 1
+          title: requesterSnpnList
+          type: array
+        targetPlmn:
+          $ref: '#/components/schemas/PlmnId'
+        targetSnssaiList:
+          items:
+            $ref: '#/components/schemas/Snssai'
+          minItems: 1
+          title: targetSnssaiList
+          type: array
+        targetNsiList:
+          items:
+            type: string
+          minItems: 1
+          title: targetNsiList
+          type: array
+        targetNfSetId:
+          description: "NF Set Identifier (see clause 28.12 of 3GPP TS 23.003), formatted\
+            \ as the following string \"set<Set ID>.<nftype>set.5gc.mnc<MNC>.mcc<MCC>\"\
+            , or  \"set<SetID>.<NFType>set.5gc.nid<NID>.mnc<MNC>.mcc<MCC>\" with \
+            \ <MCC> encoded as defined in clause 5.4.2 (\"Mcc\" data type definition)\
+            \  <MNC> encoding the Mobile Network Code part of the PLMN, comprising\
+            \ 3 digits. \n  If there are only 2 significant digits in the MNC, one\
+            \ \"0\" digit shall be inserted \n  at the left side to fill the 3 digits\
+            \ coding of MNC.  Pattern: '^[0-9]{3}$'\n<NFType> encoded as a value defined\
+            \ in Table 6.1.6.3.3-1 of 3GPP TS 29.510 but \n  with lower case characters\
+            \ <Set ID> encoded as a string of characters consisting of \n  alphabetic\
+            \ characters (A-Z and a-z), digits (0-9) and/or the hyphen (-) and that\
+            \ \n  shall end with either an alphabetic character or a digit. \n"
+          title: NfSetId
+          type: string
+        targetNfServiceSetId:
+          description: "NF Service Set Identifier (see clause 28.12 of 3GPP TS 23.003)\
+            \ formatted as the following  string \"set<Set ID>.sn<Service Name>.nfi<NF\
+            \ Instance ID>.5gc.mnc<MNC>.mcc<MCC>\", or  \"set<SetID>.sn<ServiceName>.nfi<NFInstanceID>.5gc.nid<NID>.mnc<MNC>.mcc<MCC>\"\
+            \ with  <MCC> encoded as defined in clause 5.4.2 (\"Mcc\" data type definition)\
+            \   <MNC> encoding the Mobile Network Code part of the PLMN, comprising\
+            \ 3 digits. \n  If there are only 2 significant digits in the MNC, one\
+            \ \"0\" digit shall be inserted \n  at the left side to fill the 3 digits\
+            \ coding of MNC.  Pattern: '^[0-9]{3}$'\n<NID> encoded as defined in clause\_\
+            5.4.2 (\"Nid\" data type definition)  <NFInstanceId> encoded as defined\
+            \ in clause 5.3.2  <ServiceName> encoded as defined in 3GPP TS 29.510\
+            \  <Set ID> encoded as a string of characters consisting of alphabetic\
+            \ \n  characters (A-Z and a-z), digits (0-9) and/or the hyphen (-) and\
+            \ that shall end \n  with either an alphabetic character or a digit.\n"
+          title: NfServiceSetId
+          type: string
+        hnrfAccessTokenUri:
+          description: String providing an URI formatted according to RFC 3986.
+          title: Uri_1
+          type: string
+        sourceNfInstanceId:
+          description: "String uniquely identifying a NF instance. The format of the\
+            \ NF Instance ID shall be a  Universally Unique Identifier (UUID) version\
+            \ 4, as described in IETF RFC 4122. \n"
+          format: uuid
+          title: NfInstanceId
+          type: string
+      required:
+      - grant_type
+      - nfInstanceId
+      - scope
+      title: AccessTokenReq_1
+      type: object
+    Ipv4Addr:
+      description: string identifying a Ipv4 address formatted in the "dotted decimal"
+        notation as defined in IETF RFC 1166.
+      title: Ipv4Addr
+      type: string
+    Ipv6Addr:
+      description: string identifying a Ipv6 address formatted according to clause
+        4 in IETF RFC 5952. The mixed Ipv4 Ipv6 notation according to clause 5 of
+        IETF RFC 5952 shall not be used.
+      title: Ipv6Addr
+      type: string
+    Port:
+      description: Unsigned integer with valid values between 0 and 65535.
+      maximum: 65535
+      minimum: 0
+      title: Port
+      type: integer
+    NfInstanceId:
+      description: "String uniquely identifying a NF instance. The format of the NF\
+        \ Instance ID shall be a  Universally Unique Identifier (UUID) version 4,\
+        \ as described in IETF RFC 4122. \n"
+      format: uuid
+      title: NfInstanceId
+      type: string
+    NFType:
+      anyOf:
+      - $ref: '#/components/schemas/NFType_anyOf'
+      - type: string
+      description: NF types known to NRF
+      title: NFType
+    PlmnId:
+      description: "When PlmnId needs to be converted to string (e.g. when used in\
+        \ maps as key), the string  shall be composed of three digits \"mcc\" followed\
+        \ by \"-\" and two or three digits \"mnc\".\n"
+      properties:
+        mcc:
+          description: "Mobile Country Code part of the PLMN, comprising 3 digits,\
+            \ as defined in clause 9.3.3.5 of 3GPP TS 38.413. \n"
+          pattern: "^\\d{3}$"
+          title: Mcc
+          type: string
+        mnc:
+          description: "Mobile Network Code part of the PLMN, comprising 2 or 3 digits,\
+            \ as defined in clause 9.3.3.5 of 3GPP TS 38.413."
+          pattern: "^\\d{2,3}$"
+          title: Mnc
+          type: string
+      required:
+      - mcc
+      - mnc
+      title: PlmnId
+      type: object
+    Mcc:
+      description: "Mobile Country Code part of the PLMN, comprising 3 digits, as\
+        \ defined in clause 9.3.3.5 of 3GPP TS 38.413. \n"
+      pattern: "^\\d{3}$"
+      title: Mcc
+      type: string
+    Mnc:
+      description: "Mobile Network Code part of the PLMN, comprising 2 or 3 digits,\
+        \ as defined in clause 9.3.3.5 of 3GPP TS 38.413."
+      pattern: "^\\d{2,3}$"
+      title: Mnc
+      type: string
+    Snssai:
+      description: "When Snssai needs to be converted to string (e.g. when used in\
+        \ maps as key), the string shall be composed of one to three digits \"sst\"\
+        \ optionally followed by \"-\" and 6 hexadecimal digits \"sd\".\n"
+      properties:
+        sst:
+          description: "Unsigned integer, within the range 0 to 255, representing\
+            \ the Slice/Service Type.  It indicates the expected Network Slice behaviour\
+            \ in terms of features and services. Values 0 to 127 correspond to the\
+            \ standardized SST range. Values 128 to 255 correspond  to the Operator-specific\
+            \ range. See clause 28.4.2 of 3GPP TS 23.003. Standardized values are\
+            \ defined in clause 5.15.2.2 of 3GPP TS 23.501. \n"
+          maximum: 255
+          minimum: 0
+          title: sst
+          type: integer
+        sd:
+          description: "3-octet string, representing the Slice Differentiator, in\
+            \ hexadecimal representation. Each character in the string shall take\
+            \ a value of \"0\" to \"9\", \"a\" to \"f\" or \"A\" to \"F\" and shall\
+            \ represent 4 bits. The most significant character representing the 4\
+            \ most significant bits of the SD shall appear first in the string, and\
+            \ the character representing the 4 least significant bit of the SD shall\
+            \ appear last in the string. This is an optional parameter that complements\
+            \ the Slice/Service type(s) to allow to  differentiate amongst multiple\
+            \ Network Slices of the same Slice/Service type. This IE shall be absent\
+            \ if no SD value is associated with the SST.\n"
+          pattern: "^[A-Fa-f0-9]{6}$"
+          title: sd
+          type: string
+      required:
+      - sst
+      title: Snssai
+      type: object
+    PlmnIdNid:
+      description: "Contains the serving core network operator PLMN ID and, for an\
+        \ SNPN, the NID that together with the PLMN ID identifies the SNPN.\n"
+      properties:
+        mcc:
+          description: "Mobile Country Code part of the PLMN, comprising 3 digits,\
+            \ as defined in clause 9.3.3.5 of 3GPP TS 38.413. \n"
+          pattern: "^\\d{3}$"
+          title: Mcc
+          type: string
+        mnc:
+          description: "Mobile Network Code part of the PLMN, comprising 2 or 3 digits,\
+            \ as defined in clause 9.3.3.5 of 3GPP TS 38.413."
+          pattern: "^\\d{2,3}$"
+          title: Mnc
+          type: string
+        nid:
+          description: "This represents the Network Identifier, which together with\
+            \ a PLMN ID is used to identify an SNPN (see 3GPP TS 23.003 and 3GPP TS\
+            \ 23.501 clause 5.30.2.1). \n"
+          pattern: "^[A-Fa-f0-9]{11}$"
+          title: Nid
+          type: string
+      required:
+      - mcc
+      - mnc
+      title: PlmnIdNid
+      type: object
+    Nid:
+      description: "This represents the Network Identifier, which together with a\
+        \ PLMN ID is used to identify an SNPN (see 3GPP TS 23.003 and 3GPP TS 23.501\
+        \ clause 5.30.2.1). \n"
+      pattern: "^[A-Fa-f0-9]{11}$"
+      title: Nid
+      type: string
+    NfSetId:
+      description: "NF Set Identifier (see clause 28.12 of 3GPP TS 23.003), formatted\
+        \ as the following string \"set<Set ID>.<nftype>set.5gc.mnc<MNC>.mcc<MCC>\"\
+        , or  \"set<SetID>.<NFType>set.5gc.nid<NID>.mnc<MNC>.mcc<MCC>\" with  <MCC>\
+        \ encoded as defined in clause 5.4.2 (\"Mcc\" data type definition)  <MNC>\
+        \ encoding the Mobile Network Code part of the PLMN, comprising 3 digits.\
+        \ \n  If there are only 2 significant digits in the MNC, one \"0\" digit shall\
+        \ be inserted \n  at the left side to fill the 3 digits coding of MNC.  Pattern:\
+        \ '^[0-9]{3}$'\n<NFType> encoded as a value defined in Table 6.1.6.3.3-1 of\
+        \ 3GPP TS 29.510 but \n  with lower case characters <Set ID> encoded as a\
+        \ string of characters consisting of \n  alphabetic characters (A-Z and a-z),\
+        \ digits (0-9) and/or the hyphen (-) and that \n  shall end with either an\
+        \ alphabetic character or a digit. \n"
+      title: NfSetId
+      type: string
+    NfServiceSetId:
+      description: "NF Service Set Identifier (see clause 28.12 of 3GPP TS 23.003)\
+        \ formatted as the following  string \"set<Set ID>.sn<Service Name>.nfi<NF\
+        \ Instance ID>.5gc.mnc<MNC>.mcc<MCC>\", or  \"set<SetID>.sn<ServiceName>.nfi<NFInstanceID>.5gc.nid<NID>.mnc<MNC>.mcc<MCC>\"\
+        \ with  <MCC> encoded as defined in clause 5.4.2 (\"Mcc\" data type definition)\
+        \   <MNC> encoding the Mobile Network Code part of the PLMN, comprising 3\
+        \ digits. \n  If there are only 2 significant digits in the MNC, one \"0\"\
+        \ digit shall be inserted \n  at the left side to fill the 3 digits coding\
+        \ of MNC.  Pattern: '^[0-9]{3}$'\n<NID> encoded as defined in clause\_5.4.2\
+        \ (\"Nid\" data type definition)  <NFInstanceId> encoded as defined in clause\
+        \ 5.3.2  <ServiceName> encoded as defined in 3GPP TS 29.510  <Set ID> encoded\
+        \ as a string of characters consisting of alphabetic \n  characters (A-Z and\
+        \ a-z), digits (0-9) and/or the hyphen (-) and that shall end \n  with either\
+        \ an alphabetic character or a digit.\n"
+      title: NfServiceSetId
+      type: string
+    Cause_anyOf:
+      enum:
+      - OVERLIMIT_USAGE
+      - UNEXPECTED_REASON
+      title: Cause_anyOf
+      type: string
+    SecurityMethod_anyOf:
+      enum:
+      - PSK
+      - PKI
+      - OAUTH
+      title: SecurityMethod_anyOf
+      type: string
+    NFType_anyOf:
+      enum:
+      - NRF
+      - UDM
+      - AMF
+      - SMF
+      - AUSF
+      - NEF
+      - PCF
+      - SMSF
+      - NSSF
+      - UDR
+      - LMF
+      - GMLC
+      - 5G_EIR
+      - SEPP
+      - UPF
+      - N3IWF
+      - AF
+      - UDSF
+      - BSF
+      - CHF
+      - NWDAF
+      - PCSCF
+      - CBCF
+      - HSS
+      - UCMF
+      - SOR_AF
+      - SPAF
+      - MME
+      - SCSAS
+      - SCEF
+      - SCP
+      - NSSAAF
+      - ICSCF
+      - SCSCF
+      - DRA
+      - IMS_AS
+      - AANF
+      - 5G_DDNMF
+      - NSACF
+      - MFAF
+      - EASDF
+      - DCCF
+      - MB_SMF
+      - TSCTSF
+      - ADRF
+      - GBA_BSF
+      - CEF
+      - MB_UPF
+      - NSWOF
+      - PKMF
+      - MNPF
+      - SMS_GMSC
+      - SMS_IWMSC
+      - MBSF
+      - MBSTF
+      title: NFType_anyOf
+      type: string
diff --git a/services/TS29222_CAPIF_Security_API/capif_security/typing_utils.py b/services/TS29222_CAPIF_Security_API/capif_security/typing_utils.py
new file mode 100644
index 0000000000000000000000000000000000000000..0563f81fd5345282a33705038dfa77fdcaa15872
--- /dev/null
+++ b/services/TS29222_CAPIF_Security_API/capif_security/typing_utils.py
@@ -0,0 +1,32 @@
+# coding: utf-8
+
+import sys
+
+if sys.version_info < (3, 7):
+    import typing
+
+    def is_generic(klass):
+        """ Determine whether klass is a generic class """
+        return type(klass) == typing.GenericMeta
+
+    def is_dict(klass):
+        """ Determine whether klass is a Dict """
+        return klass.__extra__ == dict
+
+    def is_list(klass):
+        """ Determine whether klass is a List """
+        return klass.__extra__ == list
+
+else:
+
+    def is_generic(klass):
+        """ Determine whether klass is a generic class """
+        return hasattr(klass, '__origin__')
+
+    def is_dict(klass):
+        """ Determine whether klass is a Dict """
+        return klass.__origin__ == dict
+
+    def is_list(klass):
+        """ Determine whether klass is a List """
+        return klass.__origin__ == list
diff --git a/services/TS29222_CAPIF_Security_API/capif_security/util.py b/services/TS29222_CAPIF_Security_API/capif_security/util.py
new file mode 100644
index 0000000000000000000000000000000000000000..873c290d1d0bd4a1b6e0a9ff18e60630cc836f14
--- /dev/null
+++ b/services/TS29222_CAPIF_Security_API/capif_security/util.py
@@ -0,0 +1,186 @@
+import datetime
+
+import six
+import typing
+from capif_security import typing_utils
+
+
+def clean_empty(d):
+    if isinstance(d, dict):
+        return {
+            k: v
+            for k, v in ((k, clean_empty(v)) for k, v in d.items())
+            if v
+        }
+    if isinstance(d, list):
+        return [v for v in map(clean_empty, d) if v]
+    return d
+
+def dict_to_camel_case(my_dict):
+
+
+        result = {}
+
+        for attr, value in my_dict.items():
+
+            my_key = ''.join(word.title() for word in attr.split('_'))
+            my_key= ''.join([my_key[0].lower(), my_key[1:]])
+
+            if isinstance(value, list):
+                result[my_key] = list(map(
+                    lambda x: dict_to_camel_case(x) if isinstance(x, dict) else x, value ))
+
+            elif hasattr(value, "to_dict"):
+                result[my_key] = dict_to_camel_case(value)
+
+            elif isinstance(value, dict):
+                value = dict_to_camel_case(value)
+                result[my_key] = value
+            else:
+                result[my_key] = value
+
+        return result
+
+
+
+def _deserialize(data, klass):
+    """Deserializes dict, list, str into an object.
+
+    :param data: dict, list or str.
+    :param klass: class literal, or string of class name.
+
+    :return: object.
+    """
+    if data is None:
+        return None
+
+    if klass in six.integer_types or klass in (float, str, bool, bytearray):
+        return _deserialize_primitive(data, klass)
+    elif klass == object:
+        return _deserialize_object(data)
+    elif klass == datetime.date:
+        return deserialize_date(data)
+    elif klass == datetime.datetime:
+        return deserialize_datetime(data)
+    elif typing_utils.is_generic(klass):
+        if typing_utils.is_list(klass):
+            return _deserialize_list(data, klass.__args__[0])
+        if typing_utils.is_dict(klass):
+            return _deserialize_dict(data, klass.__args__[1])
+    else:
+        return deserialize_model(data, klass)
+
+
+def _deserialize_primitive(data, klass):
+    """Deserializes to primitive type.
+
+    :param data: data to deserialize.
+    :param klass: class literal.
+
+    :return: int, long, float, str, bool.
+    :rtype: int | long | float | str | bool
+    """
+    try:
+        value = klass(data)
+    except UnicodeEncodeError:
+        value = six.u(data)
+    except TypeError:
+        value = data
+    return value
+
+
+def _deserialize_object(value):
+    """Return an original value.
+
+    :return: object.
+    """
+    return value
+
+
+def deserialize_date(string):
+    """Deserializes string to date.
+
+    :param string: str.
+    :type string: str
+    :return: date.
+    :rtype: date
+    """
+    if string is None:
+      return None
+    
+    try:
+        from dateutil.parser import parse
+        return parse(string).date()
+    except ImportError:
+        return string
+
+
+def deserialize_datetime(string):
+    """Deserializes string to datetime.
+
+    The string should be in iso8601 datetime format.
+
+    :param string: str.
+    :type string: str
+    :return: datetime.
+    :rtype: datetime
+    """
+    if string is None:
+      return None
+    
+    try:
+        from dateutil.parser import parse
+        return parse(string)
+    except ImportError:
+        return string
+
+
+def deserialize_model(data, klass):
+    """Deserializes list or dict to model.
+
+    :param data: dict, list.
+    :type data: dict | list
+    :param klass: class literal.
+    :return: model object.
+    """
+    instance = klass()
+
+    if not instance.openapi_types:
+        return data
+
+    for attr, attr_type in six.iteritems(instance.openapi_types):
+        if data is not None \
+                and instance.attribute_map[attr] in data \
+                and isinstance(data, (list, dict)):
+            value = data[instance.attribute_map[attr]]
+            setattr(instance, attr, _deserialize(value, attr_type))
+
+    return instance
+
+
+def _deserialize_list(data, boxed_type):
+    """Deserializes a list and its elements.
+
+    :param data: list to deserialize.
+    :type data: list
+    :param boxed_type: class literal.
+
+    :return: deserialized list.
+    :rtype: list
+    """
+    return [_deserialize(sub_data, boxed_type)
+            for sub_data in data]
+
+
+def _deserialize_dict(data, boxed_type):
+    """Deserializes a dict and its elements.
+
+    :param data: dict to deserialize.
+    :type data: dict
+    :param boxed_type: class literal.
+
+    :return: deserialized dict.
+    :rtype: dict
+    """
+    return {k: _deserialize(v, boxed_type)
+            for k, v in six.iteritems(data)}
diff --git a/services/TS29222_CAPIF_Security_API/config.yaml b/services/TS29222_CAPIF_Security_API/config.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..2a6bb81684b984cf0a22aa864ddce9044e4fa95c
--- /dev/null
+++ b/services/TS29222_CAPIF_Security_API/config.yaml
@@ -0,0 +1,22 @@
+mongo: {
+  'user': 'root',
+  'password': 'example',
+  'db': 'capif',
+  'col': 'security',
+  'capif_service_col': 'serviceapidescriptions',
+  'certs_col': "certs",
+  'capif_invokers' : 'invokerdetails',
+  'host': 'mongo',
+  'port': "27017"
+}
+
+monitoring: {
+  "fluent_bit_host": fluent-bit,
+  "fluent_bit_port": 24224,
+  "opentelemetry_url": "otel-collector",
+  "opentelemetry_port": "55680",
+  "opentelemetry_max_queue_size": 8192,
+  "opentelemetry_schedule_delay_millis": 20000,
+  "opentelemetry_max_export_batch_size": 2048,
+  "opentelemetry_export_timeout_millis": 60000
+}
\ No newline at end of file
diff --git a/services/TS29222_CAPIF_Security_API/git_push.sh b/services/TS29222_CAPIF_Security_API/git_push.sh
new file mode 100644
index 0000000000000000000000000000000000000000..9405f72e950cdb8ca24c3cf4d15cee7eac62fde7
--- /dev/null
+++ b/services/TS29222_CAPIF_Security_API/git_push.sh
@@ -0,0 +1,57 @@
+#!/bin/sh
+# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
+#
+# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl "minor update" "gitlab.com"
+
+git_user_id=$1
+git_repo_id=$2
+release_note=$3
+git_host=$4
+
+if [ "$git_host" = "" ]; then
+    git_host="github.com"
+    echo "[INFO] No command line input provided. Set \$git_host to $git_host"
+fi
+
+if [ "$git_user_id" = "" ]; then
+    git_user_id="GIT_USER_ID"
+    echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id"
+fi
+
+if [ "$git_repo_id" = "" ]; then
+    git_repo_id="GIT_REPO_ID"
+    echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id"
+fi
+
+if [ "$release_note" = "" ]; then
+    release_note="Minor update"
+    echo "[INFO] No command line input provided. Set \$release_note to $release_note"
+fi
+
+# Initialize the local directory as a Git repository
+git init
+
+# Adds the files in the local repository and stages them for commit.
+git add .
+
+# Commits the tracked changes and prepares them to be pushed to a remote repository.
+git commit -m "$release_note"
+
+# Sets the new remote
+git_remote=`git remote`
+if [ "$git_remote" = "" ]; then # git remote not defined
+
+    if [ "$GIT_TOKEN" = "" ]; then
+        echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git credential in your environment."
+        git remote add origin https://${git_host}/${git_user_id}/${git_repo_id}.git
+    else
+        git remote add origin https://${git_user_id}:${GIT_TOKEN}@${git_host}/${git_user_id}/${git_repo_id}.git
+    fi
+
+fi
+
+git pull origin master
+
+# Pushes (Forces) the changes in the local repository up to the remote repository
+echo "Git pushing to https://${git_host}/${git_user_id}/${git_repo_id}.git"
+git push origin master 2>&1 | grep -v 'To https'
diff --git a/services/TS29222_CAPIF_Security_API/main.py b/services/TS29222_CAPIF_Security_API/main.py
new file mode 100644
index 0000000000000000000000000000000000000000..d7709377257fb38fb098b63e18f5f19c0d0793e4
--- /dev/null
+++ b/services/TS29222_CAPIF_Security_API/main.py
@@ -0,0 +1,61 @@
+
+from capif_security.models import ServiceSecurity
+
+
+json_data = {
+    "securityInfo": [
+      {
+        "interfaceDetails": {
+          "ipv4Addr": "string",
+          "ipv6Addr": "string",
+          "port": 65535,
+          "securityMethods": [
+            "PSK",
+            "PKI"
+          ]
+        },
+        "aefId": "string",
+        "apiId": "string",
+        "prefSecurityMethods": [
+          "PSK",
+          "PKI"
+        ],
+        "selSecurityMethod": "PSK",
+        "authenticationInfo": "string",
+        "authorizationInfo": "string"
+      },
+      {
+        "interfaceDetails": {
+          "ipv4Addr": "string",
+          "ipv6Addr": "string",
+          "port": 65535,
+          "securityMethods": [
+            "PSK",
+            "string"
+          ]
+        },
+        "aefId": "string",
+        "apiId": "string",
+        "prefSecurityMethods": [
+          "PSK",
+          "string"
+        ],
+        "selSecurityMethod": "PSK",
+        "authenticationInfo": "string",
+        "authorizationInfo": "string"
+      }
+    ],
+    "notificationDestination": "string",
+    "requestTestNotification": True,
+    "websockNotifConfig": {
+      "websocketUri": "string",
+      "requestWebsocketUri": True
+    },
+    "supportedFeatures": "fff"
+  }
+
+#print(json_data)
+
+my_ser = ServiceSecurity.from_dict(json_data)
+
+print(my_ser)
\ No newline at end of file
diff --git a/services/TS29222_CAPIF_Security_API/requirements.txt b/services/TS29222_CAPIF_Security_API/requirements.txt
new file mode 100644
index 0000000000000000000000000000000000000000..220adafdb62aa6e9343fde8c22dc7b2f9c7e0ba7
--- /dev/null
+++ b/services/TS29222_CAPIF_Security_API/requirements.txt
@@ -0,0 +1,22 @@
+connexion[swagger-ui] == 2.14.2; python_version>="3.6"
+swagger-ui-bundle >= 0.0.2
+python_dateutil >= 2.6.0
+setuptools >= 21.0.0
+Flask == 2.0.3
+pymongo == 4.0.1
+flask_jwt_extended == 4.4.4
+pyopenssl == 23.0.0
+rfc3987 == 1.3.8
+redis ==  4.5.4
+flask_executor == 1.0.0
+opentelemetry-instrumentation == 0.38b0
+opentelemetry-instrumentation-flask == 0.38b0
+opentelemetry-instrumentation-redis == 0.38b0
+opentelemetry-instrumentation-pymongo == 0.38b0
+opentelemetry-exporter-otlp == 1.17.0
+opentelemetry-exporter-jaeger==1.17.0
+fluent == 0.10.0
+fluent-logger == 0.10.0
+opentelemetry-api == 1.17.0
+opentelemetry-sdk == 1.17.0
+flask_executor == 1.0.0
\ No newline at end of file
diff --git a/services/TS29222_CAPIF_Security_API/security_prepare.sh b/services/TS29222_CAPIF_Security_API/security_prepare.sh
new file mode 100644
index 0000000000000000000000000000000000000000..c28b38929ae793399b64b70fab1ccbcccc6aeab0
--- /dev/null
+++ b/services/TS29222_CAPIF_Security_API/security_prepare.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+VAULT_ADDR="http://$VAULT_HOSTNAME:$VAULT_PORT"
+VAULT_TOKEN=$VAULT_ACCESS_TOKEN
+
+
+
+curl  -k -retry 30 \
+    --retry-all-errors \
+    --connect-timeout 5 \
+    --max-time 10 \
+    --retry-delay 10 \
+    --retry-max-time 300 \
+    --header "X-Vault-Token: $VAULT_TOKEN" \
+    --request GET "$VAULT_ADDR/v1/secret/data/server_cert/private" 2>/dev/null | jq -r '.data.data.key' -j > /usr/src/app/capif_security/server.key
+
+
+cd /usr/src/app/
+python3 -m capif_security
\ No newline at end of file
diff --git a/services/TS29222_CAPIF_Security_API/setup.py b/services/TS29222_CAPIF_Security_API/setup.py
new file mode 100644
index 0000000000000000000000000000000000000000..d763e2edd452fb04c1a21f6fa2c721ad10fd6455
--- /dev/null
+++ b/services/TS29222_CAPIF_Security_API/setup.py
@@ -0,0 +1,39 @@
+# coding: utf-8
+
+import sys
+from setuptools import setup, find_packages
+
+NAME = "capif_security"
+VERSION = "1.0.0"
+
+# To install the library, run the following
+#
+# python setup.py install
+#
+# prerequisite: setuptools
+# http://pypi.python.org/pypi/setuptools
+
+REQUIRES = [
+    "connexion>=2.0.2",
+    "swagger-ui-bundle>=0.0.2",
+    "python_dateutil>=2.6.0"
+]
+
+setup(
+    name=NAME,
+    version=VERSION,
+    description="CAPIF_Security_API",
+    author_email="",
+    url="",
+    keywords=["OpenAPI", "CAPIF_Security_API"],
+    install_requires=REQUIRES,
+    packages=find_packages(),
+    package_data={'': ['openapi/openapi.yaml']},
+    include_package_data=True,
+    entry_points={
+        'console_scripts': ['capif_security=capif_security.__main__:main']},
+    long_description="""\
+    API for CAPIF security management. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. 
+    """
+)
+
diff --git a/services/TS29222_CAPIF_Security_API/test-requirements.txt b/services/TS29222_CAPIF_Security_API/test-requirements.txt
new file mode 100644
index 0000000000000000000000000000000000000000..0970f28c7c5a344d7fd9b9c893c584e7336df266
--- /dev/null
+++ b/services/TS29222_CAPIF_Security_API/test-requirements.txt
@@ -0,0 +1,4 @@
+pytest~=4.6.7 # needed for python 2.7+3.4
+pytest-cov>=2.8.1
+pytest-randomly==1.2.3 # needed for python 2.7+3.4
+Flask-Testing==0.8.0
diff --git a/services/TS29222_CAPIF_Security_API/tox.ini b/services/TS29222_CAPIF_Security_API/tox.ini
new file mode 100644
index 0000000000000000000000000000000000000000..f9b3b3b91b81585dbad03fb76c1e36be0a3dfa20
--- /dev/null
+++ b/services/TS29222_CAPIF_Security_API/tox.ini
@@ -0,0 +1,11 @@
+[tox]
+envlist = py3
+skipsdist=True
+
+[testenv]
+deps=-r{toxinidir}/requirements.txt
+     -r{toxinidir}/test-requirements.txt
+	 {toxinidir}
+
+commands=
+   pytest --cov=capif_security
diff --git a/services/capif-client/CAPIFInvokerGUI/invoker_gui/Dockerfile b/services/capif-client/CAPIFInvokerGUI/invoker_gui/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..8357bf96b3ffb21ac8b942395a6df5b54b708ccb
--- /dev/null
+++ b/services/capif-client/CAPIFInvokerGUI/invoker_gui/Dockerfile
@@ -0,0 +1,13 @@
+FROM python:3.8
+ENV PYTHONUNBUFFERED 1
+
+RUN apt-get update && apt-get install -y jq && apt-get clean
+RUN apt-get install -y iputils-ping
+
+RUN mkdir -p /usr/src/app
+WORKDIR /usr/src/app
+ADD requirements.txt /usr/src/app/
+RUN pip install -r requirements.txt
+ADD . /usr/src/app/
+
+CMD ["sh", "prepare.sh"]
\ No newline at end of file
diff --git a/services/capif-client/CAPIFInvokerGUI/invoker_gui/capif_ops/__init__.py b/services/capif-client/CAPIFInvokerGUI/invoker_gui/capif_ops/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/services/capif-client/CAPIFInvokerGUI/invoker_gui/capif_ops/config_files/capif_registration.json b/services/capif-client/CAPIFInvokerGUI/invoker_gui/capif_ops/config_files/capif_registration.json
new file mode 100644
index 0000000000000000000000000000000000000000..498f2844f3b1090f489960a6469bdf6d5fa6064f
--- /dev/null
+++ b/services/capif-client/CAPIFInvokerGUI/invoker_gui/capif_ops/config_files/capif_registration.json
@@ -0,0 +1,17 @@
+{
+  "folder_to_store_certificates": "/usr/src/app/capif_onboarding",
+  "capif_host": "capifcore",
+  "capif_http_port": "8080",
+  "capif_https_port": "443",
+  "capif_netapp_username": "test_netapp_23",
+  "capif_netapp_password": "test_netapp_password",
+  "capif_callback_url": "http://192.168.1.11:5000",
+  "description": ",test_app_description",
+  "csr_common_name": "test_app_common_name",
+  "csr_organizational_unit": "test_app_ou",
+  "csr_organization": "test_app_o",
+  "crs_locality": "Madrid",
+  "csr_state_or_province_name": "Madrid",
+  "csr_country_name": "ES",
+  "csr_email_address": "test@example.com"
+}
\ No newline at end of file
diff --git a/services/capif-client/CAPIFInvokerGUI/invoker_gui/capif_ops/config_files/credentials.properties b/services/capif-client/CAPIFInvokerGUI/invoker_gui/capif_ops/config_files/credentials.properties
new file mode 100755
index 0000000000000000000000000000000000000000..0c39e2c313412f75ba0a252e17da79ef884cf5be
--- /dev/null
+++ b/services/capif-client/CAPIFInvokerGUI/invoker_gui/capif_ops/config_files/credentials.properties
@@ -0,0 +1,14 @@
+[credentials]
+invoker_username = customnetapp
+invoker_password = pass123
+invoker_role = invoker
+invoker_description = Dummy NetApp
+invoker_cn = invoker
+#capif_ip = capicore
+#capif_port = 8080
+capif_callback_ip = host.docker.internal
+capif_callback_port = 8086
+nef_ip = host.docker.internal
+nef_port = 8888
+nef_callback_ip = host.docker.internal
+nef_callback_port = 8085
\ No newline at end of file
diff --git a/services/capif-client/CAPIFInvokerGUI/invoker_gui/capif_ops/config_files/demo_values.json b/services/capif-client/CAPIFInvokerGUI/invoker_gui/capif_ops/config_files/demo_values.json
new file mode 100644
index 0000000000000000000000000000000000000000..3a8a2ab4fa101b15b95b45565765dbd00a8a5aab
--- /dev/null
+++ b/services/capif-client/CAPIFInvokerGUI/invoker_gui/capif_ops/config_files/demo_values.json
@@ -0,0 +1 @@
+{"netappID": "93caff2e486955", "ccf_onboarding_url": "api-invoker-management/v1/onboardedInvokers", "ccf_discover_url": "service-apis/v1/allServiceAPIs?api-invoker-id=", "capif_access_token": "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJmcmVzaCI6ZmFsc2UsImlhdCI6MTY4OTU4NzA1OCwianRpIjoiMDViOGMwYWMtYmU4OC00OWViLWFhNWItZTA0ZDM4NWJlYWFkIiwidHlwZSI6ImFjY2VzcyIsInN1YiI6ImN1c3RvbW5ldGFwcCBpbnZva2VyIiwibmJmIjoxNjg5NTg3MDU4LCJleHAiOjE2ODk1ODc5NTh9.k8ZXlgS0CJS-aDJCHgUv0oA4B6CLBjYpp5z3qIrzsvgr20wflpKXiO03c6U3G87T33ocEPR6BWG-ZhpQ1bfml2CKU16gef4nIDIgOKh17yBF0M1eW-gULBZL9exJQIpDWJXQK9oZOrkyHjgN89ieXlVYW9hKaGQfRl_B_HZL0hllWq6E9uE7kHG-VJTEmLJTEyP6uqmfIPLz2znHeTk8eP7IB_vxeIh-7Fr6LcyziDoxMskPDqxzg_6oLyd7biH9qZyWQYvtrEPsh_kJdK5Yc7vK1Kuh01uY9JRk9E97sXU8x0yBjejHgDn9K7_kH1gugPo7eP6nEPvm3BROWHFUmw", "api_id_0": "1d3c0c7803e650264ba30963b96549", "api_name_0": "/nef/api/v1/3gpp-as-session-with-qos/", "aef_id_0": "8cadd2bf35c6adf24bda897b4e8e99", "demo_ipv4_addr_0": "3gppnef", "demo_port_0": 8090, "demo_url_0": "/nef/api/v1/3gpp-as-session-with-qos/v1/{scsAsId}/subscriptions", "netapp_service_token": "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJmcmVzaCI6ZmFsc2UsImlhdCI6MTY4OTU4ODEwOCwianRpIjoiY2NiNDNkNzktNTRjYS00NDI4LTg1OGMtN2MyNDI1MzhiZjU5IiwidHlwZSI6ImFjY2VzcyIsInN1YiI6IjIwZjAxMTY0OTRkNTA0MjhmZTI2ZDdhNjNkYjNlNSIsIm5iZiI6MTY4OTU4ODEwOCwiZXhwIjoxNjg5NTg4NzA4LCJpc3MiOiIyMGYwMTE2NDk0ZDUwNDI4ZmUyNmQ3YTYzZGIzZTUiLCJzY29wZSI6IjNncHAjOGNhZGQyYmYzNWM2YWRmMjRiZGE4OTdiNGU4ZTk5Oi9uZWYvYXBpL3YxLzNncHAtYXMtc2Vzc2lvbi13aXRoLXFvcy8ifQ.PTdAWSGCqEdxroxd1qF_cNA_JRohvNlgw_A49CyaUVqEKrky2_LnVtRll_KOHPGgGcIa8g_vqdM6We71CGx7w_KQPuSccb_wUkPQ5U2kfDT2-dkBZX8le_M1aQ9346tl3iQHqPsoMv3KdiD6mNSbO8f7vlRbQ1o7HQLtLaULB_0xbFr1iJAWdwO6Dm0KOKP_rM6kC5gKyVaLzUPUQBHGQwncQWlKp1Cey3G2cW5Aw_O6kF8mt1R1wgNCedU77JUmW3-ptc1kWmWlSo3UypYNm-XRAMWh44yYnGok5gE1tf451cRc5s9Hfl6Ya2fYYBI1by9x1S_zGlxi6f_OV9z4zg", "api_id_1": "cbc42102826d69a35de147c790a983", "api_name_1": "/nef/api/v1/3gpp-as-session-with-qos/", "aef_id_1": "1f1883a784c43f47aa4fae1dc4821f", "demo_ipv4_addr_1": "127.0.0.1", "demo_port_1": 8090, "demo_url_1": "/{scsAsId}/subscriptions", "demo_resource_id": ""}
\ No newline at end of file
diff --git a/services/capif-client/CAPIFInvokerGUI/invoker_gui/capif_ops/config_files/events.json b/services/capif-client/CAPIFInvokerGUI/invoker_gui/capif_ops/config_files/events.json
new file mode 100644
index 0000000000000000000000000000000000000000..3d109204f59cee2b45773ea6d6844a15762a86d8
--- /dev/null
+++ b/services/capif-client/CAPIFInvokerGUI/invoker_gui/capif_ops/config_files/events.json
@@ -0,0 +1,6 @@
+{
+    "events": [
+      "SERVICE_API_AVAILABLE"
+    ],
+    "notificationDestination": "http://192.168.1.11:8080/capifcallbacks"
+  }
\ No newline at end of file
diff --git a/services/capif-client/CAPIFInvokerGUI/invoker_gui/capif_ops/config_files/invoker_details.json b/services/capif-client/CAPIFInvokerGUI/invoker_gui/capif_ops/config_files/invoker_details.json
new file mode 100755
index 0000000000000000000000000000000000000000..d94aa7fe5ac73c53d7b55664f0b9e36a4a1c8c24
--- /dev/null
+++ b/services/capif-client/CAPIFInvokerGUI/invoker_gui/capif_ops/config_files/invoker_details.json
@@ -0,0 +1,13 @@
+{
+  "notificationDestination" : "http://X:Y/netapp_callback",
+  "supportedFeatures" : "fffffff",
+  "apiInvokerInformation" : "dummy",
+  "websockNotifConfig" : {
+    "requestWebsocketUri" : true,
+    "websocketUri" : "websocketUri"
+  },
+  "onboardingInformation" : {
+    "apiInvokerPublicKey" : ""
+  },
+  "requestTestNotification" : true
+}
\ No newline at end of file
diff --git a/services/capif-client/CAPIFInvokerGUI/invoker_gui/capif_ops/config_files/security_info.json b/services/capif-client/CAPIFInvokerGUI/invoker_gui/capif_ops/config_files/security_info.json
new file mode 100755
index 0000000000000000000000000000000000000000..c1b08672b8c08e0c8775b6c8a689fbba48fb51c1
--- /dev/null
+++ b/services/capif-client/CAPIFInvokerGUI/invoker_gui/capif_ops/config_files/security_info.json
@@ -0,0 +1,18 @@
+{
+    "securityInfo": [
+      {
+        "prefSecurityMethods": [
+          "OAUTH"
+        ],
+        "authenticationInfo": "string",
+        "authorizationInfo": "string"
+      }
+    ],
+    "notificationDestination": "https://mynotificationdest.com",
+    "requestTestNotification": true,
+    "websockNotifConfig": {
+      "websocketUri": "string",
+      "requestWebsocketUri": true
+    },
+    "supportedFeatures": "fff"
+  }
\ No newline at end of file
diff --git a/services/capif-client/CAPIFInvokerGUI/invoker_gui/capif_ops/config_files/service_request_body.json b/services/capif-client/CAPIFInvokerGUI/invoker_gui/capif_ops/config_files/service_request_body.json
new file mode 100644
index 0000000000000000000000000000000000000000..189c49e4d67d9bd1bab5790f7bc6fa50c78d4169
--- /dev/null
+++ b/services/capif-client/CAPIFInvokerGUI/invoker_gui/capif_ops/config_files/service_request_body.json
@@ -0,0 +1,32 @@
+{
+  "ipv4Addr": "10.0.0.3",
+  "notificationDestination": "http://invoker_gui:9091/nefcallbacks",
+  "snssai": {
+ "sst": 1,
+ "sd": "000001"
+ },
+"dnn": "province1.mnc01.mcc202.gprs",
+"qosReference": 82,
+  "altQoSReferences": [
+0
+ ],
+"usageThreshold": {
+"duration": 0,
+ "totalVolume": 0,
+"downlinkVolume": 0,
+ "uplinkVolume": 0
+ },
+"qosMonInfo": {
+"reqQosMonParams": [
+"DOWNLINK"
+],
+"repFreqs": [
+"EVENT_TRIGGERED"
+],
+ "latThreshDl": 0,
+"latThreshUl": 0,
+ "latThreshRp": 0,
+"waitTime": 0,
+ "repPeriod": 0
+}
+}
\ No newline at end of file
diff --git a/services/capif-client/CAPIFInvokerGUI/invoker_gui/capif_ops/config_files/token_request.json b/services/capif-client/CAPIFInvokerGUI/invoker_gui/capif_ops/config_files/token_request.json
new file mode 100755
index 0000000000000000000000000000000000000000..5408b745186bf0d0bd3f92a43229eef846c989c1
--- /dev/null
+++ b/services/capif-client/CAPIFInvokerGUI/invoker_gui/capif_ops/config_files/token_request.json
@@ -0,0 +1,6 @@
+{
+    "grant_type": "client_credentials",
+    "client_id": "",
+    "client_secret": "string",
+    "scope": ""
+}
\ No newline at end of file
diff --git a/services/capif-client/CAPIFInvokerGUI/invoker_gui/capif_ops/invoker_delete.py b/services/capif-client/CAPIFInvokerGUI/invoker_gui/capif_ops/invoker_delete.py
new file mode 100644
index 0000000000000000000000000000000000000000..297f88e559f8724a4a77ac5aa370bdb567e9c5ad
--- /dev/null
+++ b/services/capif-client/CAPIFInvokerGUI/invoker_gui/capif_ops/invoker_delete.py
@@ -0,0 +1,71 @@
+from dis import dis
+import requests
+import json
+import configparser
+import os
+from termcolor import colored
+
+
+class RemoveInvoker():
+
+
+    def __offboard_netapp_to_capif(self, capif_ip,  invoker_id, log_level):
+
+        print(colored("Removing netapp from CAPIF","yellow"))
+        url = 'https://{}/api-invoker-management/v1/onboardedInvokers/{}'.format(capif_ip, invoker_id)
+
+        headers = {
+            'Content-Type': 'application/json'
+        }
+
+        try:
+
+            if log_level == "debug":
+                print(colored("''''''''''REQUEST'''''''''''''''''","blue"))
+                print(colored(f"Request: to {url}","blue"))
+                print(colored(f"Request Headers: {headers}", "blue"))
+                print(colored(f"''''''''''REQUEST'''''''''''''''''", "blue"))
+
+            response = requests.request("DELETE", url, headers=headers, cert=(
+                'capif_ops/certs/dummy.crt', 'capif_ops/certs/invoker_private_key.key'), verify='capif_ops/certs/ca.crt')
+            response.raise_for_status()
+
+            if log_level == "debug":
+                print(colored("''''''''''RESPONSE'''''''''''''''''","green"))
+                print(colored(f"Response to: {response.url}","green"))
+                print(colored(f"Response Headers: {response.headers}","green"))
+                print(colored(f"Response: {response.json()}","green"))
+                print(colored(f"Response Status code: {response.status_code}","green"))
+                print(colored("Success onboard invoker","green"))
+                print(colored("''''''''''RESPONSE'''''''''''''''''","green"))
+
+        except requests.exceptions.HTTPError as err:
+            raise Exception(err.response.text, err.response.status_code)
+
+
+
+    def execute_remove_invoker(self, log_level):
+
+
+        capif_ip = os.getenv('CAPIF_HOSTNAME')
+
+        with open('capif_ops/config_files/demo_values.json', 'r') as demo_file:
+            demo_values = json.load(demo_file)
+
+        try:
+
+            self.__offboard_netapp_to_capif(capif_ip, demo_values["invokerID"], log_level)
+
+            print("ApiInvokerID: {}\n".format(demo_values["invokerID"]))
+            demo_values.pop("invokerID")
+            demo_values.pop("pub_key")
+            with open('capif_ops/config_files/demo_values.json', 'w') as outfile:
+                json.dump(demo_values, outfile)
+
+        except Exception as e:
+            status_code = e.args[0]
+            if status_code == 403:
+                print("Invoker already registered.")
+                print("Chanage invoker public key in invoker_details.json\n")
+            else:
+                print(e)
diff --git a/services/capif-client/CAPIFInvokerGUI/invoker_gui/capif_ops/invoker_discover_service.py b/services/capif-client/CAPIFInvokerGUI/invoker_gui/capif_ops/invoker_discover_service.py
new file mode 100644
index 0000000000000000000000000000000000000000..7b608ac6fd23ba097dd4b7ae73661f4ab0e300dd
--- /dev/null
+++ b/services/capif-client/CAPIFInvokerGUI/invoker_gui/capif_ops/invoker_discover_service.py
@@ -0,0 +1,96 @@
+from dis import dis
+import requests
+import json
+import configparser
+import redis
+import os
+from termcolor import colored
+
+
+class DiscoverService():
+
+    def __discover_service_apis(self, capif_ip, api_invoker_id, jwt_token, ccf_url, log_level):
+
+        print(colored("Discover Service", "yellow"))
+        url = "https://{}/{}{}".format(capif_ip, ccf_url, api_invoker_id)
+
+        payload = {}
+        files = {}
+        headers = {
+            'Content-Type': 'application/json'
+        }
+
+        try:
+
+            if log_level == "debug":
+                print(colored("''''''''''REQUEST'''''''''''''''''", "blue"))
+                print(colored(f"Request: to {url}", "blue"))
+                print(colored(f"Request Headers: {headers}", "blue"))
+                print(colored(f"''''''''''REQUEST'''''''''''''''''", "blue"))
+
+            response = requests.request("GET", url, headers=headers, data=payload, files=files, cert=(
+                'capif_ops/certs/dummy.crt', 'capif_ops/certs/invoker_private_key.key'), verify='capif_ops/certs/ca.crt')
+            response.raise_for_status()
+            response_payload = json.loads(response.text)
+
+            if log_level == "debug":
+                print(colored("''''''''''RESPONSE'''''''''''''''''", "green"))
+                print(colored(f"Response to: {response.url}", "green"))
+                print(colored(f"Response Headers: {response.headers}", "green"))
+                print(colored(f"Response: {response.json()}", "green"))
+                print(
+                    colored(f"Response Status code: {response.status_code}", "green"))
+                print(colored("''''''''''RESPONSE'''''''''''''''''", "green"))
+
+            return response_payload
+        except requests.exceptions.HTTPError as err:
+            print(err.response.text)
+            message = json.loads(err.response.text)
+            status = err.response.status_code
+            raise Exception(message, status)
+
+    def execute_discover_service(self, log_level):
+
+
+        with open('capif_ops/config_files/demo_values.json', 'r') as demo_file:
+            demo_values = json.load(demo_file)
+
+        capif_ip = os.getenv('CAPIF_HOSTNAME')
+
+        try:
+            if 'invokerID' in demo_values:
+                invokerID = demo_values['invokerID']
+                capif_access_token = demo_values['capif_access_token']
+                ccf_discover_url = demo_values['ccf_discover_url']
+                discovered_apis = self.__discover_service_apis(
+                    capif_ip, invokerID, capif_access_token, ccf_discover_url, log_level)
+                print(colored(json.dumps(discovered_apis, indent=2), "yellow"))
+
+                count = 0
+                api_list = discovered_apis["serviceAPIDescriptions"]
+                for api in api_list:
+                    getAEF_profiles = api["aefProfiles"][0]
+                    getAEF_interfaces = getAEF_profiles["interfaceDescriptions"][0]
+                    getAEF_versions = getAEF_profiles["versions"][0]
+                    getAEF_resources = getAEF_versions["resources"][0]
+                    demo_values[f'api_id_{count}'] = api["apiId"]
+                    demo_values[f'api_name_{count}'] = api["apiName"]
+                    demo_values[f'aef_id_{count}'] = getAEF_profiles["aefId"]
+                    demo_values[f'demo_ipv4_addr_{count}'] = getAEF_interfaces["ipv4Addr"]
+                    demo_values[f'demo_port_{count}'] = getAEF_interfaces["port"]
+                    demo_values[f'demo_url_{count}'] = api["apiName"] + getAEF_versions["apiVersion"]+ getAEF_resources['uri']
+                    count += 1
+
+                print(colored("Discovered APIs", "yellow"))
+                with open('capif_ops/config_files/demo_values.json', 'w') as outfile:
+                    json.dump(demo_values, outfile)
+
+        except Exception as e:
+            status_code = e.args[0]
+            if status_code == 401:
+                print("API Invoker is not authorized")
+            elif status_code == 403:
+                print("API Invoker does not exist. API Invoker id not found")
+            else:
+                print(e)
+
diff --git a/services/capif-client/CAPIFInvokerGUI/invoker_gui/capif_ops/invoker_get_auth.py b/services/capif-client/CAPIFInvokerGUI/invoker_gui/capif_ops/invoker_get_auth.py
new file mode 100644
index 0000000000000000000000000000000000000000..dde36942bb6b493791a3142ccae1e6a891d8d1c4
--- /dev/null
+++ b/services/capif-client/CAPIFInvokerGUI/invoker_gui/capif_ops/invoker_get_auth.py
@@ -0,0 +1,71 @@
+import requests
+import json
+import configparser
+import os
+from termcolor import colored
+
+class PreviousAuth():
+
+    def __get_capif_auth(self, capif_ip, capif_port, username, password):
+
+            #print("Geting Auth to exposer")
+            #url = "http://{}:{}/getauth".format(capif_ip, capif_port)
+            url = "https://register:8084/getauth".format(capif_port)
+            #url = "http://{}:{}/getauth".format(capif_ip, capif_port)
+
+            payload = dict()
+            payload['username'] = username
+            payload['password'] = password
+
+            headers = {
+                'Content-Type': 'application/json'
+            }
+
+            try:
+                response = requests.request("POST", url, headers=headers, data=json.dumps(payload), verify=False)
+
+                response.raise_for_status()
+                response_payload = json.loads(response.text)
+
+                return response_payload['access_token']
+
+            except requests.exceptions.HTTPError as err:
+                raise Exception(err.response.text, err.response.status_code)
+
+
+    def execute_get_auth(self, log_level):
+
+        config = configparser.ConfigParser()
+        config.read('capif_ops/config_files/credentials.properties')
+
+        username = config.get("credentials", "invoker_username")
+        password = config.get("credentials", "invoker_password")
+
+        capif_ip = os.getenv('CAPIF_HOSTNAME')
+        capif_port = os.getenv('CAPIF_PORT')
+
+        if os.path.exists("capif_ops/config_files/demo_values.json"):
+            #os.remove("capif_ops/config_files/demo_values.json")
+            with open('capif_ops/config_files/demo_values.json', 'r') as demo_file:
+                demo_values = json.load(demo_file)
+        else:
+            demo_values = {}
+
+        #First we need register exposer in CAPIF
+        try:
+            if 'netappID' in demo_values:
+                access_token = self.__get_capif_auth(capif_ip, capif_port, username, password)
+                demo_values['capif_access_token'] = access_token
+
+            with open('capif_ops/config_files/demo_values.json', 'w') as outfile:
+                json.dump(demo_values, outfile)
+
+            print("Invoker auth Success!")
+        except Exception as e:
+            status_code = e.args[0]
+            if status_code == 409:
+                print("User already registed. Continue with token request\n")
+            else:
+                print(e)
+
+        return True
diff --git a/services/capif-client/CAPIFInvokerGUI/invoker_gui/capif_ops/invoker_get_security_auth.py b/services/capif-client/CAPIFInvokerGUI/invoker_gui/capif_ops/invoker_get_security_auth.py
new file mode 100644
index 0000000000000000000000000000000000000000..74b026fa9e4e5859b4143ec21e91169d2619dad7
--- /dev/null
+++ b/services/capif-client/CAPIFInvokerGUI/invoker_gui/capif_ops/invoker_get_security_auth.py
@@ -0,0 +1,90 @@
+from dis import dis
+from email import charset
+import requests
+import json
+import configparser
+import redis
+import os
+from termcolor import colored
+
+
+class InvokerGetSecurityAuth():
+
+    def __get_security_token(self, capif_ip, api_invoker_id, jwt_token, ccf_url, aef_id, api_name, log_level):
+
+    
+        url = "https://{}/capif-security/v1/securities/{}/token".format(capif_ip, api_invoker_id)
+
+        with open('capif_ops/config_files/token_request.json', "rb") as f:
+            payload = json.load(f)
+
+        payload["client_id"] = api_invoker_id
+        payload["scope"] = "3gpp#"+aef_id+":"+api_name
+
+        headers = {
+            'Content-Type': 'application/x-www-form-urlencoded',
+        }
+
+        
+        payload_dict = json.dumps(payload, indent=2)
+
+        print(colored(f"Request Body: {payload_dict}", "yellow"))
+
+        try:
+
+            if log_level == "debug":
+                print(colored("''''''''''REQUEST'''''''''''''''''","blue"))
+                print(colored(f"Request: to {url}","blue"))
+                print(colored(f"Request Headers: {headers}", "blue"))
+                print(colored(f"''''''''''REQUEST'''''''''''''''''", "blue"))
+
+            response = requests.post(url, headers=headers, data=payload, cert=('capif_ops/certs/dummy.crt', 'capif_ops/certs/invoker_private_key.key'), verify='capif_ops/certs/ca.crt')
+            print(response.request.body)
+            response.raise_for_status()
+            response_payload = json.loads(response.text)
+
+            if log_level == "debug":
+                print(colored("''''''''''RESPONSE'''''''''''''''''","green"))
+                print(colored(f"Response to: {response.url}","green"))
+                print(colored(f"Response Headers: {response.headers}","green"))
+                print(colored(f"Response: {response.json()}","green"))
+                print(colored(f"Response Status code: {response.status_code}","green"))
+                print(colored("''''''''''RESPONSE'''''''''''''''''","green"))
+
+            return response_payload
+        except requests.exceptions.HTTPError as err:
+            print(err.response.text)
+            message = json.loads(err.response.text)
+            status = err.response.status_code
+            raise Exception(message, status)
+
+    def execute_get_security_auth(self, log_level):
+
+        with open('capif_ops/config_files/demo_values.json', 'r') as demo_file:
+            demo_values = json.load(demo_file)
+
+        config = configparser.ConfigParser()
+        config.read('credentials.properties')
+
+        capif_ip = os.getenv('CAPIF_HOSTNAME')
+        invokerID = demo_values['invokerID']
+        capif_access_token = demo_values['capif_access_token']
+        ccf_discover_url = demo_values['ccf_discover_url']
+
+        try:
+            if 'aef_id_0' in demo_values and 'api_name_0' in demo_values:
+                token = self.__get_security_token(capif_ip, invokerID, capif_access_token, ccf_discover_url, demo_values['aef_id_0'], demo_values['api_name_0'],log_level)
+                print(colored(json.dumps(token, indent=2),"yellow"))
+                demo_values["netapp_service_token"] = token["access_token"]
+                print(colored("Obtained Security Token","yellow"))
+
+                with open('capif_ops/config_files/demo_values.json', 'w') as outfile:
+                    json.dump(demo_values, outfile)
+        except Exception as e:
+            status_code = e.args[0]
+            if status_code == 401:
+                print("API Invoker is not authorized")
+            elif status_code == 403:
+                print("API Invoker does not exist. API Invoker id not found")
+            else:
+                print(e)
diff --git a/services/capif-client/CAPIFInvokerGUI/invoker_gui/capif_ops/invoker_previous_register.py b/services/capif-client/CAPIFInvokerGUI/invoker_gui/capif_ops/invoker_previous_register.py
new file mode 100644
index 0000000000000000000000000000000000000000..6a772648c1c862e6a3401941138bc91299d7ae41
--- /dev/null
+++ b/services/capif-client/CAPIFInvokerGUI/invoker_gui/capif_ops/invoker_previous_register.py
@@ -0,0 +1,134 @@
+import requests
+import json
+import configparser
+import os
+from termcolor import colored
+
+class PreviousRegister():
+
+    def __register_invoker_to_capif(self, capif_ip, capif_port, username, password, role, description, cn):
+
+            #print(colored("Registering exposer to CAPIF","yellow"))
+            url = "https://register:8084/register".format(capif_port)
+            #url = "http://{}:{}/register".format(capif_ip, capif_port)
+
+            payload = dict()
+            payload['username'] = username
+            payload['password'] = password
+            payload['role'] = role
+            payload['description'] = description
+            payload['cn'] = cn
+
+            headers = {
+                'Content-Type': 'application/json'
+            }
+
+            try:
+                # print(colored("''''''''''REQUEST'''''''''''''''''","blue"))
+                # print(colored(f"Request: to {url}","blue"))
+                # print(colored(f"Request Headers: {headers}", "blue"))
+                # print(colored(f"Request Body: {json.dumps(payload)}", "blue"))
+                # print(colored(f"''''''''''REQUEST'''''''''''''''''", "blue"))
+
+                response = requests.request("POST", url, headers=headers, data=json.dumps(payload), verify=False)
+                response.raise_for_status()
+                response_payload = json.loads(response.text)
+
+                # print(colored("''''''''''RESPONSE'''''''''''''''''","green"))
+                # print(colored(f"Response to: {response.url}","green"))
+                # print(colored(f"Response Headers: {response.headers}","green"))
+                # print(colored(f"Response: {response.json()}","green"))
+                # print(colored(f"Response Status code: {response.status_code}","green"))
+                # print(colored("Success to register new exposer","green"))
+                # print(colored("''''''''''RESPONSE'''''''''''''''''","green"))
+                return response_payload['id'], response_payload['ccf_onboarding_url'], response_payload['ccf_discover_url'],
+            except requests.exceptions.HTTPError as err:
+                raise Exception(err.response.status_code)
+
+
+    def __get_capif_auth(self, capif_ip, capif_port, username, password):
+
+            #print("Geting Auth to exposer")
+            url = "https://register:8084/getauth".format(capif_port)
+            #url = "http://{}:{}/getauth".format(capif_ip, capif_port)
+
+            payload = dict()
+            payload['username'] = username
+            payload['password'] = password
+
+            headers = {
+                'Content-Type': 'application/json'
+            }
+
+            try:
+                # print("''''''''''REQUEST'''''''''''''''''")
+                # print("Request: to ",url) 
+                # print("Request Headers: ",  headers) 
+                # print("Request Body: ", json.dumps(payload))
+                # print("''''''''''REQUEST'''''''''''''''''")
+
+                response = requests.request("POST", url, headers=headers, data=json.dumps(payload), verify = False)
+
+                response.raise_for_status()
+                response_payload = json.loads(response.text)
+
+                # print(colored("''''''''''RESPONSE'''''''''''''''''","green"))
+                # print(colored(f"Response to: {response.url}","green"))
+                # print(colored(f"Response Headers: {response.headers}","green"))
+                # print(colored(f"Response: {response.json()}","green"))
+                # print(colored(f"Response Status code: {response.status_code}","green"))
+                # print(colored("Get AUTH Success. Received access token", "green"))
+                # print(colored("''''''''''RESPONSE'''''''''''''''''","green"))
+                return response_payload['access_token']
+
+            except requests.exceptions.HTTPError as err:
+                raise Exception(err.response.text, err.response.status_code)
+
+
+    def execute_previous_register_invoker(self):
+
+        config = configparser.ConfigParser()
+        config.read('capif_ops/config_files/credentials.properties')
+
+        username = config.get("credentials", "invoker_username")
+        password = config.get("credentials", "invoker_password")
+        role = config.get("credentials", "invoker_role")
+        description = config.get("credentials", "invoker_description")
+        cn = config.get("credentials", "invoker_cn")
+
+        capif_ip = os.getenv('CAPIF_HOSTNAME')
+        capif_port = os.getenv('CAPIF_PORT')
+
+        if os.path.exists("capif_ops/config_files/demo_values.json"):
+            #os.remove("capif_ops/config_files/demo_values.json")
+            with open('capif_ops/config_files/demo_values.json', 'r') as demo_file:
+                demo_values = json.load(demo_file)
+        else:
+            demo_values = {}
+
+        #First we need register exposer in CAPIF
+        try:
+            netappID, ccf_onboarding_url, ccf_discover_url = self.__register_invoker_to_capif(capif_ip, capif_port, username, password, role, description, cn)
+            demo_values['netappID'] = netappID
+            demo_values['ccf_onboarding_url'] = ccf_onboarding_url
+            demo_values['ccf_discover_url'] = ccf_discover_url
+            #print(colored(f"NetAppID: {netappID}\n","yellow"))
+            #print("provider ID: {}".format(providerID))
+
+            with open('capif_ops/config_files/demo_values.json', 'w') as outfile:
+                json.dump(demo_values, outfile)
+
+            if 'netappID' in demo_values:
+                access_token = self.__get_capif_auth(capif_ip, capif_port, username, password)
+                demo_values['capif_access_token'] = access_token
+
+            with open('capif_ops/config_files/demo_values.json', 'w') as outfile:
+                json.dump(demo_values, outfile)
+        except Exception as e:
+            status_code = e.args[0]
+            if status_code == 409:
+                print()
+            else:
+                print(e)
+
+        return True
diff --git a/services/capif-client/CAPIFInvokerGUI/invoker_gui/capif_ops/invoker_register_to_capif.py b/services/capif-client/CAPIFInvokerGUI/invoker_gui/capif_ops/invoker_register_to_capif.py
new file mode 100644
index 0000000000000000000000000000000000000000..49be7316a33fdc85a6150fe2bbc00471cfe87f77
--- /dev/null
+++ b/services/capif-client/CAPIFInvokerGUI/invoker_gui/capif_ops/invoker_register_to_capif.py
@@ -0,0 +1,134 @@
+from dis import dis
+import requests
+import json
+import configparser
+import redis
+import os
+from termcolor import colored
+
+
+from OpenSSL.SSL import FILETYPE_PEM
+from OpenSSL.crypto import (dump_certificate_request, dump_privatekey, load_publickey, PKey, TYPE_RSA, X509Req, dump_publickey)
+
+
+class RegisterInvoker():
+    def __create_csr(self,  name):
+
+        # create public/private key
+        key = PKey()
+        key.generate_key(TYPE_RSA, 2048)
+
+        # Generate CSR
+        req = X509Req()
+        req.get_subject().CN = name
+        req.get_subject().O = 'Telefonica I+D'
+        req.get_subject().OU = 'Innovation'
+        req.get_subject().L = 'Madrid'
+        req.get_subject().ST = 'Madrid'
+        req.get_subject().C = 'ES'
+        req.get_subject().emailAddress = 'inno@tid.es'
+        req.set_pubkey(key)
+        req.sign(key, 'sha256')
+
+        csr_request = dump_certificate_request(FILETYPE_PEM, req)
+
+        private_key = dump_privatekey(FILETYPE_PEM, key)
+
+        return csr_request, private_key
+
+
+
+
+    def __onboard_netapp_to_capif(self, capif_ip, capif_callback_ip, capif_callback_port, jwt_token, ccf_url, log_level):
+
+        print(colored("Onboarding netapp to CAPIF","yellow"))
+        url = 'https://{}/{}'.format(capif_ip, ccf_url)
+
+        with open('capif_ops/config_files/demo_values.json', 'r') as demo_file:
+            demo_values = json.load(demo_file)
+
+        csr_request, private_key = self.__create_csr("invoker")
+
+        if 'pub_key' not in demo_values:
+            private_key_file = open("capif_ops/certs/invoker_private_key.key", 'wb+')
+            private_key_file.write(bytes(private_key))
+
+        json_file = open('capif_ops/config_files/invoker_details.json', 'rb')
+        payload_dict = json.load(json_file)
+        if 'pub_key' not in demo_values:
+            payload_dict['onboardingInformation']['apiInvokerPublicKey'] = csr_request.decode("utf-8")
+        else:
+            payload_dict['onboardingInformation']['apiInvokerPublicKey'] = demo_values['pub_key']
+        payload_dict['notificationDestination'] = payload_dict['notificationDestination'].replace("X", capif_callback_ip)
+        payload_dict['notificationDestination'] = payload_dict['notificationDestination'].replace("Y", capif_callback_port)
+        payload = json.dumps(payload_dict, indent=2)
+
+        print(colored(f"Request Body: {payload}", "yellow"))
+
+        headers = {
+            'Authorization': 'Bearer {}'.format(jwt_token),
+            'Content-Type': 'application/json'
+        }
+
+        try:
+
+            if log_level == "debug":
+                print(colored("''''''''''REQUEST'''''''''''''''''","blue"))
+                print(colored(f"Request: to {url}","blue"))
+                print(colored(f"Request Headers: {headers}", "blue"))
+                print(colored(f"Request Body: {json.dumps(payload)}", "blue"))
+                print(colored(f"''''''''''REQUEST'''''''''''''''''", "blue"))
+
+            response = requests.request("POST", url, headers=headers, data=payload, verify='capif_ops/certs/ca.crt')
+            response.raise_for_status()
+            response_payload = json.loads(response.text)
+            certification_file = open('capif_ops/certs/dummy.crt', 'wb')
+            certification_file.write(bytes(response_payload['onboardingInformation']['apiInvokerCertificate'], 'utf-8'))
+            certification_file.close()
+
+            if log_level == "debug":
+                print(colored("''''''''''RESPONSE'''''''''''''''''","green"))
+                print(colored(f"Response to: {response.url}","green"))
+                print(colored(f"Response Headers: {response.headers}","green"))
+                print(colored(f"Response: {response.json()}","green"))
+                print(colored(f"Response Status code: {response.status_code}","green"))
+                print(colored("Success onboard invoker","green"))
+                print(colored("''''''''''RESPONSE'''''''''''''''''","green"))
+            return response_payload['apiInvokerId'],  payload_dict['onboardingInformation']['apiInvokerPublicKey']
+        except requests.exceptions.HTTPError as err:
+            raise Exception(err.response.text, err.response.status_code)
+
+
+
+
+
+    def execute_register_invoker(self, log_level):
+
+        config = configparser.ConfigParser()
+        config.read('capif_ops/config_files/credentials.properties')
+
+        capif_ip = os.getenv('CAPIF_HOSTNAME')
+
+        capif_callback_ip = config.get("credentials", "capif_callback_ip")
+        capif_callback_port = config.get("credentials", "capif_callback_port")
+
+        with open('capif_ops/config_files/demo_values.json', 'r') as demo_file:
+            demo_values = json.load(demo_file)
+
+        try:
+            capif_access_token = demo_values['capif_access_token']
+            ccf_onboarding_url = demo_values['ccf_onboarding_url']
+            invokerID, pub_key = self.__onboard_netapp_to_capif(capif_ip, capif_callback_ip, capif_callback_port, capif_access_token, ccf_onboarding_url, log_level)
+            demo_values['invokerID'] = invokerID
+            demo_values['pub_key'] = pub_key
+            print("ApiInvokerID: {}\n".format(invokerID))
+            with open('capif_ops/config_files/demo_values.json', 'w') as outfile:
+                json.dump(demo_values, outfile)
+
+        except Exception as e:
+            status_code = e.args[0]
+            if status_code == 403:
+                print("Invoker already registered.")
+                print("Chanage invoker public key in invoker_details.json\n")
+            else:
+                print(e)
diff --git a/services/capif-client/CAPIFInvokerGUI/invoker_gui/capif_ops/invoker_remove_security_context.py b/services/capif-client/CAPIFInvokerGUI/invoker_gui/capif_ops/invoker_remove_security_context.py
new file mode 100644
index 0000000000000000000000000000000000000000..18bb3f35966b07492cbe71f2f6cfb1120689d59e
--- /dev/null
+++ b/services/capif-client/CAPIFInvokerGUI/invoker_gui/capif_ops/invoker_remove_security_context.py
@@ -0,0 +1,82 @@
+from dis import dis
+from email import charset
+import requests
+import json
+import configparser
+import redis
+import os
+from termcolor import colored
+
+
+class InvokerRemoveSecurityContext():
+
+    def __remove_security_service(self, capif_ip, api_invoker_id, jwt_token, ccf_url, demo_values, log_level):
+
+
+        url = "https://{}/capif-security/v1/trustedInvokers/{}".format(capif_ip, api_invoker_id)
+
+        headers = {
+            'Content-Type': 'application/json'
+        }
+
+        try:
+
+            if log_level == "debug":
+                print(colored("''''''''''REQUEST'''''''''''''''''","blue"))
+                print(colored(f"Request: to {url}","blue"))
+                print(colored(f"Request Headers: {headers}", "blue"))
+                print(colored(f"''''''''''REQUEST'''''''''''''''''", "blue"))
+
+            response = requests.delete(url, cert=('capif_ops/certs/dummy.crt', 'capif_ops/certs/invoker_private_key.key'), verify='capif_ops/certs/ca.crt')
+            response.raise_for_status()
+
+            if log_level == "debug":
+                print(colored("''''''''''RESPONSE'''''''''''''''''","green"))
+                print(colored(f"Response to: {response.url}","green"))
+                print(colored(f"Response Headers: {response.headers}","green"))
+                print(colored(f"Response: {response.json()}","green"))
+                print(colored(f"Response Status code: {response.status_code}","green"))
+                print(colored("''''''''''RESPONSE'''''''''''''''''","green"))
+
+            return 
+        except requests.exceptions.HTTPError as err:
+            print(err.response.text)
+            message = json.loads(err.response.text)
+            status = err.response.status_code
+            raise Exception(message, status)
+
+    def execute_remove_security_context(self, log_level):
+
+        with open('capif_ops/config_files/demo_values.json', 'r') as demo_file:
+            demo_values = json.load(demo_file)
+
+        config = configparser.ConfigParser()
+        config.read('credentials.properties')
+
+        capif_ip = os.getenv('CAPIF_HOSTNAME')
+        invokerID = ""
+        capif_access_token = ""
+        ccf_discover_url = ""
+
+        try:
+
+            invokerID = demo_values['invokerID']
+            capif_access_token = demo_values['capif_access_token']
+            ccf_discover_url = demo_values['ccf_discover_url']
+            security_information = self.__remove_security_service(capif_ip, invokerID, capif_access_token, ccf_discover_url, demo_values,log_level)
+            print(colored(json.dumps(security_information, indent=2),"yellow"))
+            print(colored("Register Security context","yellow"))
+
+            with open('capif_ops/config_files/demo_values.json', 'w') as outfile:
+                json.dump(demo_values, outfile)
+
+
+        except Exception as e:
+            status_code = e.args[0]
+            if status_code == 401:
+                print("API Invoker is not authorized")
+            elif status_code == 403:
+                print("API Invoker does not exist. API Invoker id not found")
+            else:
+                print(e)
+
diff --git a/services/capif-client/CAPIFInvokerGUI/invoker_gui/capif_ops/invoker_secutiry_context.py b/services/capif-client/CAPIFInvokerGUI/invoker_gui/capif_ops/invoker_secutiry_context.py
new file mode 100644
index 0000000000000000000000000000000000000000..a26988f1c499697d219876e7ee16c2c95b8eef3b
--- /dev/null
+++ b/services/capif-client/CAPIFInvokerGUI/invoker_gui/capif_ops/invoker_secutiry_context.py
@@ -0,0 +1,96 @@
+from dis import dis
+from email import charset
+import requests
+import json
+import configparser
+import redis
+import os
+from termcolor import colored
+
+
+class InvokerSecurityContext():
+
+    def __register_security_service(self, capif_ip, api_invoker_id, jwt_token, ccf_url, demo_values, log_level):
+
+
+        url = "https://{}/capif-security/v1/trustedInvokers/{}".format(capif_ip, api_invoker_id)
+
+        with open('capif_ops/config_files/security_info.json', "rb") as f:
+            payload = json.load(f)
+
+        count = 0
+        for profile in payload["securityInfo"]:
+            profile["aefId"] = demo_values[f"aef_id_{count}"]
+            profile["apiId"] = demo_values[f"api_id_{count}"]
+            count += 1
+
+        headers = {
+            'Content-Type': 'application/json'
+        }
+
+        # payload_dict = json.dumps(payload, indent=2)
+
+        # print(colored(f"Request Body: {payload_dict}", "yellow"))
+
+        try:
+
+            if log_level == "debug":
+                print(colored("''''''''''REQUEST'''''''''''''''''","blue"))
+                print(colored(f"Request: to {url}","blue"))
+                print(colored(f"Request Headers: {headers}", "blue"))
+                print(colored(f"''''''''''REQUEST'''''''''''''''''", "blue"))
+
+            response = requests.put(url, json=payload, cert=('capif_ops/certs/dummy.crt', 'capif_ops/certs/invoker_private_key.key'), verify='capif_ops/certs/ca.crt')
+            response.raise_for_status()
+            response_payload = response.json()
+
+            if log_level == "debug":
+                print(colored("''''''''''RESPONSE'''''''''''''''''","green"))
+                print(colored(f"Response to: {response.url}","green"))
+                print(colored(f"Response Headers: {response.headers}","green"))
+                print(colored(f"Response: {response.json()}","green"))
+                print(colored(f"Response Status code: {response.status_code}","green"))
+                print(colored("''''''''''RESPONSE'''''''''''''''''","green"))
+
+            return response_payload
+        except requests.exceptions.HTTPError as err:
+            print(err.response.text)
+            message = json.loads(err.response.text)
+            status = err.response.status_code
+            raise Exception(message, status)
+
+    def execute_register_security_context(self, log_level):
+
+        with open('capif_ops/config_files/demo_values.json', 'r') as demo_file:
+            demo_values = json.load(demo_file)
+
+        config = configparser.ConfigParser()
+        config.read('credentials.properties')
+
+        capif_ip = os.getenv('CAPIF_HOSTNAME')
+        invokerID = ""
+        capif_access_token = ""
+        ccf_discover_url = ""
+
+        try:
+
+            invokerID = demo_values['invokerID']
+            capif_access_token = demo_values['capif_access_token']
+            ccf_discover_url = demo_values['ccf_discover_url']
+            security_information = self.__register_security_service(capif_ip, invokerID, capif_access_token, ccf_discover_url, demo_values,log_level)
+            print(colored(json.dumps(security_information, indent=2),"yellow"))
+            print(colored("Register Security context","yellow"))
+
+            with open('capif_ops/config_files/demo_values.json', 'w') as outfile:
+                json.dump(demo_values, outfile)
+
+
+        except Exception as e:
+            status_code = e.args[0]
+            if status_code == 401:
+                print("API Invoker is not authorized")
+            elif status_code == 403:
+                print("API Invoker does not exist. API Invoker id not found")
+            else:
+                print(e)
+
diff --git a/services/capif-client/CAPIFInvokerGUI/invoker_gui/capif_ops/invoker_to_service.py b/services/capif-client/CAPIFInvokerGUI/invoker_gui/capif_ops/invoker_to_service.py
new file mode 100644
index 0000000000000000000000000000000000000000..bc54ad7077759696396525433075b004416b97d9
--- /dev/null
+++ b/services/capif-client/CAPIFInvokerGUI/invoker_gui/capif_ops/invoker_to_service.py
@@ -0,0 +1,168 @@
+from dis import dis
+import requests
+import json
+import configparser
+import redis
+import os
+import argparse
+import re
+from termcolor import colored
+
+# Get environment variables
+
+
+class InvokerToService():
+    def __demo_to_aef(self, operation, demo_ip, demo_port, demo_url, jwt_token, name, log_level):
+
+        #def register_netapp_to_nef(nef_ip, nef_port):
+        access_token_url = "https://{}:{}/api/v1/login/access-token".format(demo_ip, demo_port)
+
+        access_payload = {
+        "username": "admin@my-email.com",
+        "password": "pass"
+        }
+
+        response = requests.request('POST', access_token_url, data=access_payload, verify=False)
+        parsed = json.loads(response.text)
+
+        access_token = parsed['access_token']
+
+        print(colored("Using AEF Service API","yellow"))
+        url = "https://{}:{}{}".format(demo_ip, demo_port, demo_url)
+        #url = "http://python_aef:8086/hello"
+
+
+      
+        json_file = open('capif_ops/config_files/service_request_body.json', 'rb')
+        payload_dict = json.load(json_file)
+        payload = json.dumps(payload_dict, indent=2)
+
+        files = {}
+        headers = {
+            'Content-Type': 'application/json',
+            'Authorization': 'Bearer '+ access_token + "," +jwt_token
+        }
+
+        if operation == "create":
+            print(colored(f"Request Body: {payload}", "yellow"))
+            try:
+                if log_level == "debug":
+                    print(colored("''''''''''REQUEST'''''''''''''''''","blue"))
+                    print(colored(f"Request: to {url}","blue"))
+                    print(colored(f"Request Headers: {headers}", "blue"))
+                    print(colored(f"Request Body: {json.dumps(payload, indent=2)}", "blue"))
+                    print(colored(f"''''''''''REQUEST'''''''''''''''''", "blue"))
+                response = requests.request("POST", url, headers=headers, data=payload, files=files, verify=False)
+                response.raise_for_status()
+                response_payload = json.loads(response.text)
+
+                if log_level == "debug":
+                    print(colored("''''''''''RESPONSE'''''''''''''''''","green"))
+                    print(colored(f"Response to: {response.url}","green"))
+                    print(colored(f"Response Headers: {response.headers}","green"))
+                    print(colored(f"Response: {response.json()}","green"))
+                    print(colored(f"Response Status code: {response.status_code}","green"))
+                    print(colored("Success to invoke service","green"))
+                    print(colored(response_payload,"green"))
+                    print(colored("''''''''''RESPONSE'''''''''''''''''","green"))
+
+                link_created_resource = response_payload["link"]
+                resource_id = link_created_resource.rsplit('/', 1)[-1]
+                if resource_id:
+                    with open('capif_ops/config_files/demo_values.json', 'r') as demo_file:
+                        demo_values = json.load(demo_file)
+                    demo_values["demo_resource_id"] = resource_id
+                    with open('capif_ops/config_files/demo_values.json', 'w') as outfile:
+                        json.dump(demo_values, outfile)
+
+                return response_payload
+            except requests.exceptions.HTTPError as err:
+                print(err.response.text)
+                message = json.loads(err.response.text)
+                status = err.response.status_code
+                raise Exception(message, status)
+            
+        elif operation == "delete":
+            with open('capif_ops/config_files/demo_values.json', 'r') as demo_file:
+                        demo_values = json.load(demo_file)
+            resource_id = demo_values["demo_resource_id"]
+            if resource_id == "":
+                print("Not found resource to delete")
+                return 
+
+            url = url + "/" + resource_id
+            try:
+                if log_level == "debug":
+                    print(colored("''''''''''REQUEST'''''''''''''''''","blue"))
+                    print(colored(f"Request: to {url}","blue"))
+                    print(colored(f"Request Headers: {headers}", "blue"))
+                    print(colored(f"''''''''''REQUEST'''''''''''''''''", "blue"))
+                response = requests.request("DELETE", url, headers=headers, verify=False)
+                response.raise_for_status()
+                response_payload = json.loads(response.text)
+
+                if log_level == "debug":
+                    print(colored("''''''''''RESPONSE'''''''''''''''''","green"))
+                    print(colored(f"Response to: {response.url}","green"))
+                    print(colored(f"Response Headers: {response.headers}","green"))
+                    print(colored(f"Response: {response.json()}","green"))
+                    print(colored(f"Response Status code: {response.status_code}","green"))
+                    print(colored("Success to invoke service","green"))
+                    print(colored(response_payload,"green"))
+                    print(colored("''''''''''RESPONSE'''''''''''''''''","green"))
+
+                demo_values["demo_resource_id"] = ""
+                with open('capif_ops/config_files/demo_values.json', 'w') as outfile:
+                    json.dump(demo_values, outfile)
+
+                return response_payload
+            except requests.exceptions.HTTPError as err:
+                print(err.response.text)
+                message = json.loads(err.response.text)
+                status = err.response.status_code
+                raise Exception(message, status)
+
+        else:
+            print("You must spicify if you want create or delete resource")
+
+
+    def execute_invoker_to_service(self, input):
+
+        # parser = argparse.ArgumentParser()
+        # parser.add_argument('--name', metavar= "name", type=str, default="Evolve5G", help="Name to send to the aef service")
+        # args = parser.parse_args()
+        input_name = "prueba"
+        operation = ""
+        log_level = ""
+        params = input.split()
+        if len(params) > 0:
+            operation = params[0]
+            if len(params) > 1:
+                log_level = params[1]
+
+        with open('capif_ops/config_files/demo_values.json', 'r') as demo_file:
+            demo_values = json.load(demo_file)
+
+        try:
+            if 'netapp_service_token' in demo_values:
+
+                print(colored("Doing test","yellow"))
+                jwt_token = demo_values['netapp_service_token']
+                invokerID = demo_values['invokerID']
+                demo_ip = demo_values['demo_ipv4_addr_0']
+                #demo_port = demo_values['demo_port_0']
+                demo_port = 4443
+                demo_url = demo_values['demo_url_0']
+                demo_url = re.sub(r'\{scsAsId\}', 'myNetapp', demo_url)
+
+                result = self.__demo_to_aef(operation, demo_ip, demo_port, demo_url, jwt_token, input_name, log_level)
+                print(colored(f"Response: {json.dumps(result, indent=2)}", "yellow"))
+                print(colored("Success","yellow"))
+        except Exception as e:
+            status_code = e.args[0]
+            if status_code == 401:
+                print("API Invoker is not authorized")
+            elif status_code == 403:
+                print("API Invoker does not exist. API Invoker id not found")
+            else:
+                print(e)
\ No newline at end of file
diff --git a/services/capif-client/CAPIFInvokerGUI/invoker_gui/capif_ops/nef_calback_server/__init__.py b/services/capif-client/CAPIFInvokerGUI/invoker_gui/capif_ops/nef_calback_server/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/services/capif-client/CAPIFInvokerGUI/invoker_gui/capif_ops/nef_calback_server/callback.py b/services/capif-client/CAPIFInvokerGUI/invoker_gui/capif_ops/nef_calback_server/callback.py
new file mode 100644
index 0000000000000000000000000000000000000000..682d35893dd8b8798fea225098779e0f65b07044
--- /dev/null
+++ b/services/capif-client/CAPIFInvokerGUI/invoker_gui/capif_ops/nef_calback_server/callback.py
@@ -0,0 +1,26 @@
+#!/usr/bin/env python3
+
+from flask import Flask, jsonify, request
+# import redis
+# from redis.commands.json.path import Path
+import secrets
+from werkzeug import serving
+import os
+
+
+
+app = Flask(__name__)
+
+COUNTER = 0
+
+@app.route("/nefcallbacks", methods=["POST"])
+def nefcallback():
+    global COUNTER 
+    COUNTER += 1
+    print(f"Notification received from NEF: {COUNTER}")
+
+    return jsonify(message="Receive message"), 200
+
+
+if __name__ == '__main__':
+    serving.run_simple('0.0.0.0', 8080, app)
\ No newline at end of file
diff --git a/services/capif-client/CAPIFInvokerGUI/invoker_gui/main.py b/services/capif-client/CAPIFInvokerGUI/invoker_gui/main.py
new file mode 100644
index 0000000000000000000000000000000000000000..bed7c8bcd6b02ac4ba0ffda5d42552040f7b505d
--- /dev/null
+++ b/services/capif-client/CAPIFInvokerGUI/invoker_gui/main.py
@@ -0,0 +1,98 @@
+
+from cmd import Cmd
+from capif_ops.invoker_previous_register import PreviousRegister
+from capif_ops.invoker_register_to_capif import RegisterInvoker
+from capif_ops.invoker_discover_service import  DiscoverService
+from capif_ops.invoker_secutiry_context import InvokerSecurityContext
+from capif_ops.invoker_get_security_auth import InvokerGetSecurityAuth
+from capif_ops.invoker_delete import RemoveInvoker
+from capif_ops.invoker_get_auth import PreviousAuth
+from capif_ops.invoker_remove_security_context import InvokerRemoveSecurityContext
+from capif_ops.invoker_to_service import InvokerToService
+import shlex
+import subprocess
+from art import *
+
+prev_register = PreviousRegister()
+regiter_capif = RegisterInvoker()
+discover_service = DiscoverService()
+register_security_context = InvokerSecurityContext()
+security_context_auth = InvokerGetSecurityAuth()
+remove_invoker = RemoveInvoker()
+invoker_auth = PreviousAuth()
+remove_security_service = InvokerRemoveSecurityContext()
+invoker_service = InvokerToService()
+
+
+
+class CAPIFProvider(Cmd):
+
+  def __init__(self):
+        Cmd.__init__(self)
+        self.prompt = "> "
+        self.intro = tprint("Welcome  to  Invoker  Console")
+
+  def emptyline(self):
+        """Do nothing on empty input line"""
+        pass
+
+  def preloop(self):
+    state = prev_register.execute_previous_register_invoker()
+    self.previous_register_state = state
+
+  def precmd(self, line):
+
+    line = line.lower()
+    args = shlex.split(line)
+
+    if len(args) >= 1 and args[0] in ["goodbye"]:
+        print("The first argument is username")
+        return ""
+
+    elif len(args) >= 1 and args[0] not in ["->", "wall", "follows", "exit", "help"]:
+        pass
+
+    return line
+
+  def do_register_invoker(self, input):
+    'Register invoker to CAPIF'
+    regiter_capif.execute_register_invoker(input)
+
+  def do_discover_service(self, input):
+    'Discover all services published in CAPIF'
+    discover_service.execute_discover_service(input)
+
+  def do_register_security_context(self, input):
+    'Create security context to use services'
+    register_security_context.execute_register_security_context(input)
+
+  def do_get_security_auth(self, input):
+    "If you select Oauth as security method use this command to obtain jwt token to access service"
+    security_context_auth.execute_get_security_auth(input)
+
+  def do_get_auth(self, input):
+    'Get jwt token to register invoker in CAPIF (Optional, only if token expires)'
+    invoker_auth.execute_get_auth(input)
+
+  def do_remove_security_context(self, input):
+    print("Not implemented yet")
+    #remove_security_service.execute_remove_security_context(input)
+
+  def do_remove_invoker(self, input):
+    "Remove invoker from CAPIF"
+    remove_invoker.execute_remove_invoker(input)
+
+  def do_call_service(self, input):
+    "Test invocation os service API"
+    invoker_service.execute_invoker_to_service(input)
+
+  def do_exit(self, input):
+    print('\nExiting...')
+    return True
+
+
+if __name__ == '__main__':
+    try:
+        CAPIFProvider().cmdloop()
+    except KeyboardInterrupt:
+        print('\nExiting...')
\ No newline at end of file
diff --git a/services/capif-client/CAPIFInvokerGUI/invoker_gui/prepare.sh b/services/capif-client/CAPIFInvokerGUI/invoker_gui/prepare.sh
new file mode 100755
index 0000000000000000000000000000000000000000..ca0305a044b9c7aa9f6d60a88bac3c4f13707fc0
--- /dev/null
+++ b/services/capif-client/CAPIFInvokerGUI/invoker_gui/prepare.sh
@@ -0,0 +1,11 @@
+VAULT_ADDR="http://$VAULT_HOSTNAME:$VAULT_PORT"
+VAULT_TOKEN=$VAULT_ACCESS_TOKEN
+
+curl  -k -retry 30 \
+    --retry-all-errors \
+    --connect-timeout 5 \
+    --max-time 10 \
+    --retry-delay 10 \
+    --retry-max-time 300 \
+    --header "X-Vault-Token: $VAULT_TOKEN" \
+    --request GET "$VAULT_ADDR/v1/secret/data/ca" 2>/dev/null | jq -r '.data.data.ca' -j > ./capif_ops/certs/ca.crt
\ No newline at end of file
diff --git a/services/capif-client/CAPIFInvokerGUI/invoker_gui/requirements.txt b/services/capif-client/CAPIFInvokerGUI/invoker_gui/requirements.txt
new file mode 100755
index 0000000000000000000000000000000000000000..a9e6ededb6f821c6f5a8c6b991c68a4032dc5fad
--- /dev/null
+++ b/services/capif-client/CAPIFInvokerGUI/invoker_gui/requirements.txt
@@ -0,0 +1,13 @@
+requests == 2.26.0
+evolved5g >= 0.8.9
+python_dateutil >= 2.6.0
+setuptools >= 21.0.0
+Flask
+watchdog
+redis
+configparser
+redis
+pyopenssl
+pyjwt
+art
+termcolor
\ No newline at end of file
diff --git a/services/capif-client/Dockerfile b/services/capif-client/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..ad7e50339036e5012ef65b99bf89c66a747be050
--- /dev/null
+++ b/services/capif-client/Dockerfile
@@ -0,0 +1,5 @@
+FROM public.ecr.aws/o2v4a8t6/opencapif/client:3.1.3
+
+COPY ./CAPIFInvokerGUI .
+RUN pip3 install -r ./invoker_gui/requirements.txt
+CMD ["sleep", "infinity"]
\ No newline at end of file
diff --git a/services/check_services_are_running.sh b/services/check_services_are_running.sh
new file mode 100755
index 0000000000000000000000000000000000000000..53e8e6daccc681261cc14d5e1b83b17f4ab52a31
--- /dev/null
+++ b/services/check_services_are_running.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+running="$(docker-compose -f docker-compose-capif.yml ps --services --all --filter "status=running")"
+services="$(docker-compose -f docker-compose-capif.yml ps --services --all)"
+if [ "$running" != "$services" ]; then
+    echo "Following services are not running:"
+    # Bash specific
+    comm -13 <(sort <<<"$running") <(sort <<<"$services")
+    exit 1
+else
+    echo "All services are running"
+    exit 0
+fi
diff --git a/services/clean_capif_docker_services.sh b/services/clean_capif_docker_services.sh
new file mode 100755
index 0000000000000000000000000000000000000000..af3c31365c4823fb603bce1ec99395ef1569bfb5
--- /dev/null
+++ b/services/clean_capif_docker_services.sh
@@ -0,0 +1,40 @@
+
+# docker-compose -f "docker-compose-capif.yml" down  --rmi all --remove-orphans
+# docker network rm capif-network
+
+# status=$?
+# if [ $status -eq 0 ]; then
+#     echo "*** All Capif services are cleaned ***"
+# else
+#     echo "*** Some Capif services failed on clean ***"
+# fi
+
+# exit $status
+
+#!/bin/bash
+
+# Verificar el parámetro proporcionado
+if [[ $# -eq 0 || "$1" == "capif" ]]; then
+  FILES=("docker-compose-capif.yml")
+elif [[ "$1" == "all" ]]; then
+  FILES=("docker-compose-capif.yml" "docker-compose-vault.yml" "docker-compose-register.yml" "../monitoring/docker-compose.yml" "docker-compose-backoffice.yml")
+else
+  echo "Parámetro inválido. Uso: ./script.sh [capif|all]"
+  exit 1
+fi
+
+# Recorrer los archivos Docker Compose y ejecutar docker-compose down
+for FILE in "${FILES[@]}"; do
+  echo "Ejecutando 'docker-compose down' para el archivo $FILE"
+  docker-compose -f "$FILE" down --rmi all
+  status=$?
+    if [ $status -eq 0 ]; then
+        echo "*** Removed Service from $FILE ***"
+    else
+        echo "*** Some services of $FILE failed on clean ***"
+    fi
+done
+
+docker network rm capif-network
+
+echo "Operación completada."
diff --git a/services/docker-compose-capif.yml b/services/docker-compose-capif.yml
new file mode 100644
index 0000000000000000000000000000000000000000..d5521053d741f697631f538f3386052b4f72e2d1
--- /dev/null
+++ b/services/docker-compose-capif.yml
@@ -0,0 +1,259 @@
+version: '3.7'
+
+services:
+  redis:
+    image: "redis:alpine"
+    command: redis-server
+    ports:
+      - "6379:6379"
+    volumes:
+      - $PWD/redis-data:/var/lib/redis
+      - $PWD/redis.conf:/usr/local/etc/redis/redis.conf
+    environment:
+      - REDIS_REPLICATION_MODE=master
+
+  access-control-policy:
+    build: TS29222_CAPIF_Access_Control_Policy_API
+    expose:
+      - "8080"
+    volumes:
+      - ./TS29222_CAPIF_Access_Control_Policy_API:/usr/src/app
+    extra_hosts:
+      - host.docker.internal:host-gateway
+      - fluent-bit:host-gateway
+      - otel-collector:host-gateway
+    environment:
+      - CONTAINER_NAME=access-control-policy
+      - MONITORING=${MONITORING}
+    restart: unless-stopped
+    image: public.ecr.aws/o2v4a8t6/opencapif/access-control-policy:3.1.3
+    depends_on:
+      - redis
+      - nginx
+    
+
+  api-invoker-management:
+    build:
+      context: ./TS29222_CAPIF_API_Invoker_Management_API
+    expose:
+      - "8080"
+    volumes:
+      - ./TS29222_CAPIF_API_Invoker_Management_API:/usr/src/app
+    extra_hosts:
+      - host.docker.internal:host-gateway
+      - fluent-bit:host-gateway
+      - otel-collector:host-gateway
+      - vault:host-gateway
+    environment:
+      - CONTAINER_NAME=api-invoker-management
+      - MONITORING=${MONITORING}
+      - VAULT_HOSTNAME=vault
+      - VAULT_ACCESS_TOKEN=dev-only-token
+      - VAULT_PORT=8200
+    restart: unless-stopped
+    image: public.ecr.aws/o2v4a8t6/opencapif/api-invoker-management-api:3.1.3
+    depends_on:
+    - redis
+    - nginx
+
+  api-provider-management:
+    build: TS29222_CAPIF_API_Provider_Management_API/.
+    expose:
+      - "8080"
+    volumes:
+      - ./TS29222_CAPIF_API_Provider_Management_API:/usr/src/app
+    extra_hosts:
+      - host.docker.internal:host-gateway
+      - fluent-bit:host-gateway
+      - otel-collector:host-gateway
+      - vault:host-gateway
+    image: public.ecr.aws/o2v4a8t6/opencapif/api-provider-management-api:3.1.3
+    environment:
+      - CONTAINER_NAME=api-provider-management
+      - MONITORING=${MONITORING}
+      - VAULT_HOSTNAME=vault
+      - VAULT_ACCESS_TOKEN=dev-only-token
+      - VAULT_PORT=8200
+    depends_on:
+      - redis
+      - nginx
+
+  logs:
+    build:
+      context: ./TS29222_CAPIF_Auditing_API
+    expose:
+      - "8080"
+    volumes:
+      - ./TS29222_CAPIF_Auditing_API:/usr/src/app
+    extra_hosts:
+      - host.docker.internal:host-gateway
+      - fluent-bit:host-gateway
+      - otel-collector:host-gateway
+    restart: unless-stopped
+    image: public.ecr.aws/o2v4a8t6/opencapif/auditing-api:3.1.3
+    environment:
+      - CONTAINER_NAME=api-auditing
+      - MONITORING=${MONITORING}
+    depends_on:
+      - mongo
+
+  service-apis:
+    build:
+      context: ./TS29222_CAPIF_Discover_Service_API
+    expose:
+      - "8080"
+    volumes:
+      - ./TS29222_CAPIF_Discover_Service_API:/usr/src/app
+    restart: unless-stopped
+    extra_hosts:
+      - host.docker.internal:host-gateway
+      - fluent-bit:host-gateway
+      - otel-collector:host-gateway
+    image: public.ecr.aws/o2v4a8t6/opencapif/discover-service-api:3.1.3
+    environment:
+      - CONTAINER_NAME=services-apis
+      - MONITORING=${MONITORING}
+    depends_on:
+    - mongo
+
+  capif-events:
+    build: TS29222_CAPIF_Events_API/.
+    expose:
+      - "8080"
+    volumes:
+      - ./TS29222_CAPIF_Events_API:/usr/src/app
+    image: public.ecr.aws/o2v4a8t6/opencapif/events-api:3.1.3
+    environment:
+      - CONTAINER_NAME=api-events
+      - MONITORING=${MONITORING}
+    extra_hosts:
+      - host.docker.internal:host-gateway
+      - fluent-bit:host-gateway
+      - otel-collector:host-gateway
+    depends_on:
+      - redis
+      - mongo
+
+  api-invocation-logs:
+    build:
+      context: ./TS29222_CAPIF_Logging_API_Invocation_API
+    expose:
+      - "8080"
+    volumes:
+      - ./TS29222_CAPIF_Logging_API_Invocation_API:/usr/src/app
+    restart: unless-stopped
+    image: public.ecr.aws/o2v4a8t6/opencapif/api-invocation-logs-api:3.1.3
+    extra_hosts:
+      - host.docker.internal:host-gateway
+      - fluent-bit:host-gateway
+      - otel-collector:host-gateway
+    environment:
+      - CAPIF_HOSTNAME=${CAPIF_HOSTNAME}
+      - CONTAINER_NAME=api-invocation-logs
+      - MONITORING=${MONITORING}
+    depends_on:
+      - mongo
+
+  published-apis:
+    build: TS29222_CAPIF_Publish_Service_API/.
+    expose:
+      - "8080"
+    volumes:
+      - ./TS29222_CAPIF_Publish_Service_API:/usr/src/app
+    restart: unless-stopped
+    image: public.ecr.aws/o2v4a8t6/opencapif/publish-service-api:3.1.3
+    extra_hosts:
+      - host.docker.internal:host-gateway
+      - fluent-bit:host-gateway
+      - otel-collector:host-gateway
+    environment:
+      - CONTAINER_NAME=api-publish-apis
+      - MONITORING=${MONITORING}
+    depends_on:
+      - redis
+      - mongo
+
+  capif-routing-info:
+    build: TS29222_CAPIF_Routing_Info_API/.
+    expose:
+      - "8080"
+    image: public.ecr.aws/o2v4a8t6/opencapif/routing-info-api:3.1.3
+
+  capif-security:
+    build: TS29222_CAPIF_Security_API/.
+    expose:
+      - "8080"
+    volumes:
+      - ./TS29222_CAPIF_Security_API:/usr/src/app
+    restart: unless-stopped
+    image: public.ecr.aws/o2v4a8t6/opencapif/security-api:3.1.3
+    environment:
+      - CAPIF_HOSTNAME=${CAPIF_HOSTNAME}
+      - CONTAINER_NAME=api-security
+      - MONITORING=${MONITORING}
+      - VAULT_HOSTNAME=vault
+      - VAULT_ACCESS_TOKEN=dev-only-token
+      - VAULT_PORT=8200
+    extra_hosts:
+      - host.docker.internal:host-gateway
+      - fluent-bit:host-gateway
+      - otel-collector:host-gateway
+      - vault:host-gateway
+    depends_on:
+      - redis
+      - nginx
+
+  mongo:
+    image: mongo:6.0.2
+    logging:
+      driver: 'none'
+    restart: unless-stopped
+    environment:
+      MONGO_INITDB_ROOT_USERNAME: root
+      MONGO_INITDB_ROOT_PASSWORD: example
+  
+  mongo-express:
+    image: mongo-express:1.0.0-alpha.4
+    logging:
+      driver: 'none'
+    restart: unless-stopped
+    ports:
+      - 8082:8081
+    environment:
+      ME_CONFIG_MONGODB_ADMINUSERNAME: root
+      ME_CONFIG_MONGODB_ADMINPASSWORD: example
+      ME_CONFIG_MONGODB_URL: mongodb://root:example@mongo:27017/
+    depends_on:
+      - mongo
+
+  nginx:
+    build:
+      context: ./nginx
+    ports:
+      - "8080:8080"
+      - "443:443"
+    image: public.ecr.aws/o2v4a8t6/opencapif/nginx:3.1.3
+    environment:
+      - CAPIF_HOSTNAME=${CAPIF_HOSTNAME}
+      - VAULT_HOSTNAME=vault
+      - VAULT_ACCESS_TOKEN=dev-only-token
+      - VAULT_PORT=8200
+    hostname: ${CAPIF_HOSTNAME}
+    volumes:
+      - ./nginx/certs:/etc/nginx/certs
+    extra_hosts:
+      - host.docker.internal:host-gateway
+      - vault:host-gateway
+    restart: unless-stopped
+    depends_on:
+      - redis
+      - service-apis
+      - api-invocation-logs
+      - published-apis
+      - capif-events
+      - logs
+
+networks:
+  default:
+    name: capif-network
+    external: true
diff --git a/services/docker-compose-register.yml b/services/docker-compose-register.yml
new file mode 100644
index 0000000000000000000000000000000000000000..173d66172864206aa0ea23e4a4735a9f5e3abb62
--- /dev/null
+++ b/services/docker-compose-register.yml
@@ -0,0 +1,51 @@
+version: '3.7'
+
+services:
+  register:
+    build:
+      context: ./register
+    ports:
+      - 8084:8080
+    volumes:
+      - ./register:/usr/src/app
+    environment:
+      - CAPIF_PRIV_KEY=${CAPIF_PRIV_KEY}
+      - VAULT_HOSTNAME=vault
+      - VAULT_ACCESS_TOKEN=dev-only-token
+      - VAULT_PORT=8200
+    extra_hosts:
+      - host.docker.internal:host-gateway
+      - vault:host-gateway
+    restart: unless-stopped
+    image: public.ecr.aws/o2v4a8t6/opencapif/jwtauth:3.1.3
+    depends_on:
+       - mongo_register
+
+  mongo_register:
+    image: mongo:6.0.2
+    restart: unless-stopped
+    environment:
+      MONGO_INITDB_ROOT_USERNAME: root
+      MONGO_INITDB_ROOT_PASSWORD: example
+
+  mongo_register_express:
+    image: mongo-express:1.0.0-alpha.4
+    logging:
+      driver: 'none'
+    restart: unless-stopped
+    ports:
+      - 8083:8081
+    environment:
+      ME_CONFIG_MONGODB_ADMINUSERNAME: root
+      ME_CONFIG_MONGODB_ADMINPASSWORD: example
+      ME_CONFIG_MONGODB_URL: mongodb://root:example@mongo_register:27017/
+    depends_on:
+      - mongo_register
+
+networks:
+  default:
+    name: capif-network
+    external: true
+
+
+
diff --git a/services/docker-compose-vault.yml b/services/docker-compose-vault.yml
new file mode 100644
index 0000000000000000000000000000000000000000..e0bb7bce196fde18748da2967cb1b94485b2ef59
--- /dev/null
+++ b/services/docker-compose-vault.yml
@@ -0,0 +1,16 @@
+version: '3.7'
+services:
+  vault:
+    build:
+      context: ./vault
+    restart: unless-stopped
+    ports:
+      - 8200:8200
+    cap_add:
+      - IPC_LOCK
+    environment:
+      - VAULT_DEV_ROOT_TOKEN_ID=dev-only-token
+      - VAULT_DEV_LISTEN_ADDRESS=0.0.0.0:8200
+    volumes:
+      - ./vault/data:/vault/data
+      - ./vault/config:/vault/config
diff --git a/services/docker-compose/docker-compose-capif.yml b/services/docker-compose/docker-compose-capif.yml
new file mode 100644
index 0000000000000000000000000000000000000000..0095d9a1794b1f86a319c0819359f340b731fabe
--- /dev/null
+++ b/services/docker-compose/docker-compose-capif.yml
@@ -0,0 +1,246 @@
+version: '3.7'
+
+services:
+  redis:
+    image: "redis:alpine"
+    command: redis-server
+    ports:
+      - "6379:6379"
+    volumes:
+      - $PWD/redis-data:/var/lib/redis
+      - $PWD/redis.conf:/usr/local/etc/redis/redis.conf
+    environment:
+      - REDIS_REPLICATION_MODE=master
+
+  access-control-policy:
+    expose:
+      - "8080"
+    volumes:
+      - ../TS29222_CAPIF_Access_Control_Policy_API:/usr/src/app
+    extra_hosts:
+      - host.docker.internal:host-gateway
+      - fluent-bit:host-gateway
+      - otel-collector:host-gateway
+    environment:
+      - CONTAINER_NAME=access-control-policy
+      - MONITORING=${MONITORING}
+    restart: unless-stopped
+    image: public.ecr.aws/o2v4a8t6/opencapif/access-control-policy:v3.1.4
+    depends_on:
+      - redis
+      - nginx
+    
+
+  api-invoker-management:
+    expose:
+      - "8080"
+    volumes:
+      - ../TS29222_CAPIF_API_Invoker_Management_API:/usr/src/app
+    extra_hosts:
+      - host.docker.internal:host-gateway
+      - fluent-bit:host-gateway
+      - otel-collector:host-gateway
+      - vault:host-gateway
+    environment:
+      - CONTAINER_NAME=api-invoker-management
+      - MONITORING=${MONITORING}
+      - VAULT_HOSTNAME=vault
+      - VAULT_ACCESS_TOKEN=dev-only-token
+      - VAULT_PORT=8200
+    restart: unless-stopped
+    image: public.ecr.aws/o2v4a8t6/opencapif/api-invoker-management-api:v3.1.4
+    depends_on:
+    - redis
+    - nginx
+
+  api-provider-management:
+    expose:
+      - "8080"
+    volumes:
+      - ../TS29222_CAPIF_API_Provider_Management_API:/usr/src/app
+    extra_hosts:
+      - host.docker.internal:host-gateway
+      - fluent-bit:host-gateway
+      - otel-collector:host-gateway
+      - vault:host-gateway
+    image: public.ecr.aws/o2v4a8t6/opencapif/api-provider-management-api:v3.1.4
+    environment:
+      - CONTAINER_NAME=api-provider-management
+      - MONITORING=${MONITORING}
+      - VAULT_HOSTNAME=vault
+      - VAULT_ACCESS_TOKEN=dev-only-token
+      - VAULT_PORT=8200
+    depends_on:
+      - redis
+      - nginx
+
+  logs:
+    expose:
+      - "8080"
+    volumes:
+      - ../TS29222_CAPIF_Auditing_API:/usr/src/app
+    extra_hosts:
+      - host.docker.internal:host-gateway
+      - fluent-bit:host-gateway
+      - otel-collector:host-gateway
+    restart: unless-stopped
+    image: public.ecr.aws/o2v4a8t6/opencapif/auditing-api:v3.1.4
+    environment:
+      - CONTAINER_NAME=api-auditing
+      - MONITORING=${MONITORING}
+    depends_on:
+      - mongo
+
+  service-apis:
+    expose:
+      - "8080"
+    volumes:
+      - ../TS29222_CAPIF_Discover_Service_API:/usr/src/app
+    restart: unless-stopped
+    extra_hosts:
+      - host.docker.internal:host-gateway
+      - fluent-bit:host-gateway
+      - otel-collector:host-gateway
+    image: public.ecr.aws/o2v4a8t6/opencapif/discover-service-api:v3.1.4
+    environment:
+      - CONTAINER_NAME=services-apis
+      - MONITORING=${MONITORING}
+    depends_on:
+    - mongo
+
+  capif-events:
+    expose:
+      - "8080"
+    volumes:
+      - ../TS29222_CAPIF_Events_API:/usr/src/app
+    image: public.ecr.aws/o2v4a8t6/opencapif/events-api:v3.1.4
+    environment:
+      - CONTAINER_NAME=api-events
+      - MONITORING=${MONITORING}
+    extra_hosts:
+      - host.docker.internal:host-gateway
+      - fluent-bit:host-gateway
+      - otel-collector:host-gateway
+    depends_on:
+      - redis
+      - mongo
+
+  api-invocation-logs:
+    expose:
+      - "8080"
+    volumes:
+      - ../TS29222_CAPIF_Logging_API_Invocation_API:/usr/src/app
+    restart: unless-stopped
+    image: public.ecr.aws/o2v4a8t6/opencapif/api-invocation-logs-api:v3.1.4
+    extra_hosts:
+      - host.docker.internal:host-gateway
+      - fluent-bit:host-gateway
+      - otel-collector:host-gateway
+    environment:
+      - CAPIF_HOSTNAME=${CAPIF_HOSTNAME}
+      - CONTAINER_NAME=api-invocation-logs
+      - MONITORING=${MONITORING}
+    depends_on:
+      - mongo
+
+  published-apis:
+    expose:
+      - "8080"
+    volumes:
+      - ../TS29222_CAPIF_Publish_Service_API:/usr/src/app
+    restart: unless-stopped
+    image: public.ecr.aws/o2v4a8t6/opencapif/publish-service-api:v3.1.4
+    extra_hosts:
+      - host.docker.internal:host-gateway
+      - fluent-bit:host-gateway
+      - otel-collector:host-gateway
+    environment:
+      - CONTAINER_NAME=api-publish-apis
+      - MONITORING=${MONITORING}
+    depends_on:
+      - redis
+      - mongo
+
+  capif-routing-info:
+    expose:
+      - "8080"
+    image: public.ecr.aws/o2v4a8t6/opencapif/routing-info-api:v3.1.4
+
+  capif-security:
+    build: ../TS29222_CAPIF_Security_API/.
+    expose:
+      - "8080"
+    volumes:
+      - ../TS29222_CAPIF_Security_API:/usr/src/app
+    restart: unless-stopped
+    image: public.ecr.aws/o2v4a8t6/opencapif/security-api:v3.1.4
+    environment:
+      - CAPIF_HOSTNAME=${CAPIF_HOSTNAME}
+      - CONTAINER_NAME=api-security
+      - MONITORING=${MONITORING}
+      - VAULT_HOSTNAME=vault
+      - VAULT_ACCESS_TOKEN=dev-only-token
+      - VAULT_PORT=8200
+    extra_hosts:
+      - host.docker.internal:host-gateway
+      - fluent-bit:host-gateway
+      - otel-collector:host-gateway
+      - vault:host-gateway
+    depends_on:
+      - redis
+      - nginx
+
+  mongo:
+    image: mongo:6.0.2
+    logging:
+      driver: 'none'
+    restart: unless-stopped
+    ports:
+      - 27017:27017
+    environment:
+      MONGO_INITDB_ROOT_USERNAME: root
+      MONGO_INITDB_ROOT_PASSWORD: example
+  
+  mongo-express:
+    image: mongo-express:1.0.0-alpha.4
+    logging:
+      driver: 'none'
+    restart: unless-stopped
+    ports:
+      - 8082:8081
+    environment:
+      ME_CONFIG_MONGODB_ADMINUSERNAME: root
+      ME_CONFIG_MONGODB_ADMINPASSWORD: example
+      ME_CONFIG_MONGODB_URL: mongodb://root:example@mongo:27017/
+    depends_on:
+      - mongo
+
+  nginx:
+    ports:
+      - "8080:8080"
+      - "443:443"
+    image: public.ecr.aws/o2v4a8t6/opencapif/nginx:v3.1.4
+    environment:
+      - CAPIF_HOSTNAME=${CAPIF_HOSTNAME}
+      - VAULT_HOSTNAME=vault
+      - VAULT_ACCESS_TOKEN=dev-only-token
+      - VAULT_PORT=8200
+    hostname: ${CAPIF_HOSTNAME}
+    volumes:
+      - ./nginx/certs:/etc/nginx/certs
+    extra_hosts:
+      - host.docker.internal:host-gateway
+      - vault:host-gateway
+    restart: unless-stopped
+    depends_on:
+      - redis
+      - service-apis
+      - api-invocation-logs
+      - published-apis
+      - capif-events
+      - logs
+
+networks:
+  default:
+    name: capif-network
+    external: true
diff --git a/services/docker-compose/docker-compose-montoring.yml b/services/docker-compose/docker-compose-montoring.yml
new file mode 100644
index 0000000000000000000000000000000000000000..01dc06bcd929e1c696132d40c13b7488d8edbb7e
--- /dev/null
+++ b/services/docker-compose/docker-compose-montoring.yml
@@ -0,0 +1,110 @@
+version: '3'
+services:
+  prometheus:
+    image: prom/prometheus:latest
+    container_name: prometheus
+    user: "${DUID}:${DGID}"
+    volumes:
+      - ./prometheus/prometheus.yml:/etc/prometheus/prometheus.yml
+      - ./prometheus/prometheus_db:/var/lib/prometheus
+      - ./prometheus/prometheus_db:/prometheus
+      - ./prometheus/prometheus_db:/etc/prometheus
+      - ./prometheus/alert.rules:/etc/prometheus/alert.rules
+    command:
+      - '--config.file=/etc/prometheus/prometheus.yml'
+      - '--web.route-prefix=/'
+      - '--storage.tsdb.retention.time=200h'
+      - '--web.enable-lifecycle'
+    restart: unless-stopped
+    ports:
+      - '9090:9090'
+
+  # cadvisor collects metrics about running containers
+  cadvisor:
+    image: gcr.io/cadvisor/cadvisor:v0.47.2
+    container_name: cadvisor
+    ports:
+    - 8090:8080
+    volumes:
+    - /:/rootfs:ro
+    - /var/run:/var/run:rw
+    - /sys:/sys:ro
+    - /var/lib/docker/:/var/lib/docker:ro
+    - /var/run/docker.sock:/var/run/docker.sock:rw
+
+  grafana:
+    image: grafana/grafana
+    user: "${DUID}:${DGID}"
+    environment:
+      - GF_SECURITY_ADMIN_PASSWORD=secure_pass
+      - GF_PATHS_PROVISIONING=/etc/grafana/provisioning
+      - GF_AUTH_ANONYMOUS_ENABLED=true
+      - GF_AUTH_ANONYMOUS_ORG_ROLE=Admin
+    volumes:
+      - ./grafana/grafana_config/grafana.ini:/etc/grafana/grafana.ini
+      - ./grafana/grafana_db:/var/lib/grafana
+      - ./grafana/grafana_provisioning/grafana-datasources.yaml:/etc/grafana/provisioning/datasources/datasources.yaml
+      - ./grafana/grafana_provisioning/grafana-default-provisioning.yaml:/etc/grafana/provisioning/dashboards/default.yaml
+      - ./grafana/grafana_dashboards/Docker-monitoring.json:/var/lib/grafana/dashboards/Docker-monitoring.json
+      - ./grafana/grafana_dashboards/Loki-Logs.json:/var/lib/grafana/dashboards/Loki-Logs.json
+
+    depends_on:
+      - prometheus
+    ports:
+      - '3000:3000'
+
+  # loki save and analyze logs
+  loki:
+    image: grafana/loki:2.8.0
+    ports:
+      - "3100:3100"
+    command: -config.file=/etc/loki/local-config.yaml
+
+  # promtail send docker logs to loki
+  promtail:
+    image: grafana/promtail:2.8.0
+    volumes:
+      - /var/log:/var/log
+    command: -config.file=/etc/promtail/config.yml
+
+  # grafana image renderer
+  renderer:
+    image: grafana/grafana-image-renderer:latest
+    container_name: grafana-image-renderer
+    expose:
+      - "8081"
+    environment:
+      ENABLE_METRICS: "true"
+
+  # fluent-bit send logs to loki
+  fluent-bit:
+    image: grafana/fluent-bit-plugin-loki:main
+    container_name: fluent-bit
+    environment:
+      - LOKI_URL=http://loki:3100/loki/api/v1/push
+    volumes:
+      - ./fluent_bit/fluent-bit.conf:/fluent-bit/etc/fluent-bit.conf
+    ports:
+      - "24224:24224"
+      - "24224:24224/udp"
+
+  # opentelemetry collector
+  otel-collector:
+    image: otel/opentelemetry-collector:latest
+    ports:
+      - 55680:55680
+      - 4317:4317
+    volumes:
+      - ./otlp_collector/otel-config.yaml:/etc/otel-collector-config.yaml
+    command: ["--config", "/etc/otel-collector-config.yaml"]
+
+  # tempo is a distributed tracing backend
+  tempo:
+    image: grafana/tempo:latest
+    command: [ "-config.file=/etc/tempo.yaml" ]
+    volumes:
+      - ./tempo/tempo.yaml:/etc/tempo.yaml
+      - ./tempo/tempo-data:/tmp/tempo
+    ports:
+      - 3102:3100
+
diff --git a/services/docker-compose/docker-compose-register.yml b/services/docker-compose/docker-compose-register.yml
new file mode 100644
index 0000000000000000000000000000000000000000..acd06cad84bc638b050ee8a3be0ba49b7324cd46
--- /dev/null
+++ b/services/docker-compose/docker-compose-register.yml
@@ -0,0 +1,37 @@
+version: '3.7'
+
+services:
+  register:
+    ports:
+      - 8084:8080
+    volumes:
+      - ../register:/usr/src/app
+    environment:
+      - CAPIF_PRIV_KEY=${CAPIF_PRIV_KEY}
+      - VAULT_HOSTNAME=vault
+      - VAULT_ACCESS_TOKEN=dev-only-token
+      - VAULT_PORT=8200
+    extra_hosts:
+      - host.docker.internal:host-gateway
+      - vault:host-gateway
+    restart: unless-stopped
+    image: public.ecr.aws/o2v4a8t6/opencapif/register:v3.1.4
+    depends_on:
+       - mongo_register
+
+  mongo_register:
+    image: mongo:6.0.2
+    restart: unless-stopped
+    ports:
+      - 28017:27017
+    environment:
+      MONGO_INITDB_ROOT_USERNAME: root
+      MONGO_INITDB_ROOT_PASSWORD: example
+
+networks:
+  default:
+    name: capif-network
+    external: true
+
+
+
diff --git a/services/docker-compose/docker-compose-vault.yml b/services/docker-compose/docker-compose-vault.yml
new file mode 100644
index 0000000000000000000000000000000000000000..cd11e0aebd25a52089335fb3ef0430faf1b61ef4
--- /dev/null
+++ b/services/docker-compose/docker-compose-vault.yml
@@ -0,0 +1,16 @@
+version: '3.7'
+services:
+  vault:
+    build:
+      context: ../vault
+    restart: unless-stopped
+    ports:
+      - 8200:8200
+    cap_add:
+      - IPC_LOCK
+    environment:
+      - VAULT_DEV_ROOT_TOKEN_ID=dev-only-token
+      - VAULT_DEV_LISTEN_ADDRESS=0.0.0.0:8200
+    volumes:
+      - ./vault/data:/vault/data
+      - ./vault/config:/vault/config
diff --git a/services/docker-compose/run.sh b/services/docker-compose/run.sh
new file mode 100755
index 0000000000000000000000000000000000000000..0bde6dbbec26c95ae11ec05079fdc9e821ebc812
--- /dev/null
+++ b/services/docker-compose/run.sh
@@ -0,0 +1,91 @@
+#!/bin/bash
+
+HOSTNAME=capifcore
+MONITORING_STATE=false
+DEPLOY=all
+
+#Needed to avoid write permissions on bind volumes with prometheus and grafana
+DUID=$(id -u)
+DGID=$(id -g)
+
+# Get docker compose version
+docker_version=$(docker compose version --short | cut -d',' -f1)
+IFS='.' read -ra version_components <<< "$docker_version"
+
+if [ "${version_components[0]}" -ge 2 ] && [ "${version_components[1]}" -ge 10 ]; then
+  echo "Docker compose version it greater than 2.10"
+else
+  echo "Docker compose version is not valid. Should be greater than 2.10"
+  exit 1
+fi
+
+# Read params
+while getopts ":h:m:" opt; do
+  case $opt in
+    h)
+      HOSTNAME="$OPTARG"
+      ;;
+    m)
+      MONITORING_STATE="$OPTARG"
+      ;;    
+    \?)
+      echo "Opción no válida: -$OPTARG" >&2
+      exit 1
+      ;;
+    :)
+      echo "La opción -$OPTARG requiere un argumento." >&2
+      exit 1
+      ;;
+  esac
+done
+
+echo Nginx hostname will be $HOSTNAME, deploy $DEPLOY, monitoring $MONITORING_STATE
+
+if [ "$MONITORING_STATE" == "true" ] ; then
+    echo '***Monitoring set as true***'
+    echo '***Creating Monitoging stack***'
+
+    DUID=$DUID DGID=$DGID docker compose -f "./docker-compose-monitoring.yml" up --detach
+    status=$?
+    if [ $status -eq 0 ]; then
+        echo "*** Monitoring Stack Runing ***"
+    else
+        echo "*** Monitoring Stack failed to start ***"
+        exit $status
+    fi
+fi
+
+docker network create capif-network
+
+docker compose -f "./docker-compose-vault.yml"  up --detach --build
+
+status=$?
+if [ $status -eq 0 ]; then
+    echo "*** Vault Service Runing ***"
+else
+    echo "*** Vault failed to start ***"
+    exit $status
+fi
+
+CAPIF_HOSTNAME=$HOSTNAME MONITORING=$MONITORING_STATE docker compose -f "./docker-compose-capif.yml" up --detach --build
+
+status=$?
+if [ $status -eq 0 ]; then
+    echo "*** All Capif services are running ***"
+else
+    echo "*** Some Capif services failed to start ***"
+    exit $status
+fi
+
+
+CAPIF_PRIV_KEY_BASE_64=$(echo "$(cat nginx/certs/server.key)")
+CAPIF_PRIV_KEY=$CAPIF_PRIV_KEY_BASE_64 docker compose -f "./docker-compose-register.yml"  up --detach --build
+
+status=$?
+if [ $status -eq 0 ]; then
+    echo "*** Register Service are running ***"
+else
+    echo "*** Register Service failed to start ***"
+fi
+
+exit $status
diff --git a/services/docker-compose/stop.sh b/services/docker-compose/stop.sh
new file mode 100755
index 0000000000000000000000000000000000000000..4a6435482890009601e749f897e965fd956f291c
--- /dev/null
+++ b/services/docker-compose/stop.sh
@@ -0,0 +1,98 @@
+#!/bin/bash
+
+HOSTNAME=capifcore
+MONITORING_STATE=false
+DEPLOY=all
+DEPLOY_BACKOFFICE=${DEPLOY_BACKOFFICE:-false}
+
+# Get docker compose version
+docker_version=$(docker compose version --short | cut -d',' -f1)
+IFS='.' read -ra version_components <<< "$docker_version"
+
+if [ "${version_components[0]}" -ge 2 ] && [ "${version_components[1]}" -ge 10 ]; then
+  echo "Docker compose version it greater than 2.10"
+else
+  echo "Docker compose version is not valid. Should be greater than 2.10"
+  exit 1
+fi
+
+# Read params
+while getopts ":h:m:" opt; do
+  case $opt in
+    h)
+      HOSTNAME="$OPTARG"
+      ;;
+    m)
+      MONITORING_STATE="$OPTARG"
+      ;;    
+    \?)
+      echo "Opción no válida: -$OPTARG" >&2
+      exit 1
+      ;;
+    :)
+      echo "La opción -$OPTARG requiere un argumento." >&2
+      exit 1
+      ;;
+  esac
+done
+
+if [ "$MONITORING_STATE" = true ] ; then
+    docker compose -f "./docker-compose-monitoring.yml" down 
+    status=$?
+    if [ $status -eq 0 ]; then
+        echo "*** Monitoring Stack Stopped ***"
+    else
+        echo "*** Monitoring Stack failed to stopt ***"
+        exit $status
+    fi
+fi
+
+docker compose -f "./docker-compose-vault.yml"  down
+
+status=$?
+if [ $status -eq 0 ]; then
+    echo "*** Vault Service Stopped ***"
+else
+    echo "*** Vault failed to stop ***"
+    exit $status
+fi
+
+
+
+CAPIF_HOSTNAME=$HOSTNAME MONITORING=$MONITORING_STATE docker compose -f "./docker-compose-capif.yml" down
+
+status=$?
+if [ $status -eq 0 ]; then
+    echo "*** All Capif services are stopped ***"
+else
+    echo "*** Some Capif services failed to stop ***"
+    exit $status
+fi
+
+
+CAPIF_PRIV_KEY_BASE_64=$(echo "$(cat nginx/certs/server.key)")
+CAPIF_PRIV_KEY=$CAPIF_PRIV_KEY_BASE_64 docker compose -f "./docker-compose-register.yml" down
+
+status=$?
+if [ $status -eq 0 ]; then
+    echo "*** Register Service are stopped ***"
+else
+    echo "*** Register Service failed to stop ***"
+fi
+
+
+if [ $DEPLOY_BACKOFFICE = "false" ]; then
+    exit $status
+fi
+
+
+docker compose -f "./docker-compose-backoffice.yml"  down
+
+status=$?
+if [ $status -eq 0 ]; then
+    echo "*** Backoffice Service are stopped ***"
+else
+    echo "*** Backoffice Service failed to stop ***"
+fi
+
+exit $status
diff --git a/services/nginx/Dockerfile b/services/nginx/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..7a10574a4758f008fc99fc9a751868eee05f47fe
--- /dev/null
+++ b/services/nginx/Dockerfile
@@ -0,0 +1,16 @@
+FROM public.ecr.aws/o2v4a8t6/opencapif/nginx:base_1.23.1
+RUN apt-get update && apt-get install -y jq && apt-get clean
+RUN apt-get install -y openssl
+RUN apt-get install -y curl=7.74.0-1.3+deb11u3
+RUN apt-get -y install redis
+
+
+RUN mkdir -p /etc/nginx/certs
+
+COPY ./certs/sign_req_body_tmp.json /etc/nginx/certs/sign_req_body_tmp.json
+COPY ./nginx.conf /etc/nginx/nginx.conf
+COPY ./nginx_prepare.sh .
+
+RUN chmod a+x nginx_prepare.sh
+
+CMD ["sh", "nginx_prepare.sh"]
diff --git a/services/nginx/certs/sign_req_body_tmp.json b/services/nginx/certs/sign_req_body_tmp.json
new file mode 100644
index 0000000000000000000000000000000000000000..9327bf04d65f5faec9bd6b5637cd852d2632d2de
--- /dev/null
+++ b/services/nginx/certs/sign_req_body_tmp.json
@@ -0,0 +1,5 @@
+{
+  "csr": "CERT",
+  "mode": "server",
+  "filename": "ccf"
+}
diff --git a/services/nginx/nginx.conf b/services/nginx/nginx.conf
new file mode 100644
index 0000000000000000000000000000000000000000..d30ded7b2eb1863cc072284e1f6c5727bf849ef1
--- /dev/null
+++ b/services/nginx/nginx.conf
@@ -0,0 +1,169 @@
+worker_processes  auto;
+
+error_log  /var/log/nginx/error.log debug;
+pid        /tmp/nginx.pid;
+
+events {
+    worker_connections   1024;
+}
+
+http {
+        map  $ssl_client_s_dn  $ssl_client_s_dn_cn {
+          default "";
+          ~(^|,)CN=(?<CN>[^,]+) $CN;
+        }
+        map "$request_method:$uri:$ssl_client_s_dn_cn" $invoker_error_message {
+          default 'SUCCESS';
+          "~*(PUT|DELETE):.*:(?!(INV|superadmin))(.*)"   '{"status":401, "title":"Unauthorized" ,"detail":"Role not authorized for this API route", "cause":"User role must be invoker"}';
+        }
+        map "$request_method:$uri:$ssl_client_s_dn_cn" $provider_error_message {
+          default 'SUCCESS';
+          "~*(PUT|DELETE|PATCH):.*:(?!(AMF|superadmin))(.*)"   '{"status":401, "title":"Unauthorized" ,"detail":"Role not authorized for this API route", "cause":"User role must be amf"}';
+        }
+        map "$request_method:$uri:$ssl_client_s_dn_cn" $publish_error_message {
+          default 'SUCCESS';
+          "~*.*:.*:(?!(APF|ccf|superadmin))(.*)"           '{"status":401, "title":"Unauthorized" ,"detail":"User not authorized", "cause":"Certificate not authorized"}';
+        }
+        map "$request_method:$uri:$ssl_client_s_dn_cn" $acl_error_message {
+          default 'SUCCESS';
+          "~*.*:.*:(?!(AEF|ccf|superadmin))(.*)"           '{"status":401, "title":"Unauthorized" ,"detail":"Role not authorized for this API route", "cause":"Certificate not authorized"}';
+        }
+        map "$request_method:$uri:$ssl_client_s_dn_cn" $discover_error_message {
+          default 'SUCCESS';
+          "~*.*:.*:(?!(INV|ccf|superadmin))(.*)"           '{"status":401, "title":"Unauthorized" ,"detail":"User not authorized", "cause":"Certificate not authorized"}';
+        }
+        map "$request_method:$uri:$ssl_client_s_dn_cn" $security_error_message {
+          default 'SUCCESS';
+          "~*DELETE:.*:(?!(AEF|superadmin))(.*)"           '{"status":401, "title":"Unauthorized" ,"detail":"Role not authorized for this API route", "cause":"User role must be aef"}';
+          "~*PUT:.*:(?!(INV|superadmin))(.*)"          '{"status":401, "title":"Unauthorized" ,"detail":"Role not authorized for this API route", "cause":"User role must be invoker"}';
+          "~*GET:.*:(?!(AEF|superadmin))(.*)"              '{"status":401, "title":"Unauthorized" ,"detail":"Role not authorized for this API route", "cause":"User role must be aef"}';
+          "~*POST:.*/update:(?!(INV|superadmin))(.*)"  '{"status":401, "title":"Unauthorized" ,"detail":"Role not authorized for this API route", "cause":"User role must be invoker"}';
+          "~*POST:.*/delete:(?!(AEF|superadmin))(.*)"      '{"status":401, "title":"Unauthorized" ,"detail":"Role not authorized for this API route", "cause":"User role must be aef"}';
+          "~*POST:.*/token:(?!(INV|superadmin))(.*)"   '{"error":"unauthorized_client", "error_description":"Role not authorized for this API route"}';
+        }
+        map "$request_method:$uri:$ssl_client_s_dn_cn" $events_error_message {
+          default 'SUCCESS';
+          "~*.*:.*:ccf"           '{"status":401, "title":"Unauthorized" ,"detail":"User not authorized", "cause":"Certificate not authorized"}';
+        }
+
+        server {
+              listen      8080;
+
+              location /test {
+                add_header Content-Type 'application/json';
+                return 200  '{ "message": "Endpoint for testing purpouse" }';
+              }
+
+        }
+
+        server {
+              listen      443 ssl;
+              # server_name capifcore;
+              # server_name openshift.evolved-5g.eu;
+
+              ssl_certificate      /etc/nginx/certs/server.crt;
+              ssl_certificate_key  /etc/nginx/certs/server.key;
+              ssl_client_certificate  /etc/nginx/certs/ca.crt;
+              ssl_verify_client       optional;
+              ssl_verify_depth        2;
+
+              location / {
+                  proxy_pass $scheme://$http_host/api-invoker-management/v1/ui/;
+              }
+
+              location /api-invoker-management {
+                if ( $invoker_error_message != SUCCESS ) {
+                  add_header Content-Type 'application/problem+json';
+                  return 401 $invoker_error_message;
+                }
+                proxy_set_header X-SSL-Client-Cert $ssl_client_cert;
+                proxy_pass http://api-invoker-management:8080;
+              }
+
+              location /api-provider-management {
+                if ( $provider_error_message != SUCCESS ) {
+                  add_header Content-Type 'application/problem+json';
+                  return 401 $provider_error_message;
+                }
+                proxy_set_header X-SSL-Client-Cert $ssl_client_cert;
+                proxy_pass http://api-provider-management:8080;
+              }
+
+              location /service-apis {
+                if ($ssl_client_verify != SUCCESS) {
+                    return 403;
+                }
+                if ( $discover_error_message != SUCCESS ) {
+                  add_header Content-Type 'application/problem+json';
+                  return 401 $discover_error_message;
+                }
+                proxy_set_header X-SSL-Client-Cert $ssl_client_cert;
+                proxy_pass http://service-apis:8080;
+              }
+
+              location /published-apis {
+                if ($ssl_client_verify != SUCCESS) {
+                    return 403;
+                }
+                if ( $publish_error_message != SUCCESS ) {
+                  add_header Content-Type 'application/problem+json';
+                  return 401 $publish_error_message;
+                }
+                proxy_set_header X-SSL-Client-Cert $ssl_client_cert;
+                proxy_pass http://published-apis:8080;
+              }
+
+              location /api-invocation-logs {
+                if ($ssl_client_verify != SUCCESS) {
+                    return 403;
+                }
+                proxy_set_header X-SSL-Client-Cert $ssl_client_cert;
+                proxy_pass http://api-invocation-logs:8080;
+              }
+
+              location /logs {
+                if ($ssl_client_verify != SUCCESS) {
+                    return 403;
+                }
+                proxy_set_header X-SSL-Client-Cert $ssl_client_cert;
+                proxy_pass http://logs:8080;
+              }
+
+              location /capif-security {
+                if ($ssl_client_verify != SUCCESS) {
+                    return 403;
+                }
+                if ( $security_error_message != SUCCESS ) {
+                  add_header Content-Type 'application/problem+json';
+                  return 401 $security_error_message;
+                }
+
+                proxy_set_header X-SSL-Client-Cert $ssl_client_cert;
+                proxy_pass http://capif-security:8080;
+              }
+
+              location /capif-events {
+                if ($ssl_client_verify != SUCCESS) {
+                    return 403;
+                }
+                if ( $events_error_message != SUCCESS ) {
+                  add_header Content-Type 'application/problem+json';
+                  return 401 $events_error_message;
+                }
+                proxy_set_header X-SSL-Client-Cert $ssl_client_cert;
+                proxy_pass http://capif-events:8080;
+              }
+
+              location /access-control-policy {
+                if ( $acl_error_message != SUCCESS ) {
+                  add_header Content-Type 'application/problem+json';
+                  return 401 $acl_error_message;
+                }
+                proxy_set_header X-SSL-Client-Cert $ssl_client_cert;
+                proxy_pass http://access-control-policy:8080;
+              }
+
+        }
+}
+
+daemon off;
\ No newline at end of file
diff --git a/services/nginx/nginx_prepare.sh b/services/nginx/nginx_prepare.sh
new file mode 100644
index 0000000000000000000000000000000000000000..081b2c9ad1062c213f6cf04ed9c47847413ac12f
--- /dev/null
+++ b/services/nginx/nginx_prepare.sh
@@ -0,0 +1,38 @@
+#!/bin/bash
+CERTS_FOLDER="/etc/nginx/certs"
+cd $CERTS_FOLDER
+
+VAULT_ADDR="http://$VAULT_HOSTNAME:$VAULT_PORT"
+VAULT_TOKEN=$VAULT_ACCESS_TOKEN
+
+curl  -k -retry 30 \
+    --retry-all-errors \
+    --connect-timeout 5 \
+    --max-time 10 \
+    --retry-delay 10 \
+    --retry-max-time 300 \
+    --header "X-Vault-Token: $VAULT_TOKEN" \
+    --request GET "$VAULT_ADDR/v1/secret/data/ca" 2>/dev/null | jq -r '.data.data.ca' -j > $CERTS_FOLDER/ca.crt
+
+openssl verify -CAfile $CERTS_FOLDER/ca.crt $CERTS_FOLDER/ca.crt
+
+curl  -k -retry 30 \
+    --retry-all-errors \
+    --connect-timeout 5 \
+    --max-time 10 \
+    --retry-delay 10 \
+    --retry-max-time 300 \
+    --header "X-Vault-Token: $VAULT_TOKEN" \
+    --request GET "$VAULT_ADDR/v1/secret/data/server_cert" 2>/dev/null | jq -r '.data.data.cert' -j > $CERTS_FOLDER/server.crt
+
+curl  -k -retry 30 \
+    --retry-all-errors \
+    --connect-timeout 5 \
+    --max-time 10 \
+    --retry-delay 10 \
+    --retry-max-time 300 \
+    --header "X-Vault-Token: $VAULT_TOKEN" \
+    --request GET "$VAULT_ADDR/v1/secret/data/server_cert/private" 2>/dev/null | jq -r '.data.data.key' -j > $CERTS_FOLDER/server.key
+
+
+nginx
\ No newline at end of file
diff --git a/services/register/.gitignore b/services/register/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..43995bd42fa23bbc4c3a59d5fb9da99042fcf139
--- /dev/null
+++ b/services/register/.gitignore
@@ -0,0 +1,66 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+env/
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*,cover
+.hypothesis/
+venv/
+.venv/
+.python-version
+.pytest_cache
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+#Ipython Notebook
+.ipynb_checkpoints
diff --git a/services/register/Dockerfile b/services/register/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..75357cd0d15fcaf10e62f1bec6610afbab208e03
--- /dev/null
+++ b/services/register/Dockerfile
@@ -0,0 +1,18 @@
+FROM public.ecr.aws/o2v4a8t6/opencapif/python:3-alpine
+
+RUN mkdir -p /usr/src/app
+WORKDIR /usr/src/app
+
+COPY requirements.txt /usr/src/app/requirements.txt
+
+RUN apk add -U --no-cache gcc build-base linux-headers ca-certificates libffi-dev libressl-dev libxslt-dev
+RUN pip3 install --no-cache-dir -r requirements.txt
+RUN apk add openssl jq curl redis
+
+#ENV CAPIF_PRIV_KEY = $CAPIF_PRIV_KEY
+
+COPY . /usr/src/app
+
+EXPOSE 8080
+
+CMD ["sh", "register_prepare.sh"]
diff --git a/services/register/config.yaml b/services/register/config.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..2ac53bd343f3b76d82906c4ed871d6f4c71afcd0
--- /dev/null
+++ b/services/register/config.yaml
@@ -0,0 +1,14 @@
+mongo: {
+  'user': 'root',
+  'password': 'example',
+  'db': 'capif_users',
+  'col': 'user',
+  'host': 'mongo_register',
+  'port': '27017'
+}
+ca_factory: {
+  "url": "vault",
+  "port": "8200",
+  "token": "dev-only-token"
+}
+
diff --git a/services/register/register_prepare.sh b/services/register/register_prepare.sh
new file mode 100644
index 0000000000000000000000000000000000000000..de69be7043beb9dc002bcc98004b975d31a979af
--- /dev/null
+++ b/services/register/register_prepare.sh
@@ -0,0 +1,55 @@
+#!/bin/bash
+CERTS_FOLDER="/usr/src/app/register_service"
+cd $CERTS_FOLDER
+
+VAULT_ADDR="http://$VAULT_HOSTNAME:$VAULT_PORT"
+VAULT_TOKEN=$VAULT_ACCESS_TOKEN
+
+curl  -k -retry 30 \
+    --retry-all-errors \
+    --connect-timeout 5 \
+    --max-time 10 \
+    --retry-delay 10 \
+    --retry-max-time 300 \
+    --header "X-Vault-Token: $VAULT_TOKEN" \
+    --request GET "$VAULT_ADDR/v1/secret/data/server_cert/private" 2>/dev/null | jq -r '.data.data.key' -j > $CERTS_FOLDER/server.key
+
+openssl req -x509 \
+            -sha256 -days 356 \
+            -nodes \
+            -newkey rsa:2048 \
+            -subj "/CN=register/C=ES/L=Madrid" \
+            -keyout /usr/src/app/register_service/registerCA.key -out /usr/src/app/register_service/registerCA.crt
+
+openssl genrsa -out /usr/src/app/register_service/register_key.key 2048
+
+COUNTRY="ES"                # 2 letter country-code
+STATE="Madrid"            # state or province name
+LOCALITY="Madrid"        # Locality Name (e.g. city)
+ORGNAME="Telefonica I+D" # Organization Name (eg, company)
+ORGUNIT="Innovation"                  # Organizational Unit Name (eg. section)
+COMMONNAME="register"
+EMAIL="inno@tid.es"    # certificate's email address
+# optional extra details
+CHALLENGE=""                # challenge password
+COMPANY=""                  # company name
+
+# DAYS="-days 365"
+
+# create the certificate request
+cat <<__EOF__ | openssl req -new $DAYS -key /usr/src/app/register_service/register_key.key -out /usr/src/app/register_service/register.csr
+$COUNTRY
+$STATE
+$LOCALITY
+$ORGNAME
+$ORGUNIT
+$COMMONNAME
+$EMAIL
+$CHALLENGE
+$COMPANY
+__EOF__
+
+openssl x509 -req -in /usr/src/app/register_service/register.csr -CA /usr/src/app/register_service/registerCA.crt -CAkey /usr/src/app/register_service/registerCA.key  -CAcreateserial -out /usr/src/app/register_service/register_cert.crt -days 365 -sha256
+
+cd /usr/src/app/
+python3 -m register_service
\ No newline at end of file
diff --git a/services/register/register_service/__init__.py b/services/register/register_service/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/services/register/register_service/__main__.py b/services/register/register_service/__main__.py
new file mode 100644
index 0000000000000000000000000000000000000000..5225f78e731c7297259c8b6f573cdb487c2ef3c6
--- /dev/null
+++ b/services/register/register_service/__main__.py
@@ -0,0 +1,27 @@
+
+import os
+import base64
+from flask import Flask
+from .controllers.register_controller import register_routes
+from flask_jwt_extended import JWTManager
+
+app = Flask(__name__)
+
+jwt = JWTManager(app)
+
+with open("/usr/src/app/register_service/server.key", "rb") as key_file:
+            key_data = key_file.read()
+
+
+app.config['JWT_ALGORITHM'] = 'RS256'
+app.config['JWT_PRIVATE_KEY'] = key_data
+
+app.register_blueprint(register_routes)
+
+
+#----------------------------------------
+# launch
+#----------------------------------------
+
+if __name__ == "__main__":
+	app.run(debug=True, host = '0.0.0.0', port=8080, ssl_context= ("/usr/src/app/register_service/register_cert.crt", "/usr/src/app/register_service/register_key.key"))
diff --git a/services/register/register_service/config.py b/services/register/register_service/config.py
new file mode 100644
index 0000000000000000000000000000000000000000..d04bd1acd87603f491b09f464d8db1d6cdc52ad7
--- /dev/null
+++ b/services/register/register_service/config.py
@@ -0,0 +1,20 @@
+import yaml
+import os
+
+#Config class to get config
+class Config:
+	def __init__(self):
+		self.cached = 0
+		self.file="./config.yaml"
+		self.my_config = {}
+
+		stamp = os.stat(self.file).st_mtime
+		if stamp != self.cached:
+			self.cached = stamp
+			f = open(self.file)
+			self.my_config = yaml.safe_load(f)
+			f.close()
+
+	def get_config(self):
+		return self.my_config
+
diff --git a/services/register/register_service/controllers/register_controller.py b/services/register/register_service/controllers/register_controller.py
new file mode 100644
index 0000000000000000000000000000000000000000..71af562e59cbe6af5909fa65bd8d83f265ea490b
--- /dev/null
+++ b/services/register/register_service/controllers/register_controller.py
@@ -0,0 +1,39 @@
+#!/usr/bin/env python3
+
+from flask import Flask, jsonify, request, Blueprint
+from flask_jwt_extended import JWTManager, jwt_required, create_access_token
+from pymongo import MongoClient
+from ..core.register_operations import RegisterOperations
+import secrets
+
+
+register_routes = Blueprint("register_routes", __name__)
+register_operation = RegisterOperations()
+
+@register_routes.route("/register", methods=["POST"])
+def register():
+    username = request.json["username"]
+    password = request.json["password"]
+    description = request.json["description"]
+    role = request.json["role"]
+    cn = request.json["cn"]
+    if role != "invoker" and role != "provider":
+        return jsonify(message="Role must be invoker or provider"), 400
+
+
+    return register_operation.register_user(username, password, description, cn, role)
+
+
+@register_routes.route("/getauth", methods=["POST"])
+def getauth():
+    username = request.json["username"]
+    password = request.json["password"]
+
+    return register_operation.get_auth(username, password)
+
+@register_routes.route("/remove", methods=["DELETE"])
+def remove():
+    username = request.json["username"]
+    password = request.json["password"]
+
+    return register_operation.remove_user(username, password)
diff --git a/services/register/register_service/core/register_operations.py b/services/register/register_service/core/register_operations.py
new file mode 100644
index 0000000000000000000000000000000000000000..f929820f7e4d532af039ce50856d1e4bcbe86798
--- /dev/null
+++ b/services/register/register_service/core/register_operations.py
@@ -0,0 +1,71 @@
+from flask import Flask, jsonify, request, current_app
+from flask_jwt_extended import create_access_token
+from ..db.db import MongoDatabse
+from ..config import Config
+import secrets
+import requests
+import json
+import sys
+
+class RegisterOperations:
+
+    def __init__(self):
+        self.db = MongoDatabse()
+        self.mimetype = 'application/json'
+        self.config = Config().get_config()
+
+    def register_user(self, username, password, description, cn, role):
+
+        mycol = self.db.get_col_by_name(self.db.capif_users)
+        exist_user = mycol.find_one({"username": username})
+        if exist_user:
+            return jsonify("user already exists"), 409
+
+        user_info = dict(_id=secrets.token_hex(7), username=username, password=password, role=role, description=description, cn=cn, list_invokers=[], list_providers=[])
+        obj = mycol.insert_one(user_info)
+
+        if role == "invoker":
+            return jsonify(message="invoker registered successfully",
+                        id=obj.inserted_id,
+                        ccf_onboarding_url="api-invoker-management/v1/onboardedInvokers",
+                        ccf_discover_url="service-apis/v1/allServiceAPIs?api-invoker-id="), 201
+        else:
+            return jsonify(message="provider" + " registered successfully",
+                    id=obj.inserted_id,
+                    ccf_api_onboarding_url="api-provider-management/v1/registrations",
+                    ccf_publish_url="published-apis/v1/<apfId>/service-apis"), 201
+
+
+    def get_auth(self, username, password):
+
+        mycol = self.db.get_col_by_name(self.db.capif_users)
+
+        try:
+
+            exist_user = mycol.find_one({"username": username, "password": password})
+
+            if exist_user is None:
+                return jsonify("Not exister user with this credentials"), 400
+
+            access_token = create_access_token(identity=(username + " " + exist_user["role"]))
+            url = f"http://{self.config['ca_factory']['url']}:{self.config['ca_factory']['port']}/v1/secret/data/ca"
+            headers = {
+
+                    'X-Vault-Token': self.config['ca_factory']['token']
+            }
+            response = requests.request("GET", url, headers=headers, verify = False)
+            response_payload = json.loads(response.text)
+            return jsonify(message="Token and CA root returned successfully", access_token=access_token, ca_root=response_payload['data']['data']['ca']), 200
+
+        except Exception as e:
+            return jsonify(message=f"Errors when try getting auth: {e}"), 500
+
+    def remove_user(self, username, password):
+        mycol = self.db.get_col_by_name(self.db.capif_users)
+
+        try:
+            mycol.delete_one({"username": username, "password": password})
+            return jsonify(message="User removed successfully"), 204
+        except Exception as e:
+            return jsonify(message=f"Errors when try remove user: {e}"), 500
+
diff --git a/services/register/register_service/db/db.py b/services/register/register_service/db/db.py
new file mode 100644
index 0000000000000000000000000000000000000000..0b08933251035fc285b0983575d2e30844cce8f3
--- /dev/null
+++ b/services/register/register_service/db/db.py
@@ -0,0 +1,38 @@
+import atexit
+import time
+from pymongo import MongoClient
+from pymongo.errors import AutoReconnect
+from ..config import Config
+from bson.codec_options import CodecOptions
+
+
+class MongoDatabse():
+
+    def __init__(self):
+        self.config = Config().get_config()
+        self.db = self.__connect()
+        self.capif_users = self.config['mongo']['col']
+
+
+    def get_col_by_name(self, name):
+        return self.db[name]
+
+    def __connect(self, max_retries=3, retry_delay=1):
+        retries = 0
+        while retries < max_retries:
+            try:
+                uri = f"mongodb://{self.config['mongo']['user']}:{self.config['mongo']['password']}@" \
+                      f"{self.config['mongo']['host']}:{self.config['mongo']['port']}"
+                client = MongoClient(uri)
+                mydb = client[self.config['mongo']['db']]
+                mydb.command("ping")
+                return mydb
+            except AutoReconnect:
+                retries += 1
+                print(f"Reconnecting... Retry {retries} of {max_retries}")
+                time.sleep(retry_delay)
+        return None
+
+    def close_connection(self):
+        if self.db.client:
+            self.db.client.close()
diff --git a/services/register/requirements.txt b/services/register/requirements.txt
new file mode 100644
index 0000000000000000000000000000000000000000..c5a4f37e70ec061faaeb1876ee7d907e71c92d49
--- /dev/null
+++ b/services/register/requirements.txt
@@ -0,0 +1,8 @@
+python_dateutil >= 2.6.0
+setuptools >= 21.0.0
+Flask >= 2.0.3
+pymongo == 4.0.1
+flask_jwt_extended
+pyopenssl
+pyyaml
+requests
diff --git a/services/run.sh b/services/run.sh
new file mode 100755
index 0000000000000000000000000000000000000000..11a89c8aa219e25b4ca64e85d6af8632f0707e24
--- /dev/null
+++ b/services/run.sh
@@ -0,0 +1,91 @@
+#!/bin/bash
+
+HOSTNAME=capifcore
+MONITORING_STATE=false
+DEPLOY=all
+
+#Needed to avoid write permissions on bind volumes with prometheus and grafana
+DUID=$(id -u)
+DGID=$(id -g)
+
+# Get docker compose version
+docker_version=$(docker compose version --short | cut -d',' -f1)
+IFS='.' read -ra version_components <<< "$docker_version"
+
+if [ "${version_components[0]}" -ge 2 ] && [ "${version_components[1]}" -ge 10 ]; then
+  echo "Docker compose version it greater than 2.10"
+else
+  echo "Docker compose version is not valid. Should be greater than 2.10"
+  exit 1
+fi
+
+# Read params
+while getopts ":h:m:" opt; do
+  case $opt in
+    h)
+      HOSTNAME="$OPTARG"
+      ;;
+    m)
+      MONITORING_STATE="$OPTARG"
+      ;;    
+    \?)
+      echo "Opción no válida: -$OPTARG" >&2
+      exit 1
+      ;;
+    :)
+      echo "La opción -$OPTARG requiere un argumento." >&2
+      exit 1
+      ;;
+  esac
+done
+
+echo Nginx hostname will be $HOSTNAME, deploy $DEPLOY, monitoring $MONITORING_STATE
+
+if [ "$MONITORING_STATE" == "true" ] ; then
+    echo '***Monitoring set as true***'
+    echo '***Creating Monitoging stack***'
+
+    DUID=$DUID DGID=$DGID docker compose -f "../monitoring/docker-compose.yml" up --detach
+    status=$?
+    if [ $status -eq 0 ]; then
+        echo "*** Monitoring Stack Runing ***"
+    else
+        echo "*** Monitoring Stack failed to start ***"
+        exit $status
+    fi
+fi
+
+docker network create capif-network
+
+docker compose -f "docker-compose-vault.yml"  up --detach --build
+
+status=$?
+if [ $status -eq 0 ]; then
+    echo "*** Vault Service Runing ***"
+else
+    echo "*** Vault failed to start ***"
+    exit $status
+fi
+
+CAPIF_HOSTNAME=$HOSTNAME MONITORING=$MONITORING_STATE docker compose -f "docker-compose-capif.yml" up --detach --build
+
+status=$?
+if [ $status -eq 0 ]; then
+    echo "*** All Capif services are running ***"
+else
+    echo "*** Some Capif services failed to start ***"
+    exit $status
+fi
+
+
+CAPIF_PRIV_KEY_BASE_64=$(echo "$(cat nginx/certs/server.key)")
+CAPIF_PRIV_KEY=$CAPIF_PRIV_KEY_BASE_64 docker compose -f "docker-compose-register.yml"  up --detach --build
+
+status=$?
+if [ $status -eq 0 ]; then
+    echo "*** Register Service are running ***"
+else
+    echo "*** Register Service failed to start ***"
+fi
+
+exit $status
diff --git a/services/runCapifTests.sh b/services/runCapifTests.sh
new file mode 100755
index 0000000000000000000000000000000000000000..b73893a45ca40cacecb4dca088999461a9de55de
--- /dev/null
+++ b/services/runCapifTests.sh
@@ -0,0 +1,52 @@
+#!/bin/bash
+
+DOCKER_ROBOT_IMAGE=dockerhub.hi.inet/5ghacking/5gnow-robot-test-image
+DOCKER_ROBOT_IMAGE_VERSION=4.0
+cd ..
+REPOSITORY_BASE_FOLDER=${PWD}
+TEST_FOLDER=$REPOSITORY_BASE_FOLDER/tests
+RESULT_FOLDER=$REPOSITORY_BASE_FOLDER/results
+ROBOT_DOCKER_FILE_FOLDER=$REPOSITORY_BASE_FOLDER/tools/robot
+
+# nginx Hostname and http port (80 by default) to reach for tests
+CAPIF_HOSTNAME=capifcore
+CAPIF_HTTP_PORT=8080
+CAPIF_HTTPS_PORT=443
+
+echo "HOSTNAME = $CAPIF_HOSTNAME"
+echo "CAPIF_HTTP_PORT = $CAPIF_HTTP_PORT"
+echo "CAPIF_HTTPS_PORT = $CAPIF_HTTPS_PORT"
+
+docker >/dev/null 2>/dev/null
+if [[ $? -ne 0 ]]
+then
+    echo "Docker maybe is not installed. Please check if docker CLI is present."
+    exit -1
+fi
+
+docker images|grep -Eq '^'$DOCKER_ROBOT_IMAGE'[ ]+[ ]'$DOCKER_ROBOT_IMAGE_VERSION''
+if [[ $? -ne 0 ]]
+then
+    read -p "Robot image is not present. To continue, Do you want to build it? (y/n)" build_robot_image
+    if [[ $build_robot_image == "y" ]]
+    then
+        echo "Building Robot docker image."
+        cd $ROBOT_DOCKER_FILE_FOLDER
+        docker build --no-cache -t $DOCKER_ROBOT_IMAGE:$DOCKER_ROBOT_IMAGE_VERSION .
+        cd $REPOSITORY_BASE_FOLDER
+    else
+        exit -2
+    fi
+fi
+
+mkdir -p $RESULT_FOLDER
+
+docker run -ti --rm --network="host" \
+    --add-host host.docker.internal:host-gateway \
+    --add-host vault:host-gateway \
+    --add-host register:host-gateway \
+    -v $TEST_FOLDER:/opt/robot-tests/tests \
+    -v $RESULT_FOLDER:/opt/robot-tests/results ${DOCKER_ROBOT_IMAGE}:${DOCKER_ROBOT_IMAGE_VERSION}  \
+    --variable CAPIF_HOSTNAME:$CAPIF_HOSTNAME \
+    --variable CAPIF_HTTP_PORT:$CAPIF_HTTP_PORT \
+    --variable CAPIF_HTTPS_PORT:$CAPIF_HTTPS_PORT $@
diff --git a/services/stop.sh b/services/stop.sh
new file mode 100755
index 0000000000000000000000000000000000000000..a45576d520e8d788ea5dc333b4beeeec6fe90f10
--- /dev/null
+++ b/services/stop.sh
@@ -0,0 +1,98 @@
+#!/bin/bash
+
+HOSTNAME=capifcore
+MONITORING_STATE=false
+DEPLOY=all
+DEPLOY_BACKOFFICE=${DEPLOY_BACKOFFICE:-false}
+
+# Get docker compose version
+docker_version=$(docker compose version --short | cut -d',' -f1)
+IFS='.' read -ra version_components <<< "$docker_version"
+
+if [ "${version_components[0]}" -ge 2 ] && [ "${version_components[1]}" -ge 10 ]; then
+  echo "Docker compose version it greater than 2.10"
+else
+  echo "Docker compose version is not valid. Should be greater than 2.10"
+  exit 1
+fi
+
+# Read params
+while getopts ":h:m:" opt; do
+  case $opt in
+    h)
+      HOSTNAME="$OPTARG"
+      ;;
+    m)
+      MONITORING_STATE="$OPTARG"
+      ;;    
+    \?)
+      echo "Opción no válida: -$OPTARG" >&2
+      exit 1
+      ;;
+    :)
+      echo "La opción -$OPTARG requiere un argumento." >&2
+      exit 1
+      ;;
+  esac
+done
+
+if [ "$MONITORING_STATE" = true ] ; then
+    docker compose -f "../monitoring/docker-compose.yml" down 
+    status=$?
+    if [ $status -eq 0 ]; then
+        echo "*** Monitoring Stack Stopped ***"
+    else
+        echo "*** Monitoring Stack failed to stopt ***"
+        exit $status
+    fi
+fi
+
+docker compose -f "docker-compose-vault.yml"  down
+
+status=$?
+if [ $status -eq 0 ]; then
+    echo "*** Vault Service Stopped ***"
+else
+    echo "*** Vault failed to stop ***"
+    exit $status
+fi
+
+
+
+CAPIF_HOSTNAME=$HOSTNAME MONITORING=$MONITORING_STATE docker compose -f "docker-compose-capif.yml" down
+
+status=$?
+if [ $status -eq 0 ]; then
+    echo "*** All Capif services are stopped ***"
+else
+    echo "*** Some Capif services failed to stop ***"
+    exit $status
+fi
+
+
+CAPIF_PRIV_KEY_BASE_64=$(echo "$(cat nginx/certs/server.key)")
+CAPIF_PRIV_KEY=$CAPIF_PRIV_KEY_BASE_64 docker compose -f "docker-compose-register.yml" down
+
+status=$?
+if [ $status -eq 0 ]; then
+    echo "*** Register Service are stopped ***"
+else
+    echo "*** Register Service failed to stop ***"
+fi
+
+
+if [ $DEPLOY_BACKOFFICE = "false" ]; then
+    exit $status
+fi
+
+
+docker compose -f "docker-compose-backoffice.yml"  down
+
+status=$?
+if [ $status -eq 0 ]; then
+    echo "*** Backoffice Service are stopped ***"
+else
+    echo "*** Backoffice Service failed to stop ***"
+fi
+
+exit $status
diff --git a/services/vault/Dockerfile b/services/vault/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..0eced912f088adee63778217b87ab3a7d1a846b1
--- /dev/null
+++ b/services/vault/Dockerfile
@@ -0,0 +1,12 @@
+FROM vault:1.13.2
+
+# Instalar paquetes adicionales
+RUN apk add --no-cache jq openssl
+
+# Copiar archivos adicionales (si los tienes)
+COPY ./vault_prepare_certs.sh /vault_prepare_certs.sh
+
+RUN chmod a+x /vault_prepare_certs.sh
+
+
+CMD sh -c "vault server -dev / & sleep 5 && /vault_prepare_certs.sh && tail -f /dev/null"
diff --git a/services/vault/vault_prepare_certs.sh b/services/vault/vault_prepare_certs.sh
new file mode 100644
index 0000000000000000000000000000000000000000..dbec8fdb3730c0a73cd4be682d162dd25f3fcc79
--- /dev/null
+++ b/services/vault/vault_prepare_certs.sh
@@ -0,0 +1,138 @@
+#!/bin/sh
+
+# Establecer las variables de entorno de Vault
+
+export VAULT_ADDR='http://0.0.0.0:8200'
+export VAULT_TOKEN="dev-only-token"
+
+vault secrets enable pki
+
+# Generar una CA en Vault
+vault secrets tune -max-lease-ttl=87600h pki
+
+vault write -field=certificate pki/root/generate/internal \
+     common_name="capif" \
+     issuer_name="root-2023" \
+     ttl=87600h > root_2023_ca.crt
+
+vault write pki/config/urls \
+     issuing_certificates="$VAULT_ADDR/v1/pki/ca" \
+     crl_distribution_points="$VAULT_ADDR/v1/pki/crl"
+
+# # Generar una CA intermedia en Vault
+vault secrets enable -path=pki_int pki
+
+vault secrets tune -max-lease-ttl=43800h pki_int
+
+vault write -format=json pki_int/intermediate/generate/internal \
+     common_name="capif Intermediate Authority" \
+     issuer_name="capif-intermediate" \
+    | jq -r '.data.csr' > pki_intermediate.csr
+
+# Firmar la CA intermedia con la CA raíz
+vault write -format=json pki/root/sign-intermediate \
+     issuer_ref="root-2023" \
+     csr=@pki_intermediate.csr \
+     format=pem_bundle ttl="43800h" \
+     | jq -r '.data.certificate' > capif_intermediate.cert.pem
+
+# Configurar la CA intermedia en Vault
+vault write pki_int/intermediate/set-signed certificate=@capif_intermediate.cert.pem
+
+#Crear rol en Vault
+vault write pki_int/roles/my-ca use_csr_common_name=false require_cn=true use_csr_sans=false allowed_domains=capifcore allow_any_name=true allow_bare_domains=true allow_glob_domains=true allow_subdomains=true max_ttl=4300h ttl=4300h
+
+# Emitir un certificado firmado por la CA intermedia
+# vault write -format=json pki_int/issue/my-ca \
+#   common_name="capifcore" \
+#   format=pem_bundle ttl="438h" \
+#   | jq -r '.data.certificate' > ccf_cert.crt.pem \
+#   && jq -r '.data.issuing_ca' > root_ca.crt.pem \
+#   && jq -r '.data.private_key' > private_key.pem
+
+#   vault write -format=json pki_int/issue/my-ca \
+#   common_name="capifcore" \
+#   format=pem_bundle ttl="438h" \
+#   | jq -r '.data.private_key as $private_key | .data.issuing_ca as $issuing_ca | .data.certificate as $certificate | [$private_key, $issuing_ca, $certificate]' > cert_data.json
+
+
+#Create CSR
+openssl genrsa -out ./server.key 2048
+
+
+COUNTRY="ES"                # 2 letter country-code
+STATE="Madrid"            # state or province name
+LOCALITY="Madrid"        # Locality Name (e.g. city)
+ORGNAME="Telefonica I+D" # Organization Name (eg, company)
+ORGUNIT="Innovation"                  # Organizational Unit Name (eg. section)
+COMMONNAME="capifcore"
+EMAIL="inno@tid.es"    # certificate's email address
+# optional extra details
+CHALLENGE=""                # challenge password
+COMPANY=""                  # company name
+
+# DAYS="-days 365"
+
+# create the certificate request
+#cat <<__EOF__ | openssl req -new $DAYS -nodes -keyout client.key -out client.csr
+cat <<__EOF__ | openssl req -new $DAYS -key ./server.key -out ./server.csr
+$COUNTRY
+$STATE
+$LOCALITY
+$ORGNAME
+$ORGUNIT
+$COMMONNAME
+$EMAIL
+$CHALLENGE
+$COMPANY
+__EOF__
+
+# vault write -format=json pki_int/issue/my-ca \
+#   csr=@server.csr \
+#   format=pem_bundle ttl="438h" \
+#   | jq -r '.data.private_key as $private_key | .data.issuing_ca as $issuing_ca | .data.certificate as $certificate | [$private_key, $issuing_ca, $certificate]' > cert_data.json
+
+vault write -format=json pki_int/sign/my-ca  format=pem_bundle ttl="43000h" csr=@server.csr common_name="capifcore" | jq -r '.data.issuing_ca as $issuing_ca | .data.certificate as $certificate | [$issuing_ca, $certificate]' > cert_data.json
+
+jq -r '.[0]' cert_data.json > root_ca.crt.pem
+jq -r '.[1]' cert_data.json > server_certificate.crt.pem
+
+openssl x509 -pubkey -noout -in server_certificate.crt.pem  > server_certificate_pub.pem
+
+# Guardar la clave privada en Vault
+
+#vault kv put secret/ca ca=@root_ca.crt.pem root_2023_ca.crt
+
+#cat root_2023_ca.crt root_2023_ca.crt > ca.crt
+
+cat > certificados_concatenados.crt << EOF
+$(cat "root_2023_ca.crt")
+$(cat "root_ca.crt.pem")
+EOF
+
+
+# vault kv put secret/ca ca=@root_2023_ca.crt
+vault kv put secret/ca ca=@certificados_concatenados.crt
+
+vault kv put secret/server_cert cert=@server_certificate.crt.pem
+
+vault kv put secret/server_cert/pub pub_key=@server_certificate_pub.pem
+
+vault kv put secret/server_cert/private key=@server.key
+
+POLICY_NAME="my-policy"
+POLICY_FILE="my-policy.hcl"
+TOKEN_ID="read-ca-token"
+
+# Crear la política en Vault
+echo "path \"secret/data/ca\" {
+  capabilities = [\"read\"]
+}" > "$POLICY_FILE"
+
+vault policy write "$POLICY_NAME" "$POLICY_FILE"
+
+# Generar un nuevo token y asignar la política
+TOKEN=$(vault token create -id="$TOKEN_ID" -policy="$POLICY_NAME" -format=json | jq -r '.auth.client_token')
+
+echo "Token generado:"
+echo "$TOKEN"
\ No newline at end of file
diff --git a/tests/features/CAPIF Api Access Control Policy/__init__.robot b/tests/features/CAPIF Api Access Control Policy/__init__.robot
new file mode 100644
index 0000000000000000000000000000000000000000..e3adfdb309030c0faa6cc21b13236e1daed3988b
--- /dev/null
+++ b/tests/features/CAPIF Api Access Control Policy/__init__.robot	
@@ -0,0 +1,2 @@
+*** Settings ***
+Force Tags    capif_api_acl
\ No newline at end of file
diff --git a/tests/features/CAPIF Api Access Control Policy/capif_api_access_control_policy.robot b/tests/features/CAPIF Api Access Control Policy/capif_api_access_control_policy.robot
new file mode 100644
index 0000000000000000000000000000000000000000..1772f3ba82943aaf7ff6a945e8de6117fb31a63d
--- /dev/null
+++ b/tests/features/CAPIF Api Access Control Policy/capif_api_access_control_policy.robot	
@@ -0,0 +1,627 @@
+*** Settings ***
+Resource            /opt/robot-tests/tests/resources/common.resource
+Library             /opt/robot-tests/tests/libraries/bodyRequests.py
+Library             Collections
+Resource            /opt/robot-tests/tests/resources/common/basicRequests.robot
+Resource            ../../resources/common.resource
+
+Suite Teardown      Reset Testing Environment
+Test Setup          Reset Testing Environment
+
+
+*** Variables ***
+${APF_ID_NOT_VALID}             apf-example
+${SERVICE_API_ID_NOT_VALID}     not-valid
+${API_INVOKER_NOT_VALID}        not-valid
+${NOTIFICATION_DESTINATION}     http://robot.testing:1080
+${AEF_ID_NOT_VALID}             not-valid
+
+
+*** Test Cases ***
+Retrieve ACL
+    [Tags]    capif_api_acl-1
+    # Register APF
+    ${register_user_info_provider}=    Provider Default Registration
+
+    Call Method
+    ...    ${CAPIF_USERS}
+    ...    update_capif_users_dicts
+    ...    ${register_user_info_provider['resource_url'].path}
+    ...    ${AMF_PROVIDER_USERNAME}
+    Call Method    ${CAPIF_USERS}    update_register_users    ${PROVIDER_USERNAME}
+
+    ${service_api_description_published_1}    ${resource_url}    ${request_body}=    Publish Service Api
+    ...    ${register_user_info_provider}
+    ...    service_1
+
+    # Store apiId1
+    ${serviceApiId1}=    Set Variable    ${service_api_description_published_1['apiId']}
+
+    # Retrieve Services 1
+    ${resp}=    Get Request Capif
+    ...    /published-apis/v1/${register_user_info_provider['apf_id']}/service-apis/${serviceApiId1}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${APF_PROVIDER_USERNAME}
+
+    Check Response Variable Type And Values    ${resp}    200    ServiceAPIDescription
+    Dictionaries Should Be Equal    ${resp.json()}    ${service_api_description_published_1}
+
+    # Default Invoker Registration and Onboarding
+    ${register_user_info_invoker}    ${url}    ${request_body}=    Invoker Default Onboarding
+
+    Call Method    ${CAPIF_USERS}    update_capif_users_dicts    ${url.path}    ${INVOKER_USERNAME}
+    Call Method    ${CAPIF_USERS}    update_register_users    ${INVOKER_USERNAME}
+
+    # Test
+    ${discover_response}=    Get Request Capif
+    ...    ${DISCOVER_URL}${register_user_info_invoker['api_invoker_id']}&aef-id=${register_user_info_provider['aef_id']}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME}
+
+    Check Response Variable Type And Values    ${discover_response}    200    DiscoveredAPIs
+
+    # create Security Context
+    ${request_body}=    Create Service Security From Discover Response
+    ...    http://${CAPIF_HOSTNAME}:${CAPIF_HTTP_PORT}/test
+    ...    ${discover_response}
+    ${resp}=    Put Request Capif
+    ...    /capif-security/v1/trustedInvokers/${register_user_info_invoker['api_invoker_id']}
+    ...    json=${request_body}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME}
+
+    # Check Service Security
+    Check Response Variable Type And Values    ${resp}    201    ServiceSecurity
+    ${resource_url}=    Check Location Header    ${resp}    ${LOCATION_SECURITY_RESOURCE_REGEX}
+
+    ${resp}=    Get Request Capif
+    ...    /access-control-policy/v1/accessControlPolicyList/${serviceApiId1}?aef-id=${register_user_info_provider['aef_id']}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${AEF_PROVIDER_USERNAME}
+
+    Check Response Variable Type And Values    ${resp}    200    AccessControlPolicyList
+
+    # Check returned values
+    Should Not Be Empty    ${resp.json()['apiInvokerPolicies']}
+    Length Should Be    ${resp.json()['apiInvokerPolicies']}    1
+    Should Be Equal As Strings
+    ...    ${resp.json()['apiInvokerPolicies'][0]['apiInvokerId']}
+    ...    ${register_user_info_invoker['api_invoker_id']}
+
+Retrieve ACL with 2 Service APIs published
+    [Tags]    capif_api_acl-2
+    # Register APF
+    ${register_user_info_provider}=    Provider Default Registration
+
+    Call Method
+    ...    ${CAPIF_USERS}
+    ...    update_capif_users_dicts
+    ...    ${register_user_info_provider['resource_url'].path}
+    ...    ${AMF_PROVIDER_USERNAME}
+    Call Method    ${CAPIF_USERS}    update_register_users    ${PROVIDER_USERNAME}
+
+    ${service_api_description_published_1}    ${resource_url}    ${request_body}=    Publish Service Api
+    ...    ${register_user_info_provider}
+    ...    service_1
+    ${service_api_description_published_2}    ${resource_url}    ${request_body}=    Publish Service Api
+    ...    ${register_user_info_provider}
+    ...    service_2
+
+    # Store apiId1
+    ${serviceApiId1}=    Set Variable    ${service_api_description_published_1['apiId']}
+    ${serviceApiId2}=    Set Variable    ${service_api_description_published_2['apiId']}
+
+    # Default Invoker Registration and Onboarding
+    ${register_user_info_invoker}    ${url}    ${request_body}=    Invoker Default Onboarding
+
+    Call Method    ${CAPIF_USERS}    update_capif_users_dicts    ${url.path}    ${INVOKER_USERNAME}
+    Call Method    ${CAPIF_USERS}    update_register_users    ${INVOKER_USERNAME}
+
+    # Test
+    ${discover_response}=    Get Request Capif
+    ...    ${DISCOVER_URL}${register_user_info_invoker['api_invoker_id']}&aef-id=${register_user_info_provider['aef_id']}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME}
+
+    Check Response Variable Type And Values    ${discover_response}    200    DiscoveredAPIs
+
+    # create Security Context
+    ${request_body}=    Create Service Security From Discover Response
+    ...    http://${CAPIF_HOSTNAME}:${CAPIF_HTTP_PORT}/test
+    ...    ${discover_response}
+    ${resp}=    Put Request Capif
+    ...    /capif-security/v1/trustedInvokers/${register_user_info_invoker['api_invoker_id']}
+    ...    json=${request_body}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME}
+    # Check Service Security
+    Check Response Variable Type And Values    ${resp}    201    ServiceSecurity
+    ${resource_url}=    Check Location Header    ${resp}    ${LOCATION_SECURITY_RESOURCE_REGEX}
+
+    ${resp}=    Get Request Capif
+    ...    /access-control-policy/v1/accessControlPolicyList/${serviceApiId1}?aef-id=${register_user_info_provider['aef_id']}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${AEF_PROVIDER_USERNAME}
+
+    Check Response Variable Type And Values    ${resp}    200    AccessControlPolicyList
+
+    # Check returned values
+    Should Not Be Empty    ${resp.json()['apiInvokerPolicies']}
+    Length Should Be    ${resp.json()['apiInvokerPolicies']}    1
+    Should Be Equal As Strings
+    ...    ${resp.json()['apiInvokerPolicies'][0]['apiInvokerId']}
+    ...    ${register_user_info_invoker['api_invoker_id']}
+
+    ${resp}=    Get Request Capif
+    ...    /access-control-policy/v1/accessControlPolicyList/${serviceApiId2}?aef-id=${register_user_info_provider['aef_id']}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${AEF_PROVIDER_USERNAME}
+
+    Check Response Variable Type And Values    ${resp}    200    AccessControlPolicyList
+
+    # Check returned values
+    Should Not Be Empty    ${resp.json()['apiInvokerPolicies']}
+    Length Should Be    ${resp.json()['apiInvokerPolicies']}    1
+    Should Be Equal As Strings
+    ...    ${resp.json()['apiInvokerPolicies'][0]['apiInvokerId']}
+    ...    ${register_user_info_invoker['api_invoker_id']}
+
+Retrieve ACL with security context created by two different Invokers
+    [Tags]    capif_api_acl-3
+    # Register APF
+    ${register_user_info_provider}=    Provider Default Registration
+
+    Call Method
+    ...    ${CAPIF_USERS}
+    ...    update_capif_users_dicts
+    ...    ${register_user_info_provider['resource_url'].path}
+    ...    ${AMF_PROVIDER_USERNAME}
+    Call Method    ${CAPIF_USERS}    update_register_users    ${PROVIDER_USERNAME}
+
+    ${service_api_description_published_1}    ${resource_url}    ${request_body}=    Publish Service Api
+    ...    ${register_user_info_provider}
+    ...    service_1
+
+    # Store apiId1
+    ${serviceApiId1}=    Set Variable    ${service_api_description_published_1['apiId']}
+
+    # Retrieve Services 1
+    ${resp}=    Get Request Capif
+    ...    /published-apis/v1/${register_user_info_provider['apf_id']}/service-apis/${serviceApiId1}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${APF_PROVIDER_USERNAME}
+
+    Check Response Variable Type And Values    ${resp}    200    ServiceAPIDescription
+    Dictionaries Should Be Equal    ${resp.json()}    ${service_api_description_published_1}
+
+    # Default Invoker Registration and Onboarding
+    ${register_user_info_invoker}    ${url}    ${request_body}=    Invoker Default Onboarding
+
+    Call Method    ${CAPIF_USERS}    update_capif_users_dicts    ${url.path}    ${INVOKER_USERNAME}
+    Call Method    ${CAPIF_USERS}    update_register_users    ${INVOKER_USERNAME}
+
+    ${INVOKER_USERNAME_2}=    Set Variable    ${INVOKER_USERNAME}_2
+
+    # Register another invoker
+    ${register_user_info_invoker_2}    ${url}    ${request_body}=    Invoker Default Onboarding
+    ...    ${INVOKER_USERNAME_2}
+
+    Call Method    ${CAPIF_USERS}    update_capif_users_dicts    ${url.path}    ${INVOKER_USERNAME_2}
+    Call Method    ${CAPIF_USERS}    update_register_users    ${INVOKER_USERNAME_2}
+
+    # Get Published APIs
+    ${discover_response}=    Get Request Capif
+    ...    ${DISCOVER_URL}${register_user_info_invoker['api_invoker_id']}&aef-id=${register_user_info_provider['aef_id']}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME}
+
+    Check Response Variable Type And Values    ${discover_response}    200    DiscoveredAPIs
+
+    # create Security Context
+    ${request_body}=    Create Service Security From Discover Response
+    ...    http://${CAPIF_HOSTNAME}:${CAPIF_HTTP_PORT}/test
+    ...    ${discover_response}
+    ${resp}=    Put Request Capif
+    ...    /capif-security/v1/trustedInvokers/${register_user_info_invoker['api_invoker_id']}
+    ...    json=${request_body}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME}
+    # Check Service Security
+    Check Response Variable Type And Values    ${resp}    201    ServiceSecurity
+    ${resource_url}=    Check Location Header    ${resp}    ${LOCATION_SECURITY_RESOURCE_REGEX}
+
+    # Get Published APIs
+    ${discover_response}=    Get Request Capif
+    ...    ${DISCOVER_URL}${register_user_info_invoker_2['api_invoker_id']}&aef-id=${register_user_info_provider['aef_id']}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME_2}
+
+    Check Response Variable Type And Values    ${discover_response}    200    DiscoveredAPIs
+
+    # create Security Context
+    ${request_body}=    Create Service Security From Discover Response
+    ...    http://${CAPIF_HOSTNAME}:${CAPIF_HTTP_PORT}/test
+    ...    ${discover_response}
+    ${resp}=    Put Request Capif
+    ...    /capif-security/v1/trustedInvokers/${register_user_info_invoker_2['api_invoker_id']}
+    ...    json=${request_body}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME_2}
+    # Check Service Security
+    Check Response Variable Type And Values    ${resp}    201    ServiceSecurity
+    ${resource_url}=    Check Location Header    ${resp}    ${LOCATION_SECURITY_RESOURCE_REGEX}
+
+    ${resp}=    Get Request Capif
+    ...    /access-control-policy/v1/accessControlPolicyList/${serviceApiId1}?aef-id=${register_user_info_provider['aef_id']}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${AEF_PROVIDER_USERNAME}
+
+    Check Response Variable Type And Values    ${resp}    200    AccessControlPolicyList
+
+    # Check returned values
+    Should Not Be Empty    ${resp.json()['apiInvokerPolicies']}
+    Length Should Be    ${resp.json()['apiInvokerPolicies']}    2
+
+    ${API_INVOKER_1_PRESENT}=    Set Variable    ${False}
+    ${API_INVOKER_2_PRESENT}=    Set Variable    ${False}
+
+    FOR    ${policy}    IN    @{resp.json()['apiInvokerPolicies']}
+        Log    ${policy}
+        IF    "${policy['apiInvokerId']}" == "${register_user_info_invoker['api_invoker_id']}"
+            ${API_INVOKER_1_PRESENT}=    Set Variable    ${True}
+        ELSE IF    "${policy['apiInvokerId']}" == "${register_user_info_invoker_2['api_invoker_id']}"
+            ${API_INVOKER_2_PRESENT}=    Set Variable    ${True}
+        END
+    END
+
+    Should Be True    ${API_INVOKER_1_PRESENT}==${True}
+    Should Be True    ${API_INVOKER_2_PRESENT}==${True}
+
+Retrieve ACL filtered by api-invoker-id
+    [Tags]    capif_api_acl-4
+    # Register APF
+    ${register_user_info_provider}=    Provider Default Registration
+
+    Call Method
+    ...    ${CAPIF_USERS}
+    ...    update_capif_users_dicts
+    ...    ${register_user_info_provider['resource_url'].path}
+    ...    ${AMF_PROVIDER_USERNAME}
+    Call Method    ${CAPIF_USERS}    update_register_users    ${PROVIDER_USERNAME}
+
+    ${service_api_description_published_1}    ${resource_url}    ${request_body}=    Publish Service Api
+    ...    ${register_user_info_provider}
+    ...    service_1
+
+    # Store apiId1
+    ${serviceApiId1}=    Set Variable    ${service_api_description_published_1['apiId']}
+
+    # Retrieve Services 1
+    ${resp}=    Get Request Capif
+    ...    /published-apis/v1/${register_user_info_provider['apf_id']}/service-apis/${serviceApiId1}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${APF_PROVIDER_USERNAME}
+
+    Check Response Variable Type And Values    ${resp}    200    ServiceAPIDescription
+    Dictionaries Should Be Equal    ${resp.json()}    ${service_api_description_published_1}
+
+    # Default Invoker Registration and Onboarding
+    ${register_user_info_invoker}    ${url}    ${request_body}=    Invoker Default Onboarding
+
+    Call Method    ${CAPIF_USERS}    update_capif_users_dicts    ${url.path}    ${INVOKER_USERNAME}
+    Call Method    ${CAPIF_USERS}    update_register_users    ${INVOKER_USERNAME}
+
+    ${INVOKER_USERNAME_2}=    Set Variable    ${INVOKER_USERNAME}_2
+
+    # Register another invoker
+    ${register_user_info_invoker_2}    ${url}    ${request_body}=    Invoker Default Onboarding
+    ...    ${INVOKER_USERNAME_2}
+
+    Call Method    ${CAPIF_USERS}    update_capif_users_dicts    ${url.path}    ${INVOKER_USERNAME_2}
+    Call Method    ${CAPIF_USERS}    update_register_users    ${INVOKER_USERNAME_2}
+
+    # Get Published APIs
+    ${discover_response}=    Get Request Capif
+    ...    ${DISCOVER_URL}${register_user_info_invoker['api_invoker_id']}&aef-id=${register_user_info_provider['aef_id']}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME}
+
+    Check Response Variable Type And Values    ${discover_response}    200    DiscoveredAPIs
+
+    # create Security Context
+    ${request_body}=    Create Service Security From Discover Response
+    ...    http://${CAPIF_HOSTNAME}:${CAPIF_HTTP_PORT}/test
+    ...    ${discover_response}
+    ${resp}=    Put Request Capif
+    ...    /capif-security/v1/trustedInvokers/${register_user_info_invoker['api_invoker_id']}
+    ...    json=${request_body}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME}
+    # Check Service Security
+    Check Response Variable Type And Values    ${resp}    201    ServiceSecurity
+    ${resource_url}=    Check Location Header    ${resp}    ${LOCATION_SECURITY_RESOURCE_REGEX}
+
+    # Get Published APIs
+    ${discover_response}=    Get Request Capif
+    ...    ${DISCOVER_URL}${register_user_info_invoker_2['api_invoker_id']}&aef-id=${register_user_info_provider['aef_id']}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME_2}
+
+    Check Response Variable Type And Values    ${discover_response}    200    DiscoveredAPIs
+
+    # create Security Context
+    ${request_body}=    Create Service Security From Discover Response
+    ...    http://${CAPIF_HOSTNAME}:${CAPIF_HTTP_PORT}/test
+    ...    ${discover_response}
+    ${resp}=    Put Request Capif
+    ...    /capif-security/v1/trustedInvokers/${register_user_info_invoker_2['api_invoker_id']}
+    ...    json=${request_body}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME_2}
+    # Check Service Security
+    Check Response Variable Type And Values    ${resp}    201    ServiceSecurity
+    ${resource_url}=    Check Location Header    ${resp}    ${LOCATION_SECURITY_RESOURCE_REGEX}
+
+    ${resp}=    Get Request Capif
+    ...    /access-control-policy/v1/accessControlPolicyList/${serviceApiId1}?aef-id=${register_user_info_provider['aef_id']}&api-invoker-id=${register_user_info_invoker['api_invoker_id']}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${AEF_PROVIDER_USERNAME}
+
+    Check Response Variable Type And Values    ${resp}    200    AccessControlPolicyList
+
+    # Check returned values
+    Should Not Be Empty    ${resp.json()['apiInvokerPolicies']}
+    Length Should Be    ${resp.json()['apiInvokerPolicies']}    1
+    Should Be Equal As Strings
+    ...    ${resp.json()['apiInvokerPolicies'][0]['apiInvokerId']}
+    ...    ${register_user_info_invoker['api_invoker_id']}
+
+    ${resp}=    Get Request Capif
+    ...    /access-control-policy/v1/accessControlPolicyList/${serviceApiId1}?aef-id=${register_user_info_provider['aef_id']}&api-invoker-id=${register_user_info_invoker_2['api_invoker_id']}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${AEF_PROVIDER_USERNAME}
+
+    Check Response Variable Type And Values    ${resp}    200    AccessControlPolicyList
+
+    # Check returned values
+    Should Not Be Empty    ${resp.json()['apiInvokerPolicies']}
+    Length Should Be    ${resp.json()['apiInvokerPolicies']}    1
+    Should Be Equal As Strings
+    ...    ${resp.json()['apiInvokerPolicies'][0]['apiInvokerId']}
+    ...    ${register_user_info_invoker_2['api_invoker_id']}
+
+Retrieve ACL filtered by supported-features
+    [Tags]    capif_api_acl-5
+    Skip    Test ${TEST_NAME} is not currently supported by CAPIF
+
+Retrieve ACL with aef-id not valid
+    [Tags]    capif_api_acl-6
+    ${register_user_info_invoker}
+    ...    ${register_user_info_provider}
+    ...    ${service_api_description_published}=
+    ...    Basic ACL registration
+
+    # ...    /access-control-policy/v1/accessControlPolicyList/${service_api_description_published['apiId']}?aef-id=${register_user_info_provider['aef_id']}
+    ${resp}=    Get Request Capif
+    ...    /access-control-policy/v1/accessControlPolicyList/${service_api_description_published['apiId']}?aef-id=${AEF_ID_NOT_VALID}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${AEF_PROVIDER_USERNAME}
+
+    # Check Results
+    Check Response Variable Type And Values
+    ...    ${resp}
+    ...    404
+    ...    ProblemDetails
+    ...    status=404
+    ...    title=Not Found
+    ...    detail=No ACLs found for the requested service: ${service_api_description_published['apiId']}, aef_id: ${AEF_ID_NOT_VALID}, invoker: None and supportedFeatures: None
+    ...    cause=Wrong id
+
+Retrieve ACL with service-id not valid
+    [Tags]    capif_api_acl-7
+    ${register_user_info_invoker}
+    ...    ${register_user_info_provider}
+    ...    ${service_api_description_published}=
+    ...    Basic ACL registration
+
+    ${resp}=    Get Request Capif
+    ...    /access-control-policy/v1/accessControlPolicyList/${SERVICE_API_ID_NOT_VALID}?aef-id=${register_user_info_provider['aef_id']}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${AEF_PROVIDER_USERNAME}
+
+    # Check Results
+    Check Response Variable Type And Values
+    ...    ${resp}
+    ...    404
+    ...    ProblemDetails
+    ...    status=404
+    ...    title=Not Found
+    ...    detail=No ACLs found for the requested service: ${SERVICE_API_ID_NOT_VALID}, aef_id: ${register_user_info_provider['aef_id']}, invoker: None and supportedFeatures: None
+    ...    cause=Wrong id
+
+Retrieve ACL with service-api-id and aef-id not valid
+    [Tags]    capif_api_acl-8
+    ${register_user_info_invoker}
+    ...    ${register_user_info_provider}
+    ...    ${service_api_description_published}=
+    ...    Basic ACL registration
+
+    ${resp}=    Get Request Capif
+    ...    /access-control-policy/v1/accessControlPolicyList/${SERVICE_API_ID_NOT_VALID}?aef-id=${AEF_ID_NOT_VALID}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${AEF_PROVIDER_USERNAME}
+
+    # Check Results
+    Check Response Variable Type And Values
+    ...    ${resp}
+    ...    404
+    ...    ProblemDetails
+    ...    status=404
+    ...    title=Not Found
+    ...    detail=No ACLs found for the requested service: ${SERVICE_API_ID_NOT_VALID}, aef_id: ${AEF_ID_NOT_VALID}, invoker: None and supportedFeatures: None
+    ...    cause=Wrong id
+
+Retrieve ACL without SecurityContext created previously by Invoker
+    [Tags]    capif_api_acl-9
+    ${register_user_info_invoker}
+    ...    ${register_user_info_provider}
+    ...    ${service_api_description_published}=
+    ...    Basic ACL registration    create_security_context=${False}
+
+    # ...    /access-control-policy/v1/accessControlPolicyList/${service_api_description_published['apiId']}?aef-id=${register_user_info_provider['aef_id']}
+    ${resp}=    Get Request Capif
+    ...    /access-control-policy/v1/accessControlPolicyList/${service_api_description_published['apiId']}?aef-id=${register_user_info_provider['aef_id']}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${AEF_PROVIDER_USERNAME}
+
+    # Check Results
+    Check Response Variable Type And Values
+    ...    ${resp}
+    ...    404
+    ...    ProblemDetails
+    ...    status=404
+    ...    title=Not Found
+    ...    detail=No ACLs found for the requested service: ${service_api_description_published['apiId']}, aef_id: ${register_user_info_provider['aef_id']}, invoker: None and supportedFeatures: None
+    ...    cause=Wrong id
+
+Retrieve ACL filtered by api-invoker-id not present
+    [Tags]    capif_api_acl-10
+    ${register_user_info_invoker}
+    ...    ${register_user_info_provider}
+    ...    ${service_api_description_published}=
+    ...    Basic ACL registration
+
+    ${resp}=    Get Request Capif
+    ...    /access-control-policy/v1/accessControlPolicyList/${service_api_description_published['apiId']}?aef-id=${register_user_info_provider['aef_id']}&api-invoker-id=${API_INVOKER_NOT_VALID}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${AEF_PROVIDER_USERNAME}
+
+    # Check Results
+    Check Response Variable Type And Values
+    ...    ${resp}
+    ...    404
+    ...    ProblemDetails
+    ...    status=404
+    ...    title=Not Found
+    ...    detail=No ACLs found for the requested service: ${service_api_description_published['apiId']}, aef_id: ${register_user_info_provider['aef_id']}, invoker: ${API_INVOKER_NOT_VALID} and supportedFeatures: None
+    ...    cause=Wrong id
+
+Retrieve ACL with APF Certificate
+    [Tags]    capif_api_acl-11
+    ${register_user_info_invoker}
+    ...    ${register_user_info_provider}
+    ...    ${service_api_description_published}=
+    ...    Basic ACL registration
+
+    ${resp}=    Get Request Capif
+    ...    /access-control-policy/v1/accessControlPolicyList/${service_api_description_published['apiId']}?aef-id=${register_user_info_provider['aef_id']}&api-invoker-id=${API_INVOKER_NOT_VALID}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${APF_PROVIDER_USERNAME}
+
+    # Check Results
+    Check Response Variable Type And Values    ${resp}    401    ProblemDetails
+    ...    title=Unauthorized
+    ...    status=401
+    ...    detail=Role not authorized for this API route
+    ...    cause=Certificate not authorized
+
+Retrieve ACL with AMF Certificate
+    [Tags]    capif_api_acl-12
+    ${register_user_info_invoker}
+    ...    ${register_user_info_provider}
+    ...    ${service_api_description_published}=
+    ...    Basic ACL registration
+
+    ${resp}=    Get Request Capif
+    ...    /access-control-policy/v1/accessControlPolicyList/${service_api_description_published['apiId']}?aef-id=${register_user_info_provider['aef_id']}&api-invoker-id=${API_INVOKER_NOT_VALID}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${AMF_PROVIDER_USERNAME}
+
+    # Check Results
+    Check Response Variable Type And Values    ${resp}    401    ProblemDetails
+    ...    title=Unauthorized
+    ...    status=401
+    ...    detail=Role not authorized for this API route
+    ...    cause=Certificate not authorized
+
+Retrieve ACL with Invoker Certificate
+    [Tags]    capif_api_acl-13
+    ${register_user_info_invoker}
+    ...    ${register_user_info_provider}
+    ...    ${service_api_description_published}=
+    ...    Basic ACL registration
+
+    ${resp}=    Get Request Capif
+    ...    /access-control-policy/v1/accessControlPolicyList/${service_api_description_published['apiId']}?aef-id=${register_user_info_provider['aef_id']}&api-invoker-id=${API_INVOKER_NOT_VALID}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME}
+
+    # Check Results
+    Check Response Variable Type And Values    ${resp}    401    ProblemDetails
+    ...    title=Unauthorized
+    ...    status=401
+    ...    detail=Role not authorized for this API route
+    ...    cause=Certificate not authorized
+
+No ACL for invoker after be removed
+    [Tags]    capif_api_acl-14
+    ${register_user_info_invoker}
+    ...    ${register_user_info_provider}
+    ...    ${service_api_description_published}=
+    ...    Basic ACL registration
+
+    ${resp}=    Get Request Capif
+    ...    /access-control-policy/v1/accessControlPolicyList/${service_api_description_published['apiId']}?aef-id=${register_user_info_provider['aef_id']}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${AEF_PROVIDER_USERNAME}
+
+    Check Response Variable Type And Values    ${resp}    200    AccessControlPolicyList
+
+    Remove entity   ${INVOKER_USERNAME}
+
+    ${resp}=    Get Request Capif
+    ...    /access-control-policy/v1/accessControlPolicyList/${service_api_description_published['apiId']}?aef-id=${register_user_info_provider['aef_id']}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${AEF_PROVIDER_USERNAME}
+
+    # Check Results
+    Check Response Variable Type And Values
+    ...    ${resp}
+    ...    404
+    ...    ProblemDetails
+    ...    status=404
+    ...    title=Not Found
+    ...    detail=No ACLs found for the requested service: ${service_api_description_published['apiId']}, aef_id: ${register_user_info_provider['aef_id']}, invoker: None and supportedFeatures: None
+    ...    cause=Wrong id
+
diff --git a/tests/features/CAPIF Api Auditing Service/__init__.robot b/tests/features/CAPIF Api Auditing Service/__init__.robot
new file mode 100644
index 0000000000000000000000000000000000000000..d4becb75919758f57dfc8a36879326f3bc8c77d3
--- /dev/null
+++ b/tests/features/CAPIF Api Auditing Service/__init__.robot	
@@ -0,0 +1,2 @@
+*** Settings ***
+Force Tags    capif_api_auditing_service
\ No newline at end of file
diff --git a/tests/features/CAPIF Api Auditing Service/capif_auditing_api.robot b/tests/features/CAPIF Api Auditing Service/capif_auditing_api.robot
new file mode 100644
index 0000000000000000000000000000000000000000..e4052ef40e9c21ac2c71ebc5718fc6a416ff255e
--- /dev/null
+++ b/tests/features/CAPIF Api Auditing Service/capif_auditing_api.robot	
@@ -0,0 +1,243 @@
+*** Settings ***
+Resource        /opt/robot-tests/tests/resources/common.resource
+Library         /opt/robot-tests/tests/libraries/bodyRequests.py
+Library         Collections
+Resource        /opt/robot-tests/tests/resources/common/basicRequests.robot
+Resource        ../../resources/common.resource
+
+Test Setup      Reset Testing Environment
+Suite Teardown   Reset Testing Environment
+
+*** Variables ***
+${AEF_ID_NOT_VALID}             aef-example
+${SERVICE_API_ID_NOT_VALID}     not-valid
+${API_INVOKER_NOT_VALID}        not-valid
+${NOTIFICATION_DESTINATION}     http://robot.testing:1080
+${API_VERSION_VALID}            v1
+${API_VERSION_NOT_VALID}        v58
+
+*** Test Cases ***
+Get Log Entry
+    [Tags]    capif_api_auditing_service-1
+    #Register APF
+    ${register_user_info}=    Provider Default Registration
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${register_user_info['resource_url'].path}  ${AMF_PROVIDER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${PROVIDER_USERNAME}
+
+    # Publish one api
+    Publish Service Api    ${register_user_info}
+
+    #Register INVOKER
+    ${register_user_info_invoker}    ${url}    ${request_body}=    Invoker Default Onboarding
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${url.path}  ${INVOKER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${INVOKER_USERNAME}
+
+    ${discover_response}=    Get Request Capif
+    ...    ${DISCOVER_URL}${register_user_info_invoker['api_invoker_id']}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME}
+
+    ${api_ids}   ${api_names}=    Get Api Ids And Names From Discover Response    ${discover_response}
+
+    # Create Log Entry
+    ${request_body}=  Create Log Entry  ${register_user_info['aef_id']}  ${register_user_info_invoker['api_invoker_id']}  ${api_ids}  ${api_names}
+    ${resp_1}=    Post Request Capif
+    ...    /api-invocation-logs/v1/${register_user_info['aef_id']}/logs
+    ...    json=${request_body}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${AEF_PROVIDER_USERNAME}
+
+
+    ${resp_2}=    Get Request Capif
+    ...    /logs/v1/apiInvocationLogs?aef-id=${register_user_info['aef_id']}&api-invoker-id=${register_user_info_invoker['api_invoker_id']}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${AMF_PROVIDER_USERNAME}
+
+    # Check Results
+    Check Response Variable Type And Values    ${resp_2}    200    InvocationLog
+    Length Should Be   ${resp_2.json()["logs"]}  2
+
+Get a log entry without entry created
+    [Tags]    capif_api_auditing_service-2
+    #Register APF
+    ${register_user_info}=    Provider Default Registration
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${register_user_info['resource_url'].path}  ${AMF_PROVIDER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${PROVIDER_USERNAME}
+
+    # Publish one api
+    Publish Service Api    ${register_user_info}
+
+    #Register INVOKER
+    ${register_user_info_invoker}    ${url}    ${request_body}=    Invoker Default Onboarding
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${url.path}  ${INVOKER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${INVOKER_USERNAME}
+
+
+     ${resp_1}=  Get Request Capif
+    ...    /logs/v1/apiInvocationLogs?aef-id=${register_user_info['aef_id']}&api-invoker-id=${register_user_info_invoker['api_invoker_id']}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${AMF_PROVIDER_USERNAME}
+
+    # Check Results
+    Check Response Variable Type And Values    ${resp_1}    404   ProblemDetails
+    ...    title=Not Found
+    ...    status=404
+    ...    detail=aefId or/and apiInvokerId do not match any InvocationLogs
+    ...    cause=No log invocations found
+
+
+Get a log entry withut aefid and apiInvokerId
+    [Tags]    capif_api_auditing_service-3
+    #Register APF
+    ${register_user_info}=    Provider Default Registration
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${register_user_info['resource_url'].path}  ${AMF_PROVIDER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${PROVIDER_USERNAME}
+
+    # Publish one api
+    Publish Service Api    ${register_user_info}
+
+    #Register INVOKER
+    ${register_user_info_invoker}    ${url}    ${request_body}=    Invoker Default Onboarding
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${url.path}  ${INVOKER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${INVOKER_USERNAME}
+
+    ${discover_response}=    Get Request Capif
+    ...    ${DISCOVER_URL}${register_user_info_invoker['api_invoker_id']}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME}
+
+    ${api_ids}   ${api_names}=    Get Api Ids And Names From Discover Response    ${discover_response}
+
+    # Create Log Entry
+    ${request_body}=  Create Log Entry  ${register_user_info['aef_id']}  ${register_user_info_invoker['api_invoker_id']}  ${api_ids}  ${api_names}
+    ${resp_1}=    Post Request Capif
+    ...    /api-invocation-logs/v1/${AEF_ID_NOT_VALID}/logs
+    ...    json=${request_body}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${AEF_PROVIDER_USERNAME}
+
+
+     ${resp_2}=    Get Request Capif
+    ...    /logs/v1/apiInvocationLogs
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${AMF_PROVIDER_USERNAME}
+
+    # Check Results
+    Check Response Variable Type And Values    ${resp_2}    400   ProblemDetails
+    ...    title=Bad Request
+    ...    status=400
+    ...    detail=aef_id and api_invoker_id parameters are mandatory
+    ...    cause=Mandatory parameters missing
+
+
+Get Log Entry with apiVersion filter
+    [Tags]    capif_api_auditing_service-4
+    #Register APF
+    ${register_user_info}=    Provider Default Registration
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${register_user_info['resource_url'].path}  ${AMF_PROVIDER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${PROVIDER_USERNAME}
+
+    # Publish one api
+    Publish Service Api    ${register_user_info}
+
+    #Register INVOKER
+    ${register_user_info_invoker}    ${url}    ${request_body}=    Invoker Default Onboarding
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${url.path}  ${INVOKER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${INVOKER_USERNAME}
+
+    ${discover_response}=    Get Request Capif
+    ...    ${DISCOVER_URL}${register_user_info_invoker['api_invoker_id']}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME}
+
+    ${api_ids}   ${api_names}=    Get Api Ids And Names From Discover Response    ${discover_response}
+
+    # Create Log Entry
+    ${request_body}=  Create Log Entry  ${register_user_info['aef_id']}  ${register_user_info_invoker['api_invoker_id']}  ${api_ids}  ${api_names}
+    ${resp_1}=    Post Request Capif
+    ...    /api-invocation-logs/v1/${register_user_info['aef_id']}/logs
+    ...    json=${request_body}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${AEF_PROVIDER_USERNAME}
+
+
+    ${resp_2}=    Get Request Capif
+    ...    /logs/v1/apiInvocationLogs?aef-id=${register_user_info['aef_id']}&api-invoker-id=${register_user_info_invoker['api_invoker_id']}&api-version=${API_VERSION_VALID} 
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${AMF_PROVIDER_USERNAME}
+
+    # Check Results
+    Check Response Variable Type And Values    ${resp_2}    200    InvocationLog
+    Length Should Be   ${resp_2.json()["logs"]}  1
+
+Get Log Entry with no exist apiVersion filter 
+    [Tags]    capif_api_auditing_service-5
+    #Register APF
+    ${register_user_info}=    Provider Default Registration
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${register_user_info['resource_url'].path}  ${AMF_PROVIDER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${PROVIDER_USERNAME}
+
+    # Publish one api
+    Publish Service Api    ${register_user_info}
+
+    #Register INVOKER
+    ${register_user_info_invoker}    ${url}    ${request_body}=    Invoker Default Onboarding
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${url.path}  ${INVOKER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${INVOKER_USERNAME}
+
+
+    ${discover_response}=    Get Request Capif
+    ...    ${DISCOVER_URL}${register_user_info_invoker['api_invoker_id']}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME}
+
+    ${api_ids}   ${api_names}=    Get Api Ids And Names From Discover Response    ${discover_response}
+
+    # Create Log Entry
+    ${request_body}=  Create Log Entry  ${register_user_info['aef_id']}  ${register_user_info_invoker['api_invoker_id']}  ${api_ids}  ${api_names}
+    ${resp_1}=    Post Request Capif
+    ...    /api-invocation-logs/v1/${register_user_info['aef_id']}/logs
+    ...    json=${request_body}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${AEF_PROVIDER_USERNAME}
+
+
+    ${resp_2}=    Get Request Capif
+    ...    /logs/v1/apiInvocationLogs?aef-id=${register_user_info['aef_id']}&api-invoker-id=${register_user_info_invoker['api_invoker_id']}&api-version=${API_VERSION_NOT_VALID} 
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${AMF_PROVIDER_USERNAME}
+
+    # Check Results
+   # Check Results
+    Check Response Variable Type And Values    ${resp_2}    404   ProblemDetails
+    ...    title=Not Found
+    ...    status=404
+    ...    detail=Parameters do not match any log entry
+    ...    cause=No logs found
+
+
+
+
diff --git a/tests/features/CAPIF Api Discover Service/__init__.robot b/tests/features/CAPIF Api Discover Service/__init__.robot
new file mode 100644
index 0000000000000000000000000000000000000000..c98b3a978f2d3efebfb71e49928d24848518a6a1
--- /dev/null
+++ b/tests/features/CAPIF Api Discover Service/__init__.robot	
@@ -0,0 +1,2 @@
+*** Settings ***
+Force Tags    capif_api_discover_service
\ No newline at end of file
diff --git a/tests/features/CAPIF Api Discover Service/capif_api_service_discover.robot b/tests/features/CAPIF Api Discover Service/capif_api_service_discover.robot
new file mode 100644
index 0000000000000000000000000000000000000000..0e2a5f7ba27531d9b8470304867ffc3d191dfaca
--- /dev/null
+++ b/tests/features/CAPIF Api Discover Service/capif_api_service_discover.robot	
@@ -0,0 +1,257 @@
+*** Settings ***
+Resource        /opt/robot-tests/tests/resources/common.resource
+Resource        /opt/robot-tests/tests/resources/api_invoker_management_requests/apiInvokerManagementRequests.robot
+Resource        ../../resources/common.resource
+Library         /opt/robot-tests/tests/libraries/bodyRequests.py
+
+Test Setup      Reset Testing Environment
+Suite Teardown   Reset Testing Environment
+# Test Setup    Initialize Test And Register    role=invoker
+
+
+*** Variables ***
+${API_INVOKER_NOT_REGISTERED}       not-valid
+
+
+*** Test Cases ***
+Discover Published service APIs by Authorised API Invoker
+    [Tags]    capif_api_discover_service-1
+    #Register APF
+    ${register_user_info}=    Provider Default Registration
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${register_user_info['resource_url'].path}  ${AMF_PROVIDER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${PROVIDER_USERNAME}
+
+    # Publish one api
+    ${service_api_description_published}    ${resource_url}    ${request_body}=    Publish Service Api
+    ...    ${register_user_info}
+
+    # Default Invoker Registration and Onboarding
+    ${register_user_info_invoker}    ${url}    ${request_body}=    Invoker Default Onboarding
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${url.path}  ${INVOKER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${INVOKER_USERNAME}
+
+    # Test
+    ${resp}=    Get Request Capif
+    ...    ${DISCOVER_URL}${register_user_info_invoker['api_invoker_id']}&aef-id=${register_user_info['aef_id']}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME}
+
+    Check Response Variable Type And Values    ${resp}    200    DiscoveredAPIs
+
+    # Check Results
+    Dictionary Should Contain Key    ${resp.json()}    serviceAPIDescriptions
+    Should Not Be Empty    ${resp.json()['serviceAPIDescriptions']}
+    Length Should Be    ${resp.json()['serviceAPIDescriptions']}    1
+    List Should Contain Value   ${resp.json()['serviceAPIDescriptions']}    ${service_api_description_published}
+
+
+Discover Published service APIs by Non Authorised API Invoker
+    [Tags]    capif_api_discover_service-2
+    #Register APF
+    ${register_user_info}=    Provider Default Registration
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${register_user_info['resource_url'].path}  ${AMF_PROVIDER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${PROVIDER_USERNAME}
+
+    # Publish one api
+    Publish Service Api    ${register_user_info}
+
+    #Register INVOKER
+    ${register_user_info_invoker}    ${url}    ${request_body}=    Invoker Default Onboarding
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${url.path}  ${INVOKER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${INVOKER_USERNAME}
+
+    ${resp}=    Get Request Capif
+    ...    ${DISCOVER_URL}${register_user_info_invoker['api_invoker_id']}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${APF_PROVIDER_USERNAME}
+
+    # Check Results
+    Check Response Variable Type And Values    ${resp}    401    ProblemDetails
+    ...    title=Unauthorized
+    ...    status=401
+    ...    detail=User not authorized
+    ...    cause=Certificate not authorized
+
+Discover Published service APIs by not registered API Invoker
+    [Tags]    capif_api_discover_service-3
+    #Register APF
+    ${register_user_info}=    Provider Default Registration
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${register_user_info['resource_url'].path}  ${AMF_PROVIDER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${PROVIDER_USERNAME}
+
+    # Publish one api
+    Publish Service Api    ${register_user_info}
+
+    #Register INVOKER
+    ${register_user_info_invoker}    ${url}    ${request_body}=    Invoker Default Onboarding
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${url.path}  ${INVOKER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${INVOKER_USERNAME}
+
+    ${resp}=    Get Request Capif
+    ...    ${DISCOVER_URL}${API_INVOKER_NOT_REGISTERED}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME}
+
+    # Check Results
+    Check Response Variable Type And Values    ${resp}    404    ProblemDetails
+    ...    title=Not Found
+    ...    status=404
+    ...    detail=API Invoker does not exist
+    ...    cause=API Invoker id not found
+
+Discover Published service APIs by registered API Invoker with 1 result filtered
+    [Tags]    capif_api_discover_service-4
+    #Register APF
+    ${register_user_info}=    Provider Default Registration
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${register_user_info['resource_url'].path}  ${AMF_PROVIDER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${PROVIDER_USERNAME}
+
+    ${api_name_1}=    Set Variable    service_1
+    ${api_name_2}=    Set Variable    service_2
+
+    # Publish 2 apis
+    ${service_api_description_published_1}    ${resource_url}    ${request_body}=    Publish Service Api
+    ...    ${register_user_info}
+    ...    ${api_name_1}
+    ${service_api_description_published_2}    ${resource_url}    ${request_body}=    Publish Service Api
+    ...    ${register_user_info}
+    ...    ${api_name_2}
+
+    # Register INVOKER
+    ${register_user_info_invoker}    ${url}    ${request_body}=    Invoker Default Onboarding
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${url.path}  ${INVOKER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${INVOKER_USERNAME}
+
+    # Request all APIs for Invoker
+    ${resp}=    Get Request Capif
+    ...    ${DISCOVER_URL}${register_user_info_invoker['api_invoker_id']}&aef-id=${register_user_info['aef_id']}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME}
+
+    Check Response Variable Type And Values    ${resp}    200    DiscoveredAPIs
+
+    # Check returned values
+    Should Not Be Empty    ${resp.json()['serviceAPIDescriptions']}
+    Length Should Be    ${resp.json()['serviceAPIDescriptions']}    2
+    List Should Contain Value   ${resp.json()['serviceAPIDescriptions']}    ${service_api_description_published_1}
+    List Should Contain Value   ${resp.json()['serviceAPIDescriptions']}    ${service_api_description_published_2}
+
+    # Request api 1
+    ${resp}=    Get Request Capif
+    ...    ${DISCOVER_URL}${register_user_info_invoker['api_invoker_id']}&api-name=${api_name_1}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME}
+
+    Check Response Variable Type And Values    ${resp}    200    DiscoveredAPIs
+
+    # Check Results
+    Should Not Be Empty    ${resp.json()['serviceAPIDescriptions']}
+    Length Should Be    ${resp.json()['serviceAPIDescriptions']}    1
+    List Should Contain Value    ${resp.json()['serviceAPIDescriptions']}    ${service_api_description_published_1}
+
+Discover Published service APIs by registered API Invoker filtered with no match
+    [Tags]    capif_api_discover_service-5
+    #Register APF
+    ${register_user_info}=    Provider Default Registration
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${register_user_info['resource_url'].path}  ${AMF_PROVIDER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${PROVIDER_USERNAME}
+
+    ${api_name_1}=    Set Variable    apiName1
+    ${api_name_2}=    Set Variable    apiName2
+
+    # Publish 2 apis
+    ${service_api_description_published_1}    ${resource_url}    ${request_body}=    Publish Service Api
+    ...    ${register_user_info}
+    ...    ${api_name_1}
+    ${service_api_description_published_2}    ${resource_url}    ${request_body}=    Publish Service Api
+    ...    ${register_user_info}
+    ...    ${api_name_2}
+
+    # Change to invoker role and register at api invoker management
+    ${register_user_info_invoker}    ${url}    ${request_body}=    Invoker Default Onboarding
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${url.path}  ${INVOKER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${INVOKER_USERNAME}
+
+    # Request all APIs for Invoker
+    ${resp}=    Get Request Capif
+    ...    ${DISCOVER_URL}${register_user_info_invoker['api_invoker_id']}&aef-id=${register_user_info['aef_id']}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME}
+
+    Check Response Variable Type And Values    ${resp}    200    DiscoveredAPIs
+
+    # Check returned values
+    Should Not Be Empty    ${resp.json()['serviceAPIDescriptions']}
+    Length Should Be    ${resp.json()['serviceAPIDescriptions']}    2
+    List Should Contain Value   ${resp.json()['serviceAPIDescriptions']}    ${service_api_description_published_1}
+    List Should Contain Value   ${resp.json()['serviceAPIDescriptions']}    ${service_api_description_published_2}
+
+    # Request api 1
+    ${resp}=    Get Request Capif
+    ...    ${DISCOVER_URL}${register_user_info_invoker['api_invoker_id']}&api-name=NOT_VALID_NAME
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME}
+
+    # Check Results
+    Check Response Variable Type And Values    ${resp}    404    ProblemDetails
+    ...    title=Not Found
+    ...    status=404
+    ...    detail=API Invoker ${register_user_info_invoker['api_invoker_id']} has no API Published that accomplish filter conditions
+    ...    cause=No API Published accomplish filter conditions
+
+Discover Published service APIs by registered API Invoker not filtered
+    [Tags]    capif_api_discover_service-6
+    #Register APF
+    ${register_user_info}=    Provider Default Registration
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${register_user_info['resource_url'].path}  ${AMF_PROVIDER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${PROVIDER_USERNAME}
+
+    ${api_name_1}=    Set Variable    apiName1
+    ${api_name_2}=    Set Variable    apiName2
+
+    # Publish 2 apis
+    ${service_api_description_published_1}    ${resource_url}    ${request_body}=    Publish Service Api
+    ...    ${register_user_info}
+    ...    ${api_name_1}
+    ${service_api_description_published_2}    ${resource_url}    ${request_body}=    Publish Service Api
+    ...    ${register_user_info}
+    ...    ${api_name_2}
+
+    # Change to invoker role and register at api invoker management
+    ${register_user_info_invoker}    ${url}    ${request_body}=    Invoker Default Onboarding
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${url.path}  ${INVOKER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${INVOKER_USERNAME}
+
+    # Request all APIs for Invoker
+    ${resp}=    Get Request Capif
+    ...    ${DISCOVER_URL}${register_user_info_invoker['api_invoker_id']}&aef-id=${register_user_info['aef_id']}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME}
+
+    Check Response Variable Type And Values    ${resp}    200    DiscoveredAPIs
+
+    # Check Results
+    Should Not Be Empty    ${resp.json()['serviceAPIDescriptions']}
+    Length Should Be    ${resp.json()['serviceAPIDescriptions']}    2
+    List Should Contain Value   ${resp.json()['serviceAPIDescriptions']}    ${service_api_description_published_1}
+    List Should Contain Value   ${resp.json()['serviceAPIDescriptions']}    ${service_api_description_published_2}
diff --git a/tests/features/CAPIF Api Events/__init__.robot b/tests/features/CAPIF Api Events/__init__.robot
new file mode 100644
index 0000000000000000000000000000000000000000..fa13d5313dcece2a76f23fd9dbe2ebac7534ae9e
--- /dev/null
+++ b/tests/features/CAPIF Api Events/__init__.robot	
@@ -0,0 +1,2 @@
+*** Settings ***
+Force Tags    capif_api_events
\ No newline at end of file
diff --git a/tests/features/CAPIF Api Events/capif_events_api.robot b/tests/features/CAPIF Api Events/capif_events_api.robot
new file mode 100644
index 0000000000000000000000000000000000000000..aecff959070855eaff11efbe3893fffa8199c38f
--- /dev/null
+++ b/tests/features/CAPIF Api Events/capif_events_api.robot	
@@ -0,0 +1,156 @@
+*** Settings ***
+Resource        /opt/robot-tests/tests/resources/common.resource
+Library         /opt/robot-tests/tests/libraries/bodyRequests.py
+Library         XML
+Resource        /opt/robot-tests/tests/resources/common/basicRequests.robot
+Resource        ../../resources/common.resource
+
+Test Setup      Reset Testing Environment
+Suite Teardown   Reset Testing Environment
+
+
+*** Variables ***
+${API_INVOKER_NOT_REGISTERED}       not-valid
+${SUBSCRIBER_ID_NOT_VALID}          not-valid
+${SUBSCRIPTION_ID_NOT_VALID}        not-valid
+
+
+*** Test Cases ***
+Creates a new individual CAPIF Event Subscription
+    [Tags]    capif_api_events-1
+    # Default Invoker Registration and Onboarding
+    ${register_user_info_invoker}    ${url}    ${request_body}=    Invoker Default Onboarding
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${url.path}  ${INVOKER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${INVOKER_USERNAME}
+
+    ${request_body}=    Create Events Subscription
+    ${resp}=    Post Request Capif
+    ...    /capif-events/v1/${register_user_info_invoker['api_invoker_id']}/subscriptions
+    ...    json=${request_body}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME}
+
+    # Check Results
+    Check Response Variable Type And Values    ${resp}    201    EventSubscription
+    ${subscriber_id}    ${subscription_id}=    Check Event Location Header    ${resp}
+
+Creates a new individual CAPIF Event Subscription with Invalid SubscriberId
+    [Tags]    capif_api_events-2
+    # Default Invoker Registration and Onboarding
+    ${register_user_info_invoker}    ${url}    ${request_body}=    Invoker Default Onboarding
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${url.path}  ${INVOKER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${INVOKER_USERNAME}
+
+    ${request_body}=    Create Events Subscription
+    ${resp}=    Post Request Capif
+    ...    /capif-events/v1/${SUBSCRIBER_ID_NOT_VALID}/subscriptions
+    ...    json=${request_body}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME}
+
+    # Check Results
+    Check Response Variable Type And Values  ${resp}    404    ProblemDetails
+    ...    title=Not Found
+    ...    status=404
+    ...    detail=Invoker or APF or AEF or AMF Not found
+    ...    cause=Subscriber Not Found
+
+Deletes an individual CAPIF Event Subscription
+    [Tags]    capif_api_events-3
+    # Default Invoker Registration and Onboarding
+    ${register_user_info_invoker}    ${url}    ${request_body}=    Invoker Default Onboarding
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${url.path}  ${INVOKER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${INVOKER_USERNAME}
+
+    ${request_body}=    Create Events Subscription
+    ${resp}=    Post Request Capif
+    ...    /capif-events/v1/${register_user_info_invoker['api_invoker_id']}/subscriptions
+    ...    json=${request_body}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME}
+
+    Check Response Variable Type And Values    ${resp}    201    EventSubscription
+
+    ${subscriber_id}    ${subscription_id}=    Check Event Location Header    ${resp}
+
+    ${resp}=    Delete Request Capif
+    ...    /capif-events/v1/${subscriber_id}/subscriptions/${subscription_id}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME}
+
+    Status Should Be    204    ${resp}
+
+Deletes an individual CAPIF Event Subscription with invalid SubscriberId
+    [Tags]    capif_api_events-4
+    # Default Invoker Registration and Onboarding
+    ${register_user_info_invoker}    ${url}    ${request_body}=    Invoker Default Onboarding
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${url.path}  ${INVOKER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${INVOKER_USERNAME}
+
+    ${request_body}=    Create Events Subscription
+    ${resp}=    Post Request Capif
+    ...    /capif-events/v1/${register_user_info_invoker['api_invoker_id']}/subscriptions
+    ...    json=${request_body}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME}
+
+    Check Response Variable Type And Values    ${resp}    201    EventSubscription
+
+    ${subscriber_id}    ${subscription_id}=    Check Event Location Header    ${resp}
+
+    ${resp}=    Delete Request Capif
+    ...    /capif-events/v1/${SUBSCRIBER_ID_NOT_VALID}/subscriptions/${subscription_id}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME}
+    
+    # Check Results
+    Check Response Variable Type And Values  ${resp}    404    ProblemDetails
+    ...    title=Not Found
+    ...    status=404
+    ...    detail=Invoker or APF or AEF or AMF Not found
+    ...    cause=Subscriber Not Found
+
+
+Deletes an individual CAPIF Event Subscription with invalid SubscriptionId
+    [Tags]    capif_api_events-5
+
+    # Default Invoker Registration and Onboarding
+    ${register_user_info_invoker}    ${url}    ${request_body}=    Invoker Default Onboarding
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${url.path}  ${INVOKER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${INVOKER_USERNAME}
+
+    ${request_body}=    Create Events Subscription
+    ${resp}=    Post Request Capif
+    ...    /capif-events/v1/${register_user_info_invoker['api_invoker_id']}/subscriptions
+    ...    json=${request_body}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME}
+
+    Check Response Variable Type And Values    ${resp}    201    EventSubscription
+
+    ${subscriber_id}    ${subscription_id}=    Check Event Location Header    ${resp}
+
+    ${resp}=    Delete Request Capif
+    ...    /capif-events/v1/${subscriber_id}/subscriptions/${SUBSCRIPTION_ID_NOT_VALID}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME}
+
+    # Check Results
+    Check Response Variable Type And Values    ${resp}    401    ProblemDetails
+    ...    title=Unauthorized
+    ...    detail=User not authorized
+    ...    cause=You are not the owner of this resource
+
diff --git a/tests/features/CAPIF Api Invoker Management/__init__.robot b/tests/features/CAPIF Api Invoker Management/__init__.robot
new file mode 100644
index 0000000000000000000000000000000000000000..4d19a72bd234aeaa8f4449ad38b088dc6de090bc
--- /dev/null
+++ b/tests/features/CAPIF Api Invoker Management/__init__.robot	
@@ -0,0 +1,2 @@
+*** Settings ***
+Force Tags    capif_api_invoker_management
\ No newline at end of file
diff --git a/tests/features/CAPIF Api Invoker Management/capif_api_invoker_managenet.robot b/tests/features/CAPIF Api Invoker Management/capif_api_invoker_managenet.robot
new file mode 100644
index 0000000000000000000000000000000000000000..48eaa879065564a02d73836e6de26ec144880f01
--- /dev/null
+++ b/tests/features/CAPIF Api Invoker Management/capif_api_invoker_managenet.robot	
@@ -0,0 +1,201 @@
+*** Settings ***
+Resource        /opt/robot-tests/tests/resources/common.resource
+Resource        /opt/robot-tests/tests/resources/api_invoker_management_requests/apiInvokerManagementRequests.robot
+Resource    ../../resources/common.resource
+Library         /opt/robot-tests/tests/libraries/bodyRequests.py
+Library         Process
+Library         Collections
+
+Test Setup      Reset Testing Environment
+Suite Teardown   Reset Testing Environment
+
+
+*** Variables ***
+${API_INVOKER_NOT_REGISTERED}       not-valid
+
+
+*** Test Cases ***
+Onboard NetApp
+    [Tags]    capif_api_invoker_management-1
+    #Register Netapp
+    ${register_user_info}=    Register User At Jwt Auth
+    ...    username=${INVOKER_USERNAME}    role=${INVOKER_ROLE}
+
+    # Send Onboarding Request
+    ${request_body}=    Create Onboarding Notification Body
+    ...    http://${CAPIF_CALLBACK_IP}:${CAPIF_CALLBACK_PORT}/netapp_callback
+    ...    ${register_user_info['csr_request']}
+    ...    ${INVOKER_USERNAME}
+    ${resp}=    Post Request Capif
+    ...    ${register_user_info['ccf_onboarding_url']}
+    ...    json=${request_body}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    access_token=${register_user_info['access_token']}
+
+    # Check Results
+    Check Response Variable Type And Values  ${resp}  201  APIInvokerEnrolmentDetails
+    ${url}=    Parse Url    ${resp.headers['Location']}
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${url.path}  ${INVOKER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${INVOKER_USERNAME}
+    Check Location Header    ${resp}    ${LOCATION_INVOKER_RESOURCE_REGEX}
+
+    # Store dummy signed certificate
+    Store In File    ${INVOKER_USERNAME}.crt    ${resp.json()['onboardingInformation']['apiInvokerCertificate']}
+
+Register NetApp Already Onboarded
+    [Tags]    capif_api_invoker_management-2
+    # Default Invoker Registration and Onboarding
+    ${register_user_info}    ${url}    ${request_body}=    Invoker Default Onboarding
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${url.path}  ${INVOKER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${INVOKER_USERNAME}
+
+    ${resp}=    Post Request Capif
+    ...    ${register_user_info['ccf_onboarding_url']}
+    ...    json=${request_body}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    access_token=${register_user_info['access_token']}
+
+    # Check Results
+    Check Response Variable Type And Values    ${resp}    403    ProblemDetails
+    ...    status=403
+    ...    title=Forbidden
+    ...    detail=Invoker already registered
+    ...    cause=Identical invoker public key
+
+Update Onboarded NetApp
+    [Tags]    capif_api_invoker_management-3
+    ${new_notification_destination}=    Set Variable
+    ...    http://${CAPIF_CALLBACK_IP}:${CAPIF_CALLBACK_PORT}/netapp_new_callback
+    # Default Invoker Registration and Onboarding
+    ${register_user_info}    ${url}    ${request_body}=    Invoker Default Onboarding
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${url.path}  ${INVOKER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${INVOKER_USERNAME}
+
+    Set To Dictionary
+    ...    ${request_body}
+    ...    notificationDestination=${new_notification_destination}
+
+    ${resp}=    Put Request Capif
+    ...    ${url.path}
+    ...    ${request_body}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME}
+
+    # Check Results
+    Check Response Variable Type And Values    ${resp}    200    APIInvokerEnrolmentDetails
+    ...    notificationDestination=${new_notification_destination}
+
+Update Not Onboarded NetApp
+    [Tags]    capif_api_invoker_management-4
+    # Default Invoker Registration and Onboarding
+    ${register_user_info}    ${url}    ${request_body}=    Invoker Default Onboarding
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${url.path}  ${INVOKER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${INVOKER_USERNAME}
+
+    ${resp}=    Put Request Capif
+    ...    /api-invoker-management/v1/onboardedInvokers/${INVOKER_NOT_REGISTERED}
+    ...    ${request_body}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME}
+
+    # Check Results
+    Check Response Variable Type And Values    ${resp}    404    ProblemDetails
+    ...    status=404
+    ...    title=Not Found
+    ...    detail=Please provide an existing Netapp ID
+    ...    cause=Not exist NetappID
+
+Offboard NetApp
+    [Tags]    capif_api_invoker_management-5
+    # Default Invoker Registration and Onboarding
+    ${register_user_info}    ${url}    ${request_body}=    Invoker Default Onboarding
+
+    Call Method  ${CAPIF_USERS}  update_register_users   ${INVOKER_USERNAME}
+
+    ${resp}=    Delete Request Capif
+    ...    ${url.path}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME}
+
+    # Check Results
+    Should Be Equal As Strings    ${resp.status_code}    204
+
+Offboard Not Previously Onboarded NetApp
+    [Tags]    capif_api_invoker_management-6
+    # Default Invoker Registration and Onboarding
+    ${register_user_info}    ${url}    ${request_body}=    Invoker Default Onboarding
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${url.path}  ${INVOKER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${INVOKER_USERNAME}
+
+    ${resp}=    Delete Request Capif
+    ...    /api-invoker-management/v1/onboardedInvokers/${INVOKER_NOT_REGISTERED}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME}
+
+    # Check Results
+    Check Response Variable Type And Values    ${resp}    404    ProblemDetails
+    ...    status=404
+    ...    title=Not Found
+    ...    detail=Please provide an existing Netapp ID
+    ...    cause=Not exist NetappID
+
+Update Onboarded NetApp Certificate
+    [Tags]    capif_api_invoker_management-7
+    ${new_notification_destination}=    Set Variable
+    ...    http://${CAPIF_CALLBACK_IP}:${CAPIF_CALLBACK_PORT}/netapp_new_callback
+    # Default Invoker Registration and Onboarding
+    ${register_user_info}    ${url}    ${request_body}=    Invoker Default Onboarding
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${url.path}  ${INVOKER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${INVOKER_USERNAME}
+
+    ${INVOKER_USERNAME_NEW}=   Set Variable     ${INVOKER_USERNAME}_NEW
+
+    ${csr_request_new}=    Create User Csr    ${INVOKER_USERNAME_NEW}    invoker
+
+    ${new_onboarding_notification_body}=    Create Onboarding Notification Body
+    ...    http://${CAPIF_CALLBACK_IP}:${CAPIF_CALLBACK_PORT}/netapp_callback
+    ...    ${csr_request_new}
+    ...    ${INVOKER_USERNAME}
+
+    Set To Dictionary
+    ...    ${request_body}
+    ...    onboardingInformation=${new_onboarding_notification_body['onboardingInformation']}
+
+    ${resp}=    Put Request Capif
+    ...    ${url.path}
+    ...    ${request_body}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME}
+
+    Check Response Variable Type And Values    ${resp}    200    APIInvokerEnrolmentDetails
+
+    Store In File    ${INVOKER_USERNAME_NEW}.crt    ${resp.json()['onboardingInformation']['apiInvokerCertificate']}
+
+    Set To Dictionary
+    ...    ${request_body}
+    ...    notificationDestination=${new_notification_destination}
+
+    ${resp}=    Put Request Capif
+    ...    ${url.path}
+    ...    ${request_body}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME_NEW}
+
+    # Check Results
+    Check Response Variable Type And Values    ${resp}    200    APIInvokerEnrolmentDetails
+    ...    notificationDestination=${new_notification_destination}
+
+
diff --git a/tests/features/CAPIF Api Logging Service/__init__.robot b/tests/features/CAPIF Api Logging Service/__init__.robot
new file mode 100644
index 0000000000000000000000000000000000000000..fd3c43e4753c33b780c9886fbccf52ae68b82318
--- /dev/null
+++ b/tests/features/CAPIF Api Logging Service/__init__.robot	
@@ -0,0 +1,2 @@
+*** Settings ***
+Force Tags    capif_api_logging_service
\ No newline at end of file
diff --git a/tests/features/CAPIF Api Logging Service/capif_logging_api.robot b/tests/features/CAPIF Api Logging Service/capif_logging_api.robot
new file mode 100644
index 0000000000000000000000000000000000000000..de9c6726f983a28bfe631bd0bb8090d73ea8de91
--- /dev/null
+++ b/tests/features/CAPIF Api Logging Service/capif_logging_api.robot	
@@ -0,0 +1,221 @@
+*** Settings ***
+Resource        /opt/robot-tests/tests/resources/common.resource
+Library         /opt/robot-tests/tests/libraries/bodyRequests.py
+Library         Collections
+Resource        /opt/robot-tests/tests/resources/common/basicRequests.robot
+Resource        ../../resources/common.resource
+
+Test Setup      Reset Testing Environment
+Suite Teardown   Reset Testing Environment
+
+*** Variables ***
+${AEF_ID_NOT_VALID}             aef-example
+${SERVICE_API_ID_NOT_VALID}     not-valid
+${API_INVOKER_NOT_VALID}        not-valid
+${NOTIFICATION_DESTINATION}     http://robot.testing:1080
+
+*** Test Cases ***
+Create a log entry
+    [Tags]    capif_api_logging_service-1
+    #Register APF
+    ${register_user_info}=    Provider Default Registration
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${register_user_info['resource_url'].path}  ${AMF_PROVIDER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${PROVIDER_USERNAME}
+
+    # Publish one api
+    Publish Service Api    ${register_user_info}
+
+    #Register INVOKER
+    ${register_user_info_invoker}    ${url}    ${request_body}=    Invoker Default Onboarding
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${url.path}  ${INVOKER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${INVOKER_USERNAME}
+
+    ${discover_response}=    Get Request Capif
+    ...    ${DISCOVER_URL}${register_user_info_invoker['api_invoker_id']}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME}
+
+    ${api_ids}   ${api_names}=    Get Api Ids And Names From Discover Response    ${discover_response}
+
+    # Create Log Entry
+    ${request_body}=  Create Log Entry  ${register_user_info['aef_id']}  ${register_user_info_invoker['api_invoker_id']}  ${api_ids}  ${api_names}
+    ${resp}=    Post Request Capif
+    ...    /api-invocation-logs/v1/${register_user_info['aef_id']}/logs
+    ...    json=${request_body}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${AEF_PROVIDER_USERNAME}
+
+
+    # Check Results
+    Check Response Variable Type And Values    ${resp}    201    InvocationLog
+    ${resource_url}=    Check Location Header    ${resp}    ${LOCATION_LOGGING_RESOURCE_REGEX}
+
+Create a log entry invalid aefId
+    [Tags]    capif_api_logging_service-2
+    #Register APF
+    ${register_user_info}=    Provider Default Registration
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${register_user_info['resource_url'].path}  ${AMF_PROVIDER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${PROVIDER_USERNAME}
+
+    # Publish one api
+    Publish Service Api    ${register_user_info}
+
+    #Register INVOKER
+    ${register_user_info_invoker}    ${url}    ${request_body}=    Invoker Default Onboarding
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${url.path}  ${INVOKER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${INVOKER_USERNAME}
+
+    ${discover_response}=    Get Request Capif
+    ...    ${DISCOVER_URL}${register_user_info_invoker['api_invoker_id']}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME}
+
+    ${api_ids}   ${api_names}=    Get Api Ids And Names From Discover Response    ${discover_response}
+
+    # Create Log Entry
+    ${request_body}=  Create Log Entry  ${register_user_info['aef_id']}  ${register_user_info_invoker['api_invoker_id']}  ${api_ids}  ${api_names}
+    ${resp}=    Post Request Capif
+    ...    /api-invocation-logs/v1/${AEF_ID_NOT_VALID}/logs
+    ...    json=${request_body}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${AEF_PROVIDER_USERNAME}
+
+    # Check Results
+    Check Response Variable Type And Values    ${resp}    404   ProblemDetails
+    ...    title=Not Found
+    ...    status=404
+    ...    detail=Exposer not exist
+    ...    cause=Exposer id not found
+
+
+
+Create a log entry invalid serviceApi
+    [Tags]    capif_api_logging_service-3
+    #Register APF
+    ${register_user_info}=    Provider Default Registration
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${register_user_info['resource_url'].path}  ${AMF_PROVIDER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${PROVIDER_USERNAME}
+
+    # Publish one api
+    Publish Service Api    ${register_user_info}
+
+    #Register INVOKER
+    ${register_user_info_invoker}    ${url}    ${request_body}=    Invoker Default Onboarding
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${url.path}  ${INVOKER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${INVOKER_USERNAME}
+
+    ${discover_response}=    Get Request Capif
+    ...    ${DISCOVER_URL}${register_user_info_invoker['api_invoker_id']}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME}
+
+    # Create Log Entry
+    ${request_body}=  Create Log Entry Bad Service  ${register_user_info['aef_id']}  ${register_user_info_invoker['api_invoker_id']}
+    ${resp}=    Post Request Capif
+    ...    /api-invocation-logs/v1/${register_user_info['aef_id']}/logs
+    ...    json=${request_body}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${AEF_PROVIDER_USERNAME}
+
+    # Check Results
+    Check Response Variable Type And Values    ${resp}    404    ProblemDetails
+    ...    title=Not Found
+    ...    status=404
+    ...    detail=Service API not exist
+
+Create a log entry invalid apiInvokerId
+    [Tags]    capif_api_logging_service-4
+    #Register APF
+    ${register_user_info}=    Provider Default Registration
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${register_user_info['resource_url'].path}  ${AMF_PROVIDER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${PROVIDER_USERNAME}
+
+    # Publish one api
+    Publish Service Api    ${register_user_info}
+
+    #Register INVOKER
+    ${register_user_info_invoker}    ${url}    ${request_body}=    Invoker Default Onboarding
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${url.path}  ${INVOKER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${INVOKER_USERNAME}
+
+    ${discover_response}=    Get Request Capif
+    ...    ${DISCOVER_URL}${register_user_info_invoker['api_invoker_id']}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME}
+
+    ${api_ids}   ${api_names}=    Get Api Ids And Names From Discover Response    ${discover_response}
+
+    # Create Log Entry
+    ${request_body}=  Create Log Entry  ${register_user_info['aef_id']}  ${API_INVOKER_NOT_VALID}   ${api_ids}  ${api_names}
+    ${resp}=    Post Request Capif
+    ...    /api-invocation-logs/v1/${register_user_info['aef_id']}/logs
+    ...    json=${request_body}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${AEF_PROVIDER_USERNAME}
+
+    # Check Results
+    Check Response Variable Type And Values    ${resp}    404    ProblemDetails
+    ...    title=Not Found
+    ...    status=404
+    ...    detail=Invoker not exist
+    ...    cause=Invoker id not found
+
+
+Create a log entry different aef_id in body
+    [Tags]    capif_api_logging_service-5
+    #Register APF
+    ${register_user_info}=    Provider Default Registration
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${register_user_info['resource_url'].path}  ${AMF_PROVIDER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${PROVIDER_USERNAME}
+
+    # Publish one api
+    Publish Service Api    ${register_user_info}
+
+    #Register INVOKER
+    ${register_user_info_invoker}    ${url}    ${request_body}=    Invoker Default Onboarding
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${url.path}  ${INVOKER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${INVOKER_USERNAME}
+
+
+    ${discover_response}=    Get Request Capif
+    ...    ${DISCOVER_URL}${register_user_info_invoker['api_invoker_id']}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME}
+
+    ${api_ids}   ${api_names}=    Get Api Ids And Names From Discover Response    ${discover_response}
+
+    # Create Log Entry
+    ${request_body}=  Create Log Entry  ${AEF_ID_NOT_VALID}  ${register_user_info_invoker['api_invoker_id']}  ${api_ids}  ${api_names}
+    ${resp}=    Post Request Capif
+    ...    /api-invocation-logs/v1/${register_user_info['aef_id']}/logs
+    ...    json=${request_body}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${AEF_PROVIDER_USERNAME}
+
+    # Check Results
+    Check Response Variable Type And Values    ${resp}    401    ProblemDetails
+    ...    title=Unauthorized
+    ...    status=401
+    ...    detail=AEF id not matching in request and body
+    ...    cause=Not identical AEF id
+
diff --git a/tests/features/CAPIF Api Provider Management/__init__.robot b/tests/features/CAPIF Api Provider Management/__init__.robot
new file mode 100644
index 0000000000000000000000000000000000000000..24460ae506caedfcd15f2c0653e3cbcf1ace72d6
--- /dev/null
+++ b/tests/features/CAPIF Api Provider Management/__init__.robot	
@@ -0,0 +1,2 @@
+*** Settings ***
+Force Tags    capif_api_provider_management
\ No newline at end of file
diff --git a/tests/features/CAPIF Api Provider Management/capif_api_provider_management.robot b/tests/features/CAPIF Api Provider Management/capif_api_provider_management.robot
new file mode 100644
index 0000000000000000000000000000000000000000..fd70925603b386487b54f0c2a01de3b543be2979
--- /dev/null
+++ b/tests/features/CAPIF Api Provider Management/capif_api_provider_management.robot	
@@ -0,0 +1,222 @@
+*** Settings ***
+Resource        /opt/robot-tests/tests/resources/common.resource
+Resource        ../../resources/common.resource
+Library         /opt/robot-tests/tests/libraries/bodyRequests.py
+Library         Process
+Library         Collections
+
+Test Setup      Reset Testing Environment
+Suite Teardown   Reset Testing Environment
+
+
+*** Variables ***
+${API_PROVIDER_NOT_REGISTERED}      notValid
+
+
+*** Test Cases ***
+Register Api Provider
+    [Tags]    capif_api_provider_management-1
+    #Register Provider User An create Certificates for each function
+    ${register_user_info}=    Register User At Jwt Auth Provider
+    ...    username=${PROVIDER_USERNAME}    role=${PROVIDER_ROLE}
+
+    # Create provider Registration Body
+    ${apf_func_details}=    Create Api Provider Function Details
+    ...    ${register_user_info['apf_username']}
+    ...    ${register_user_info['apf_csr_request']}
+    ...    APF
+    ${aef_func_details}=    Create Api Provider Function Details
+    ...    ${register_user_info['aef_username']}
+    ...    ${register_user_info['aef_csr_request']}
+    ...    AEF
+    ${amf_func_details}=    Create Api Provider Function Details
+    ...    ${register_user_info['amf_username']}
+    ...    ${register_user_info['amf_csr_request']}
+    ...    AMF
+    ${api_prov_funcs}=    Create List    ${apf_func_details}    ${aef_func_details}    ${amf_func_details}
+
+    ${request_body}=    Create Api Provider Enrolment Details Body
+    ...    ${register_user_info['access_token']}
+    ...    ${api_prov_funcs}
+
+    # Register Provider
+    ${resp}=    Post Request Capif
+    ...    /api-provider-management/v1/registrations
+    ...    json=${request_body}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    access_token=${register_user_info['access_token']}
+
+    # Check Results
+    Check Response Variable Type And Values    ${resp}    201    APIProviderEnrolmentDetails
+
+    ${url}=    Parse Url    ${resp.headers['Location']}
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${url.path}  ${register_user_info['amf_username']}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${PROVIDER_USERNAME}
+
+    ${resource_url}=    Check Location Header    ${resp}    ${LOCATION_PROVIDER_RESOURCE_REGEX}
+
+
+    FOR    ${prov}    IN    @{resp.json()['apiProvFuncs']}
+        Log Dictionary    ${prov}
+        Store In File    ${prov['apiProvFuncInfo']}.crt    ${prov['regInfo']['apiProvCert']}
+    END
+
+Register Api Provider Already registered
+    [Tags]    capif_api_provider_management-2
+    ${register_user_info}=    Provider Default Registration
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${register_user_info['resource_url'].path}  ${AMF_PROVIDER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${PROVIDER_USERNAME}
+
+
+    ${resp}=    Post Request Capif
+    ...    /api-provider-management/v1/registrations
+    ...    json=${register_user_info['provider_enrollment_details']}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    access_token=${register_user_info['access_token']}
+
+    # Check Results
+    Check Response Variable Type And Values    ${resp}    403    ProblemDetails
+    ...    status=403
+    ...    title=Forbidden
+    ...    detail=Provider already registered
+    ...    cause=Identical provider reg sec
+
+Update Registered Api Provider
+    [Tags]    capif_api_provider_management-3
+    ${register_user_info}=    Provider Default Registration
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${register_user_info['resource_url'].path}  ${AMF_PROVIDER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${PROVIDER_USERNAME}
+
+    ${request_body}=    Set Variable    ${register_user_info['provider_enrollment_details']}
+
+    Set To Dictionary    ${request_body}    apiProvDomInfo=ROBOT_TESTING_MOD
+
+    ${resp}=    Put Request Capif
+    ...    ${register_user_info['resource_url'].path}
+    ...    json=${request_body}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${AMF_PROVIDER_USERNAME}
+
+    FOR    ${prov}    IN    @{resp.json()['apiProvFuncs']}
+        Log Dictionary    ${prov}
+        Store In File    ${prov['apiProvFuncInfo']}.crt    ${prov['regInfo']['apiProvCert']}
+        IF    "${prov['apiProvFuncRole']}" == "APF"
+            Set To Dictionary    ${register_user_info}    apf_id=${prov['apiProvFuncId']}
+        ELSE IF    "${prov['apiProvFuncRole']}" == "AEF"
+            Set To Dictionary    ${register_user_info}    aef_id=${prov['apiProvFuncId']}
+        ELSE IF    "${prov['apiProvFuncRole']}" == "AMF"
+            Set To Dictionary    ${register_user_info}    amf_id=${prov['apiProvFuncId']}
+        ELSE
+            Fail    "${prov['apiProvFuncRole']} is not valid role"
+        END
+    END
+
+    # Check Results
+    Check Response Variable Type And Values    ${resp}    200    APIProviderEnrolmentDetails
+    ...    apiProvDomInfo=ROBOT_TESTING_MOD
+
+Update Not Registered Api Provider
+    [Tags]    capif_api_provider_management-4
+    ${register_user_info}=    Provider Default Registration
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${register_user_info['resource_url'].path}  ${AMF_PROVIDER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${PROVIDER_USERNAME}
+
+    ${request_body}=    Set Variable    ${register_user_info['provider_enrollment_details']}
+
+    ${resp}=    Put Request Capif
+    ...    /api-provider-management/v1/registrations/${API_PROVIDER_NOT_REGISTERED}
+    ...    json=${request_body}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${AMF_PROVIDER_USERNAME}
+
+    # Check Results
+    Check Response Variable Type And Values    ${resp}    404    ProblemDetails
+    ...    status=404
+    ...    title=Not Found
+    ...    detail=Not Exist Provider Enrolment Details
+    ...    cause=Not found registrations to send this api provider details
+
+# Partially Update Registered Api Provider
+#     [Tags]    capif_api_provider_management-5
+#     ${register_user_info}=    Provider Default Registration
+
+#     ${request_body}=    Create Api Provider Enrolment Details Patch Body    ROBOT_TESTING_MOD
+
+#     ${resp}=    Patch Request Capif
+#     ...    ${register_user_info['resource_url'].path}
+#     ...    json=${request_body}
+#     ...    server=${CAPIF_HTTPS_URL}
+#     ...    verify=ca.crt
+#     ...    username=${AMF_PROVIDER_USERNAME}
+
+#     Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${register_user_info['resource_url'].path}  ${register_user_info['amf_username']}
+#     Call Method  ${CAPIF_USERS}  update_register_users   ${PROVIDER_USERNAME}
+
+#     # Check Results
+#     Check Response Variable Type And Values    ${resp}    200    APIProviderEnrolmentDetails
+#     ...    apiProvDomInfo=ROBOT_TESTING_MOD
+
+Partially Update Not Registered Api Provider
+    [Tags]    capif_api_provider_management-6
+    ${register_user_info}=    Provider Default Registration
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${register_user_info['resource_url'].path}  ${AMF_PROVIDER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${PROVIDER_USERNAME}
+
+    ${request_body}=    Create Api Provider Enrolment Details Patch Body
+
+    ${resp}=    Patch Request Capif
+    ...    /api-provider-management/v1/registrations/${API_PROVIDER_NOT_REGISTERED}
+    ...    json=${request_body}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${AMF_PROVIDER_USERNAME}
+
+    # Check Results
+    Check Response Variable Type And Values    ${resp}    404    ProblemDetails
+    ...    status=404
+    ...    title=Not Found
+    ...    detail=Not Exist Provider Enrolment Details
+    ...    cause=Not found registrations to send this api provider details
+
+Delete Registered Api Provider
+    [Tags]    capif_api_provider_management-7
+    ${register_user_info}=    Provider Default Registration
+
+    Call Method  ${CAPIF_USERS}  update_register_users   ${PROVIDER_USERNAME}
+
+    ${resp}=    Delete Request Capif
+    ...    ${register_user_info['resource_url'].path}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${AMF_PROVIDER_USERNAME}
+
+    # Check Results
+    Status Should Be    204    ${resp}
+
+Delete Not Registered Api Provider
+    [Tags]    capif_api_provider_management-8
+    ${register_user_info}=    Provider Default Registration
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${register_user_info['resource_url'].path}  ${AMF_PROVIDER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${PROVIDER_USERNAME}
+
+    ${resp}=    Delete Request Capif
+    ...    /api-provider-management/v1/registrations/${API_PROVIDER_NOT_REGISTERED}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${AMF_PROVIDER_USERNAME}
+
+    # Check Results
+    Check Response Variable Type And Values    ${resp}    404    ProblemDetails
+    ...    status=404
+    ...    title=Not Found
+    ...    detail=Not Exist Provider Enrolment Details
+    ...    cause=Not found registrations to send this api provider details
diff --git a/tests/features/CAPIF Api Publish Service/__init__.robot b/tests/features/CAPIF Api Publish Service/__init__.robot
new file mode 100644
index 0000000000000000000000000000000000000000..137026fb42fc6f966f77de428d6bbb9ac126dd7d
--- /dev/null
+++ b/tests/features/CAPIF Api Publish Service/__init__.robot	
@@ -0,0 +1,2 @@
+*** Settings ***
+Force Tags    capif_api_publish_service
\ No newline at end of file
diff --git a/tests/features/CAPIF Api Publish Service/capif_api_publish_service.robot b/tests/features/CAPIF Api Publish Service/capif_api_publish_service.robot
new file mode 100644
index 0000000000000000000000000000000000000000..cd58b3ea2a30687002f2847a6c510ebe2ad7817f
--- /dev/null
+++ b/tests/features/CAPIF Api Publish Service/capif_api_publish_service.robot	
@@ -0,0 +1,374 @@
+*** Settings ***
+Resource        /opt/robot-tests/tests/resources/common.resource
+Resource        ../../resources/common/basicRequests.robot
+Resource        ../../resources/common.resource
+Library         /opt/robot-tests/tests/libraries/bodyRequests.py
+
+Test Setup      Reset Testing Environment
+Suite Teardown   Reset Testing Environment
+
+
+*** Variables ***
+${APF_ID_NOT_VALID}             apf-example
+${SERVICE_API_ID_NOT_VALID}     not-valid
+
+
+*** Test Cases ***
+Publish API by Authorised API Publisher
+    [Tags]    capif_api_publish_service-1
+    #Register APF
+    ${register_user_info}=    Provider Default Registration
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${register_user_info['resource_url'].path}  ${AMF_PROVIDER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${PROVIDER_USERNAME}
+
+    # Test
+    ${request_body}=    Create Service Api Description    service_1
+    ${resp}=    Post Request Capif
+    ...    /published-apis/v1/${register_user_info['apf_id']}/service-apis
+    ...    json=${request_body}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${APF_PROVIDER_USERNAME}
+
+    Check Response Variable Type And Values    ${resp}    201    ServiceAPIDescription
+    ...    apiName=service_1
+    Dictionary Should Contain Key    ${resp.json()}    apiId
+    ${resource_url}=    Check Location Header    ${resp}    ${LOCATION_PUBLISH_RESOURCE_REGEX}
+
+Publish API by NON Authorised API Publisher
+    [Tags]    capif_api_publish_service-2
+    #Register APF
+    ${register_user_info}=    Provider Default Registration
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${register_user_info['resource_url'].path}  ${AMF_PROVIDER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${PROVIDER_USERNAME}
+
+    ${request_body}=    Create Service Api Description
+    ${resp}=    Post Request Capif
+    ...    /published-apis/v1/${APF_ID_NOT_VALID}/service-apis
+    ...    json=${request_body}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${APF_PROVIDER_USERNAME}
+
+    Check Response Variable Type And Values    ${resp}    401    ProblemDetails
+    ...    status=401
+    ...    title=Unauthorized
+    ...    detail=Publisher not existing
+    ...    cause=Publisher id not found
+
+Retrieve all APIs Published by Authorised apfId
+    [Tags]    capif_api_publish_service-3
+    #Register APF
+    ${register_user_info}=    Provider Default Registration
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${register_user_info['resource_url'].path}  ${AMF_PROVIDER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${PROVIDER_USERNAME}
+
+    # Register One Service
+    ${service_api_description_published_1}    ${resource_url}    ${request_body}=    Publish Service Api
+    ...    ${register_user_info}
+    ...    service_1
+    ${service_api_description_published_2}    ${resource_url}    ${request_body}=    Publish Service Api
+    ...    ${register_user_info}
+    ...    service_2
+
+    # Retrieve Services published
+    ${resp}=    Get Request Capif
+    ...    /published-apis/v1/${register_user_info['apf_id']}/service-apis
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${APF_PROVIDER_USERNAME}
+
+    Check Response Variable Type And Values    ${resp}    200    ServiceAPIDescription
+
+    List Should Contain Value    ${resp.json()}    ${service_api_description_published_1}
+    List Should Contain Value    ${resp.json()}    ${service_api_description_published_2}
+
+Retrieve all APIs Published by NON Authorised apfId
+    [Tags]    capif_api_publish_service-4
+    #Register APF
+    ${register_user_info}=    Provider Default Registration
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${register_user_info['resource_url'].path}  ${AMF_PROVIDER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${PROVIDER_USERNAME}
+
+    # Retrieve Services published
+    ${resp}=    Get Request Capif
+    ...    /published-apis/v1/${APF_ID_NOT_VALID}/service-apis
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${APF_PROVIDER_USERNAME}
+
+    Check Response Variable Type And Values    ${resp}    401    ProblemDetails
+    ...    title=Unauthorized
+    ...    status=401
+    ...    detail=Publisher not existing
+    ...    cause=Publisher id not found
+
+Retrieve single APIs Published by Authorised apfId
+    [Tags]    capif_api_publish_service-5
+    #Register APF
+    ${register_user_info}=    Provider Default Registration
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${register_user_info['resource_url'].path}  ${AMF_PROVIDER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${PROVIDER_USERNAME}
+
+    ${service_api_description_published_1}    ${resource_url}    ${request_body}=    Publish Service Api
+    ...    ${register_user_info}
+    ...    service_1
+    ${service_api_description_published_2}    ${resource_url}    ${request_body}=    Publish Service Api
+    ...    ${register_user_info}
+    ...    service_2
+
+    # Store apiId1
+    ${serviceApiId1}=    Set Variable    ${service_api_description_published_1['apiId']}
+    ${serviceApiId2}=    Set Variable    ${service_api_description_published_2['apiId']}
+
+    # Retrieve Services 1
+    ${resp}=    Get Request Capif
+    ...    /published-apis/v1/${register_user_info['apf_id']}/service-apis/${serviceApiId1}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${APF_PROVIDER_USERNAME}
+
+    Check Response Variable Type And Values    ${resp}    200    ServiceAPIDescription
+    Dictionaries Should Be Equal    ${resp.json()}    ${service_api_description_published_1}
+
+    # Retrieve Services 1
+    ${resp}=    Get Request Capif
+    ...    /published-apis/v1/${register_user_info['apf_id']}/service-apis/${serviceApiId2}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${APF_PROVIDER_USERNAME}
+
+    Check Response Variable Type And Values    ${resp}    200    ServiceAPIDescription
+    Dictionaries Should Be Equal    ${resp.json()}    ${service_api_description_published_2}
+
+Retrieve single APIs non Published by Authorised apfId
+    [Tags]    capif_api_publish_service-6
+    #Register APF
+    ${register_user_info}=    Provider Default Registration
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${register_user_info['resource_url'].path}  ${AMF_PROVIDER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${PROVIDER_USERNAME}
+
+    ${resp}=    Get Request Capif
+    ...    /published-apis/v1/${register_user_info['apf_id']}/service-apis/${SERVICE_API_ID_NOT_VALID}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${APF_PROVIDER_USERNAME}
+
+
+    Check Response Variable Type And Values    ${resp}    401    ProblemDetails
+    ...    title=Unauthorized
+    ...    detail=User not authorized
+    ...    cause=You are not the owner of this resource
+
+Retrieve single APIs Published by NON Authorised apfId
+    [Tags]    capif_api_publish_service-7
+    # Register APF
+    ${register_user_info}=    Provider Default Registration
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${register_user_info['resource_url'].path}  ${AMF_PROVIDER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${PROVIDER_USERNAME}
+
+    # Publish Service API
+    ${service_api_description_published_1}    ${resource_url}    ${request_body}=    Publish Service Api
+    ...    ${register_user_info}
+    ...    service_1
+
+    # Register INVOKER
+    ${register_user_info_invoker}    ${url}    ${request_body}=    Invoker Default Onboarding
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${url.path}  ${INVOKER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${INVOKER_USERNAME}
+
+    ${resp}=    Get Request Capif
+    ...    ${resource_url.path}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME}
+
+    Check Response Variable Type And Values    ${resp}    401    ProblemDetails
+    ...    title=Unauthorized
+    ...    status=401
+    ...    detail=User not authorized
+    ...    cause=Certificate not authorized
+
+Update API Published by Authorised apfId with valid serviceApiId
+    [Tags]    capif_api_publish_service-8
+    #Register APF
+    ${register_user_info}=    Provider Default Registration
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${register_user_info['resource_url'].path}  ${AMF_PROVIDER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${PROVIDER_USERNAME}
+
+    ${service_api_description_published_1}    ${resource_url}    ${request_body}=    Publish Service Api
+    ...    ${register_user_info}
+    ...    service_1
+
+    ${request_body_modified}=    Create Service Api Description    service_1_modified
+    ${resp}=    Put Request Capif
+    ...    ${resource_url.path}
+    ...    json=${request_body_modified}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${APF_PROVIDER_USERNAME}
+
+    Check Response Variable Type And Values    ${resp}    200    ServiceAPIDescription
+    ...    apiName=service_1_modified
+
+    # Retrieve Service
+    ${resp}=    Get Request Capif
+    ...    ${resource_url.path}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${APF_PROVIDER_USERNAME}
+
+    Check Response Variable Type And Values    ${resp}    200    ServiceAPIDescription
+    ...    apiName=service_1_modified
+
+Update APIs Published by Authorised apfId with invalid serviceApiId
+    [Tags]    capif_api_publish_service-9
+    #Register APF
+    ${register_user_info}=    Provider Default Registration
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${register_user_info['resource_url'].path}  ${AMF_PROVIDER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${PROVIDER_USERNAME}
+
+    ${service_api_description_published_1}    ${resource_url}    ${request_body}=    Publish Service Api
+    ...    ${register_user_info}
+    ...    service_1
+
+    ${request_body}=    Create Service Api Description    service_1_modified
+    ${resp}=    Put Request Capif
+    ...    /published-apis/v1/${register_user_info['apf_id']}/service-apis/${SERVICE_API_ID_NOT_VALID}
+    ...    json=${request_body}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${APF_PROVIDER_USERNAME}
+
+    Check Response Variable Type And Values    ${resp}    401    ProblemDetails
+    ...    title=Unauthorized
+    ...    detail=User not authorized
+    ...    cause=You are not the owner of this resource
+
+Update APIs Published by NON Authorised apfId
+    [Tags]    capif_api_publish_service-10
+    #Register APF
+    ${register_user_info}=    Provider Default Registration
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${register_user_info['resource_url'].path}  ${AMF_PROVIDER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${PROVIDER_USERNAME}
+
+    ${service_api_description_published_1}    ${resource_url}    ${request_body}=    Publish Service Api
+    ...    ${register_user_info}
+    ...    service_1
+
+    #Register INVOKER
+    ${register_user_info_invoker}    ${url}    ${request_body}=    Invoker Default Onboarding
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${url.path}  ${INVOKER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${INVOKER_USERNAME}
+
+    ${request_body}=    Create Service Api Description    service_1_modified
+    ${resp}=    Put Request Capif
+    ...    ${resource_url.path}
+    ...    json=${request_body}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME}
+
+    Check Response Variable Type And Values    ${resp}    401    ProblemDetails
+    ...    title=Unauthorized
+    ...    status=401
+    ...    detail=User not authorized
+    ...    cause=Certificate not authorized
+
+    # Retrieve Service
+    ${resp}=    Get Request Capif
+    ...    ${resource_url.path}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${APF_PROVIDER_USERNAME}
+
+    Check Response Variable Type And Values    ${resp}    200    ServiceAPIDescription
+    ...    apiName=service_1
+
+Delete API Published by Authorised apfId with valid serviceApiId
+    [Tags]    capif_api_publish_service-11
+    #Register APF
+    ${register_user_info}=    Provider Default Registration
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${register_user_info['resource_url'].path}  ${AMF_PROVIDER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${PROVIDER_USERNAME}
+
+    ${service_api_description_published_1}    ${resource_url}    ${request_body}=    Publish Service Api
+    ...    ${register_user_info}
+    ...    first_service
+
+    ${resp}=    Delete Request Capif
+    ...    ${resource_url.path}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${APF_PROVIDER_USERNAME}
+
+    Status Should Be    204    ${resp}
+
+    ${resp}=    Get Request Capif
+    ...    ${resource_url.path}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${APF_PROVIDER_USERNAME}
+
+    Check Response Variable Type And Values    ${resp}    401    ProblemDetails
+    ...    title=Unauthorized
+    ...    detail=User not authorized
+    ...    cause=You are not the owner of this resource
+
+Delete APIs Published by Authorised apfId with invalid serviceApiId
+    [Tags]    capif_api_publish_service-12
+    #Register APF
+    ${register_user_info}=    Provider Default Registration
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${register_user_info['resource_url'].path}  ${AMF_PROVIDER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${PROVIDER_USERNAME}
+
+    ${resp}=    Delete Request Capif
+    ...    /published-apis/v1/${register_user_info['apf_id']}/service-apis/${SERVICE_API_ID_NOT_VALID}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${APF_PROVIDER_USERNAME}
+
+    Check Response Variable Type And Values    ${resp}    401    ProblemDetails
+    ...    title=Unauthorized
+    ...    detail=User not authorized
+    ...    cause=You are not the owner of this resource
+
+Delete APIs Published by NON Authorised apfId
+    [Tags]    capif_api_publish_service-13
+    #Register APF
+    ${register_user_info}=    Provider Default Registration
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${register_user_info['resource_url'].path}  ${AMF_PROVIDER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${PROVIDER_USERNAME}
+
+    #Register INVOKER
+    ${register_user_info_invoker}    ${url}    ${request_body}=    Invoker Default Onboarding
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${url.path}  ${INVOKER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${INVOKER_USERNAME}
+
+    ${resp}=    Delete Request Capif
+    ...    /published-apis/v1/${register_user_info['apf_id']}/service-apis/${SERVICE_API_ID_NOT_VALID}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME}
+
+    Check Response Variable Type And Values    ${resp}    401    ProblemDetails
+    ...    title=Unauthorized
+    ...    status=401
+    ...    detail=User not authorized
+    ...    cause=Certificate not authorized
diff --git a/tests/features/CAPIF Security Api/__init__.robot b/tests/features/CAPIF Security Api/__init__.robot
new file mode 100644
index 0000000000000000000000000000000000000000..3cb47d6d79033cd4bf08c1577222a06097cefa87
--- /dev/null
+++ b/tests/features/CAPIF Security Api/__init__.robot	
@@ -0,0 +1,2 @@
+*** Settings ***
+Force Tags    capif_security_api
\ No newline at end of file
diff --git a/tests/features/CAPIF Security Api/capif_security_api.robot b/tests/features/CAPIF Security Api/capif_security_api.robot
new file mode 100644
index 0000000000000000000000000000000000000000..2a41e80d3d49131d970826e9f48f1609b20ba2e2
--- /dev/null
+++ b/tests/features/CAPIF Security Api/capif_security_api.robot	
@@ -0,0 +1,1192 @@
+*** Settings ***
+Resource        /opt/robot-tests/tests/resources/common.resource
+Library         /opt/robot-tests/tests/libraries/bodyRequests.py
+Library         Collections
+Resource        /opt/robot-tests/tests/resources/common/basicRequests.robot
+Resource        ../../resources/common.resource
+
+Test Setup      Reset Testing Environment
+Suite Teardown   Reset Testing Environment
+
+
+*** Variables ***
+${APF_ID_NOT_VALID}             apf-example
+${SERVICE_API_ID_NOT_VALID}     not-valid
+${API_INVOKER_NOT_VALID}        not-valid
+${NOTIFICATION_DESTINATION}     http://robot.testing:1080
+
+
+*** Test Cases ***
+Create a security context for an API invoker
+    [Tags]    capif_security_api-1
+    # Default Invoker Registration and Onboarding
+    ${register_user_info_invoker}    ${url}    ${request_body}=    Invoker Default Onboarding
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${url.path}  ${INVOKER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${INVOKER_USERNAME}
+
+    # Create Security Context
+    ${request_body}=    Create Service Security Body    ${NOTIFICATION_DESTINATION}
+    ${resp}=    Put Request Capif
+    ...    /capif-security/v1/trustedInvokers/${register_user_info_invoker['api_invoker_id']}
+    ...    json=${request_body}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME}
+
+    # Check Results
+    Check Response Variable Type And Values    ${resp}    201    ServiceSecurity
+    ${resource_url}=    Check Location Header    ${resp}    ${LOCATION_SECURITY_RESOURCE_REGEX}
+
+Create a security context for an API invoker with Provider role
+    [Tags]    capif_security_api-2
+    # Default Invoker Registration and Onboarding
+    ${register_user_info_invoker}    ${url}    ${request_body}=    Invoker Default Onboarding
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${url.path}  ${INVOKER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${INVOKER_USERNAME}
+
+    # Register Provider
+    ${register_user_info_publisher}=    Provider Default Registration
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${register_user_info_publisher['resource_url'].path}  ${AMF_PROVIDER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${PROVIDER_USERNAME}
+
+    # Create Security Context
+    ${request_body}=    Create Service Security Body    ${NOTIFICATION_DESTINATION}
+    ${resp}=    Put Request Capif
+    ...    /capif-security/v1/trustedInvokers/${register_user_info_invoker['api_invoker_id']}
+    ...    json=${request_body}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${AEF_PROVIDER_USERNAME}
+
+    # Check Results
+    Check Response Variable Type And Values    ${resp}    401    ProblemDetails
+    ...    title=Unauthorized
+    ...    status=401
+    ...    detail=Role not authorized for this API route
+    ...    cause=User role must be invoker
+
+Create a security context for an API invoker with Provider entity role and invalid apiInvokerId
+    [Tags]    capif_security_api-3
+    # Register APF
+    ${register_user_info_publisher}=    Provider Default Registration
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${register_user_info_publisher['resource_url'].path}  ${AMF_PROVIDER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${PROVIDER_USERNAME}
+
+    # Create Security Context
+    ${request_body}=    Create Service Security Body    ${NOTIFICATION_DESTINATION}
+    ${resp}=    Put Request Capif
+    ...    /capif-security/v1/trustedInvokers/${API_INVOKER_NOT_VALID}
+    ...    json=${request_body}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${AEF_PROVIDER_USERNAME}
+
+    # Check Results
+    Check Response Variable Type And Values    ${resp}    401    ProblemDetails
+    ...    title=Unauthorized
+    ...    status=401
+    ...    detail=Role not authorized for this API route
+    ...    cause=User role must be invoker
+
+Create a security context for an API invoker with Invalid apiInvokerID
+    [Tags]    capif_security_api-4
+    # Default Invoker Registration and Onboarding
+    ${register_user_info_invoker}    ${url}    ${request_body}=    Invoker Default Onboarding
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${url.path}  ${INVOKER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${INVOKER_USERNAME}
+
+    ${request_body}=    Create Service Security Body    ${NOTIFICATION_DESTINATION}
+    ${resp}=    Put Request Capif
+    ...    /capif-security/v1/trustedInvokers/${API_INVOKER_NOT_VALID}
+    ...    json=${request_body}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME}
+
+    # Check Results
+    Check Response Variable Type And Values    ${resp}    404    ProblemDetails
+    ...    title=Not Found
+    ...    status=404
+    ...    detail=Invoker not found
+    ...    cause=API Invoker not exists or invalid ID
+
+Retrieve the Security Context of an API Invoker
+    [Tags]    capif_security_api-5
+    # Default Invoker Registration and Onboarding
+    ${register_user_info_invoker}    ${url}    ${request_body}=    Invoker Default Onboarding
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${url.path}  ${INVOKER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${INVOKER_USERNAME}
+
+    ${request_body}=    Create Service Security Body    ${NOTIFICATION_DESTINATION}
+    ${resp}=    Put Request Capif
+    ...    /capif-security/v1/trustedInvokers/${register_user_info_invoker['api_invoker_id']}
+    ...    json=${request_body}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME}
+
+    Check Response Variable Type And Values    ${resp}    201    ServiceSecurity
+    ${resource_url}=    Check Location Header    ${resp}    ${LOCATION_SECURITY_RESOURCE_REGEX}
+
+    ${service_security_context}=    Set Variable    ${resp.json()}
+
+    # Register APF
+    ${register_user_info_publisher}=    Provider Default Registration
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${register_user_info_publisher['resource_url'].path}  ${AMF_PROVIDER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${PROVIDER_USERNAME}
+
+    # Retrieve Security context can setup by parameters if authenticationInfo and authorizationInfo are needed at response.
+    # ...    /capif-security/v1/trustedInvokers/${register_user_info_invoker['api_invoker_id']}?authenticationInfo=true&authorizationInfo=true
+    ${resp}=    Get Request Capif
+    ...    /capif-security/v1/trustedInvokers/${register_user_info_invoker['api_invoker_id']}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${AEF_PROVIDER_USERNAME}
+
+    # Check Results
+    Check Response Variable Type And Values    ${resp}    200    ServiceSecurity
+
+    ${service_security_context_filtered}=    Remove Keys From Object
+    ...    ${service_security_context}
+    ...    authenticationInfo
+    ...    authorizationInfo
+
+    Dictionaries Should Be Equal    ${resp.json()}    ${service_security_context_filtered}
+
+Retrieve the Security Context of an API Invoker with invalid apiInvokerID
+    [Tags]    capif_security_api-6
+    # Register APF
+    ${register_user_info_publisher}=    Provider Default Registration
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${register_user_info_publisher['resource_url'].path}  ${AMF_PROVIDER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${PROVIDER_USERNAME}
+
+    ${resp}=    Get Request Capif
+    ...    /capif-security/v1/trustedInvokers/${API_INVOKER_NOT_VALID}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${AEF_PROVIDER_USERNAME}
+
+    Check Response Variable Type And Values    ${resp}    404    ProblemDetails
+    ...    title=Not Found
+    ...    status=404
+    ...    detail=Invoker not found
+    ...    cause=API Invoker not exists or invalid ID
+
+Retrieve the Security Context of an API Invoker with invalid apfId
+    [Tags]    capif_security_api-7
+    # Default Invoker Registration and Onboarding
+    ${register_user_info_invoker}    ${url}    ${request_body}=    Invoker Default Onboarding
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${url.path}  ${INVOKER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${INVOKER_USERNAME}
+
+    ${request_body}=    Create Service Security Body    ${NOTIFICATION_DESTINATION}
+    ${resp}=    Put Request Capif
+    ...    /capif-security/v1/trustedInvokers/${register_user_info_invoker['api_invoker_id']}
+    ...    json=${request_body}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME}
+
+    Check Response Variable Type And Values    ${resp}    201    ServiceSecurity
+
+    # We will request information using invoker user, that is not allowed
+    ${resp}=    Get Request Capif
+    ...    /capif-security/v1/trustedInvokers/${register_user_info_invoker['api_invoker_id']}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME}
+
+    # Check Results
+    Check Response Variable Type And Values    ${resp}    401    ProblemDetails
+    ...    title=Unauthorized
+    ...    status=401
+    ...    detail=Role not authorized for this API route
+    ...    cause=User role must be aef
+
+Delete the Security Context of an API Invoker
+    [Tags]    capif_security_api-8
+    # Default Invoker Registration and Onboarding
+    ${register_user_info_invoker}    ${url}    ${request_body}=    Invoker Default Onboarding
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${url.path}  ${INVOKER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${INVOKER_USERNAME}
+
+    ${request_body}=    Create Service Security Body    ${NOTIFICATION_DESTINATION}
+    ${resp}=    Put Request Capif
+    ...    /capif-security/v1/trustedInvokers/${register_user_info_invoker['api_invoker_id']}
+    ...    json=${request_body}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME}
+
+    Check Response Variable Type And Values    ${resp}    201    ServiceSecurity
+
+    # Register APF
+    ${register_user_info_publisher}=    Provider Default Registration
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${register_user_info_publisher['resource_url'].path}  ${AMF_PROVIDER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${PROVIDER_USERNAME}
+
+    # Remove Security Context
+    ${resp}=    Delete Request Capif
+    ...    /capif-security/v1/trustedInvokers/${register_user_info_invoker['api_invoker_id']}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${AEF_PROVIDER_USERNAME}
+
+    Status Should Be    204    ${resp}
+
+    # Check if Security Context is removed
+    ${resp}=    Get Request Capif
+    ...    /capif-security/v1/trustedInvokers/${register_user_info_invoker['api_invoker_id']}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${AEF_PROVIDER_USERNAME}
+
+    Check Response Variable Type And Values    ${resp}    404    ProblemDetails
+    ...    title=Not Found
+    ...    status=404
+    ...    detail=Security context not found
+    ...    cause=API Invoker has no security context
+
+Delete the Security Context of an API Invoker with Invoker entity role
+    [Tags]    capif_security_api-9
+    # Default Invoker Registration and Onboarding
+    ${register_user_info_invoker}    ${url}    ${request_body}=    Invoker Default Onboarding
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${url.path}  ${INVOKER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${INVOKER_USERNAME}
+
+    ${request_body}=    Create Service Security Body    ${NOTIFICATION_DESTINATION}
+    ${resp}=    Put Request Capif
+    ...    /capif-security/v1/trustedInvokers/${register_user_info_invoker['api_invoker_id']}
+    ...    json=${request_body}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME}
+
+    Check Response Variable Type And Values    ${resp}    201    ServiceSecurity
+
+    ${resp}=    Delete Request Capif
+    ...    /capif-security/v1/trustedInvokers/${register_user_info_invoker['api_invoker_id']}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME}
+
+    # Check Result
+    Check Response Variable Type And Values    ${resp}    401    ProblemDetails
+    ...    title=Unauthorized
+    ...    status=401
+    ...    detail=Role not authorized for this API route
+    ...    cause=User role must be aef
+
+Delete the Security Context of an API Invoker with Invoker entity role and invalid apiInvokerID
+    [Tags]    capif_security_api-10
+    # Default Invoker Registration and Onboarding
+    ${register_user_info_invoker}    ${url}    ${request_body}=    Invoker Default Onboarding
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${url.path}  ${INVOKER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${INVOKER_USERNAME}
+
+    ${resp}=    Delete Request Capif
+    ...    /capif-security/v1/trustedInvokers/${API_INVOKER_NOT_VALID}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME}
+
+    # Check Result
+    Check Response Variable Type And Values    ${resp}    401    ProblemDetails
+    ...    title=Unauthorized
+    ...    status=401
+    ...    detail=Role not authorized for this API route
+    ...    cause=User role must be aef
+
+Delete the Security Context of an API Invoker with invalid apiInvokerID
+    [Tags]    capif_security_api-11
+    # Register Provider
+    ${register_user_info_publisher}=    Provider Default Registration
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${register_user_info_publisher['resource_url'].path}  ${AMF_PROVIDER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${PROVIDER_USERNAME}
+
+    ${resp}=    Delete Request Capif
+    ...    /capif-security/v1/trustedInvokers/${API_INVOKER_NOT_VALID}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${AEF_PROVIDER_USERNAME}
+
+    # Check Result
+    Check Response Variable Type And Values    ${resp}    404    ProblemDetails
+    ...    title=Not Found
+    ...    status=404
+    ...    detail=Invoker not found
+    ...    cause=API Invoker not exists or invalid ID
+
+Update the Security Context of an API Invoker
+    [Tags]    capif_security_api-12
+    # Default Invoker Registration and Onboarding
+    ${register_user_info_invoker}    ${url}    ${request_body}=    Invoker Default Onboarding
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${url.path}  ${INVOKER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${INVOKER_USERNAME}
+
+    # Register Provider
+    ${register_user_info_publisher}=    Provider Default Registration
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${register_user_info_publisher['resource_url'].path}  ${AMF_PROVIDER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${PROVIDER_USERNAME}
+
+    ${request_body}=    Create Service Security Body    ${NOTIFICATION_DESTINATION}
+    ${resp}=    Put Request Capif
+    ...    /capif-security/v1/trustedInvokers/${register_user_info_invoker['api_invoker_id']}
+    ...    json=${request_body}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME}
+
+    # Check Results
+    Check Response Variable Type And Values    ${resp}    201    ServiceSecurity
+
+    # Store Initial Security Context
+    ${security_context}=    Set Variable    ${resp.json()}
+
+    # Update Security Context
+    ${request_body}=    Create Service Security Body    http://robot.testing2
+    ${resp}=    Post Request Capif
+    ...    /capif-security/v1/trustedInvokers/${register_user_info_invoker['api_invoker_id']}/update
+    ...    json=${request_body}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME}
+
+    Check Response Variable Type And Values    ${resp}    200    ServiceSecurity
+
+    # Store Security Context modified.
+    ${security_context_modified}=    Set Variable    ${resp.json()}
+
+    # Check Security Context is corretly modified at CCF
+    ${resp}=    Get Request Capif
+    ...    /capif-security/v1/trustedInvokers/${register_user_info_invoker['api_invoker_id']}?authenticationInfo=true&authorizationInfo=true
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${AEF_PROVIDER_USERNAME}
+
+    # Check Results
+    Check Response Variable Type And Values    ${resp}    200    ServiceSecurity
+    Dictionaries Should Be Equal    ${resp.json()}    ${security_context_modified}
+
+Update the Security Context of an API Invoker with Provider entity role
+    [Tags]    capif_security_api-13
+    # Default Invoker Registration and Onboarding
+    ${register_user_info_invoker}    ${url}    ${request_body}=    Invoker Default Onboarding
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${url.path}  ${INVOKER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${INVOKER_USERNAME}
+
+    ${request_body}=    Create Service Security Body    ${NOTIFICATION_DESTINATION}
+    ${resp}=    Put Request Capif
+    ...    /capif-security/v1/trustedInvokers/${register_user_info_invoker['api_invoker_id']}
+    ...    json=${request_body}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME}
+
+    Check Response Variable Type And Values    ${resp}    201    ServiceSecurity
+
+    #Register Provider
+    ${register_user_info_publisher}=    Provider Default Registration
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${register_user_info_publisher['resource_url'].path}  ${AMF_PROVIDER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${PROVIDER_USERNAME}
+
+    ${resp}=    Post Request Capif
+    ...    /capif-security/v1/trustedInvokers/${register_user_info_invoker['api_invoker_id']}/update
+    ...    json=${request_body}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${AEF_PROVIDER_USERNAME}
+
+    # Check Results
+    Check Response Variable Type And Values    ${resp}    401    ProblemDetails
+    ...    title=Unauthorized
+    ...    status=401
+    ...    detail=Role not authorized for this API route
+    ...    cause=User role must be invoker
+
+Update the Security Context of an API Invoker with AEF entity role and invalid apiInvokerId
+    [Tags]    capif_security_api-14
+    #Register Provider
+    ${register_user_info_publisher}=    Provider Default Registration
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${register_user_info_publisher['resource_url'].path}  ${AMF_PROVIDER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${PROVIDER_USERNAME}
+
+    ${request_body}=    Create Service Security Body    ${NOTIFICATION_DESTINATION}
+    ${resp}=    Post Request Capif
+    ...    /capif-security/v1/trustedInvokers/${API_INVOKER_NOT_VALID}/update
+    ...    json=${request_body}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${AEF_PROVIDER_USERNAME}
+
+    Check Response Variable Type And Values    ${resp}    401    ProblemDetails
+    ...    title=Unauthorized
+    ...    status=401
+    ...    detail=Role not authorized for this API route
+    ...    cause=User role must be invoker
+
+Update the Security Context of an API Invoker with invalid apiInvokerID
+    [Tags]    capif_security_api-15
+    # Default Invoker Registration and Onboarding
+    ${register_user_info_invoker}    ${url}    ${request_body}=    Invoker Default Onboarding
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${url.path}  ${INVOKER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${INVOKER_USERNAME}
+
+    ${request_body}=    Create Service Security Body    ${NOTIFICATION_DESTINATION}
+    ${resp}=    Post Request Capif
+    ...    /capif-security/v1/trustedInvokers/${API_INVOKER_NOT_VALID}/update
+    ...    json=${request_body}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME}
+
+    # Check Result
+    Check Response Variable Type And Values    ${resp}    404    ProblemDetails
+    ...    title=Not Found
+    ...    status=404
+    ...    detail=Invoker not found
+    ...    cause=API Invoker not exists or invalid ID
+
+Revoke the authorization of the API invoker for APIs
+    [Tags]    capif_security_api-16
+    # Register APF
+    ${register_user_info_provider}=    Provider Default Registration
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${register_user_info_provider['resource_url'].path}  ${AMF_PROVIDER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${PROVIDER_USERNAME}
+
+    ${api_name}=    Set Variable    service_1
+
+    # Register One Service
+    ${service_api_description_published_1}    ${resource_url}    ${request_body}=    Publish Service Api
+    ...    ${register_user_info_provider}
+    ...    ${api_name}
+
+    # Default Invoker Registration and Onboarding
+    ${register_user_info_invoker}    ${url}    ${request_body}=    Invoker Default Onboarding
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${url.path}  ${INVOKER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${INVOKER_USERNAME}
+
+
+    # Test
+    ${discover_response}=    Get Request Capif
+    ...    ${DISCOVER_URL}${register_user_info_invoker['api_invoker_id']}&aef-id=${register_user_info_provider['aef_id']}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME}
+
+    Check Response Variable Type And Values    ${discover_response}    200    DiscoveredAPIs
+
+    ${api_ids}=    Get Api Ids From Discover Response    ${discover_response}
+
+    # create Security Context
+    ${request_body}=    Create Service Security From Discover Response
+    ...    http://${CAPIF_HOSTNAME}:${CAPIF_HTTP_PORT}/test
+    ...    ${discover_response}
+    ${resp}=    Put Request Capif
+    ...    /capif-security/v1/trustedInvokers/${register_user_info_invoker['api_invoker_id']}
+    ...    json=${request_body}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME}
+
+    Check Response Variable Type And Values    ${resp}    201    ServiceSecurity
+
+    # Revoke Security Context by Provider
+    ${request_body}=    Create Security Notification Body
+    ...    ${register_user_info_invoker['api_invoker_id']}
+    ...    ${api_ids}
+    ${resp}=    Post Request Capif
+    ...    /capif-security/v1/trustedInvokers/${register_user_info_invoker['api_invoker_id']}/delete
+    ...    json=${request_body}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${AEF_PROVIDER_USERNAME}
+
+    # Check Results
+    Status Should Be    204    ${resp}
+
+    # Check if Security Context is removed
+    ${resp}=    Get Request Capif
+    ...    /capif-security/v1/trustedInvokers/${register_user_info_invoker['api_invoker_id']}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${AEF_PROVIDER_USERNAME}
+
+    Check Response Variable Type And Values    ${resp}    404    ProblemDetails
+    ...    title=Not Found
+    ...    status=404
+    ...    detail=Security context not found
+    ...    cause=API Invoker has no security context
+
+Revoke the authorization of the API invoker for APIs without valid apfID.
+    [Tags]    capif_security_api-17
+    # Default Invoker Registration and Onboarding
+    ${register_user_info_invoker}    ${url}    ${request_body}=    Invoker Default Onboarding
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${url.path}  ${INVOKER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${INVOKER_USERNAME}
+
+    ${request_body}=    Create Service Security Body    ${NOTIFICATION_DESTINATION}
+    ${resp}=    Put Request Capif
+    ...    /capif-security/v1/trustedInvokers/${register_user_info_invoker['api_invoker_id']}
+    ...    json=${request_body}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME}
+
+    Check Response Variable Type And Values    ${resp}    201    ServiceSecurity
+
+    ${security_context}=    Set Variable    ${resp.json()}
+
+    # Register Provider
+    ${register_user_info_publisher}=    Provider Default Registration
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${register_user_info_publisher['resource_url'].path}  ${AMF_PROVIDER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${PROVIDER_USERNAME}
+
+    # Revoke Security Context by Invoker
+    ${request_body}=    Create Security Notification Body    ${register_user_info_invoker['api_invoker_id']}    1234
+    ${resp}=    Post Request Capif
+    ...    /capif-security/v1/trustedInvokers/${register_user_info_invoker['api_invoker_id']}/delete
+    ...    json=${request_body}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME}
+
+    # Check Results
+    Check Response Variable Type And Values    ${resp}    401    ProblemDetails
+    ...    title=Unauthorized
+    ...    status=401
+    ...    detail=Role not authorized for this API route
+    ...    cause=User role must be aef
+
+    ${resp}=    Get Request Capif
+    ...    /capif-security/v1/trustedInvokers/${register_user_info_invoker['api_invoker_id']}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${AEF_PROVIDER_USERNAME}
+
+    # Check Results
+    Check Response Variable Type And Values    ${resp}    200    ServiceSecurity
+    ${security_context_filtered}=    Remove Keys From Object
+    ...    ${security_context}
+    ...    authenticationInfo
+    ...    authorizationInfo
+    Dictionaries Should Be Equal    ${resp.json()}    ${security_context_filtered}
+
+Revoke the authorization of the API invoker for APIs with invalid apiInvokerId
+    [Tags]    capif_security_api-18
+    # Default Invoker Registration and Onboarding
+    ${register_user_info_invoker}    ${url}    ${request_body}=    Invoker Default Onboarding
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${url.path}  ${INVOKER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${INVOKER_USERNAME}
+
+    ${request_body}=    Create Service Security Body    ${NOTIFICATION_DESTINATION}
+    ${resp}=    Put Request Capif
+    ...    /capif-security/v1/trustedInvokers/${register_user_info_invoker['api_invoker_id']}
+    ...    json=${request_body}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME}
+
+    Check Response Variable Type And Values    ${resp}    201    ServiceSecurity
+
+    ${security_context}=    Set Variable    ${resp.json()}
+
+    #Register Provider
+    ${register_user_info_publisher}=    Provider Default Registration
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${register_user_info_publisher['resource_url'].path}  ${AMF_PROVIDER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${PROVIDER_USERNAME}
+
+    ${request_body}=    Create Security Notification Body    ${API_INVOKER_NOT_VALID}    1234
+    ${resp}=    Post Request Capif
+    ...    /capif-security/v1/trustedInvokers/${API_INVOKER_NOT_VALID}/delete
+    ...    json=${request_body}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${AEF_PROVIDER_USERNAME}
+
+    # Check Results
+    Check Response Variable Type And Values    ${resp}    404    ProblemDetails
+    ...    title=Not Found
+    ...    status=404
+    ...    detail=Invoker not found
+    ...    cause=API Invoker not exists or invalid ID
+
+    ${resp}=    Get Request Capif
+    ...    /capif-security/v1/trustedInvokers/${register_user_info_invoker['api_invoker_id']}?authenticationInfo=true&authorizationInfo=true
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${AEF_PROVIDER_USERNAME}
+
+    # Check Results
+    Check Response Variable Type And Values    ${resp}    200    ServiceSecurity
+    Dictionaries Should Be Equal    ${resp.json()}    ${security_context}
+
+Retrieve access token
+    [Tags]    capif_security_api-19
+    # Register APF
+    ${register_user_info_provider}=    Provider Default Registration
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${register_user_info_provider['resource_url'].path}  ${AMF_PROVIDER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${PROVIDER_USERNAME}
+
+    ${api_name}=    Set Variable    service_1
+
+    # Register One Service
+    ${service_api_description_published_1}    ${resource_url}    ${request_body}=    Publish Service Api
+    ...    ${register_user_info_provider}
+    ...    ${api_name}
+
+    # Default Invoker Registration and Onboarding
+    ${register_user_info_invoker}    ${url}    ${request_body}=    Invoker Default Onboarding
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${url.path}  ${INVOKER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${INVOKER_USERNAME}
+
+    # Test
+    ${discover_response}=    Get Request Capif
+    ...    ${DISCOVER_URL}${register_user_info_invoker['api_invoker_id']}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME}
+
+    Check Response Variable Type And Values    ${discover_response}    200    DiscoveredAPIs
+
+    # create Security Context
+    ${request_body}=    Create Service Security From Discover Response
+    ...    ${NOTIFICATION_DESTINATION}
+    ...    ${discover_response}
+    ${resp}=    Put Request Capif
+    ...    /capif-security/v1/trustedInvokers/${register_user_info_invoker['api_invoker_id']}
+    ...    json=${request_body}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME}
+
+    Check Response Variable Type And Values    ${resp}    201    ServiceSecurity
+
+    # Retrieve Token from CCF
+    ${scope}=    Create Scope    ${register_user_info_provider['aef_id']}    ${api_name}
+    ${request_body}=    Create Access Token Req Body    ${register_user_info_invoker['api_invoker_id']}    ${scope}
+    ${resp}=    Post Request Capif
+    ...    /capif-security/v1/securities/${register_user_info_invoker['api_invoker_id']}/token
+    ...    data=${request_body}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME}
+
+    # Check Results
+    Check Response Variable Type And Values    ${resp}    200    AccessTokenRsp
+    ...    token_type=Bearer
+
+    Should Not Be Empty    ${resp.json()['access_token']}
+
+Retrieve access token by Provider
+    [Tags]    capif_security_api-20
+    # Register APF
+    ${register_user_info_provider}=    Provider Default Registration
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${register_user_info_provider['resource_url'].path}  ${AMF_PROVIDER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${PROVIDER_USERNAME}
+
+    ${api_name}=    Set Variable    service_1
+
+    # Register One Service
+    ${service_api_description_published_1}    ${resource_url}    ${request_body}=    Publish Service Api
+    ...    ${register_user_info_provider}
+    ...    ${api_name}
+
+    # Default Invoker Registration and Onboarding
+    ${register_user_info_invoker}    ${url}    ${request_body}=    Invoker Default Onboarding
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${url.path}  ${INVOKER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${INVOKER_USERNAME}
+
+    # Test
+    ${discover_response}=    Get Request Capif
+    ...    ${DISCOVER_URL}${register_user_info_invoker['api_invoker_id']}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME}
+
+    Check Response Variable Type And Values    ${discover_response}    200    DiscoveredAPIs
+
+    # create Security Context
+    ${request_body}=    Create Service Security From Discover Response
+    ...    ${NOTIFICATION_DESTINATION}
+    ...    ${discover_response}
+    ${resp}=    Put Request Capif
+    ...    /capif-security/v1/trustedInvokers/${register_user_info_invoker['api_invoker_id']}
+    ...    json=${request_body}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME}
+
+    Check Response Variable Type And Values    ${resp}    201    ServiceSecurity
+
+    # Retrieve Token from CCF
+    ${scope}=    Create Scope    ${register_user_info_provider['aef_id']}    ${api_name}
+    ${request_body}=    Create Access Token Req Body    ${register_user_info_invoker['api_invoker_id']}    ${scope}
+    ${resp}=    Post Request Capif
+    ...    /capif-security/v1/securities/${register_user_info_invoker['api_invoker_id']}/token
+    ...    data=${request_body}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${AEF_PROVIDER_USERNAME}
+
+    # Check Results
+    Check Response Variable Type And Values    ${resp}    401    AccessTokenErr
+    ...    error=unauthorized_client
+    ...    error_description=Role not authorized for this API route
+
+Retrieve access token by Provider with invalid apiInvokerId
+    [Tags]    capif_security_api-21
+    # Register APF
+    ${register_user_info_provider}=    Provider Default Registration
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${register_user_info_provider['resource_url'].path}  ${AMF_PROVIDER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${PROVIDER_USERNAME}
+
+    ${api_name}=    Set Variable    service_1
+
+    # Register One Service
+    ${service_api_description_published_1}    ${resource_url}    ${request_body}=    Publish Service Api
+    ...    ${register_user_info_provider}
+    ...    ${api_name}
+
+    # Default Invoker Registration and Onboarding
+    ${register_user_info_invoker}    ${url}    ${request_body}=    Invoker Default Onboarding
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${url.path}  ${INVOKER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${INVOKER_USERNAME}
+
+    # Test
+    ${discover_response}=    Get Request Capif
+    ...    ${DISCOVER_URL}${register_user_info_invoker['api_invoker_id']}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME}
+
+    Check Response Variable Type And Values    ${discover_response}    200    DiscoveredAPIs
+
+    # create Security Context
+    ${request_body}=    Create Service Security From Discover Response
+    ...    ${NOTIFICATION_DESTINATION}
+    ...    ${discover_response}
+    ${resp}=    Put Request Capif
+    ...    /capif-security/v1/trustedInvokers/${register_user_info_invoker['api_invoker_id']}
+    ...    json=${request_body}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME}
+
+    Check Response Variable Type And Values    ${resp}    201    ServiceSecurity
+
+    # Retrieve Token from CCF
+    ${scope}=    Create Scope    ${register_user_info_provider['aef_id']}    ${api_name}
+    ${request_body}=    Create Access Token Req Body    ${register_user_info_invoker['api_invoker_id']}    ${scope}
+    ${resp}=    Post Request Capif
+    ...    /capif-security/v1/securities/${API_INVOKER_NOT_VALID}/token
+    ...    data=${request_body}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${AEF_PROVIDER_USERNAME}
+
+    # Check Results
+    Check Response Variable Type And Values    ${resp}    401    AccessTokenErr
+    ...    error=unauthorized_client
+    ...    error_description=Role not authorized for this API route
+
+Retrieve access token with invalid apiInvokerId
+    [Tags]    capif_security_api-22
+    # Default Invoker Registration and Onboarding
+    # Register APF
+    ${register_user_info_provider}=    Provider Default Registration
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${register_user_info_provider['resource_url'].path}  ${AMF_PROVIDER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${PROVIDER_USERNAME}
+
+    ${api_name}=    Set Variable    service_1
+
+    # Register One Service
+    ${service_api_description_published_1}    ${resource_url}    ${request_body}=    Publish Service Api
+    ...    ${register_user_info_provider}
+    ...    ${api_name}
+
+    # Default Invoker Registration and Onboarding
+    ${register_user_info_invoker}    ${url}    ${request_body}=    Invoker Default Onboarding
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${url.path}  ${INVOKER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${INVOKER_USERNAME}
+
+    # Test
+    ${discover_response}=    Get Request Capif
+    ...    ${DISCOVER_URL}${register_user_info_invoker['api_invoker_id']}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME}
+
+    Check Response Variable Type And Values    ${discover_response}    200    DiscoveredAPIs
+
+    # create Security Context
+    ${request_body}=    Create Service Security From Discover Response
+    ...    ${NOTIFICATION_DESTINATION}
+    ...    ${discover_response}
+    ${resp}=    Put Request Capif
+    ...    /capif-security/v1/trustedInvokers/${register_user_info_invoker['api_invoker_id']}
+    ...    json=${request_body}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME}
+
+    Check Response Variable Type And Values    ${resp}    201    ServiceSecurity
+
+    # Retrieve Token from CCF
+    ${scope}=    Create Scope    ${register_user_info_provider['aef_id']}    ${api_name}
+    ${request_body}=    Create Access Token Req Body    ${register_user_info_invoker['api_invoker_id']}    ${scope}
+    ${resp}=    Post Request Capif
+    ...    /capif-security/v1/securities/${API_INVOKER_NOT_VALID}/token
+    ...    data=${request_body}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME}
+
+    # Check Results
+    Check Response Variable Type And Values    ${resp}    404    ProblemDetails29571
+    ...    title=Not Found
+    ...    status=404
+    ...    detail=Security context not found
+    ...    cause=API Invoker has no security context
+
+Retrieve access token with invalid client_id
+    [Tags]    capif_security_api-23
+    # Default Invoker Registration and Onboarding
+    # Register APF
+    ${register_user_info_provider}=    Provider Default Registration
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${register_user_info_provider['resource_url'].path}  ${AMF_PROVIDER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${PROVIDER_USERNAME}
+
+    ${api_name}=    Set Variable    service_1
+
+    # Register One Service
+    ${service_api_description_published_1}    ${resource_url}    ${request_body}=    Publish Service Api
+    ...    ${register_user_info_provider}
+    ...    ${api_name}
+
+    # Default Invoker Registration and Onboarding
+    ${register_user_info_invoker}    ${url}    ${request_body}=    Invoker Default Onboarding
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${url.path}  ${INVOKER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${INVOKER_USERNAME}
+
+    # Test
+    ${discover_response}=    Get Request Capif
+    ...    ${DISCOVER_URL}${register_user_info_invoker['api_invoker_id']}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME}
+
+    Check Response Variable Type And Values    ${discover_response}    200    DiscoveredAPIs
+
+    # create Security Context
+    ${request_body}=    Create Service Security From Discover Response
+    ...    ${NOTIFICATION_DESTINATION}
+    ...    ${discover_response}
+    ${resp}=    Put Request Capif
+    ...    /capif-security/v1/trustedInvokers/${register_user_info_invoker['api_invoker_id']}
+    ...    json=${request_body}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME}
+
+    Check Response Variable Type And Values    ${resp}    201    ServiceSecurity
+
+    # Retrieve Token from CCF
+    ${scope}=    Create Scope    ${register_user_info_provider['aef_id']}    ${api_name}
+    ${request_body}=    Create Access Token Req Body    ${API_INVOKER_NOT_VALID}    ${scope}
+    ${resp}=    Post Request Capif
+    ...    /capif-security/v1/securities/${register_user_info_invoker['api_invoker_id']}/token
+    ...    data=${request_body}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME}
+
+    # Check Results
+    Check Response Variable Type And Values    ${resp}    400    AccessTokenErr
+    ...    error=invalid_client
+    ...    error_description=Client Id not found
+
+Retrieve access token with unsupported grant_type
+    [Tags]    capif_security_api-24
+    # Default Invoker Registration and Onboarding
+    # Register APF
+    ${register_user_info_provider}=    Provider Default Registration
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${register_user_info_provider['resource_url'].path}  ${AMF_PROVIDER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${PROVIDER_USERNAME}
+
+    ${api_name}=    Set Variable    service_1
+
+    # Register One Service
+    ${service_api_description_published_1}    ${resource_url}    ${request_body}=    Publish Service Api
+    ...    ${register_user_info_provider}
+    ...    ${api_name}
+
+    # Default Invoker Registration and Onboarding
+    ${register_user_info_invoker}    ${url}    ${request_body}=    Invoker Default Onboarding
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${url.path}  ${INVOKER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${INVOKER_USERNAME}
+
+    # Test
+    ${discover_response}=    Get Request Capif
+    ...    ${DISCOVER_URL}${register_user_info_invoker['api_invoker_id']}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME}
+
+    Check Response Variable Type And Values    ${discover_response}    200    DiscoveredAPIs
+
+    # create Security Context
+    ${request_body}=    Create Service Security From Discover Response
+    ...    ${NOTIFICATION_DESTINATION}
+    ...    ${discover_response}
+    ${resp}=    Put Request Capif
+    ...    /capif-security/v1/trustedInvokers/${register_user_info_invoker['api_invoker_id']}
+    ...    json=${request_body}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME}
+
+    Check Response Variable Type And Values    ${resp}    201    ServiceSecurity
+
+    # Retrieve Token from CCF
+    ${scope}=    Create Scope    ${register_user_info_provider['aef_id']}    ${api_name}
+    ${grant_type}=    Set Variable    not_valid
+    ${request_body}=    Create Access Token Req Body
+    ...    ${register_user_info_invoker['api_invoker_id']}
+    ...    ${scope}
+    ...    grant_type=${grant_type}
+    ${resp}=    Post Request Capif
+    ...    /capif-security/v1/securities/${register_user_info_invoker['api_invoker_id']}/token
+    ...    data=${request_body}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME}
+
+    # Check Results
+    Check Response Variable Type And Values
+    ...    ${resp}
+    ...    400
+    ...    AccessTokenErr
+    ...    error=unsupported_grant_type
+    ...    error_description=Invalid value for `grant_type` \\(${grant_type}\\), must be one of \\['client_credentials'\\] - 'grant_type'
+
+Retrieve access token with invalid scope
+    [Tags]    capif_security_api-25
+    # Default Invoker Registration and Onboarding
+    # Register APF
+    ${register_user_info_provider}=    Provider Default Registration
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${register_user_info_provider['resource_url'].path}  ${AMF_PROVIDER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${PROVIDER_USERNAME}
+
+    ${api_name}=    Set Variable    service_1
+
+    # Register One Service
+    ${service_api_description_published_1}    ${resource_url}    ${request_body}=    Publish Service Api
+    ...    ${register_user_info_provider}
+    ...    ${api_name}
+
+    # Default Invoker Registration and Onboarding
+    ${register_user_info_invoker}    ${url}    ${request_body}=    Invoker Default Onboarding
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${url.path}  ${INVOKER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${INVOKER_USERNAME}
+
+    # Test
+    ${discover_response}=    Get Request Capif
+    ...    ${DISCOVER_URL}${register_user_info_invoker['api_invoker_id']}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME}
+
+    Check Response Variable Type And Values    ${discover_response}    200    DiscoveredAPIs
+
+    # create Security Context
+    ${request_body}=    Create Service Security From Discover Response
+    ...    ${NOTIFICATION_DESTINATION}
+    ...    ${discover_response}
+    ${resp}=    Put Request Capif
+    ...    /capif-security/v1/trustedInvokers/${register_user_info_invoker['api_invoker_id']}
+    ...    json=${request_body}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME}
+
+    Check Response Variable Type And Values    ${resp}    201    ServiceSecurity
+
+    # Retrieve Token from CCF
+    ${scope}=    Create Scope    ${register_user_info_provider['aef_id']}    ${api_name}
+    ${request_body}=    Create Access Token Req Body
+    ...    ${register_user_info_invoker['api_invoker_id']}
+    ...    "not-valid-scope"
+    ${resp}=    Post Request Capif
+    ...    /capif-security/v1/securities/${register_user_info_invoker['api_invoker_id']}/token
+    ...    data=${request_body}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME}
+
+    # Check Results
+    Check Response Variable Type And Values    ${resp}    400    AccessTokenErr
+    ...    error=invalid_scope
+    ...    error_description=The first characters must be '3gpp'
+
+Retrieve access token with invalid aefid at scope
+    [Tags]    capif_security_api-26
+    # Default Invoker Registration and Onboarding
+    # Register APF
+    ${register_user_info_provider}=    Provider Default Registration
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${register_user_info_provider['resource_url'].path}  ${AMF_PROVIDER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${PROVIDER_USERNAME}
+
+    ${api_name}=    Set Variable    service_1
+
+    # Register One Service
+    ${service_api_description_published_1}    ${resource_url}    ${request_body}=    Publish Service Api
+    ...    ${register_user_info_provider}
+    ...    ${api_name}
+
+    # Default Invoker Registration and Onboarding
+    ${register_user_info_invoker}    ${url}    ${request_body}=    Invoker Default Onboarding
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${url.path}  ${INVOKER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${INVOKER_USERNAME}
+
+    # Test
+    ${discover_response}=    Get Request Capif
+    ...    ${DISCOVER_URL}${register_user_info_invoker['api_invoker_id']}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME}
+
+    Check Response Variable Type And Values    ${discover_response}    200    DiscoveredAPIs
+
+    # create Security Context
+    ${request_body}=    Create Service Security From Discover Response
+    ...    ${NOTIFICATION_DESTINATION}
+    ...    ${discover_response}
+    ${resp}=    Put Request Capif
+    ...    /capif-security/v1/trustedInvokers/${register_user_info_invoker['api_invoker_id']}
+    ...    json=${request_body}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME}
+
+    Check Response Variable Type And Values    ${resp}    201    ServiceSecurity
+
+    # Retrieve Token from CCF
+    ${scope}=    Create Scope    ${register_user_info_provider['aef_id']}    ${api_name}
+    ${request_body}=    Create Access Token Req Body
+    ...    ${register_user_info_invoker['api_invoker_id']}
+    ...    3gpp#1234:${api_name}
+    ${resp}=    Post Request Capif
+    ...    /capif-security/v1/securities/${register_user_info_invoker['api_invoker_id']}/token
+    ...    data=${request_body}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME}
+
+    # Check Results
+    Check Response Variable Type And Values    ${resp}    400    AccessTokenErr
+    ...    error=invalid_scope
+    ...    error_description=One of aef_id not belongs of your security context
+
+Retrieve access token with invalid apiName at scope
+    [Tags]    capif_security_api-27
+    # Default Invoker Registration and Onboarding
+    # Register APF
+    ${register_user_info_provider}=    Provider Default Registration
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${register_user_info_provider['resource_url'].path}  ${AMF_PROVIDER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${PROVIDER_USERNAME}
+
+    ${api_name}=    Set Variable    service_1
+
+    # Register One Service
+    ${service_api_description_published_1}    ${resource_url}    ${request_body}=    Publish Service Api
+    ...    ${register_user_info_provider}
+    ...    ${api_name}
+
+    # Default Invoker Registration and Onboarding
+    ${register_user_info_invoker}    ${url}    ${request_body}=    Invoker Default Onboarding
+
+    Call Method  ${CAPIF_USERS}  update_capif_users_dicts  ${url.path}  ${INVOKER_USERNAME}
+    Call Method  ${CAPIF_USERS}  update_register_users   ${INVOKER_USERNAME}
+
+    # Test
+    ${discover_response}=    Get Request Capif
+    ...    ${DISCOVER_URL}${register_user_info_invoker['api_invoker_id']}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME}
+
+    Check Response Variable Type And Values    ${discover_response}    200    DiscoveredAPIs
+
+    # create Security Context
+    ${request_body}=    Create Service Security From Discover Response
+    ...    ${NOTIFICATION_DESTINATION}
+    ...    ${discover_response}
+    ${resp}=    Put Request Capif
+    ...    /capif-security/v1/trustedInvokers/${register_user_info_invoker['api_invoker_id']}
+    ...    json=${request_body}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME}
+
+    Check Response Variable Type And Values    ${resp}    201    ServiceSecurity
+
+    # Retrieve Token from CCF
+    ${not_valid_api_name}=    Set Variable    not-valid
+    ${request_body}=    Create Access Token Req Body
+    ...    ${register_user_info_invoker['api_invoker_id']}
+    ...    3gpp#${register_user_info_provider['aef_id']}:${not_valid_api_name}
+    ${resp}=    Post Request Capif
+    ...    /capif-security/v1/securities/${register_user_info_invoker['api_invoker_id']}/token
+    ...    data=${request_body}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME}
+
+    # Check Results
+    Check Response Variable Type And Values    ${resp}    400    AccessTokenErr
+    ...    error=invalid_scope
+    ...    error_description=One of the api names does not exist or is not associated with the aef id provided
\ No newline at end of file
diff --git a/tests/features/__init__.robot b/tests/features/__init__.robot
new file mode 100644
index 0000000000000000000000000000000000000000..19e0fdb7e68b094801d11ec7f563450fa5029a0b
--- /dev/null
+++ b/tests/features/__init__.robot
@@ -0,0 +1,56 @@
+*** Settings ***
+Resource        /opt/robot-tests/tests/resources/common.resource
+Resource    ../resources/common.resource
+
+Suite Setup     Prepare environment
+# Suite Teardown  Reset Testing Environment
+
+Force Tags      all
+
+
+*** Keywords ***
+Prepare environment
+    Log    ${CAPIF_HOSTNAME}
+    Log    "${CAPIF_HTTP_PORT}"
+    Log    "${CAPIF_HTTPS_PORT}"
+
+    Set Global Variable    ${CAPIF_HTTP_VAULT_URL}    http://${CAPIF_VAULT}/
+    IF    "${CAPIF_VAULT_PORT}" != ""
+        Set Global Variable    ${CAPIF_HTTP_VAULT_URL}    http://${CAPIF_VAULT}:${CAPIF_VAULT_PORT}/
+    END
+
+    Set Global Variable    ${CAPIF_HTTPS_REGISTER_URL}    https://${CAPIF_REGISTER}/
+    IF    "${CAPIF_REGISTER_PORT}" != ""
+        Set Global Variable     ${CAPIF_HTTPS_REGISTER_URL}    https://${CAPIF_REGISTER}:${CAPIF_REGISTER_PORT}/
+    END
+
+    Set Global Variable    ${CAPIF_HTTP_URL}    http://${CAPIF_HOSTNAME}/
+    IF    "${CAPIF_HTTP_PORT}" != ""
+        Set Global Variable    ${CAPIF_HTTP_URL}    http://${CAPIF_HOSTNAME}:${CAPIF_HTTP_PORT}/
+    END
+
+    Set Global Variable    ${CAPIF_HTTPS_URL}    https://${CAPIF_HOSTNAME}/
+    IF    "${CAPIF_HTTPS_PORT}" != ""
+        Set Global Variable    ${CAPIF_HTTPS_URL}    https://${CAPIF_HOSTNAME}:${CAPIF_HTTPS_PORT}/
+    END
+
+    ${status}    ${CAPIF_IP}=    Run Keyword And Ignore Error    Get Ip From Hostname    ${CAPIF_HOSTNAME}
+
+    IF    "${status}" == "PASS"
+        Log    We will use a remote deployment
+        Log    ${CAPIF_IP}
+    ELSE
+        Log    We will use a local deployment
+        Add Dns To Hosts    127.0.0.1    ${CAPIF_HOSTNAME}
+    END
+    # Obtain ca root certificate
+    Retrieve Ca Root
+
+    Reset Testing Environment
+
+Retrieve Ca Root
+    [Documentation]    This keyword retrieve ca.root from CAPIF and store it at ca.crt in order to use at TLS communications
+    ${resp}=    Get CA Vault  /v1/secret/data/ca  ${CAPIF_HTTP_VAULT_URL}
+    Status Should Be    200    ${resp}
+    Log    ${resp.json()['data']['data']['ca']}
+    Store In File    ca.crt    ${resp.json()['data']['data']['ca']}
diff --git a/tests/libraries/api_events/bodyRequests.py b/tests/libraries/api_events/bodyRequests.py
new file mode 100644
index 0000000000000000000000000000000000000000..ab6e4dae3d646bccbb9ac3f994c7f71112d9e2dc
--- /dev/null
+++ b/tests/libraries/api_events/bodyRequests.py
@@ -0,0 +1,32 @@
+def create_events_subscription():
+    return {
+        "eventFilters": [
+            {
+                "aefIds": ["aefIds", "aefIds"],
+                "apiIds": ["apiIds", "apiIds"],
+                "apiInvokerIds": ["apiInvokerIds", "apiInvokerIds"]
+            },
+            {
+                "aefIds": ["aefIds", "aefIds"],
+                "apiIds": ["apiIds", "apiIds"],
+                "apiInvokerIds": ["apiInvokerIds", "apiInvokerIds"]
+            }
+        ],
+        "eventReq": {
+            "grpRepTime": 5,
+            "immRep": True,
+            "maxReportNbr": 0,
+            "monDur": "2000-01-23T04:56:07+00:00",
+            "partitionCriteria": ["TAC", "GEOAREA"],
+            "repPeriod": 6,
+            "sampRatio": 15
+        },
+        "events": ["SERVICE_API_AVAILABLE", "API_INVOKER_ONBOARDED"],
+        "notificationDestination": "http://robot.testing",
+        "requestTestNotification": True,
+        "supportedFeatures": "aaa",
+        "websockNotifConfig": {
+            "requestWebsocketUri": True,
+            "websocketUri": "websocketUri"
+        }
+    }
diff --git a/tests/libraries/api_invoker_management/bodyRequests.py b/tests/libraries/api_invoker_management/bodyRequests.py
new file mode 100644
index 0000000000000000000000000000000000000000..37b9456d03bf96cdf511bc1639ebaf3126ab2777
--- /dev/null
+++ b/tests/libraries/api_invoker_management/bodyRequests.py
@@ -0,0 +1,20 @@
+def create_onboarding_notification_body(notification_destination="https://host.docker.internal/netapp_callback", api_invoker_public_key="ApiInvokerPublicKey",api_invoker_information='ROBOT_TESTING', api_invoker_id=None):
+    data = {
+        "notificationDestination": notification_destination,
+        "supportedFeatures": "fffffff",
+        "apiInvokerInformation": api_invoker_information,
+        "websockNotifConfig": {
+            "requestWebsocketUri": True,
+            "websocketUri": "websocketUri"
+        },
+        "onboardingInformation": {
+            "apiInvokerPublicKey": api_invoker_public_key.decode("utf-8"),
+            "onboardingSecret": "onboardingSecret",
+            "apiInvokerCertificate": "apiInvokerCertificate"
+        },
+        "requestTestNotification": True
+    }
+    if api_invoker_id != None:
+        data['apiInvokerId'] = api_invoker_id
+
+    return (data)
diff --git a/tests/libraries/api_logging_service/bodyRequests.py b/tests/libraries/api_logging_service/bodyRequests.py
new file mode 100644
index 0000000000000000000000000000000000000000..fe3faf1dd9dbc1ccd0fb96ce96e5b73d0cd805f9
--- /dev/null
+++ b/tests/libraries/api_logging_service/bodyRequests.py
@@ -0,0 +1,133 @@
+def create_log_entry(aefId=None, apiInvokerId=None, apiId=None, apiName=None):
+    data = {
+    "aefId": aefId,
+    "apiInvokerId": apiInvokerId,
+    "logs": [
+        {
+        "apiId": apiId[0],
+        "apiName": apiName[0],
+        "apiVersion": "v1",
+        "resourceName": "string",
+        "uri": "http://resource/endpoint",
+        "protocol": "HTTP_1_1",
+        "operation": "GET",
+        "result": "string",
+        "invocationTime": "2023-03-30T10:30:21.408Z",
+        "invocationLatency": 0,
+        "inputParameters": "string",
+        "outputParameters": "string",
+        "srcInterface": {
+            "ipv4Addr": "192.168.1.1",
+            "fqdn": "string",
+            "port": 65535,
+            "apiPrefix": "string",
+            "securityMethods": [
+            "PSK",
+            "string"
+            ]
+        },
+        "destInterface": {
+            "ipv4Addr": "192.168.1.23",
+            "fqdn": "string",
+            "port": 65535,
+            "apiPrefix": "string",
+            "securityMethods": [
+            "PSK",
+            "string"
+            ]
+        },
+        "fwdInterface": "string"
+        },
+        {
+        "apiId": apiId[0],
+        "apiName": apiName[0],
+        "apiVersion": "v2",
+        "resourceName": "string",
+        "uri": "http://resource/endpoint",
+        "protocol": "HTTP_1_1",
+        "operation": "GET",
+        "result": "string",
+        "invocationTime": "2023-03-30T10:30:21.408Z",
+        "invocationLatency": 0,
+        "inputParameters": "string",
+        "outputParameters": "string",
+        "srcInterface": {
+            "ipv4Addr": "192.168.1.1",
+            "fqdn": "string",
+            "port": 65535,
+            "apiPrefix": "string",
+            "securityMethods": [
+            "PSK",
+            "string"
+            ]
+        },
+        "destInterface": {
+            "ipv4Addr": "192.168.1.23",
+            "fqdn": "string",
+            "port": 65535,
+            "apiPrefix": "string",
+            "securityMethods": [
+            "PSK",
+            "string"
+            ]
+        },
+        "fwdInterface": "string"
+        }
+    ],
+    "supportedFeatures": "ffff"
+    }
+    return data 
+
+def create_log_entry_bad_service(aefId=None, apiInvokerId=None):
+    data = {
+    "aefId": aefId,
+    "apiInvokerId": apiInvokerId,
+    "logs": [
+        {
+        "apiId": "not-exist",
+        "apiName": "not-exist",
+        "apiVersion": "string",
+        "resourceName": "string",
+        "uri": "string",
+        "protocol": "HTTP_1_1",
+        "operation": "GET",
+        "result": "string",
+        "invocationTime": "2023-03-30T10:30:21.408Z",
+        "invocationLatency": 0,
+        "inputParameters": "string",
+        "outputParameters": "string",
+        "srcInterface": {
+            "ipv4Addr": "192.168.1.1",
+            "fqdn": "string",
+            "port": 65535,
+            "apiPrefix": "string",
+            "securityMethods": [
+            "PSK",
+            "string"
+            ]
+        },
+        "destInterface": {
+            "ipv4Addr": "192.168.1.23",
+            "fqdn": "string",
+            "port": 65535,
+            "apiPrefix": "string",
+            "securityMethods": [
+            "PSK",
+            "string"
+            ]
+        },
+        "fwdInterface": "string"
+        }
+    ],
+    "supportedFeatures": "ffff"
+    }
+    return data 
+
+def get_api_ids_and_names_from_discover_response(discover_response):
+    api_ids=[]
+    api_names=[]
+    service_api_descriptions = discover_response.json()['serviceAPIDescriptions']
+    for service_api_description in service_api_descriptions:
+        api_ids.append(service_api_description['apiId'])
+        api_names.append(service_api_description['apiName'])
+    return api_ids, api_names
diff --git a/tests/libraries/api_provider_management/bodyRequests.py b/tests/libraries/api_provider_management/bodyRequests.py
new file mode 100644
index 0000000000000000000000000000000000000000..e024a5b946e2464b5a57202d8642a512a59e27d1
--- /dev/null
+++ b/tests/libraries/api_provider_management/bodyRequests.py
@@ -0,0 +1,41 @@
+def create_api_provider_enrolment_details_body(regSec, api_prov_funcs, apiProvDomInfo="ROBOT_TESTING"):
+    data = {
+        "regSec": regSec,
+        "apiProvFuncs": api_prov_funcs,
+        "apiProvDomInfo": apiProvDomInfo,
+        "suppFeat": "fffffff",
+        "failReason": "string"
+    }
+
+    return (data)
+
+
+def create_api_provider_function_details(username, public_key, role):
+    data = {
+        "regInfo": {
+            "apiProvPubKey": public_key.decode("utf-8"),
+        },
+        "apiProvFuncRole": role,
+        "apiProvFuncInfo": username
+
+    }
+    return data
+
+
+def create_api_provider_enrolment_details_patch_body(apiProvDomInfo="ROBOT_TESTING"):
+    data = {
+        "apiProvFuncs": [
+            {
+                "apiProvFuncId": "PATCH",
+                "regInfo": {
+                    "apiProvPubKey": "PATCH",
+                    "apiProvCert": "PATCH"
+                },
+                "apiProvFuncRole": "AEF",
+                "apiProvFuncInfo": "PATCH"
+            }
+        ],
+        "apiProvDomInfo": apiProvDomInfo,
+    }
+
+    return (data)
diff --git a/tests/libraries/api_publish_service/bodyRequests.py b/tests/libraries/api_publish_service/bodyRequests.py
new file mode 100644
index 0000000000000000000000000000000000000000..17ac4a794a5ba1a38357ee229d04b3b4590bfdc8
--- /dev/null
+++ b/tests/libraries/api_publish_service/bodyRequests.py
@@ -0,0 +1,68 @@
+def create_service_api_description(api_name="service_1",aef_id="aef_id"):
+    return {
+        "apiName": api_name,
+        "aefProfiles": [
+            {
+                "aefId": aef_id,
+                "versions": [
+                    {
+                        "apiVersion": "v1",
+                        "expiry": "2021-11-30T10:32:02.004000Z",
+                        "resources": [
+                            {
+                                "resourceName": "string",
+                                "commType": "REQUEST_RESPONSE",
+                                "uri": "string",
+                                "custOpName": "string",
+                                "operations": [
+                                    "GET"
+                                ],
+                                "description": "string"
+                            }
+                        ],
+                        "custOperations": [
+                            {
+                                "commType": "REQUEST_RESPONSE",
+                                "custOpName": "string",
+                                "operations": [
+                                    "GET"
+                                ],
+                                "description": "string"
+                            }
+                        ]
+                    }
+                ],
+                "protocol": "HTTP_1_1",
+                "dataFormat": "JSON",
+                "securityMethods": ["PSK"],
+                "interfaceDescriptions": [
+                    {
+                        "ipv4Addr": "string",
+                        "port": 65535,
+                        "securityMethods": ["PSK"]
+                    },
+                    {
+                        "ipv4Addr": "string",
+                        "port": 65535,
+                        "securityMethods": ["PSK"]
+                    }
+                ]
+            }
+        ],
+        "description": "ROBOT_TESTING",
+        "supportedFeatures": "fffff",
+        "shareableInfo": {
+            "isShareable": True,
+            "capifProvDoms": [
+                "string"
+            ]
+        },
+        "serviceAPICategory": "string",
+        "apiSuppFeats": "fffff",
+        "pubApiPath": {
+            "ccfIds": [
+                "string"
+            ]
+        },
+        "ccfId": "string"
+    }
diff --git a/tests/libraries/bodyRequests.py b/tests/libraries/bodyRequests.py
new file mode 100644
index 0000000000000000000000000000000000000000..5e451242c693f385bccea597db898a5f7c16f725
--- /dev/null
+++ b/tests/libraries/bodyRequests.py
@@ -0,0 +1,8 @@
+from common.bodyRequests import *
+from api_invoker_management.bodyRequests import *
+from api_logging_service.bodyRequests import *
+from api_publish_service.bodyRequests import *
+from api_events.bodyRequests import *
+from security_api.bodyRequests import *
+from api_provider_management.bodyRequests import *
+
diff --git a/tests/libraries/common/bodyRequests.py b/tests/libraries/common/bodyRequests.py
new file mode 100644
index 0000000000000000000000000000000000000000..3f1e482d4717bc5d3ddfc298962afb8e42bc1a7e
--- /dev/null
+++ b/tests/libraries/common/bodyRequests.py
@@ -0,0 +1,125 @@
+from operator import contains
+import re
+import json
+from xmlrpc.client import boolean
+import rfc3987
+
+f = open('/opt/robot-tests/tests/libraries/common/types.json')
+capif_types = json.load(f)
+
+
+def check_variable(input, data_type):
+    print(input)
+    print(type(input))
+    print(data_type)
+    if isinstance(input, list):
+        for one in input:
+            check_variable(one, data_type)
+            return True
+    if data_type == "string":
+        if isinstance(input, str):
+            return True
+        else:
+            raise Exception("variable is not string type")
+    elif data_type == "integer":
+        if isinstance(input, int):
+            return True
+        else:
+            raise Exception("variable is not integer type")
+    elif data_type == "boolean":
+        if isinstance(input, boolean):
+            return True
+        else:
+            raise Exception("variable is not integer type")
+    elif data_type == "URI":
+        check_uri(input,data_type)
+        return True
+    elif data_type == "URI_reference":
+        check_uri(input, data_type)
+        return True
+    elif data_type not in capif_types.keys():
+        raise Exception("ERROR, type " + data_type +
+                        " is not present in types file")
+    if "Check" in capif_types[data_type].keys():
+        if not capif_types[data_type]["Check"]:
+            return True
+    if "enum" in capif_types[data_type].keys():
+        if input in capif_types[data_type]["enum"]:
+            print("value (" + input + ") is present at enum (" +
+                  ','.join(capif_types[data_type]["enum"]) + ")")
+            return True
+        else:
+            raise Exception("value (" + input + ") is not present at enum (" +
+                            ','.join(capif_types[data_type]["enum"]) + ")")
+    if "regex" in capif_types[data_type].keys():
+        check_regex(input, capif_types[data_type]["regex"])
+        return True
+
+    # Check Structure
+    all_attributes = check_attributes_dict(input, data_type)
+
+    print(all_attributes)
+
+    print('Check Variable type')
+    # Check Variable type
+    for key in input.keys():
+        print(key)
+        check_variable(input[key], all_attributes[key])
+
+
+def check_attributes_dict(body, data_type):
+    mandatory_attributes = capif_types[data_type]["mandatory_attributes"]
+    optional_parameters = capif_types[data_type]["optional_attributes"]
+    all_attributes = mandatory_attributes | optional_parameters
+    # Check if body has not allowed attributes
+
+    for body_key in body.keys():
+        if body_key not in all_attributes.keys():
+            raise Exception('Attribute "' + body_key +
+                            '" is not present as a mandatory or optional key (' + ','.join(all_attributes.keys()) + ')')
+
+    if mandatory_attributes:
+        for mandatory_key in mandatory_attributes.keys():
+            if mandatory_key not in body.keys():
+                raise Exception('Mandatory Attribute "' + mandatory_key +
+                                '" is not present at body under check')
+
+    if 'oneOf' in capif_types[data_type].keys():
+        one_of = capif_types[data_type]["oneOf"]
+        count = 0
+        for body_key in body.keys():
+            if body_key in one_of:
+                count = count+1
+
+        if count == 0:
+            raise Exception('Mandatory oneOf [' + ','.join(one_of) +
+                            '] is not present at body (' + ','.join(body.keys()) + ')')
+        elif count > 1:
+            raise Exception('More than one oneOf [' + ','.join(
+                one_of) + '] is present at body (' + ','.join(body.keys()) + ')')
+
+    return all_attributes
+
+
+def sign_csr_body(username, public_key):
+    data = {
+        "csr":  public_key.decode("utf-8"),
+        "mode":  "client",
+        "filename": username
+    }
+    return data
+
+
+def check_uri(input,rule):
+    if rfc3987.match(input, rule=rule) is not None:
+        return input
+    else:
+        raise Exception(rule + " is not accomplish rfc3986 rule ("+input+")")
+
+def check_regex(input, regex):
+    matched = re.match(regex, input)
+    is_match = bool(matched)
+    if is_match:
+        print("Regex match")
+    else:
+        raise Exception("Input(" + input + ") not match regex (" + regex + ")")
diff --git a/tests/libraries/common/types.json b/tests/libraries/common/types.json
new file mode 100644
index 0000000000000000000000000000000000000000..4b683595c43c912f868856107d21ed84ad08032d
--- /dev/null
+++ b/tests/libraries/common/types.json
@@ -0,0 +1,606 @@
+{
+  "ProblemDetails": {
+    "mandatory_attributes": {},
+    "optional_attributes": {
+      "type": "URI",
+      "title": "string",
+      "status": "integer",
+      "detail": "string",
+      "instance": "URI",
+      "cause": "string",
+      "invalidParams": "InvalidParam",
+      "supportedFeatures": "SupportedFeatures"
+    }
+  },
+  "ProblemDetails29571": {
+    "mandatory_attributes": {},
+    "optional_attributes": {
+      "type": "URI",
+      "title": "string",
+      "status": "integer",
+      "detail": "string",
+      "instance": "URI",
+      "cause": "string",
+      "invalidParams": "InvalidParam",
+      "supportedFeatures": "SupportedFeatures",
+      "accessTokenError": "AccessTokenErr",
+      "accessTokenRequest": "AccessTokenReq29571",
+      "nrfId": "NrfId"
+    }
+  },
+  "NrfId": {
+    "regex": "^([0-9A-Za-z]([-0-9A-Za-z]{0,61}[0-9A-Za-z])?\\.)+[A-Za-z]{2,63}\\.?$"
+  },
+  "InvalidParam": {
+    "mandatory_attributes": {
+      "param": "string"
+    },
+    "optional_attributes": {
+      "reason": "string"
+    }
+  },
+  "APIInvokerEnrolmentDetails": {
+    "mandatory_attributes": {
+      "apiInvokerId": "string",
+      "onboardingInformation": "OnboardingInformation",
+      "notificationDestination": "URI"
+    },
+    "optional_attributes": {
+      "requestTestNotification": "boolean",
+      "websockNotifConfig": "WebsockNotifConfig",
+      "apiList": "ServiceAPIDescription",
+      "apiInvokerInformation": "string",
+      "supportedFeatures": "SupportedFeatures"
+    }
+  },
+  "OnboardingInformation": {
+    "mandatory_attributes": {
+      "apiInvokerPublicKey": "string"
+    },
+    "optional_attributes": {
+      "apiInvokerCertificate": "string",
+      "onboardingSecret": "string"
+    }
+  },
+  "WebsockNotifConfig": {
+    "mandatory_attributes": {},
+    "optional_attributes": {
+      "websocketUri": "URI_reference",
+      "requestWebsocketUri": "boolean"
+    }
+  },
+  "ServiceAPIDescription": {
+    "mandatory_attributes": {
+      "apiName": "string"
+    },
+    "optional_attributes": {
+      "apiId": "string",
+      "aefProfiles": "AefProfile",
+      "description": "string",
+      "supportedFeatures": "SupportedFeatures",
+      "shareableInfo": "ShareableInformation",
+      "serviceAPICategory": "string",
+      "apiSuppFeats": "SupportedFeatures",
+      "pubApiPath": "PublishedApiPath",
+      "ccfId": "string"
+    }
+  },
+  "AefProfile": {
+    "mandatory_attributes": {
+      "aefId": "string",
+      "versions": "Version"
+    },
+    "optional_attributes": {
+      "protocol": "Protocol",
+      "dataFormat": "DataFormat",
+      "securityMethods": "SecurityMethod",
+      "domainName": "string",
+      "interfaceDescriptions": "InterfaceDescription",
+      "aefLocation": "AefLocation"
+    },
+    "oneOf": ["interfaceDescriptions", "domainName"]
+  },
+  "Version": {
+    "mandatory_attributes": {
+      "apiVersion": "string"
+    },
+    "optional_attributes": {
+      "expiry": "string",
+      "resources": "Resource",
+      "custOperations": "CustomOperation"
+    }
+  },
+  "Resource": {
+    "mandatory_attributes": {
+      "resourceName": "string",
+      "commType": "CommunicationType",
+      "uri": "URI_reference"
+    },
+    "optional_attributes": {
+      "custOpName": "string",
+      "operations": "Operation",
+      "description": "string"
+    }
+  },
+  "CommunicationType": {
+    "enum": ["REQUEST_RESPONSE", "SUBSCRIBE_NOTIFY"]
+  },
+  "Operation": {
+    "enum": ["GET", "POST", "PUT", "PATCH", "DELETE"]
+  },
+  "CustomOperation": {
+    "mandatory_attributes": {
+      "commType": "CommunicationType",
+      "custOpName": "string"
+    },
+    "optional_attributes": {
+      "operations": "Operation",
+      "description": "string"
+    }
+  },
+  "Protocol": {
+    "enum": ["HTTP_1_1", "HTTP_2"]
+  },
+  "DataFormat": {
+    "enum": ["JSON"]
+  },
+  "SecurityMethod": {
+    "enum": ["PSK", "PKI", "OAUTH"]
+  },
+  "InterfaceDescription": {
+    "mandatory_attributes": {},
+    "optional_attributes": {
+      "ipv4Addr": "string",
+      "ipv6Addr": "string",
+      "port": "integer",
+      "securityMethods": "SecurityMethod"
+    },
+    "oneOf": ["ipv4Addr", "ipv6Addr"]
+  },
+  "AefLocation": {
+    "mandatory_attributes": {},
+    "optional_attributes": {
+      "civicAddr": "CivicAddress",
+      "geoArea": "GeographicArea",
+      "dcId": "string"
+    }
+  },
+  "CivicAddress": {
+    "mandatory_attributes": {},
+    "optional_attributes": {
+      "country": "string",
+      "A1": "string",
+      "A2": "string",
+      "A3": "string",
+      "A4": "string",
+      "A5": "string",
+      "A6": "string",
+      "PRD": "string",
+      "POD": "string",
+      "STS": "string",
+      "HNO": "string",
+      "HNS": "string",
+      "LMK": "string",
+      "LOC": "string",
+      "NAM": "string",
+      "PC": "string",
+      "BLD": "string",
+      "UNIT": "string",
+      "FLR": "string",
+      "ROOM": "string",
+      "PLC": "string",
+      "PCN": "string",
+      "POBOX": "string",
+      "ADDCODE": "string",
+      "SEAT": "string",
+      "RD": "string",
+      "RDSEC": "string",
+      "RDBR": "string",
+      "RDSUBBR": "string",
+      "PRM": "string",
+      "POM": "string",
+      "usageRules": "string",
+      "method": "string",
+      "providedBy": "string"
+    }
+  },
+  "GeographicArea": {
+    "Check": false
+  },
+  "ShareableInformation": {
+    "mandatory_attributes": {
+      "isShareable": "boolean"
+    },
+    "optional_attributes": {
+      "capifProvDoms": "string"
+    }
+  },
+  "PublishedApiPath": {
+    "mandatory_attributes": {},
+    "optional_attributes": {
+      "ccfIds": "string"
+    }
+  },
+  "EventSubscription": {
+    "mandatory_attributes": {
+      "events": "CAPIFEvent",
+      "notificationDestination": "URI"
+    },
+    "optional_attributes": {
+      "eventFilters": "CAPIFEventFilter",
+      "eventReq": "ReportingInformation",
+      "requestTestNotification": "boolean",
+      "websockNotifConfig": "WebsockNotifConfig",
+      "supportedFeatures": "SupportedFeatures"
+    }
+  },
+  "CAPIFEvent": {
+    "enum": [
+      "SERVICE_API_AVAILABLE",
+      "SERVICE_API_UNAVAILABLE",
+      "SERVICE_API_UPDATE",
+      "API_INVOKER_ONBOARDED",
+      "API_INVOKER_OFFBOARDED",
+      "SERVICE_API_INVOCATION_SUCCESS",
+      "SERVICE_API_INVOCATION_FAILURE",
+      "ACCESS_CONTROL_POLICY_UPDATE",
+      "ACCESS_CONTROL_POLICY_UNAVAILABLE",
+      "API_INVOKER_AUTHORIZATION_REVOKED",
+      "API_INVOKER_UPDATED",
+      "API_TOPOLOGY_HIDING_CREATED",
+      "API_TOPOLOGY_HIDING_REVOKED"
+    ]
+  },
+  "CAPIFEventFilter": {
+    "mandatory_attributes": {},
+    "optional_attributes": {
+      "apiIds": "string",
+      "apiInvokerIds": "string",
+      "aefIds": "string"
+    }
+  },
+  "ReportingInformation": {
+    "mandatory_attributes": {},
+    "optional_attributes": {
+      "immRep": "boolean",
+      "notifMethod": "NotificationMethod",
+      "maxReportNbr": "integer",
+      "monDur": "string",
+      "repPeriod": "integer",
+      "sampRatio": "integer",
+      "partitionCriteria": "PartitioningCriteria",
+      "grpRepTime": "integer",
+      "notifFlag": "NotificationFlag"
+    }
+  },
+  "NotificationMethod": {
+    "enum": ["PERIODIC", "ONE_TIME", "ON_EVENT_DETECTION"]
+  },
+  "PartitioningCriteria": {
+    "enum": ["TAC", "SUBPLMN", "GEOAREA", "SNSSAI", "DNN"]
+  },
+  "NotificationFlag": {
+    "enum": ["ACTIVATE", "DEACTIVATE", "RETRIEVAL"]
+  },
+  "DiscoveredAPIs": {
+    "mandatory_attributes": {},
+    "optional_attributes": {
+      "serviceAPIDescriptions": "ServiceAPIDescription"
+    }
+  },
+  "ServiceSecurity": {
+    "mandatory_attributes": {
+      "securityInfo": "SecurityInformation",
+      "notificationDestination": "URI"
+    },
+    "optional_attributes": {
+      "requestTestNotification": "boolean",
+      "websockNotifConfig": "WebsockNotifConfig",
+      "supportedFeatures": "SupportedFeatures"
+    }
+  },
+  "SecurityInformation": {
+    "mandatory_attributes": {
+      "prefSecurityMethods": "SecurityMethod"
+    },
+    "optional_attributes": {
+      "interfaceDetails": "InterfaceDescription",
+      "aefId": "string",
+      "apiId": "string",
+      "selSecurityMethod": "SecurityMethod",
+      "authenticationInfo": "string",
+      "authorizationInfo": "string"
+    },
+    "oneOf": ["interfaceDetails", "aefId"]
+  },
+  "SupportedFeatures": {
+    "regex": "^[A-Fa-f0-9]*$"
+  },
+  "SecurityNotification": {
+    "mandatory_attributes": {
+      "apiInvokerId": "string",
+      "apiIds": "string",
+      "cause": "Cause"
+    },
+    "optional_attributes": {
+      "aefId": "string"
+    }
+  },
+  "Cause": {
+    "enum": ["OVERLIMIT_USAGE", "UNEXPECTED_REASON"]
+  },
+  "AccessTokenReq": {
+    "mandatory_attributes": {
+      "grant_type": "GrantType",
+      "client_id": "string"
+    },
+    "optional_attributes": {
+      "client_secret": "string",
+      "scope": "string"
+    }
+  },
+  "AccessTokenReq29571": {
+    "mandatory_attributes": {
+      "grant_type": "GrantType",
+      "nfInstanceId": "UUID",
+      "scope": "ScopeRegex"
+    },
+    "optional_attributes": {
+      "nfType": "NFType",
+      "targetNfType": "NFType",
+      "targetNfInstanceId": "UUID",
+      "requesterPlmn": "PlmnId",
+      "requesterPlmnList": "PlmnId",
+      "requesterSnssaiList": "Snssai",
+      "requesterFqdn": "Fqdn",
+      "requesterSnpnList": "PlmnIdNid",
+      "targetPlmn": "PlmnId",
+      "targetSnpn": "PlmnIdNid",
+      "targetSnssaiList": "Snssai",
+      "targetNsiList": "string",
+      "targetNfSetId": "NfSetId",
+      "targetNfServiceSetId": "NfServiceSetId",
+      "hnrfAccessTokenUri": "URI",
+      "sourceNfInstanceId": "UUID"
+    }
+  },
+  "NfSetId":{
+    "regex": "set[a-zA-Z0-9\\-]+\\.(nrf|udm|amf|smf|ausf|nef|pcf|smsf|nssf|udr|lmf|gmlc|5g_eir|sepp|upf|n3iwf|af|udsf|bsf|chf|nwdaf|pcscf|cbcf|hss|ucmf|sor_af|spaf|mme|scsas|scef|scp|nssaaf|icscf|scscf|dra|ims_as|aanf|5g_ddnmf|nsacf|mfaf|easdf|dccf|mb_smf|tsctsf|adrf|gba_bsf|cef|mb_upf|nswof|pkmf|mnpf|sms_gmsc|sms_iwmsc|mbsf|mbstf|panf)set\\.5gc(\\.nid[A-Fa-f0-9]{11})?\\.mnc[0-9]{3}\\.mcc[0-9]{3}"
+  },
+  "NfServiceSetId":{
+    "regex": "set[a-zA-Z0-9\\-]+\\.(nrf|udm|amf|smf|ausf|nef|pcf|smsf|nssf|udr|lmf|gmlc|5g_eir|sepp|upf|n3iwf|af|udsf|bsf|chf|nwdaf|pcscf|cbcf|hss|ucmf|sor_af|spaf|mme|scsas|scef|scp|nssaaf|icscf|scscf|dra|ims_as|aanf|5g_ddnmf|nsacf|mfaf|easdf|dccf|mb_smf|tsctsf|adrf|gba_bsf|cef|mb_upf|nswof|pkmf|mnpf|sms_gmsc|sms_iwmsc|mbsf|mbstf|panf)set\\.5gc(\\.nid[A-Fa-f0-9]{11})?\\.mnc[0-9]{3}\\.mcc[0-9]{3}"
+  },
+  "ScopeRegex": {
+    "regex": "^([a-zA-Z0-9_:-]+)( [a-zA-Z0-9_:-]+)*$"
+  },
+  "Fqdn": {
+    "regex": "^([0-9A-Za-z]([-0-9A-Za-z]{0,61}[0-9A-Za-z])?\\.)+[A-Za-z]{2,63}\\.?$"
+  },
+  "UUID": {
+    "regex": "^[0-9a-f]{8}-[0-9a-f]{4}-[0-5][0-9a-f]{3}-[089ab][0-9a-f]{3}-[0-9a-f]{12}$"
+  },
+  "NFType": {
+    "enum": [
+      "NRF",
+      "UDM",
+      "AMF",
+      "SMF",
+      "AUSF",
+      "NEF",
+      "PCF",
+      "SMSF",
+      "NSSF",
+      "UDR",
+      "LMF",
+      "GMLC",
+      "5G_EIR",
+      "SEPP",
+      "UPF",
+      "N3IWF",
+      "AF",
+      "UDSF",
+      "BSF",
+      "CHF",
+      "NWDAF",
+      "PCSCF",
+      "CBCF",
+      "HSS",
+      "UCMF",
+      "SOR_AF",
+      "SPAF",
+      "MME",
+      "SCSAS",
+      "SCEF",
+      "SCP",
+      "NSSAAF",
+      "ICSCF",
+      "SCSCF",
+      "DRA",
+      "IMS_AS",
+      "AANF",
+      "5G_DDNMF",
+      "NSACF",
+      "MFAF",
+      "EASDF",
+      "DCCF",
+      "MB_SMF",
+      "TSCTSF",
+      "ADRF",
+      "GBA_BSF",
+      "CEF",
+      "MB_UPF",
+      "NSWOF",
+      "PKMF",
+      "MNPF",
+      "SMS_GMSC",
+      "SMS_IWMSC",
+      "MBSF",
+      "MBSTF",
+      "PANF"
+    ]
+  },
+  "PlmnId": {
+    "mandatory_attributes": {
+      "mcc": "Mcc",
+      "mnc": "Mnc"
+    },
+    "optional_attributes": {}
+  },
+  "PlmnIdNid":{
+    "mandatory_attributes": {
+      "mcc": "Mcc",
+      "mnc": "Mnc"
+    },
+    "optional_attributes": {
+      "nid": "Nid"
+    }
+  },
+  "Mcc": {
+    "regex": "^[0-9]{3}$"
+  },
+  "Mnc": {
+    "regex": "^[0-9]{2,3}$"
+  },
+  "Snssai": {
+    "mandatory_attributes": {
+      "sst": "integer"
+    },
+    "optional_attributes": {
+      "sd": "SlideDifferentiator"
+    }
+  },
+  "SlideDifferentiator": {
+    "regex": "^[A-Fa-f0-9]{6}$"
+  },
+  "Nid":{
+    "regex": "^[A-Fa-f0-9]{11}$"
+  },
+  "AccessTokenRsp": {
+    "mandatory_attributes": {
+      "access_token": "string",
+      "token_type": "TokenType",
+      "expires_in": "integer"
+    },
+    "optional_attributes": {
+      "scope": "string"
+    }
+  },
+  "GrantType": {
+    "enum": ["client_credentials"]
+  },
+  "TokenType": {
+    "enum": ["Bearer"]
+  },
+  "AccessTokenErr": {
+    "mandatory_attributes": {
+      "error": "ErrorType"
+    },
+    "optional_attributes": {
+      "error_description": "string",
+      "error_uri": "string"
+    }
+  },
+  "ErrorType": {
+    "enum": [
+      "invalid_request",
+      "invalid_client",
+      "invalid_grant",
+      "unauthorized_client",
+      "unsupported_grant_type",
+      "invalid_scope"
+    ]
+  },
+  "APIProviderEnrolmentDetails": {
+    "mandatory_attributes": {
+      "regSec": "string",
+      "apiProvDomId": "string"
+    },
+    "optional_attributes": {
+      "apiProvFuncs": "APIProviderFunctionDetails",
+      "apiProvDomInfo": "string",
+      "suppFeat": "SupportedFeatures",
+      "failReason": "string"
+    }
+  },
+  "APIProviderFunctionDetails": {
+    "mandatory_attributes": {
+      "regInfo": "RegistrationInformation",
+      "apiProvFuncRole": "ApiProviderFuncRole",
+      "apiProvFuncId": "string"
+    },
+    "optional_attributes": {
+      "apiProvFuncInfo": "string"
+    }
+  },
+  "RegistrationInformation": {
+    "mandatory_attributes": {
+      "apiProvPubKey": "string",
+      "apiProvCert": "string"
+    },
+    "optional_attributes": {}
+  },
+  "ApiProviderFuncRole": {
+    "enum": ["AEF", "APF", "AMF"]
+  },
+  "InvocationLog": {
+    "mandatory_attributes": {
+      "aefId": "string",
+      "apiInvokerId": "string",
+      "logs": "Log"
+    },
+    "optional_attributes": {
+      "log_id":"string",
+      "supportedFeatures": "SupportedFeatures"
+    }
+  },
+  "Log": {
+    "mandatory_attributes": {
+      "apiId": "string",
+      "apiName": "string",
+      "apiVersion": "string",
+      "resourceName": "string",
+      "protocol": "Protocol",
+      "result": "string"
+    },
+    "optional_attributes": {
+      "log_id": "string",
+      "uri": "URI",
+      "operation": "Operation",
+      "invocationTime": "string",
+      "invocationLatency": "integer",
+      "inputParameters": "Any",
+      "outputParameters": "Any",
+      "srcInterface": "InterfaceDescription",
+      "destInterface": "InterfaceDescription",
+      "fwdInterface": "string",
+      "supportedFeatures": "SupportedFeatures"
+    }
+  },
+  "Any": {
+    "Check": false
+  },
+  "AccessControlPolicyList": {
+    "mandatory_attributes": {},
+    "optional_attributes": {
+      "apiInvokerPolicies": "ApiInvokerPolicy"
+    }
+  },
+  "ApiInvokerPolicy": {
+    "mandatory_attributes": {
+      "apiInvokerId":"string"
+    },
+    "optional_attributes": {
+      "allowedTotalInvocations": "integer",
+      "allowedInvocationsPerSecond": "integer",
+      "allowedInvocationTimeRangeList": "TimeRange"
+    }
+  },
+  "TimeRange": {
+    "mandatory_attributes": {},
+    "optional_attributes":{
+      "startTime": "string",
+      "stopTime": "string"
+    }
+  }
+
+}
diff --git a/tests/libraries/environment.py b/tests/libraries/environment.py
new file mode 100644
index 0000000000000000000000000000000000000000..d8100fa4fc79a0cfbb7c1e2cf2b3ff420b282247
--- /dev/null
+++ b/tests/libraries/environment.py
@@ -0,0 +1,25 @@
+class CapifUserManager():
+    def __init__(self):
+        self.capif_users = {}
+        self.register_users = []
+
+    def update_register_users(self, value):
+        self.register_users.append(value)
+
+    def update_capif_users_dicts(self, key, value):
+        self.capif_users[key] = value
+
+    def remove_capif_users_entry(self, key):
+        self.capif_users.pop(key)
+
+    def remove_register_users_entry(self, value):
+        self.register_users.remove(value)
+
+    def get_capif_users_dict(self):
+        return self.capif_users
+
+    def get_register_users(self):
+        return self.register_users
+
+
+CAPIF_USERS = CapifUserManager()
\ No newline at end of file
diff --git a/tests/libraries/helpers.py b/tests/libraries/helpers.py
new file mode 100644
index 0000000000000000000000000000000000000000..ec1abe0d8b49c00971a013faff814416e68dfead
--- /dev/null
+++ b/tests/libraries/helpers.py
@@ -0,0 +1,141 @@
+import requests
+import re
+import pandas as pd
+from urllib.parse import urlparse
+from OpenSSL.crypto import (dump_certificate_request, dump_privatekey,
+                            PKey, TYPE_RSA, X509Req)
+from OpenSSL.SSL import FILETYPE_PEM
+import socket
+import copy
+
+
+def parse_url(input):
+    return urlparse(input)
+
+
+def get_db_host(input):
+    p = re.compile('^(http|https):\/\/([^:/]+):?([0-9]{1,6})?.*')
+    m = p.match(input)
+    if m:
+        if m.lastindex == 3:
+            return m[2], m[3]
+        return m[2], 80
+    else:
+        raise Exception('Host is not present at ' + input)
+
+
+def get_subscriber_and_subscription_from_location(input):
+    p = re.compile('^.*/v1/([a-zA-Z0-9]+)/subscriptions/([a-zA-Z0-9]+)/?')
+    m = p.match(input)
+    if m:
+        if m.lastindex == 2:
+            return m[1], m[2]
+        raise Exception('Only match ' + m.lastindex + ' and the expected is 2')
+    else:
+        raise Exception('Host is not present at ' + input)
+
+
+def get_registration_id(input):
+    p = re.compile('^.*/v1/registrations/([a-zA-Z0-9]+)/?')
+    m = p.match(input)
+    if m:
+        if m.lastindex == 1:
+            return m[1]
+        raise Exception('Only match ' + m.lastindex + ' and the expected is 1')
+    else:
+        raise Exception('registration id is not present at ' + input)
+
+
+def store_in_file(file_path, data):
+    with open(file_path, 'wb') as f:
+        f.write(bytes(data, 'utf-8'))
+        f.close()
+
+
+def cert_tuple(cert_file, key_file):
+    return (cert_file, key_file)
+
+
+def add_dns_to_hosts(ip_address, host_name):
+    capif_dns = "{}      {}".format(ip_address, host_name)
+    dns_file = open("/etc/hosts", "a")
+    dns_file.write("{}\n".format(capif_dns))
+    dns_file.close()
+
+
+def create_csr(csr_file_path, private_key_path, cn):
+    # create public/private key
+    key = PKey()
+    key.generate_key(TYPE_RSA, 2048)
+
+    # Generate CSR
+    req = X509Req()
+    req.get_subject().CN = cn
+    req.get_subject().O = 'Telefonica I+D'
+    req.get_subject().OU = 'Innovation'
+    req.get_subject().L = 'Madrid'
+    req.get_subject().ST = 'Madrid'
+    req.get_subject().C = 'ES'
+    req.get_subject().emailAddress = 'inno@tid.es'
+    req.set_pubkey(key)
+    req.sign(key, 'sha256')
+
+    with open(csr_file_path, 'wb+') as f:
+        f.write(dump_certificate_request(FILETYPE_PEM, req))
+        f.close()
+        csr_request = dump_certificate_request(FILETYPE_PEM, req)
+    with open(private_key_path, 'wb+') as f:
+        f.write(dump_privatekey(FILETYPE_PEM, key))
+        f.close()
+
+    return csr_request
+
+
+def create_user_csr(username, cn=None):
+    csr_file_path = username+'.csr'
+    private_key_path = username + '.key'
+    if cn == None:
+        cn = username
+    return create_csr(csr_file_path, private_key_path, cn)
+
+
+def get_ip_from_hostname(hostname):
+    return socket.gethostbyname(hostname)
+
+
+def remove_keys_from_object_helper(input, keys_to_remove):
+    print(keys_to_remove)
+    print(input)
+    print(type(input))
+    if isinstance(input, list):
+        print('list')
+        for data in input:
+            remove_keys_from_object_helper(data, keys_to_remove)
+            return True
+
+    # Check Variable type
+    elif isinstance(input, dict):
+        print('dict')
+
+        for key in list(input.keys()):
+            print('key=' + key)
+            if key in keys_to_remove:
+                print('Remove ' + key + ' from object')
+                del input[key]
+            elif isinstance(input[key], dict) or isinstance(input[key], list):
+                remove_keys_from_object_helper(input[key], keys_to_remove)
+    else:
+        return True
+    return input
+
+
+def remove_key_from_object(input, key_to_remove):
+    input_copy = copy.deepcopy(input)
+    remove_keys_from_object_helper(input_copy, [key_to_remove])
+    return input_copy
+
+
+def create_scope(aef_id, api_name):
+    data = "3gpp#" + aef_id + ":" + api_name
+
+    return data
diff --git a/tests/libraries/security_api/bodyRequests.py b/tests/libraries/security_api/bodyRequests.py
new file mode 100644
index 0000000000000000000000000000000000000000..6adcc4cfbc77c2ac614ab2cbcc67e40d1399eeb2
--- /dev/null
+++ b/tests/libraries/security_api/bodyRequests.py
@@ -0,0 +1,96 @@
+def create_service_security_body(notification_destination, aef_id=None, api_id=None):
+    data = {
+        "notificationDestination": notification_destination,
+        "supportedFeatures": "fffffff",
+        "securityInfo": [{
+            "authenticationInfo": "authenticationInfo",
+            "authorizationInfo": "authorizationInfo",
+            "interfaceDetails": {
+                "ipv4Addr": "127.0.0.1",
+                "securityMethods": ["PSK"],
+                "port": 5248
+            },
+            "prefSecurityMethods": ["PSK", "PKI", "OAUTH"],
+        }
+        ],
+        "websockNotifConfig": {
+            "requestWebsocketUri": True,
+            "websocketUri": "websocketUri"
+        },
+        "requestTestNotification": True
+    }
+
+    if aef_id != None and api_id != None:
+        data['securityInfo'].append({
+            "authenticationInfo": "authenticationInfo",
+            "authorizationInfo": "authorizationInfo",
+            "prefSecurityMethods": ["PSK", "PKI", "OAUTH"],
+            "aefId": aef_id,
+            "apiId": api_id
+        })
+
+    return data
+
+
+def create_service_security_from_discover_response(notification_destination, discover_response):
+    data = {
+        "notificationDestination": notification_destination,
+        "supportedFeatures": "fffffff",
+        "securityInfo": [],
+        "websockNotifConfig": {
+            "requestWebsocketUri": True,
+            "websocketUri": "websocketUri"
+        },
+        "requestTestNotification": True
+    }
+    service_api_descriptions = discover_response.json()['serviceAPIDescriptions']
+    for service_api_description in service_api_descriptions:
+        for aef_profile in service_api_description['aefProfiles']:
+            data['securityInfo'].append({
+                "authenticationInfo": "authenticationInfo",
+                "authorizationInfo": "authorizationInfo",
+                "prefSecurityMethods": ["PSK", "PKI", "OAUTH"],
+                "aefId": aef_profile['aefId'],
+                "apiId": service_api_description['apiId']
+            })
+    return data
+
+
+def create_security_notification_body(api_invoker_id, api_ids, cause="OVERLIMIT_USAGE", aef_id=None):
+    # cause must be one of [ OVERLIMIT_USAGE, UNEXPECTED_REASON ]
+    data = {
+        "apiIds": api_ids,
+        "apiInvokerId": api_invoker_id,
+        "cause": cause
+    }
+
+    if isinstance(api_ids,list):
+        data['apiIds'] = api_ids
+    else:
+        data['apiIds'] = [ api_ids ]
+
+    if aef_id != None:
+        data['aefId'] = aef_id
+    
+
+    return data
+
+
+def create_access_token_req_body(client_id, scope, client_secret=None,grant_type="client_credentials"):
+    data = {
+        "client_id": client_id,
+        "grant_type": grant_type,
+        "scope": scope
+    }
+
+    if client_secret != None:
+        data['client_secret'] = client_secret
+
+    return data
+
+def get_api_ids_from_discover_response(discover_response):
+    api_ids=[]
+    service_api_descriptions = discover_response.json()['serviceAPIDescriptions']
+    for service_api_description in service_api_descriptions:
+        api_ids.append(service_api_description['apiId'])
+    return api_ids
diff --git a/tests/requirements.txt b/tests/requirements.txt
new file mode 100644
index 0000000000000000000000000000000000000000..71b55e2329efca2577a402b24133de42a318d187
--- /dev/null
+++ b/tests/requirements.txt
@@ -0,0 +1,7 @@
+# Requirements file for tests.
+robotframework-mongodb-library==3.2
+requests==2.28.1
+configparser==5.3.0
+redis==4.3.4
+rfc3987==1.3.8
+robotframework-httpctrl
\ No newline at end of file
diff --git a/tests/resources/api_invoker_management_requests/apiInvokerManagementRequests.robot b/tests/resources/api_invoker_management_requests/apiInvokerManagementRequests.robot
new file mode 100644
index 0000000000000000000000000000000000000000..117cfd1beb17b7d290d43c884c48a70d62c75046
--- /dev/null
+++ b/tests/resources/api_invoker_management_requests/apiInvokerManagementRequests.robot
@@ -0,0 +1,4 @@
+*** Settings ***
+Resource    /opt/robot-tests/tests/resources/common.resource
+Resource    /opt/robot-tests/tests/resources/common/basicRequests.robot
+
diff --git a/tests/resources/common.resource b/tests/resources/common.resource
new file mode 100644
index 0000000000000000000000000000000000000000..b111127701b3a18a33282044d46efd3e38f076cc
--- /dev/null
+++ b/tests/resources/common.resource
@@ -0,0 +1,84 @@
+*** Settings ***
+Library     /opt/robot-tests/tests/libraries/helpers.py
+Variables    /opt/robot-tests/tests/libraries/environment.py
+Resource    /opt/robot-tests/tests/resources/common/basicRequests.robot
+
+
+*** Variables ***
+${INVOKER_USERNAME}             ROBOT_TESTING_INVOKER
+${PROVIDER_USERNAME}            ROBOT_TESTING_PROVIDER
+${APF_PROVIDER_USERNAME}        APF_${PROVIDER_USERNAME}
+${AEF_PROVIDER_USERNAME}        AEF_${PROVIDER_USERNAME}
+${AMF_PROVIDER_USERNAME}        AMF_${PROVIDER_USERNAME}
+
+${INVOKER_NOT_REGISTERED}       not-valid
+${INVOKER_ROLE}                 invoker
+${PROVIDER_ROLE}                provider
+
+${CAPIF_HOSTNAME}               capifcore
+${CAPIF_VAULT}                  vault
+${CAPIF_VAULT_PORT}             8200
+${CAPIF_VAULT_TOKEN}            read-ca-token
+${CAPIF_REGISTER}               register
+${CAPIF_REGISTER_PORT}          8084
+${CAPIF_HTTP_PORT}
+${CAPIF_HTTPS_PORT}
+${CAPIF_IP}                     127.0.0.1
+${CAPIF_CALLBACK_IP}            host.docker.internal
+${CAPIF_CALLBACK_PORT}          8086
+
+${DISCOVER_URL}                 /service-apis/v1/allServiceAPIs?api-invoker-id=
+
+
+*** Keywords ***
+Reset Testing Environment
+    Log    Db capif.invokerdetails collection will be removed in order to isolate each test.
+
+    #Clean Test Information By HTTP Requests
+    Clean Test Information
+
+Check Location Header
+    [Documentation]    This keyword will check location header at response according to regular expression provided as argument
+    [Arguments]    ${resp}    ${regular_expression}
+
+    ${event_url}=    Parse Url    ${resp.headers['Location']}
+
+    Should Match Regexp    ${event_url.path}    ${regular_expression}
+    RETURN    ${event_url}
+
+Check Event Location Header
+    [Arguments]    ${resp}
+
+    ${event_url}=    Check Location Header    ${resp}    ${LOCATION_EVENT_RESOURCE_REGEX}
+
+    ${subscriber_id}    ${subscription_id}=    Get Subscriber And Subscription From Location    ${event_url.path}
+
+    RETURN    ${subscriber_id}    ${subscription_id}
+
+Check Problem Details
+    [Arguments]    ${resp}    &{input_parameters}
+    Check Variable    ${resp.json()}    ProblemDetails
+    FOR    ${input}    IN    @{input_parameters}
+        Log    ${input}=${input_parameters['${input}']}
+        Should Match    "${resp.json()['${input}']}"    "${input_parameters['${input}']}"
+    END
+
+Check Response Variable Type And Values
+    [Arguments]    ${resp}    ${status_code}    ${variable_type}    &{input_parameters}
+    Status Should Be    ${status_code}    ${resp}
+    Check Variable    ${resp.json()}    ${variable_type}
+    FOR    ${input}    IN    @{input_parameters}
+        Log    ${input}=${input_parameters['${input}']}
+        Should Match Regexp    "${resp.json()['${input}']}"    "${input_parameters['${input}']}"
+    END
+
+Remove Keys From Object
+    [Arguments]    ${input}    @{keys_to_remove}
+
+    ${filtered_input}=    Remove Keys From Object Helper    ${input}    ${keys_to_remove}
+
+    RETURN    ${filtered_input}
+
+Test ${TEST NAME} Currently Not Supported
+    Log    Test "${TEST NAME}" Currently not supported    WARN
+    Skip    Test "${TEST NAME}" Currently not supported
diff --git a/tests/resources/common/basicRequests.robot b/tests/resources/common/basicRequests.robot
new file mode 100644
index 0000000000000000000000000000000000000000..1d8d69553cd9e905b95463627e0e1c8a72c20973
--- /dev/null
+++ b/tests/resources/common/basicRequests.robot
@@ -0,0 +1,593 @@
+*** Settings ***
+Documentation       This resource file contains the basic requests used by Capif. NGINX_HOSTNAME and CAPIF_AUTH can be set as global variables, depends on environment used
+
+Library             RequestsLibrary
+Library             Collections
+Library             OperatingSystem
+Library             XML
+
+
+*** Variables ***
+${CAPIF_AUTH}                           ${EMPTY}
+${CAPIF_BEARER}                         ${EMPTY}
+
+${LOCATION_INVOKER_RESOURCE_REGEX}
+...                                     ^/api-invoker-management/v1/onboardedInvokers/[0-9a-zA-Z]+
+${LOCATION_EVENT_RESOURCE_REGEX}
+...                                     ^/capif-events/v1/[0-9a-zA-Z]+/subscriptions/[0-9a-zA-Z]+
+${LOCATION_INVOKER_RESOURCE_REGEX}
+...                                     ^/api-invoker-management/v1/onboardedInvokers/[0-9a-zA-Z]+
+${LOCATION_PUBLISH_RESOURCE_REGEX}
+...                                     ^/published-apis/v1/[0-9a-zA-Z]+/service-apis/[0-9a-zA-Z]+
+${LOCATION_SECURITY_RESOURCE_REGEX}
+...                                     ^/capif-security/v1/trustedInvokers/[0-9a-zA-Z]+
+${LOCATION_PROVIDER_RESOURCE_REGEX}
+...                                     ^/api-provider-management/v1/registrations/[0-9a-zA-Z]+
+${LOCATION_LOGGING_RESOURCE_REGEX}
+...                                     ^/api-invocation-logs/v1/[0-9a-zA-Z]+/logs/[0-9a-zA-Z]+
+
+${INVOKER_ROLE}                         invoker
+${AMF_ROLE}                             amf
+${APF_ROLE}                             apf
+${AEF_ROLE}                             aef
+
+
+*** Keywords ***
+Create CAPIF Session
+    [Documentation]    Create needed session and headers.
+    ...    If server input data is set to NONE, it will try to use NGINX_HOSTNAME variable.
+    [Arguments]    ${server}=${NONE}    ${access_token}=${NONE}    ${verify}=${NONE}    ${vault_token}=${NONE}
+
+    IF    "${server}" != "${NONE}"
+        Create Session    apisession    ${server}    verify=${verify}
+    END
+
+    ${headers}=    Create Dictionary
+    IF    "${access_token}" != "${NONE}"
+        ${headers}=    Create Dictionary    Authorization=Bearer ${access_token}
+    END
+
+    IF    "${vault_token}" != "${NONE}"
+        ${headers}=    Create Dictionary    X-Vault-Token    ${vault_token}
+    END
+
+    RETURN    ${headers}
+
+Post Request Capif
+    [Timeout]    60s
+    [Arguments]
+    ...    ${endpoint}
+    ...    ${json}=${NONE}
+    ...    ${server}=${NONE}
+    ...    ${access_token}=${NONE}
+    ...    ${auth}=${NONE}
+    ...    ${verify}=${FALSE}
+    ...    ${cert}=${NONE}
+    ...    ${username}=${NONE}
+    ...    ${data}=${NONE}
+
+    ${headers}=    Create CAPIF Session    ${server}    ${access_token}    ${verify}
+
+    IF    '${username}' != '${NONE}'
+        ${cert}=    Set variable    ${{ ('${username}.crt','${username}.key') }}
+    END
+
+    ${resp}=    POST On Session
+    ...    apisession
+    ...    ${endpoint}
+    ...    headers=${headers}
+    ...    json=${json}
+    ...    expected_status=any
+    ...    verify=${verify}
+    ...    cert=${cert}
+    ...    data=${data}
+    RETURN    ${resp}
+
+Get Request Capif
+    [Timeout]    60s
+    [Arguments]
+    ...    ${endpoint}
+    ...    ${server}=${NONE}
+    ...    ${access_token}=${NONE}
+    ...    ${auth}=${NONE}
+    ...    ${verify}=${FALSE}
+    ...    ${cert}=${NONE}
+    ...    ${username}=${NONE}
+
+    ${headers}=    Create CAPIF Session    ${server}    ${access_token}
+
+    IF    '${username}' != '${NONE}'
+        ${cert}=    Set variable    ${{ ('${username}.crt','${username}.key') }}
+    END
+
+    ${resp}=    GET On Session
+    ...    apisession
+    ...    ${endpoint}
+    ...    headers=${headers}
+    ...    expected_status=any
+    ...    verify=${verify}
+    ...    cert=${cert}
+    RETURN    ${resp}
+
+Get CA Vault
+    [Timeout]    60s
+    [Arguments]
+    ...    ${endpoint}
+    ...    ${server}=${NONE}
+    ...    ${access_token}=${NONE}
+    ...    ${auth}=${NONE}
+    ...    ${verify}=${FALSE}
+    ...    ${cert}=${NONE}
+    ...    ${username}=${NONE}
+
+    ${headers}=    Create CAPIF Session    ${server}    ${access_token}    vault_token=${CAPIF_VAULT_TOKEN}
+
+    IF    '${username}' != '${NONE}'
+        ${cert}=    Set variable    ${{ ('${username}.crt','${username}.key') }}
+    END
+
+    ${resp}=    GET On Session
+    ...    apisession
+    ...    ${endpoint}
+    ...    headers=${headers}
+    ...    expected_status=any
+    ...    verify=${verify}
+    ...    cert=${cert}
+    RETURN    ${resp}
+    RETURN    ${response}
+
+Put Request Capif
+    [Timeout]    60s
+    [Arguments]
+    ...    ${endpoint}
+    ...    ${json}=${NONE}
+    ...    ${server}=${NONE}
+    ...    ${access_token}=${NONE}
+    ...    ${auth}=${NONE}
+    ...    ${verify}=${FALSE}
+    ...    ${cert}=${NONE}
+    ...    ${username}=${NONE}
+
+    ${headers}=    Create CAPIF Session    ${server}    ${access_token}
+
+    IF    '${username}' != '${NONE}'
+        ${cert}=    Set variable    ${{ ('${username}.crt','${username}.key') }}
+    END
+
+    ${resp}=    PUT On Session
+    ...    apisession
+    ...    ${endpoint}
+    ...    headers=${headers}
+    ...    json=${json}
+    ...    expected_status=any
+    ...    verify=${verify}
+    ...    cert=${cert}
+
+    RETURN    ${resp}
+
+Patch Request Capif
+    [Timeout]    60s
+    [Arguments]
+    ...    ${endpoint}
+    ...    ${json}=${NONE}
+    ...    ${server}=${NONE}
+    ...    ${access_token}=${NONE}
+    ...    ${auth}=${NONE}
+    ...    ${verify}=${FALSE}
+    ...    ${cert}=${NONE}
+    ...    ${username}=${NONE}
+
+    ${headers}=    Create CAPIF Session    ${server}    ${access_token}
+
+    IF    '${username}' != '${NONE}'
+        ${cert}=    Set variable    ${{ ('${username}.crt','${username}.key') }}
+    END
+
+    ${resp}=    PATCH On Session
+    ...    apisession
+    ...    ${endpoint}
+    ...    headers=${headers}
+    ...    json=${json}
+    ...    expected_status=any
+    ...    verify=${verify}
+    ...    cert=${cert}
+
+    RETURN    ${resp}
+
+Delete Request Capif
+    [Timeout]    60s
+    [Arguments]
+    ...    ${endpoint}
+    ...    ${server}=${NONE}
+    ...    ${access_token}=${NONE}
+    ...    ${auth}=${NONE}
+    ...    ${verify}=${FALSE}
+    ...    ${cert}=${NONE}
+    ...    ${username}=${NONE}
+
+    ${headers}=    Create CAPIF Session    ${server}    ${access_token}
+
+    IF    '${username}' != '${NONE}'
+        ${cert}=    Set variable    ${{ ('${username}.crt','${username}.key') }}
+    END
+
+    ${resp}=    DELETE On Session
+    ...    apisession
+    ...    ${endpoint}
+    ...    headers=${headers}
+    ...    expected_status=any
+    ...    verify=${verify}
+    ...    cert=${cert}
+
+    RETURN    ${resp}
+
+Register User At Jwt Auth
+    [Arguments]    ${username}    ${role}    ${password}=password    ${description}=Testing
+
+    ${cn}=    Set Variable    ${username}
+    # Create certificate and private_key for this machine.
+    IF    "${role}" == "${INVOKER_ROLE}"
+        ${cn}=    Set Variable    invoker
+        ${csr_request}=    Create User Csr    ${username}    ${cn}
+        Log    inside if cn=${cn}
+    ELSE
+        ${csr_request}=    Set Variable    ${None}
+    END
+
+    Log    cn=${cn}
+
+    &{body}=    Create Dictionary
+    ...    password=${password}
+    ...    username=${username}
+    ...    role=${role}
+    ...    description=${description}
+    ...    cn=${cn}
+
+    Create Session    jwtsession    ${CAPIF_HTTPS_REGISTER_URL}    verify=False    disable_warnings=1
+
+    ${resp}=    POST On Session    jwtsession    /register    json=${body}
+
+    Should Be Equal As Strings    ${resp.status_code}    201
+
+    ${get_auth_response}=    Get Auth For User    ${username}    ${password}
+
+    ${register_user_info}=    Create Dictionary
+    ...    netappID=${resp.json()['id']}
+    ...    csr_request=${csr_request}
+    ...    &{resp.json()}
+    ...    &{get_auth_response}
+
+    Log Dictionary    ${register_user_info}
+
+    IF    "ca_root" in @{register_user_info.keys()}
+        Store In File    ca.crt    ${register_user_info['ca_root']}
+    END
+
+    IF    "cert" in @{register_user_info.keys()}
+        Store In File    ${username}.crt    ${register_user_info['cert']}
+    END
+    IF    "private_key" in @{register_user_info.keys()}
+        Store In File    ${username}.key    ${register_user_info['private_key']}
+    END
+
+    RETURN    ${register_user_info}
+
+Register User At Jwt Auth Provider
+    [Arguments]    ${username}    ${role}    ${password}=password    ${description}=Testing
+
+    ${apf_username}=    Set Variable    APF_${username}
+    ${aef_username}=    Set Variable    AEF_${username}
+    ${amf_username}=    Set Variable    AMF_${username}
+
+    # Create a certificate for each kind of role under provider
+    ${csr_request}=    Create User Csr    ${username}    provider
+
+    ${apf_csr_request}=    Create User Csr    ${apf_username}    apf
+    ${aef_csr_request}=    Create User Csr    ${aef_username}    aef
+    ${amf_csr_request}=    Create User Csr    ${amf_username}    amf
+
+    # Register provider
+    &{body}=    Create Dictionary
+    ...    password=${password}
+    ...    username=${username}
+    ...    role=${role}
+    ...    description=${description}
+    ...    cn=${username}
+
+    Create Session    jwtsession    ${CAPIF_HTTPS_REGISTER_URL}    verify=False    disable_warnings=1
+
+    ${resp}=    POST On Session    jwtsession    /register    json=${body}
+
+    Should Be Equal As Strings    ${resp.status_code}    201
+
+    # Get Auth to obtain access_token
+    ${get_auth_response}=    Get Auth For User    ${username}    ${password}
+
+    ${register_user_info}=    Create Dictionary
+    ...    netappID=${resp.json()['id']}
+    ...    csr_request=${csr_request}
+    ...    apf_csr_request=${apf_csr_request}
+    ...    aef_csr_request=${aef_csr_request}
+    ...    amf_csr_request=${amf_csr_request}
+    ...    apf_username=${apf_username}
+    ...    aef_username=${aef_username}
+    ...    amf_username=${amf_username}
+    ...    &{resp.json()}
+    ...    &{get_auth_response}
+
+    Log Dictionary    ${register_user_info}
+
+    RETURN    ${register_user_info}
+
+Get Auth For User
+    [Arguments]    ${username}    ${password}
+
+    &{body}=    Create Dictionary    username=${username}    password=${password}
+
+    ${resp}=    POST On Session    jwtsession    /getauth    json=${body}
+
+    Should Be Equal As Strings    ${resp.status_code}    200
+
+    # Should Be Equal As Strings    ${resp.json()['message']}    Certificate created successfuly
+
+    RETURN    ${resp.json()}
+
+# Clean Test Information By HTTP Requests
+#    Create Session    jwtsession    ${CAPIF_HTTP_URL}    verify=True
+
+#    ${resp}=    DELETE On Session    jwtsession    /testdata
+#    Should Be Equal As Strings    ${resp.status_code}    200
+
+Clean Test Information
+    ${capif_users_dict}=    Call Method    ${CAPIF_USERS}    get_capif_users_dict
+
+    ${register_users}=    Call Method    ${CAPIF_USERS}    get_register_users
+
+    ${keys}=    Get Dictionary Keys    ${capif_users_dict}
+
+    FOR    ${key}    IN    @{keys}
+        ${value}=    Get From Dictionary    ${capif_users_dict}    ${key}
+        ${resp}=    Delete Request Capif
+        ...    ${key}
+        ...    server=${CAPIF_HTTPS_URL}
+        ...    verify=ca.crt
+        ...    username=${value}
+
+        Status Should Be    204    ${resp}
+
+        Call Method    ${CAPIF_USERS}    remove_capif_users_entry    ${key}
+    END
+
+    FOR    ${user}    IN    @{register_users}
+        &{body}=    Create Dictionary
+        ...    password=password
+        ...    username=${user}
+
+        Create Session    jwtsession    ${CAPIF_HTTPS_REGISTER_URL}    verify=False    disable_warnings=1
+
+        ${resp}=    DELETE On Session    jwtsession    /remove    json=${body}
+
+        Should Be Equal As Strings    ${resp.status_code}    204
+
+        Call Method    ${CAPIF_USERS}    remove_register_users_entry    ${user}
+    END
+
+Remove entity
+    [Arguments]   ${entity_user}   ${certificate_name}=${entity_user}
+
+    ${capif_users_dict}=    Call Method    ${CAPIF_USERS}    get_capif_users_dict
+
+    ${register_users}=    Call Method    ${CAPIF_USERS}    get_register_users
+
+    Log Dictionary    ${capif_users_dict}
+    Log List    ${register_users}
+    ${keys}=    Get Dictionary Keys    ${capif_users_dict}
+
+    FOR    ${key}    IN    @{keys}
+        ${value}=    Get From Dictionary    ${capif_users_dict}    ${key}
+        IF   "${value}" == "${certificate_name}"
+            ${resp}=    Delete Request Capif
+            ...    ${key}
+            ...    server=${CAPIF_HTTPS_URL}
+            ...    verify=ca.crt
+            ...    username=${value}
+
+            Status Should Be    204    ${resp}
+
+            Call Method    ${CAPIF_USERS}    remove_capif_users_entry    ${key}
+        END
+    END
+
+    &{body}=    Create Dictionary
+    ...    password=password
+    ...    username=${entity_user}
+
+    Create Session    jwtsession    ${CAPIF_HTTPS_REGISTER_URL}    verify=False    disable_warnings=1
+
+    ${resp}=    DELETE On Session    jwtsession    /remove    json=${body}
+
+    Should Be Equal As Strings    ${resp.status_code}    204
+
+    Call Method    ${CAPIF_USERS}    remove_register_users_entry    ${entity_user}
+
+    Log Dictionary    ${capif_users_dict}
+    Log List    ${register_users}
+
+
+Invoker Default Onboarding
+    [Arguments]    ${invoker_username}=${INVOKER_USERNAME}
+    ${register_user_info}=    Register User At Jwt Auth
+    ...    username=${INVOKER_USERNAME}    role=${INVOKER_ROLE}
+
+    # Send Onboarding Request
+    ${request_body}=    Create Onboarding Notification Body
+    ...    http://${CAPIF_CALLBACK_IP}:${CAPIF_CALLBACK_PORT}/netapp_callback
+    ...    ${register_user_info['csr_request']}
+    ...    ${INVOKER_USERNAME}
+    ${resp}=    Post Request Capif
+    ...    ${register_user_info['ccf_onboarding_url']}
+    ...    json=${request_body}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    access_token=${register_user_info['access_token']}
+
+    Set To Dictionary    ${register_user_info}    api_invoker_id=${resp.json()['apiInvokerId']}
+    Log Dictionary    ${register_user_info}
+
+    # Assertions
+    Status Should Be    201    ${resp}
+    Check Variable    ${resp.json()}    APIInvokerEnrolmentDetails
+    Check Location Header    ${resp}    ${LOCATION_INVOKER_RESOURCE_REGEX}
+    # Store dummy signede certificate
+    Store In File    ${INVOKER_USERNAME}.crt    ${resp.json()['onboardingInformation']['apiInvokerCertificate']}
+
+    ${url}=    Parse Url    ${resp.headers['Location']}
+
+    RETURN    ${register_user_info}    ${url}    ${request_body}
+
+Provider Registration
+    [Arguments]    ${register_user_info}
+
+    # Create provider Registration Body
+    ${apf_func_details}=    Create Api Provider Function Details
+    ...    ${register_user_info['apf_username']}
+    ...    ${register_user_info['apf_csr_request']}
+    ...    APF
+    ${aef_func_details}=    Create Api Provider Function Details
+    ...    ${register_user_info['aef_username']}
+    ...    ${register_user_info['aef_csr_request']}
+    ...    AEF
+    ${amf_func_details}=    Create Api Provider Function Details
+    ...    ${register_user_info['amf_username']}
+    ...    ${register_user_info['amf_csr_request']}
+    ...    AMF
+    ${api_prov_funcs}=    Create List    ${apf_func_details}    ${aef_func_details}    ${amf_func_details}
+
+    ${request_body}=    Create Api Provider Enrolment Details Body
+    ...    ${register_user_info['access_token']}
+    ...    ${api_prov_funcs}
+
+    # Register Provider
+    ${resp}=    Post Request Capif
+    ...    /api-provider-management/v1/registrations
+    ...    json=${request_body}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    access_token=${register_user_info['access_token']}
+
+    # Check Results
+    Check Response Variable Type And Values    ${resp}    201    APIProviderEnrolmentDetails
+    ${resource_url}=    Check Location Header    ${resp}    ${LOCATION_PROVIDER_RESOURCE_REGEX}
+
+    Log Dictionary    ${resp.json()}
+
+    FOR    ${prov}    IN    @{resp.json()['apiProvFuncs']}
+        Log Dictionary    ${prov}
+        Store In File    ${prov['apiProvFuncInfo']}.crt    ${prov['regInfo']['apiProvCert']}
+        IF    "${prov['apiProvFuncRole']}" == "APF"
+            Set To Dictionary    ${register_user_info}    apf_id=${prov['apiProvFuncId']}
+        ELSE IF    "${prov['apiProvFuncRole']}" == "AEF"
+            Set To Dictionary    ${register_user_info}    aef_id=${prov['apiProvFuncId']}
+        ELSE IF    "${prov['apiProvFuncRole']}" == "AMF"
+            Set To Dictionary    ${register_user_info}    amf_id=${prov['apiProvFuncId']}
+        ELSE
+            Fail    "${prov['apiProvFuncRole']} is not valid role"
+        END
+    END
+
+    Set To Dictionary
+    ...    ${register_user_info}
+    ...    provider_enrollment_details=${request_body}
+    ...    resource_url=${resource_url}
+    ...    provider_register_response=${resp}
+
+    RETURN    ${register_user_info}
+
+Provider Default Registration
+    # Register Provider
+    ${register_user_info}=    Register User At Jwt Auth Provider
+    ...    username=${PROVIDER_USERNAME}    role=${PROVIDER_ROLE}
+
+    ${register_user_info}=    Provider Registration    ${register_user_info}
+
+    Log Dictionary    ${register_user_info}
+    RETURN    ${register_user_info}
+
+Publish Service Api
+    [Arguments]    ${register_user_info_provider}    ${service_name}=service_1
+
+    ${request_body}=    Create Service Api Description    ${service_name}    ${register_user_info_provider['aef_id']}
+    ${resp}=    Post Request Capif
+    ...    /published-apis/v1/${register_user_info_provider['apf_id']}/service-apis
+    ...    json=${request_body}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${register_user_info_provider['apf_username']}
+
+    Check Response Variable Type And Values    ${resp}    201    ServiceAPIDescription
+    Dictionary Should Contain Key    ${resp.json()}    apiId
+    ${resource_url}=    Check Location Header    ${resp}    ${LOCATION_PUBLISH_RESOURCE_REGEX}
+
+    RETURN    ${resp.json()}    ${resource_url}    ${request_body}
+
+Basic ACL registration
+    [Arguments]    ${create_security_context}=${True}
+    # Register APF
+    ${register_user_info_provider}=    Provider Default Registration
+
+    Call Method
+    ...    ${CAPIF_USERS}
+    ...    update_capif_users_dicts
+    ...    ${register_user_info_provider['resource_url'].path}
+    ...    ${AMF_PROVIDER_USERNAME}
+    Call Method    ${CAPIF_USERS}    update_register_users    ${PROVIDER_USERNAME}
+
+    ${service_api_description_published}    ${resource_url}    ${request_body}=    Publish Service Api
+    ...    ${register_user_info_provider}
+    ...    service_1
+
+    # Store apiId1
+    ${serviceApiId}=    Set Variable    ${service_api_description_published['apiId']}
+
+    # Retrieve Services 1
+    ${resp}=    Get Request Capif
+    ...    /published-apis/v1/${register_user_info_provider['apf_id']}/service-apis/${serviceApiId}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${APF_PROVIDER_USERNAME}
+
+    Check Response Variable Type And Values    ${resp}    200    ServiceAPIDescription
+    Dictionaries Should Be Equal    ${resp.json()}    ${service_api_description_published}
+
+    # Default Invoker Registration and Onboarding
+    ${register_user_info_invoker}    ${url}    ${request_body}=    Invoker Default Onboarding
+
+    Call Method    ${CAPIF_USERS}    update_capif_users_dicts    ${url.path}    ${INVOKER_USERNAME}
+    Call Method    ${CAPIF_USERS}    update_register_users    ${INVOKER_USERNAME}
+
+    # Test
+    ${discover_response}=    Get Request Capif
+    ...    ${DISCOVER_URL}${register_user_info_invoker['api_invoker_id']}&aef-id=${register_user_info_provider['aef_id']}
+    ...    server=${CAPIF_HTTPS_URL}
+    ...    verify=ca.crt
+    ...    username=${INVOKER_USERNAME}
+
+    Check Response Variable Type And Values    ${discover_response}    200    DiscoveredAPIs
+
+    IF    ${create_security_context} == ${True}
+        # create Security Context
+        ${request_body}=    Create Service Security From Discover Response
+        ...    http://${CAPIF_HOSTNAME}:${CAPIF_HTTP_PORT}/test
+        ...    ${discover_response}
+        ${resp}=    Put Request Capif
+        ...    /capif-security/v1/trustedInvokers/${register_user_info_invoker['api_invoker_id']}
+        ...    json=${request_body}
+        ...    server=${CAPIF_HTTPS_URL}
+        ...    verify=ca.crt
+        ...    username=${INVOKER_USERNAME}
+        # Check Service Security
+        Check Response Variable Type And Values    ${resp}    201    ServiceSecurity
+        ${resource_url}=    Check Location Header    ${resp}    ${LOCATION_SECURITY_RESOURCE_REGEX}
+    END
+
+    RETURN    ${register_user_info_invoker}    ${register_user_info_provider}    ${service_api_description_published}
diff --git a/tests/resources/common/httpServer.robot b/tests/resources/common/httpServer.robot
new file mode 100644
index 0000000000000000000000000000000000000000..7105dc1a1f2b504378735fd4002210a409f4c532
--- /dev/null
+++ b/tests/resources/common/httpServer.robot
@@ -0,0 +1,2 @@
+*** Settings ***
+Library           HttpLibrary
diff --git a/tests/resources/common/httpServerCtrl.robot b/tests/resources/common/httpServerCtrl.robot
new file mode 100644
index 0000000000000000000000000000000000000000..8782d192f8f2133808298ba01c6da635f419fd34
--- /dev/null
+++ b/tests/resources/common/httpServerCtrl.robot
@@ -0,0 +1,3 @@
+*** Settings ***
+
+Library         String
diff --git a/tools/open_api_script/generate_all_capif_apis.sh b/tools/open_api_script/generate_all_capif_apis.sh
new file mode 100755
index 0000000000000000000000000000000000000000..0b5393c9e85444beac33c4b1f7ada8cb0788f508
--- /dev/null
+++ b/tools/open_api_script/generate_all_capif_apis.sh
@@ -0,0 +1,92 @@
+#!/bin/bash
+
+ENDPOINTS=()
+SERVICE_NAMES=()
+COMPOSITE_PROJECT=CAPIF-composite-test2
+OUTPUT_HOST_BASE_DIRECTORY=out/CAPIF-composite-test2
+OUTPUT_DOCKER_BASE_DIRECTORY=/gen/$OUTPUT_HOST_BASE_DIRECTORY
+DOCKER_COMPOSE_FILENAME=$OUTPUT_HOST_BASE_DIRECTORY/docker-compose-test.yml
+NGINX_CONF_FILE=$OUTPUT_HOST_BASE_DIRECTORY/nginx.conf
+
+echo "docker compose file: $DOCKER_COMPOSE_FILENAME"
+mkdir -p $OUTPUT_HOST_BASE_DIRECTORY
+
+# rm $DOCKER_COMPOSE_FILENAME || true
+cat > $DOCKER_COMPOSE_FILENAME << EOF
+services:
+EOF
+
+function createPythonServer {
+    SWAGGER_FILE=$1
+    API_NAME=$(basename -s .yaml $SWAGGER_FILE)
+    ENDPOINT=$(awk '/- url: /{ print $3 }' $SWAGGER_FILE|awk -F / '{ print $2}')
+    OUTPUT=$OUTPUT_DOCKER_BASE_DIRECTORY/$API_NAME/
+    echo "SWAGGER_FILE: $SWAGGER_FILE"
+    echo "API_NAME: $API_NAME"
+    echo "ENDPOINT: $ENDPOINT"
+    echo "OUTPUT DIRECTORY: $OUTPUT"
+    ENDPOINTS+=($ENDPOINT)
+    SERVICE_NAME=$(echo $ENDPOINT | sed 's/-/_/g')
+    # SERVICE_NAMES+=($SERVICE_NAME)
+    ./run-in-docker.sh generate -i $SWAGGER_FILE \
+       -g python-flask \
+       -o $OUTPUT \
+       --package-name=$SERVICE_NAME
+    cat >> $DOCKER_COMPOSE_FILENAME << EOF
+  $ENDPOINT:
+    build: $API_NAME/.
+    expose:
+      - "8080"
+EOF
+}
+
+
+CAPIF_FILES=$(ls capif|awk '/TS29222/{  print "capif/"$0 }')
+for CAPIF_FILE in ${CAPIF_FILES[*]}
+do
+createPythonServer $CAPIF_FILE
+done
+
+cat >> $DOCKER_COMPOSE_FILENAME << EOF
+  nginx:
+    image: nginx:latest
+    volumes:
+      - ./nginx.conf:/etc/nginx/nginx.conf:ro
+    ports:
+      - "8080:8080"
+    depends_on:
+EOF
+
+for endpoint in ${ENDPOINTS[*]}
+do
+cat >> $DOCKER_COMPOSE_FILENAME << EOF
+      - $endpoint
+EOF
+done
+
+cat > $NGINX_CONF_FILE << EOF
+user  nginx;
+
+events {
+    worker_connections   1000;
+}
+http {
+        server {
+              listen 8080;
+EOF
+
+
+for endpoint in ${ENDPOINTS[*]}
+do
+cat >> $NGINX_CONF_FILE << EOF
+              location /$endpoint {
+                proxy_pass http://$endpoint:8080;
+              }
+EOF
+done
+
+cat >> $NGINX_CONF_FILE << EOF
+        }
+}
+EOF
+
diff --git a/tools/robot/Dockerfile b/tools/robot/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..49cea1714ace28c777903b7c30f30bad1ae674cf
--- /dev/null
+++ b/tools/robot/Dockerfile
@@ -0,0 +1,100 @@
+FROM harbor.elevenpaths.com/dockerhub-proxy/library/ubuntu:20.04
+LABEL maintainer="Jorge Moratinos Salcines <jorge.moratinossalcines@telefonica.com>"
+LABEL version="2.0"
+LABEL description="Docker to run Robot Framework"
+
+ENV ROBOT_DIRECTORY=/opt/robot-tests
+ENV ROBOT_COMMON_DIRECTORY=$ROBOT_DIRECTORY/common
+ENV ROBOT_TESTS_DIRECTORY=$ROBOT_DIRECTORY/tests
+ENV ROBOT_RESULTS_DIRECTORY=$ROBOT_DIRECTORY/results
+
+
+# Create directories structure
+RUN mkdir $ROBOT_DIRECTORY
+RUN mkdir $ROBOT_COMMON_DIRECTORY
+RUN mkdir $ROBOT_TESTS_DIRECTORY
+RUN mkdir $ROBOT_RESULTS_DIRECTORY
+
+
+# Create Volumes for docker
+# VOLUME $ROBOT_DIRECTORY
+VOLUME $ROBOT_COMMON_DIRECTORY
+VOLUME $ROBOT_TESTS_DIRECTORY
+VOLUME $ROBOT_RESULTS_DIRECTORY
+
+WORKDIR $ROBOT_DIRECTORY
+
+ENV DEBIAN_FRONTEND=noninteractive
+
+# Install dependencies
+RUN apt-get update
+RUN apt-get upgrade -y
+RUN apt-get install -y --no-install-recommends  \
+    software-properties-common \
+    build-essential \
+    bash \
+    bash-completion \
+    libxml2 \
+    libxslt-dev \
+    curl \
+    yarn \
+    less \
+    dpkg \
+    wget \
+    python3 \
+    python3-dev \
+    libxslt-dev \
+    libffi-dev \
+    python3-pip \
+    python3-venv \
+    python2.7-dev \
+    libssl-dev \
+    libldap2-dev libsasl2-dev ldap-utils slapd tox lcov valgrind\
+    tshark
+
+RUN add-apt-repository ppa:deadsnakes/ppa
+RUN apt-get update
+RUN apt-get install -y --fix-missing python3.10 python3.10-venv python3.10-dev
+
+
+RUN mkdir /opt/venv
+RUN python3.10 -m venv /opt/venv
+
+ADD basicRequirements.txt /root/
+
+ADD basicRobotInstall.sh /root/
+RUN chmod a+x /root/basicRobotInstall.sh \
+    && /root/basicRobotInstall.sh /root/basicRequirements.txt
+RUN sed -i 's/\/bin\/ash/\/bin\/bash/g' /etc/passwd
+
+ADD entrypoint.sh /root/
+ADD linter_entrypoint.sh /root/
+ADD featdoc_entrypoint.sh /root/
+ADD libdoc_entrypoint.sh /root/
+
+
+RUN sed  -i 's|ROBOT_DIRECTORY|'$ROBOT_DIRECTORY'|g' /root/entrypoint.sh
+RUN sed  -i 's|ROBOT_TESTS_DIRECTORY|'$ROBOT_TESTS_DIRECTORY'|g' /root/entrypoint.sh
+RUN sed  -i 's|ROBOT_COMMON_DIRECTORY|'$ROBOT_COMMON_DIRECTORY'|g' /root/entrypoint.sh
+RUN sed  -i 's|ROBOT_RESULTS_DIRECTORY|'$ROBOT_RESULTS_DIRECTORY'|g' /root/entrypoint.sh
+
+RUN sed  -i 's|ROBOT_DIRECTORY|'$ROBOT_DIRECTORY'|g' /root/linter_entrypoint.sh
+RUN sed  -i 's|ROBOT_TESTS_DIRECTORY|'$ROBOT_TESTS_DIRECTORY'|g' /root/linter_entrypoint.sh
+RUN sed  -i 's|ROBOT_COMMON_DIRECTORY|'$ROBOT_COMMON_DIRECTORY'|g' /root/linter_entrypoint.sh
+
+
+RUN sed  -i 's|ROBOT_DIRECTORY|'$ROBOT_DIRECTORY'|g' /root/featdoc_entrypoint.sh
+RUN sed  -i 's|ROBOT_TESTS_DIRECTORY|'$ROBOT_TESTS_DIRECTORY'|g' /root/featdoc_entrypoint.sh
+RUN sed  -i 's|ROBOT_COMMON_DIRECTORY|'$ROBOT_COMMON_DIRECTORY'|g' /root/featdoc_entrypoint.sh
+
+RUN sed  -i 's|ROBOT_DIRECTORY|'$ROBOT_DIRECTORY'|g' /root/libdoc_entrypoint.sh
+RUN sed  -i 's|ROBOT_TESTS_DIRECTORY|'$ROBOT_TESTS_DIRECTORY'|g' /root/libdoc_entrypoint.sh
+RUN sed  -i 's|ROBOT_COMMON_DIRECTORY|'$ROBOT_COMMON_DIRECTORY'|g' /root/libdoc_entrypoint.sh
+
+
+RUN chmod a+x /root/entrypoint.sh
+RUN chmod a+x /root/linter_entrypoint.sh
+RUN chmod a+x /root/featdoc_entrypoint.sh
+RUN chmod a+x /root/libdoc_entrypoint.sh
+
+ENTRYPOINT [ "/root/entrypoint.sh" ]
diff --git a/tools/robot/README.md b/tools/robot/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..91e8caa08d928976971ee2898f8fe95818db9280
--- /dev/null
+++ b/tools/robot/README.md
@@ -0,0 +1,37 @@
+# Usage
+
+In order to achieve independence of underlying machine we build a docker with robot binary to use this tool in a deacoplated, static and controlled way.
+
+## Generate robot-test docker image
+
+To generate container unit use the following
+
+The image will be built and pushed to artifact.
+
+The docker image is stored at dockerhub.hi.inet/5ghacking/robot-test-image:latest
+
+# To build image
+
+Under "robot" directory, execute this:
+
+docker build . -t dockerhub.hi.inet/5ghacking/robot-test-image:latest
+
+## To run test with container
+```
+docker run -t --rm 
+       -v <ROBOT_COMMON_DIRECTORY>:/opt/robot-tests/common 
+       -v <ROBOT_TESTS_DIRECTORY>:/opt/robot-tests/tests 
+       dockerhub.hi.inet/5ghacking/robot-test-image:latest
+       <RELATIVE_PATH_TO_TEST>
+```
+
+If RELATIVE_PATH_TO_TEST is not set, it will execute alll tests placed in <ROBOT_TEST_DIRECTORY>, in other case, robot.test should be call relate to <ROBOT_TEST_DIRECTORY>
+
+# To run bash in container
+```
+docker run -ti --entrypoint=/bin/bash --rm 
+       -v <ROBOT_COMMON_DIRECTORY>:/opt/robot-tests/common 
+       -v <ROBOT_TESTS_DIRECTORY>:/opt/robot-tests/tests 
+       dockerhub.hi.inet/5ghacking/robot-test-image:latest
+
+```
diff --git a/tools/robot/basicRequirements.txt b/tools/robot/basicRequirements.txt
new file mode 100644
index 0000000000000000000000000000000000000000..87752271253dc67c7e0c0d8e8f42d4768001b074
--- /dev/null
+++ b/tools/robot/basicRequirements.txt
@@ -0,0 +1,101 @@
+# Requirements needed when generating releases. See BUILD.rst for details.
+appdirs==1.4.4
+argh==0.26.2
+arrow==1.2.3
+async-generator==1.10
+async-timeout==4.0.2
+attrs==22.1.0
+bcrypt==4.0.1
+beautifulsoup4==4.11.1
+binaryornot==0.4.4
+bson==0.5.10
+certifi==2021.10.8
+cffi==1.15.1
+chardet==5.0.0
+charset-normalizer==2.0.12
+click==8.0.1
+configparser==5.3.0
+cookiecutter==2.1.1
+coverage==4.5.4
+cryptography==38.0.1
+Deprecated==1.2.13
+distlib==0.3.6
+dnspython==2.2.1
+docutils==0.19
+exceptiongroup==1.0.0rc9
+filelock==3.8.0
+flake8==3.9.2
+h11==0.14.0
+robotframework-httpctrl==0.3.1
+idna==3.4
+iniconfig==1.1.1
+invoke==1.6.0
+ipaddress==1.0.23
+Jinja2==3.1.2
+jinja2-time==0.2.0
+lxml==4.9.1
+MarkupSafe==2.1.1
+mccabe==0.6.1
+numpy==1.23.4
+outcome==1.2.0
+packaging==21.3
+pandas==1.5.1
+paramiko==2.11.0
+pathtools==0.1.2
+platformdirs==2.5.2
+pluggy==0.13.1
+psutil==5.9.3
+py==1.11.0
+pyasn1==0.4.8
+pyasn1-modules==0.2.8
+pycodestyle==2.7.0
+pycparser==2.21
+pyflakes==2.3.1
+PyGithub==1.56
+PyJWT==2.6.0
+pymongo==4.3.2
+PyNaCl==1.5.0
+pyOpenSSL==22.1.0
+pyparsing==3.0.9
+PySocks==1.7.1
+pytest==6.2.4
+python-dateutil==2.8.2
+python-ldap==3.4.3
+python-slugify==6.1.2
+pythonping==1.1.3
+pytz==2022.5
+PyYAML==6.0
+redis==4.3.4
+rellu==0.7
+requests==2.28.1
+rfc3987==1.3.8
+robotframework==6.0
+robotframework-lint==1.1
+robotframework-mongodb-library==3.2
+robotframework-pythonlibcore==3.0.0
+robotframework-requests==0.9.3
+robotframework-seleniumlibrary==6.0.0
+robotframework-sshlibrary==3.8.0
+robotremoteserver==1.1
+scp==0.14.4
+selenium==4.5.0
+six==1.16.0
+sniffio==1.3.0
+sortedcontainers==2.4.0
+soupsieve==2.3.2.post1
+sshconf==0.2.5
+text-unidecode==1.3
+toml==0.10.2
+tomli==2.0.1
+tox==3.26.0
+tqdm==4.64.1
+trio==0.22.0
+trio-websocket==0.9.2
+typing-extensions==3.10.0.2
+urllib3==1.26.12
+virtualenv==20.16.5
+watchdog==0.9.0
+webdrivermanager==0.10.0
+wrapt==1.14.1
+wsproto==1.2.0
+xlrd==2.0.1
\ No newline at end of file
diff --git a/tools/robot/basicRobotInstall.sh b/tools/robot/basicRobotInstall.sh
new file mode 100644
index 0000000000000000000000000000000000000000..511821fbab10d55f80dd2a13af1d60035ca0bd40
--- /dev/null
+++ b/tools/robot/basicRobotInstall.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+echo "Installing basic software related with robotFramework"
+source /opt/venv/bin/activate; 
+pip install --upgrade pip
+pip install --upgrade robotframework;
+pip install -r $1 
+echo "Robot framework installed"
diff --git a/tools/robot/doc_entrypoint.sh b/tools/robot/doc_entrypoint.sh
new file mode 100755
index 0000000000000000000000000000000000000000..9595c0b453a6687a544c41cc199e0c66e015b0cb
--- /dev/null
+++ b/tools/robot/doc_entrypoint.sh
@@ -0,0 +1,48 @@
+#!/bin/bash
+source /opt/venv/bin/activate;
+BASE_DIRECTORY=ROBOT_DIRECTORY
+BASE_REQ_FILE=$BASE_DIRECTORY/requirements.txt
+COMMON_REQ_FILE=ROBOT_COMMON_DIRECTORY/requirements.txt
+TESTS_REQ_FILE=ROBOT_TESTS_DIRECTORY/requirements.txt
+
+ARGUMENTS=
+OPTIONS=
+
+while [ -n "$1" ]; do # while loop starts
+
+        case "$1" in
+
+
+        --*)
+                OPTIONS+="$1 $2 "
+                shift
+                ;;
+
+        *) ARGUMENTS+="ROBOT_TESTS_DIRECTORY/$1 " ;;
+        esac
+        shift
+done
+
+if [[ -f "$BASE_REQ_FILE" ]]; then
+    rm $BASE_REQ_FILE
+fi
+
+echo '# Requirements file for tests.' > $BASE_REQ_FILE
+
+if [[ -f "$COMMON_REQ_FILE" ]]; then
+    cat $COMMON_REQ_FILE >> $BASE_REQ_FILE
+fi
+
+if [[ -f "$TESTS_REQ_FILE" ]]; then
+    cat $TESTS_REQ_FILE >> $BASE_REQ_FILE
+fi
+
+cat $BASE_REQ_FILE | sort | uniq > $BASE_REQ_FILE.tmp ; mv $BASE_REQ_FILE.tmp $BASE_REQ_FILE
+
+if [ -z "$ARGUMENTS" ]
+then
+      ARGUMENTS="ROBOT_TESTS_DIRECTORY/"
+fi
+
+pip install -r $BASE_REQ_FILE
+python3 -m robot.testdoc $OPTIONS $ARGUMENTS
diff --git a/tools/robot/entrypoint.sh b/tools/robot/entrypoint.sh
new file mode 100644
index 0000000000000000000000000000000000000000..d889a7aa00c1c94988752e7810b356b24bca3289
--- /dev/null
+++ b/tools/robot/entrypoint.sh
@@ -0,0 +1,48 @@
+#!/bin/bash
+source /opt/venv/bin/activate;
+BASE_DIRECTORY=ROBOT_DIRECTORY
+BASE_REQ_FILE=$BASE_DIRECTORY/requirements.txt
+COMMON_REQ_FILE=ROBOT_COMMON_DIRECTORY/requirements.txt
+TESTS_REQ_FILE=ROBOT_TESTS_DIRECTORY/requirements.txt
+
+ARGUMENTS=
+OPTIONS=
+
+while [ -n "$1" ]; do # while loop starts
+
+        case "$1" in
+
+
+        --*)
+                OPTIONS+="$1 $2 "
+                shift
+                ;;
+
+        *) ARGUMENTS+="ROBOT_TESTS_DIRECTORY/$1 " ;;
+        esac
+        shift
+done
+
+if [[ -f "$BASE_REQ_FILE" ]]; then
+    rm $BASE_REQ_FILE
+fi
+
+echo '# Requirements file for tests.' > $BASE_REQ_FILE
+
+if [[ -f "$COMMON_REQ_FILE" ]]; then
+    cat $COMMON_REQ_FILE >> $BASE_REQ_FILE
+fi
+
+if [[ -f "$TESTS_REQ_FILE" ]]; then
+    cat $TESTS_REQ_FILE >> $BASE_REQ_FILE
+fi
+
+cat $BASE_REQ_FILE | sort | uniq > $BASE_REQ_FILE.tmp ; mv $BASE_REQ_FILE.tmp $BASE_REQ_FILE
+
+if [ -z "$ARGUMENTS" ]
+then
+      ARGUMENTS="ROBOT_TESTS_DIRECTORY/"
+fi
+
+pip install -r $BASE_REQ_FILE
+robot -d ROBOT_RESULTS_DIRECTORY --xunit xunit.xml $OPTIONS $ARGUMENTS
diff --git a/tools/robot/featdoc_entrypoint.sh b/tools/robot/featdoc_entrypoint.sh
new file mode 100755
index 0000000000000000000000000000000000000000..9595c0b453a6687a544c41cc199e0c66e015b0cb
--- /dev/null
+++ b/tools/robot/featdoc_entrypoint.sh
@@ -0,0 +1,48 @@
+#!/bin/bash
+source /opt/venv/bin/activate;
+BASE_DIRECTORY=ROBOT_DIRECTORY
+BASE_REQ_FILE=$BASE_DIRECTORY/requirements.txt
+COMMON_REQ_FILE=ROBOT_COMMON_DIRECTORY/requirements.txt
+TESTS_REQ_FILE=ROBOT_TESTS_DIRECTORY/requirements.txt
+
+ARGUMENTS=
+OPTIONS=
+
+while [ -n "$1" ]; do # while loop starts
+
+        case "$1" in
+
+
+        --*)
+                OPTIONS+="$1 $2 "
+                shift
+                ;;
+
+        *) ARGUMENTS+="ROBOT_TESTS_DIRECTORY/$1 " ;;
+        esac
+        shift
+done
+
+if [[ -f "$BASE_REQ_FILE" ]]; then
+    rm $BASE_REQ_FILE
+fi
+
+echo '# Requirements file for tests.' > $BASE_REQ_FILE
+
+if [[ -f "$COMMON_REQ_FILE" ]]; then
+    cat $COMMON_REQ_FILE >> $BASE_REQ_FILE
+fi
+
+if [[ -f "$TESTS_REQ_FILE" ]]; then
+    cat $TESTS_REQ_FILE >> $BASE_REQ_FILE
+fi
+
+cat $BASE_REQ_FILE | sort | uniq > $BASE_REQ_FILE.tmp ; mv $BASE_REQ_FILE.tmp $BASE_REQ_FILE
+
+if [ -z "$ARGUMENTS" ]
+then
+      ARGUMENTS="ROBOT_TESTS_DIRECTORY/"
+fi
+
+pip install -r $BASE_REQ_FILE
+python3 -m robot.testdoc $OPTIONS $ARGUMENTS
diff --git a/tools/robot/libdoc_entrypoint.sh b/tools/robot/libdoc_entrypoint.sh
new file mode 100755
index 0000000000000000000000000000000000000000..186c721aa065a0c765236b99e2231e91a5c35566
--- /dev/null
+++ b/tools/robot/libdoc_entrypoint.sh
@@ -0,0 +1,48 @@
+#!/bin/bash
+source /opt/venv/bin/activate;
+BASE_DIRECTORY=ROBOT_DIRECTORY
+BASE_REQ_FILE=$BASE_DIRECTORY/requirements.txt
+COMMON_REQ_FILE=ROBOT_COMMON_DIRECTORY/requirements.txt
+TESTS_REQ_FILE=ROBOT_TESTS_DIRECTORY/requirements.txt
+
+ARGUMENTS=
+OPTIONS=
+
+while [ -n "$1" ]; do # while loop starts
+
+        case "$1" in
+
+
+        --*)
+                OPTIONS+="$1 $2 "
+                shift
+                ;;
+
+        *) ARGUMENTS+="ROBOT_TESTS_DIRECTORY/$1 " ;;
+        esac
+        shift
+done
+
+if [[ -f "$BASE_REQ_FILE" ]]; then
+    rm $BASE_REQ_FILE
+fi
+
+echo '# Requirements file for tests.' > $BASE_REQ_FILE
+
+if [[ -f "$COMMON_REQ_FILE" ]]; then
+    cat $COMMON_REQ_FILE >> $BASE_REQ_FILE
+fi
+
+if [[ -f "$TESTS_REQ_FILE" ]]; then
+    cat $TESTS_REQ_FILE >> $BASE_REQ_FILE
+fi
+
+cat $BASE_REQ_FILE | sort | uniq > $BASE_REQ_FILE.tmp ; mv $BASE_REQ_FILE.tmp $BASE_REQ_FILE
+
+if [ -z "$ARGUMENTS" ]
+then
+      ARGUMENTS="ROBOT_TESTS_DIRECTORY/"
+fi
+
+pip install -r $BASE_REQ_FILE
+python3 -m robot.libdoc $OPTIONS $ARGUMENTS
diff --git a/tools/robot/linter_entrypoint.sh b/tools/robot/linter_entrypoint.sh
new file mode 100755
index 0000000000000000000000000000000000000000..803719adaefa59da7f8492623d68ca9984e6b4ac
--- /dev/null
+++ b/tools/robot/linter_entrypoint.sh
@@ -0,0 +1,48 @@
+#!/bin/bash
+source /opt/venv/bin/activate;
+BASE_DIRECTORY=ROBOT_DIRECTORY
+BASE_REQ_FILE=$BASE_DIRECTORY/requirements.txt
+COMMON_REQ_FILE=ROBOT_COMMON_DIRECTORY/requirements.txt
+TESTS_REQ_FILE=ROBOT_TESTS_DIRECTORY/requirements.txt
+
+ARGUMENTS=
+OPTIONS=
+
+while [ -n "$1" ]; do # while loop starts
+
+        case "$1" in
+
+
+        --*)
+                OPTIONS+="$1 $2 "
+                shift
+                ;;
+
+        *) ARGUMENTS+="ROBOT_TESTS_DIRECTORY/$1 " ;;
+        esac
+        shift
+done
+
+if [[ -f "$BASE_REQ_FILE" ]]; then
+    rm $BASE_REQ_FILE
+fi
+
+echo '# Requirements file for tests.' > $BASE_REQ_FILE
+
+if [[ -f "$COMMON_REQ_FILE" ]]; then
+    cat $COMMON_REQ_FILE >> $BASE_REQ_FILE
+fi
+
+if [[ -f "$TESTS_REQ_FILE" ]]; then
+    cat $TESTS_REQ_FILE >> $BASE_REQ_FILE
+fi
+
+cat $BASE_REQ_FILE | sort | uniq > $BASE_REQ_FILE.tmp ; mv $BASE_REQ_FILE.tmp $BASE_REQ_FILE
+
+if [ -z "$ARGUMENTS" ]
+then
+      ARGUMENTS="ROBOT_TESTS_DIRECTORY/"
+fi
+
+pip install -r $BASE_REQ_FILE
+rflint $OPTIONS $ARGUMENTS