Update generated api files & docs

Issue-ID: NONRTRIC-1042
Change-Id: I487cb2204e542cccd57ca57a5ffd0145befcd988
Signed-off-by: JohnKeeney <john.keeney@est.tech>

diff --git a/.readthedocs.yaml b/.readthedocs.yaml
index 26aaa65..3614718 100644 (file)
--- a/.readthedocs.yaml
+++ b/.readthedocs.yaml
@@ -28,7 +28,8 @@ build:
     python: "3.11"
   jobs:
     post_build:
-      - cp -v docs/offeredapis/openapitoolgen/offeredapis/pms-api/pms-api.html $READTHEDOCS_OUTPUT/html
+      - cp -v docs/offeredapis/openapitoolgen/offeredapis/pms-api/index.html $READTHEDOCS_OUTPUT/html
+      - cp -v docs/offeredapis/openapitoolgen/offeredapis/pms-api/v3/index.html $READTHEDOCS_OUTPUT/html
 
 python:
   install:

diff --git a/api/a1pms-api-v3.json b/api/a1pms-api-v3.json
index 43313bd..c844073 100644 (file)
--- a/api/a1pms-api-v3.json
+++ b/api/a1pms-api-v3.json
@@ -19,8 +19,8 @@
     "url" : "{apiRoot}/a1-policy-management/v1",
     "variables" : {
       "apiRoot" : {
-        "default" : "https://a1-pms.com",
-        "description" : "apiRoot is the Host:port/Domain name of the service  where the A1Pms running"
+        "default" : "https://example.com",
+        "description" : "This is the Host:Port or Address where the A1-Policy Management Service can be accessed"
       }
     }
   } ],

diff --git a/api/pms-api-v3.json b/api/pms-api-v3.json
index 43313bd..c844073 100644 (file)
--- a/api/pms-api-v3.json
+++ b/api/pms-api-v3.json
@@ -19,8 +19,8 @@
     "url" : "{apiRoot}/a1-policy-management/v1",
     "variables" : {
       "apiRoot" : {
-        "default" : "https://a1-pms.com",
-        "description" : "apiRoot is the Host:port/Domain name of the service  where the A1Pms running"
+        "default" : "https://example.com",
+        "description" : "This is the Host:Port or Address where the A1-Policy Management Service can be accessed"
       }
     }
   } ],

diff --git a/api/pms-api-v3.yaml b/api/pms-api-v3.yaml
index d2d613a..46f881e 100644 (file)
--- a/api/pms-api-v3.yaml
+++ b/api/pms-api-v3.yaml
@@ -56,8 +56,8 @@ servers:
   - url: '{apiRoot}/a1-policy-management/v1'
     variables:
       apiRoot:
-        description: 'apiRoot is the Host:port/Domain name of the service  where the A1Pms running'
-        default: 'https://a1-pms.com'
+        default: 'https://example.com'
+        description: 'This is the Host:Port or Address where the A1-Policy Management Service can be accessed'
 tags:
   - name: A1 Policy Management
     description: "API used to create polices, Policy Instances and get \ them as individual using an ID or get all policies/Instances."

diff --git a/api/pms-api/v3/custom/index.html b/api/pms-api/v3/custom/index.html
index 720207e..db61079 100644 (file)
--- a/api/pms-api/v3/custom/index.html
+++ b/api/pms-api/v3/custom/index.html
@@ -1255,7 +1255,7 @@ ul.nav-tabs {
                             <pre class="prettyprint"><code class="language-bsh">curl -X POST \
  -H "Accept: application/json,application/problem+json" \
  -H "Content-Type: application/json" \
- "https://a1-pms.com/a1-policy-management/v1/policies" \
+ "https://example.com/a1-policy-management/v1/policies" \
  -d '{
   &quot;policyId&quot; : &quot;POLICY-ID&quot;,
   &quot;nearRtRicId&quot; : &quot;Near-RT-Ric-ID&quot;,
@@ -2442,7 +2442,7 @@ $(document).ready(function() {
                           <div class="tab-pane active" id="examples-A1PolicyManagement-deletePolicy-0-curl">
                             <pre class="prettyprint"><code class="language-bsh">curl -X DELETE \
  -H "Accept: application/problem+json" \
- "https://a1-pms.com/a1-policy-management/v1/policies/{policyId}"
+ "https://example.com/a1-policy-management/v1/policies/{policyId}"
 </code></pre>
                           </div>
                           <div class="tab-pane" id="examples-A1PolicyManagement-deletePolicy-0-java">
@@ -3516,7 +3516,7 @@ Specifies the content type that the client expects to receive in response to the
                           <div class="tab-pane active" id="examples-A1PolicyManagement-getAllPolicies-0-curl">
                             <pre class="prettyprint"><code class="language-bsh">curl -X GET \
  -H "Accept: application/json,application/problem+json" \
- "https://a1-pms.com/a1-policy-management/v1/policies?policyTypeId=policyTypeId_example&nearRtRicId=nearRtRicId_example&serviceId=serviceId_example&typeName=typeName_example"
+ "https://example.com/a1-policy-management/v1/policies?policyTypeId=policyTypeId_example&nearRtRicId=nearRtRicId_example&serviceId=serviceId_example&typeName=typeName_example"
 </code></pre>
                           </div>
                           <div class="tab-pane" id="examples-A1PolicyManagement-getAllPolicies-0-java">
@@ -4702,7 +4702,7 @@ Select policies of types with the given type name (type identity has the format
                           <div class="tab-pane active" id="examples-A1PolicyManagement-getPolicy-0-curl">
                             <pre class="prettyprint"><code class="language-bsh">curl -X GET \
  -H "Accept: application/json,application/problem+json" \
- "https://a1-pms.com/a1-policy-management/v1/policies/{policyId}"
+ "https://example.com/a1-policy-management/v1/policies/{policyId}"
 </code></pre>
                           </div>
                           <div class="tab-pane" id="examples-A1PolicyManagement-getPolicy-0-java">
@@ -5794,7 +5794,7 @@ Specifies the content type that the client expects to receive in response to the
                           <div class="tab-pane active" id="examples-A1PolicyManagement-getPolicyTypeDefinition-0-curl">
                             <pre class="prettyprint"><code class="language-bsh">curl -X GET \
  -H "Accept: application/json,application/problem+json" \
- "https://a1-pms.com/a1-policy-management/v1/policy-types/{policyTypeId}"
+ "https://example.com/a1-policy-management/v1/policy-types/{policyTypeId}"
 </code></pre>
                           </div>
                           <div class="tab-pane" id="examples-A1PolicyManagement-getPolicyTypeDefinition-0-java">
@@ -6886,7 +6886,7 @@ Specifies the content type that the client expects to receive in response to the
                           <div class="tab-pane active" id="examples-A1PolicyManagement-getPolicyTypes-0-curl">
                             <pre class="prettyprint"><code class="language-bsh">curl -X GET \
  -H "Accept: application/json,application/problem+json" \
- "https://a1-pms.com/a1-policy-management/v1/policy-types?nearRtRicId=nearRtRicId_example&typeName=typeName_example&compatibleWithVersion=compatibleWithVersion_example"
+ "https://example.com/a1-policy-management/v1/policy-types?nearRtRicId=nearRtRicId_example&typeName=typeName_example&compatibleWithVersion=compatibleWithVersion_example"
 </code></pre>
                           </div>
                           <div class="tab-pane" id="examples-A1PolicyManagement-getPolicyTypes-0-java">
@@ -8039,7 +8039,7 @@ Select types that are compatible with the given version. This parameter is only
                             <pre class="prettyprint"><code class="language-bsh">curl -X PUT \
  -H "Accept: application/json,application/problem+json" \
  -H "Content-Type: application/json" \
- "https://a1-pms.com/a1-policy-management/v1/policies/{policyId}" \
+ "https://example.com/a1-policy-management/v1/policies/{policyId}" \
  -d ''
 </code></pre>
                           </div>

diff --git a/api/pms-api/v3/index.html b/api/pms-api/v3/index.html
index dfa34bf..6404c06 100644 (file)
--- a/api/pms-api/v3/index.html
+++ b/api/pms-api/v3/index.html
@@ -1286,7 +1286,7 @@ ul.nav-tabs {
                             <pre class="prettyprint"><code class="language-bsh">curl -X POST \
  -H "Accept: application/json,application/problem+json" \
  -H "Content-Type: application/json" \
- "https://a1-pms.com/a1-policy-management/v1/policies" \
+ "https://example.com/a1-policy-management/v1/policies" \
  -d '{
   &quot;policyId&quot; : &quot;POLICY-ID&quot;,
   &quot;nearRtRicId&quot; : &quot;Near-RT-Ric-ID&quot;,
@@ -2473,7 +2473,7 @@ $(document).ready(function() {
                           <div class="tab-pane active" id="examples-A1PolicyManagement-deletePolicy-0-curl">
                             <pre class="prettyprint"><code class="language-bsh">curl -X DELETE \
  -H "Accept: application/problem+json" \
- "https://a1-pms.com/a1-policy-management/v1/policies/{policyId}"
+ "https://example.com/a1-policy-management/v1/policies/{policyId}"
 </code></pre>
                           </div>
                           <div class="tab-pane" id="examples-A1PolicyManagement-deletePolicy-0-java">
@@ -3547,7 +3547,7 @@ Specifies the content type that the client expects to receive in response to the
                           <div class="tab-pane active" id="examples-A1PolicyManagement-getAllPolicies-0-curl">
                             <pre class="prettyprint"><code class="language-bsh">curl -X GET \
  -H "Accept: application/json,application/problem+json" \
- "https://a1-pms.com/a1-policy-management/v1/policies?policyTypeId=policyTypeId_example&nearRtRicId=nearRtRicId_example&serviceId=serviceId_example&typeName=typeName_example"
+ "https://example.com/a1-policy-management/v1/policies?policyTypeId=policyTypeId_example&nearRtRicId=nearRtRicId_example&serviceId=serviceId_example&typeName=typeName_example"
 </code></pre>
                           </div>
                           <div class="tab-pane" id="examples-A1PolicyManagement-getAllPolicies-0-java">
@@ -4733,7 +4733,7 @@ Select policies of types with the given type name (type identity has the format
                           <div class="tab-pane active" id="examples-A1PolicyManagement-getPolicy-0-curl">
                             <pre class="prettyprint"><code class="language-bsh">curl -X GET \
  -H "Accept: application/json,application/problem+json" \
- "https://a1-pms.com/a1-policy-management/v1/policies/{policyId}"
+ "https://example.com/a1-policy-management/v1/policies/{policyId}"
 </code></pre>
                           </div>
                           <div class="tab-pane" id="examples-A1PolicyManagement-getPolicy-0-java">
@@ -5825,7 +5825,7 @@ Specifies the content type that the client expects to receive in response to the
                           <div class="tab-pane active" id="examples-A1PolicyManagement-getPolicyTypeDefinition-0-curl">
                             <pre class="prettyprint"><code class="language-bsh">curl -X GET \
  -H "Accept: application/json,application/problem+json" \
- "https://a1-pms.com/a1-policy-management/v1/policy-types/{policyTypeId}"
+ "https://example.com/a1-policy-management/v1/policy-types/{policyTypeId}"
 </code></pre>
                           </div>
                           <div class="tab-pane" id="examples-A1PolicyManagement-getPolicyTypeDefinition-0-java">
@@ -6917,7 +6917,7 @@ Specifies the content type that the client expects to receive in response to the
                           <div class="tab-pane active" id="examples-A1PolicyManagement-getPolicyTypes-0-curl">
                             <pre class="prettyprint"><code class="language-bsh">curl -X GET \
  -H "Accept: application/json,application/problem+json" \
- "https://a1-pms.com/a1-policy-management/v1/policy-types?nearRtRicId=nearRtRicId_example&typeName=typeName_example&compatibleWithVersion=compatibleWithVersion_example"
+ "https://example.com/a1-policy-management/v1/policy-types?nearRtRicId=nearRtRicId_example&typeName=typeName_example&compatibleWithVersion=compatibleWithVersion_example"
 </code></pre>
                           </div>
                           <div class="tab-pane" id="examples-A1PolicyManagement-getPolicyTypes-0-java">
@@ -8070,7 +8070,7 @@ Select types that are compatible with the given version. This parameter is only
                             <pre class="prettyprint"><code class="language-bsh">curl -X PUT \
  -H "Accept: application/json,application/problem+json" \
  -H "Content-Type: application/json" \
- "https://a1-pms.com/a1-policy-management/v1/policies/{policyId}" \
+ "https://example.com/a1-policy-management/v1/policies/{policyId}" \
  -d ''
 </code></pre>
                           </div>
@@ -9494,7 +9494,7 @@ $(document).ready(function() {
                           <div class="tab-pane active" id="examples-Configuration-getConfiguration-0-curl">
                             <pre class="prettyprint"><code class="language-bsh">curl -X GET \
  -H "Accept: application/json,application/problem+json" \
- "https://a1-pms.com/a1-policy-management/v1/configuration"
+ "https://example.com/a1-policy-management/v1/configuration"
 </code></pre>
                           </div>
                           <div class="tab-pane" id="examples-Configuration-getConfiguration-0-java">
@@ -9896,7 +9896,7 @@ pub fn main() {
                             <pre class="prettyprint"><code class="language-bsh">curl -X PUT \
  -H "Accept: */*,application/problem+json" \
  -H "Content-Type: application/json" \
- "https://a1-pms.com/a1-policy-management/v1/configuration" \
+ "https://example.com/a1-policy-management/v1/configuration" \
  -d ''
 </code></pre>
                           </div>
@@ -10360,7 +10360,7 @@ $(document).ready(function() {
                           <div class="tab-pane active" id="examples-HealthCheck-getStatus-0-curl">
                             <pre class="prettyprint"><code class="language-bsh">curl -X GET \
  -H "Accept: application/json" \
- "https://a1-pms.com/a1-policy-management/v1/status"
+ "https://example.com/a1-policy-management/v1/status"
 </code></pre>
                           </div>
                           <div class="tab-pane" id="examples-HealthCheck-getStatus-0-java">
@@ -10693,7 +10693,7 @@ pub fn main() {
                           <div class="tab-pane active" id="examples-NearRTRICRepository-getRic-0-curl">
                             <pre class="prettyprint"><code class="language-bsh">curl -X GET \
  -H "Accept: application/json,application/problem+json" \
- "https://a1-pms.com/a1-policy-management/v1/rics/ric?managedElementId=managedElementId_example&ricId=ricId_example"
+ "https://example.com/a1-policy-management/v1/rics/ric?managedElementId=managedElementId_example&ricId=ricId_example"
 </code></pre>
                           </div>
                           <div class="tab-pane" id="examples-NearRTRICRepository-getRic-0-java">
@@ -11211,7 +11211,7 @@ The identity of a Near-RT RIC to get information for.
                           <div class="tab-pane active" id="examples-NearRTRICRepository-getRics-0-curl">
                             <pre class="prettyprint"><code class="language-bsh">curl -X GET \
  -H "Accept: application/json,application/problem+json" \
- "https://a1-pms.com/a1-policy-management/v1/rics?policyTypeId=policyTypeId_example"
+ "https://example.com/a1-policy-management/v1/rics?policyTypeId=policyTypeId_example"
 </code></pre>
                           </div>
                           <div class="tab-pane" id="examples-NearRTRICRepository-getRics-0-java">
@@ -11701,7 +11701,7 @@ The identity of a policy type. If given, all Near-RT RICs supporting the policy
                           <div class="tab-pane active" id="examples-ServiceRegistryAndSupervision-deleteService-0-curl">
                             <pre class="prettyprint"><code class="language-bsh">curl -X DELETE \
  -H "Accept: */*,application/problem+json" \
- "https://a1-pms.com/a1-policy-management/v1/services/{serviceId}"
+ "https://example.com/a1-policy-management/v1/services/{serviceId}"
 </code></pre>
                           </div>
                           <div class="tab-pane" id="examples-ServiceRegistryAndSupervision-deleteService-0-java">
@@ -12180,7 +12180,7 @@ Specifies the content type that the client expects to receive in response to the
                           <div class="tab-pane active" id="examples-ServiceRegistryAndSupervision-getServices-0-curl">
                             <pre class="prettyprint"><code class="language-bsh">curl -X GET \
  -H "Accept: application/json,application/problem+json" \
- "https://a1-pms.com/a1-policy-management/v1/services?serviceId=serviceId_example"
+ "https://example.com/a1-policy-management/v1/services?serviceId=serviceId_example"
 </code></pre>
                           </div>
                           <div class="tab-pane" id="examples-ServiceRegistryAndSupervision-getServices-0-java">
@@ -12668,7 +12668,7 @@ The identity of the service
                             <pre class="prettyprint"><code class="language-bsh">curl -X PUT \
  -H "Accept: */*,application/problem+json" \
  -H "Content-Type: application/json" \
- "https://a1-pms.com/a1-policy-management/v1/services/{serviceId}/keepalive" \
+ "https://example.com/a1-policy-management/v1/services/{serviceId}/keepalive" \
  -d ''
 </code></pre>
                           </div>
@@ -13211,7 +13211,7 @@ $(document).ready(function() {
                             <pre class="prettyprint"><code class="language-bsh">curl -X PUT \
  -H "Accept: */*,application/problem+json" \
  -H "Content-Type: application/json" \
- "https://a1-pms.com/a1-policy-management/v1/services" \
+ "https://example.com/a1-policy-management/v1/services" \
  -d '{
   &quot;keepAliveIntervalSeconds&quot; : 0,
   &quot;callbackUrl&quot; : &quot;callbackUrl&quot;,

diff --git a/config/application.yaml b/config/application.yaml
index 205c21a..e1f3b5c 100644 (file)
--- a/config/application.yaml
+++ b/config/application.yaml
@@ -61,6 +61,8 @@ app:
 lifecycle:
   timeout-per-shutdown-phase: "20s"
 logging:
+  # Reactive logging filter
+  reactive-entry-exit-filter-enabled: true
   # Configuration of logging
   file:
     name: /var/log/policy-agent/application.log

diff --git a/docs/offeredapis/openapitoolgen/offeredapis/pms-api/pms-api.html b/docs/offeredapis/openapitoolgen/offeredapis/pms-api/index.html
similarity index 100%
rename from docs/offeredapis/openapitoolgen/offeredapis/pms-api/pms-api.html
rename to docs/offeredapis/openapitoolgen/offeredapis/pms-api/index.html

diff --git a/docs/offeredapis/openapitoolgen/offeredapis/pms-api/v3/custom/index.html b/docs/offeredapis/openapitoolgen/offeredapis/pms-api/v3/custom/index.html
index 720207e..db61079 100644 (file)
--- a/docs/offeredapis/openapitoolgen/offeredapis/pms-api/v3/custom/index.html
+++ b/docs/offeredapis/openapitoolgen/offeredapis/pms-api/v3/custom/index.html
@@ -1255,7 +1255,7 @@ ul.nav-tabs {
                             <pre class="prettyprint"><code class="language-bsh">curl -X POST \
  -H "Accept: application/json,application/problem+json" \
  -H "Content-Type: application/json" \
- "https://a1-pms.com/a1-policy-management/v1/policies" \
+ "https://example.com/a1-policy-management/v1/policies" \
  -d '{
   &quot;policyId&quot; : &quot;POLICY-ID&quot;,
   &quot;nearRtRicId&quot; : &quot;Near-RT-Ric-ID&quot;,
@@ -2442,7 +2442,7 @@ $(document).ready(function() {
                           <div class="tab-pane active" id="examples-A1PolicyManagement-deletePolicy-0-curl">
                             <pre class="prettyprint"><code class="language-bsh">curl -X DELETE \
  -H "Accept: application/problem+json" \
- "https://a1-pms.com/a1-policy-management/v1/policies/{policyId}"
+ "https://example.com/a1-policy-management/v1/policies/{policyId}"
 </code></pre>
                           </div>
                           <div class="tab-pane" id="examples-A1PolicyManagement-deletePolicy-0-java">
@@ -3516,7 +3516,7 @@ Specifies the content type that the client expects to receive in response to the
                           <div class="tab-pane active" id="examples-A1PolicyManagement-getAllPolicies-0-curl">
                             <pre class="prettyprint"><code class="language-bsh">curl -X GET \
  -H "Accept: application/json,application/problem+json" \
- "https://a1-pms.com/a1-policy-management/v1/policies?policyTypeId=policyTypeId_example&nearRtRicId=nearRtRicId_example&serviceId=serviceId_example&typeName=typeName_example"
+ "https://example.com/a1-policy-management/v1/policies?policyTypeId=policyTypeId_example&nearRtRicId=nearRtRicId_example&serviceId=serviceId_example&typeName=typeName_example"
 </code></pre>
                           </div>
                           <div class="tab-pane" id="examples-A1PolicyManagement-getAllPolicies-0-java">
@@ -4702,7 +4702,7 @@ Select policies of types with the given type name (type identity has the format
                           <div class="tab-pane active" id="examples-A1PolicyManagement-getPolicy-0-curl">
                             <pre class="prettyprint"><code class="language-bsh">curl -X GET \
  -H "Accept: application/json,application/problem+json" \
- "https://a1-pms.com/a1-policy-management/v1/policies/{policyId}"
+ "https://example.com/a1-policy-management/v1/policies/{policyId}"
 </code></pre>
                           </div>
                           <div class="tab-pane" id="examples-A1PolicyManagement-getPolicy-0-java">
@@ -5794,7 +5794,7 @@ Specifies the content type that the client expects to receive in response to the
                           <div class="tab-pane active" id="examples-A1PolicyManagement-getPolicyTypeDefinition-0-curl">
                             <pre class="prettyprint"><code class="language-bsh">curl -X GET \
  -H "Accept: application/json,application/problem+json" \
- "https://a1-pms.com/a1-policy-management/v1/policy-types/{policyTypeId}"
+ "https://example.com/a1-policy-management/v1/policy-types/{policyTypeId}"
 </code></pre>
                           </div>
                           <div class="tab-pane" id="examples-A1PolicyManagement-getPolicyTypeDefinition-0-java">
@@ -6886,7 +6886,7 @@ Specifies the content type that the client expects to receive in response to the
                           <div class="tab-pane active" id="examples-A1PolicyManagement-getPolicyTypes-0-curl">
                             <pre class="prettyprint"><code class="language-bsh">curl -X GET \
  -H "Accept: application/json,application/problem+json" \
- "https://a1-pms.com/a1-policy-management/v1/policy-types?nearRtRicId=nearRtRicId_example&typeName=typeName_example&compatibleWithVersion=compatibleWithVersion_example"
+ "https://example.com/a1-policy-management/v1/policy-types?nearRtRicId=nearRtRicId_example&typeName=typeName_example&compatibleWithVersion=compatibleWithVersion_example"
 </code></pre>
                           </div>
                           <div class="tab-pane" id="examples-A1PolicyManagement-getPolicyTypes-0-java">
@@ -8039,7 +8039,7 @@ Select types that are compatible with the given version. This parameter is only
                             <pre class="prettyprint"><code class="language-bsh">curl -X PUT \
  -H "Accept: application/json,application/problem+json" \
  -H "Content-Type: application/json" \
- "https://a1-pms.com/a1-policy-management/v1/policies/{policyId}" \
+ "https://example.com/a1-policy-management/v1/policies/{policyId}" \
  -d ''
 </code></pre>
                           </div>

diff --git a/docs/offeredapis/openapitoolgen/offeredapis/pms-api/v3/index.html b/docs/offeredapis/openapitoolgen/offeredapis/pms-api/v3/index.html
index dfa34bf..6404c06 100644 (file)
--- a/docs/offeredapis/openapitoolgen/offeredapis/pms-api/v3/index.html
+++ b/docs/offeredapis/openapitoolgen/offeredapis/pms-api/v3/index.html
@@ -1286,7 +1286,7 @@ ul.nav-tabs {
                             <pre class="prettyprint"><code class="language-bsh">curl -X POST \
  -H "Accept: application/json,application/problem+json" \
  -H "Content-Type: application/json" \
- "https://a1-pms.com/a1-policy-management/v1/policies" \
+ "https://example.com/a1-policy-management/v1/policies" \
  -d '{
   &quot;policyId&quot; : &quot;POLICY-ID&quot;,
   &quot;nearRtRicId&quot; : &quot;Near-RT-Ric-ID&quot;,
@@ -2473,7 +2473,7 @@ $(document).ready(function() {
                           <div class="tab-pane active" id="examples-A1PolicyManagement-deletePolicy-0-curl">
                             <pre class="prettyprint"><code class="language-bsh">curl -X DELETE \
  -H "Accept: application/problem+json" \
- "https://a1-pms.com/a1-policy-management/v1/policies/{policyId}"
+ "https://example.com/a1-policy-management/v1/policies/{policyId}"
 </code></pre>
                           </div>
                           <div class="tab-pane" id="examples-A1PolicyManagement-deletePolicy-0-java">
@@ -3547,7 +3547,7 @@ Specifies the content type that the client expects to receive in response to the
                           <div class="tab-pane active" id="examples-A1PolicyManagement-getAllPolicies-0-curl">
                             <pre class="prettyprint"><code class="language-bsh">curl -X GET \
  -H "Accept: application/json,application/problem+json" \
- "https://a1-pms.com/a1-policy-management/v1/policies?policyTypeId=policyTypeId_example&nearRtRicId=nearRtRicId_example&serviceId=serviceId_example&typeName=typeName_example"
+ "https://example.com/a1-policy-management/v1/policies?policyTypeId=policyTypeId_example&nearRtRicId=nearRtRicId_example&serviceId=serviceId_example&typeName=typeName_example"
 </code></pre>
                           </div>
                           <div class="tab-pane" id="examples-A1PolicyManagement-getAllPolicies-0-java">
@@ -4733,7 +4733,7 @@ Select policies of types with the given type name (type identity has the format
                           <div class="tab-pane active" id="examples-A1PolicyManagement-getPolicy-0-curl">
                             <pre class="prettyprint"><code class="language-bsh">curl -X GET \
  -H "Accept: application/json,application/problem+json" \
- "https://a1-pms.com/a1-policy-management/v1/policies/{policyId}"
+ "https://example.com/a1-policy-management/v1/policies/{policyId}"
 </code></pre>
                           </div>
                           <div class="tab-pane" id="examples-A1PolicyManagement-getPolicy-0-java">
@@ -5825,7 +5825,7 @@ Specifies the content type that the client expects to receive in response to the
                           <div class="tab-pane active" id="examples-A1PolicyManagement-getPolicyTypeDefinition-0-curl">
                             <pre class="prettyprint"><code class="language-bsh">curl -X GET \
  -H "Accept: application/json,application/problem+json" \
- "https://a1-pms.com/a1-policy-management/v1/policy-types/{policyTypeId}"
+ "https://example.com/a1-policy-management/v1/policy-types/{policyTypeId}"
 </code></pre>
                           </div>
                           <div class="tab-pane" id="examples-A1PolicyManagement-getPolicyTypeDefinition-0-java">
@@ -6917,7 +6917,7 @@ Specifies the content type that the client expects to receive in response to the
                           <div class="tab-pane active" id="examples-A1PolicyManagement-getPolicyTypes-0-curl">
                             <pre class="prettyprint"><code class="language-bsh">curl -X GET \
  -H "Accept: application/json,application/problem+json" \
- "https://a1-pms.com/a1-policy-management/v1/policy-types?nearRtRicId=nearRtRicId_example&typeName=typeName_example&compatibleWithVersion=compatibleWithVersion_example"
+ "https://example.com/a1-policy-management/v1/policy-types?nearRtRicId=nearRtRicId_example&typeName=typeName_example&compatibleWithVersion=compatibleWithVersion_example"
 </code></pre>
                           </div>
                           <div class="tab-pane" id="examples-A1PolicyManagement-getPolicyTypes-0-java">
@@ -8070,7 +8070,7 @@ Select types that are compatible with the given version. This parameter is only
                             <pre class="prettyprint"><code class="language-bsh">curl -X PUT \
  -H "Accept: application/json,application/problem+json" \
  -H "Content-Type: application/json" \
- "https://a1-pms.com/a1-policy-management/v1/policies/{policyId}" \
+ "https://example.com/a1-policy-management/v1/policies/{policyId}" \
  -d ''
 </code></pre>
                           </div>
@@ -9494,7 +9494,7 @@ $(document).ready(function() {
                           <div class="tab-pane active" id="examples-Configuration-getConfiguration-0-curl">
                             <pre class="prettyprint"><code class="language-bsh">curl -X GET \
  -H "Accept: application/json,application/problem+json" \
- "https://a1-pms.com/a1-policy-management/v1/configuration"
+ "https://example.com/a1-policy-management/v1/configuration"
 </code></pre>
                           </div>
                           <div class="tab-pane" id="examples-Configuration-getConfiguration-0-java">
@@ -9896,7 +9896,7 @@ pub fn main() {
                             <pre class="prettyprint"><code class="language-bsh">curl -X PUT \
  -H "Accept: */*,application/problem+json" \
  -H "Content-Type: application/json" \
- "https://a1-pms.com/a1-policy-management/v1/configuration" \
+ "https://example.com/a1-policy-management/v1/configuration" \
  -d ''
 </code></pre>
                           </div>
@@ -10360,7 +10360,7 @@ $(document).ready(function() {
                           <div class="tab-pane active" id="examples-HealthCheck-getStatus-0-curl">
                             <pre class="prettyprint"><code class="language-bsh">curl -X GET \
  -H "Accept: application/json" \
- "https://a1-pms.com/a1-policy-management/v1/status"
+ "https://example.com/a1-policy-management/v1/status"
 </code></pre>
                           </div>
                           <div class="tab-pane" id="examples-HealthCheck-getStatus-0-java">
@@ -10693,7 +10693,7 @@ pub fn main() {
                           <div class="tab-pane active" id="examples-NearRTRICRepository-getRic-0-curl">
                             <pre class="prettyprint"><code class="language-bsh">curl -X GET \
  -H "Accept: application/json,application/problem+json" \
- "https://a1-pms.com/a1-policy-management/v1/rics/ric?managedElementId=managedElementId_example&ricId=ricId_example"
+ "https://example.com/a1-policy-management/v1/rics/ric?managedElementId=managedElementId_example&ricId=ricId_example"
 </code></pre>
                           </div>
                           <div class="tab-pane" id="examples-NearRTRICRepository-getRic-0-java">
@@ -11211,7 +11211,7 @@ The identity of a Near-RT RIC to get information for.
                           <div class="tab-pane active" id="examples-NearRTRICRepository-getRics-0-curl">
                             <pre class="prettyprint"><code class="language-bsh">curl -X GET \
  -H "Accept: application/json,application/problem+json" \
- "https://a1-pms.com/a1-policy-management/v1/rics?policyTypeId=policyTypeId_example"
+ "https://example.com/a1-policy-management/v1/rics?policyTypeId=policyTypeId_example"
 </code></pre>
                           </div>
                           <div class="tab-pane" id="examples-NearRTRICRepository-getRics-0-java">
@@ -11701,7 +11701,7 @@ The identity of a policy type. If given, all Near-RT RICs supporting the policy
                           <div class="tab-pane active" id="examples-ServiceRegistryAndSupervision-deleteService-0-curl">
                             <pre class="prettyprint"><code class="language-bsh">curl -X DELETE \
  -H "Accept: */*,application/problem+json" \
- "https://a1-pms.com/a1-policy-management/v1/services/{serviceId}"
+ "https://example.com/a1-policy-management/v1/services/{serviceId}"
 </code></pre>
                           </div>
                           <div class="tab-pane" id="examples-ServiceRegistryAndSupervision-deleteService-0-java">
@@ -12180,7 +12180,7 @@ Specifies the content type that the client expects to receive in response to the
                           <div class="tab-pane active" id="examples-ServiceRegistryAndSupervision-getServices-0-curl">
                             <pre class="prettyprint"><code class="language-bsh">curl -X GET \
  -H "Accept: application/json,application/problem+json" \
- "https://a1-pms.com/a1-policy-management/v1/services?serviceId=serviceId_example"
+ "https://example.com/a1-policy-management/v1/services?serviceId=serviceId_example"
 </code></pre>
                           </div>
                           <div class="tab-pane" id="examples-ServiceRegistryAndSupervision-getServices-0-java">
@@ -12668,7 +12668,7 @@ The identity of the service
                             <pre class="prettyprint"><code class="language-bsh">curl -X PUT \
  -H "Accept: */*,application/problem+json" \
  -H "Content-Type: application/json" \
- "https://a1-pms.com/a1-policy-management/v1/services/{serviceId}/keepalive" \
+ "https://example.com/a1-policy-management/v1/services/{serviceId}/keepalive" \
  -d ''
 </code></pre>
                           </div>
@@ -13211,7 +13211,7 @@ $(document).ready(function() {
                             <pre class="prettyprint"><code class="language-bsh">curl -X PUT \
  -H "Accept: */*,application/problem+json" \
  -H "Content-Type: application/json" \
- "https://a1-pms.com/a1-policy-management/v1/services" \
+ "https://example.com/a1-policy-management/v1/services" \
  -d '{
   &quot;keepAliveIntervalSeconds&quot; : 0,
   &quot;callbackUrl&quot; : &quot;callbackUrl&quot;,

diff --git a/docs/offeredapis/swagger/a1pms-api-v3.json b/docs/offeredapis/swagger/a1pms-api-v3.json
index 43313bd..c844073 100644 (file)
--- a/docs/offeredapis/swagger/a1pms-api-v3.json
+++ b/docs/offeredapis/swagger/a1pms-api-v3.json
@@ -19,8 +19,8 @@
     "url" : "{apiRoot}/a1-policy-management/v1",
     "variables" : {
       "apiRoot" : {
-        "default" : "https://a1-pms.com",
-        "description" : "apiRoot is the Host:port/Domain name of the service  where the A1Pms running"
+        "default" : "https://example.com",
+        "description" : "This is the Host:Port or Address where the A1-Policy Management Service can be accessed"
       }
     }
   } ],

diff --git a/docs/offeredapis/swagger/pms-api-v3.json b/docs/offeredapis/swagger/pms-api-v3.json
index 43313bd..c844073 100644 (file)
--- a/docs/offeredapis/swagger/pms-api-v3.json
+++ b/docs/offeredapis/swagger/pms-api-v3.json
@@ -19,8 +19,8 @@
     "url" : "{apiRoot}/a1-policy-management/v1",
     "variables" : {
       "apiRoot" : {
-        "default" : "https://a1-pms.com",
-        "description" : "apiRoot is the Host:port/Domain name of the service  where the A1Pms running"
+        "default" : "https://example.com",
+        "description" : "This is the Host:Port or Address where the A1-Policy Management Service can be accessed"
       }
     }
   } ],

diff --git a/docs/offeredapis/swagger/pms-api-v3.yaml b/docs/offeredapis/swagger/pms-api-v3.yaml
index d2d613a..46f881e 100644 (file)
--- a/docs/offeredapis/swagger/pms-api-v3.yaml
+++ b/docs/offeredapis/swagger/pms-api-v3.yaml
@@ -56,8 +56,8 @@ servers:
   - url: '{apiRoot}/a1-policy-management/v1'
     variables:
       apiRoot:
-        description: 'apiRoot is the Host:port/Domain name of the service  where the A1Pms running'
-        default: 'https://a1-pms.com'
+        default: 'https://example.com'
+        description: 'This is the Host:Port or Address where the A1-Policy Management Service can be accessed'
 tags:
   - name: A1 Policy Management
     description: "API used to create polices, Policy Instances and get \ them as individual using an ID or get all policies/Instances."

diff --git a/pom.xml b/pom.xml
index 64cb570..1179f4a 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -417,7 +417,7 @@
                         </configuration>
                     </execution>
                     <execution>
-                        <id>generate-openapi-json-config-a1pms</id>
+                        <id>generate-openapi-json-custom-a1pms</id>
                         <phase>prepare-package</phase>
                         <goals>
                             <goal>generate</goal>
@@ -480,13 +480,13 @@
                         </configuration>
                     </execution>
                     <execution>
-                        <id>generate-openapi-html-config-a1pms</id>
+                        <id>generate-openapi-html-custom-a1pms</id>
                         <phase>prepare-package</phase>
                         <goals>
                             <goal>generate</goal>
                         </goals>
                         <configuration>
-                            <inputSpec>${project.basedir}/api/pms-api-v3.json</inputSpec>
+                            <inputSpec>${project.basedir}/api/a1pms-api-v3.json</inputSpec>
                             <generatorName>html2</generatorName>
                             <output>${project.basedir}/api/pms-api/v3/custom</output>
                             <skipOperationExample>false</skipOperationExample>
@@ -593,16 +593,12 @@
                             <outputDirectory>${project.basedir}/api</outputDirectory>
                             <resources>
                                 <resource>
-                                    <directory>${project.basedir}/onap/oran/a1-policy-management/api</directory>
+                                    <directory>${project.basedir}/onap/oran/a1-policy-management/api/offeredapis/swagger</directory>
                                     <includes>
                                         <include>pms-api.json</include>
                                         <include>pms-api.yaml</include>
                                         <include>pms-api-v3.json</include>
                                         <include>pms-api-v3.yaml</include>
-                                        <include>a1pms-api-v3.json</include>
-                                        <include>api/pms-api/index.html</include>
-                                        <include>api/pms-api/v3/index.html</include>
-                                        <include>api/pms-api/v3/custom/index.html</include>
                                     </includes>
                                 </resource>
                             </resources>