diff options
| -rw-r--r-- | odlsli/odlsli-alpine/pom.xml | 10 | ||||
| -rw-r--r-- | odlsli/odlsli-ubuntu/pom.xml | 7 | ||||
| -rw-r--r-- | odlsli/src/main/properties/a1-adapter-api-dg.properties | 79 | ||||
| -rw-r--r-- | platform-logic/a1Adapter-api/pom.xml | 54 | ||||
| -rw-r--r-- | platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_getHealthCheck.json | 61 | ||||
| -rw-r--r-- | platform-logic/a1Adapter-api/src/main/resources/graph.versions | 1 | ||||
| -rw-r--r-- | platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_getHealthCheck.xml | 12 | ||||
| -rw-r--r-- | platform-logic/pom.xml | 1 |
8 files changed, 223 insertions, 2 deletions
diff --git a/odlsli/odlsli-alpine/pom.xml b/odlsli/odlsli-alpine/pom.xml index ead42745..8a2219e5 100644 --- a/odlsli/odlsli-alpine/pom.xml +++ b/odlsli/odlsli-alpine/pom.xml @@ -35,7 +35,7 @@ <odl.features.extra>odl-restconf-all,odl-mdsal-all,odl-mdsal-apidocs, odl-daexim-all, odl-restconf-nb-rfc8040</odl.features.extra> <ccsdk.odl.features>ccsdk-sli-core-all,ccsdk-sli-adaptors-all,ccsdk-sli-northbound-all,ccsdk-sli-plugins-all,ccsdk-features-all</ccsdk.odl.features> <odl.boot.features.extra>${odl.features.extra},${ccsdk.odl.features}</odl.boot.features.extra> - + <ccsdk.sli.core.version>0.7.0-SNAPSHOT</ccsdk.sli.core.version> <ccsdk.sli.adaptors.version>0.7.0-SNAPSHOT</ccsdk.sli.adaptors.version> <ccsdk.sli.northbound.version>0.7.0-SNAPSHOT</ccsdk.sli.northbound.version> @@ -283,7 +283,13 @@ <classifier>repo</classifier> <type>zip</type> </dependency> - + <dependency> + <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId> + <artifactId>a1Adapter-installer</artifactId> + <version>${ccsdk.features.version}</version> + <classifier>repo</classifier> + <type>zip</type> + </dependency> </dependencies> <build> diff --git a/odlsli/odlsli-ubuntu/pom.xml b/odlsli/odlsli-ubuntu/pom.xml index 08d8c862..332eb07a 100644 --- a/odlsli/odlsli-ubuntu/pom.xml +++ b/odlsli/odlsli-ubuntu/pom.xml @@ -282,6 +282,13 @@ <classifier>repo</classifier> <type>zip</type> </dependency> + <dependency> + <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId> + <artifactId>a1Adapter-installer</artifactId> + <version>${ccsdk.features.version}</version> + <classifier>repo</classifier> + <type>zip</type> + </dependency> </dependencies> <build> diff --git a/odlsli/src/main/properties/a1-adapter-api-dg.properties b/odlsli/src/main/properties/a1-adapter-api-dg.properties new file mode 100644 index 00000000..390724e6 --- /dev/null +++ b/odlsli/src/main/properties/a1-adapter-api-dg.properties @@ -0,0 +1,79 @@ +restapi.templateDir=/opt/onap/ccsdk/restapi/templates +controller.url=http://sdnc.onap:8282 +controller.user=admin +controller.pwd=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U +ric-plt-A1Mediator-deployed=true + +restapi.trustStoreFileName=/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks +restapi.trustStorePassword=adminadmin +restapi.keyStoreFileName=/opt/onap/sdnc/data/stores/sdnc.p12 +restapi.keyStorePassword=adminadmin +restapi.connection-oof-url=http://oof.api.simpledemo.onap.org:8698/api/oof/v1/route +naming.gen-name.url=http://neng-serv:8080 +naming.gen-name.user=ccsdkapps +naming.gen-name.pwd=ccsdkapps + + +#URLs for A1 Mediator +near-rt-ric-id=10.12.7.38:10001 +a1Mediator.url=http://10.12.7.38:10001/a1-p +restapi.healthcheck=healthcheck +restapi.policytypes=policytypes +restapi.policytype=policytypes/{policy_type_id} +restapi.policies=policytypes/{policy_type_id}/policies +restapi.policy=policytypes/{policy_type_id}/policies/{policy_instance_id} +restapi.policystatus=policytypes/{policy_type_id}/policies/{policy_instance_id}/status + +# Templates for A1 Adapter REST API's +restapi.a1Mediator.healthcheck.template=a1Mediator-healthcheck.json +restapi.a1Mediator.getpolicytypes.template=a1Mediator-getpolicytypes.json +restapi.a1Mediator.getpolicytype.template=a1Mediator-getpolicytype.json +restapi.a1Mediator.deletepolicytype.template=a1Mediator-deletepolicytype.json +restapi.a1Mediator.createpolicytype.template=a1Mediator-createpolicytype.json +restapi.a1Mediator.getpolicyinstances.template=a1Mediator-getpolicyinstances.json +restapi.a1Mediator.getpolicyinstance.template=a1Mediator-getpolicyinstance.json +restapi.a1Mediator.deletepolicyinstance.template=a1Mediator-deletepolicyinstance.json +restapi.a1Mediator.createpolicyinstance.template=a1Mediator-createpolicyinstance.json +restapi.a1Mediator.getpolicyinstancestatus.template=a1Mediator-getpolicyinstancestatus.json + + +# Templates for DMAAP +restapi.dmaap-publish.templatefile=a1Adapter-dmaap-publish-template.json +restapi.dmaap-publish-config-response.template=a1Adapter-dmaap-publish-config-response-template.json + +restapi.dmaap-publish-a1Mediator.healthcheck-payload.template=a1Mediator-dmaap-publish-healthcheck-payload.json +restapi.dmaap-publish-a1Mediator.getpolicytypes-payload.template=a1Mediator-dmaap-publish-getpolicytypes-payload.json +restapi.dmaap-publish-a1Mediator.getpolicytype-payload.template=a1Mediator-dmaap-publish-getpolicytype-payload.json +restapi.dmaap-publish-a1Mediator.deletepolicytype-payload.template=a1Mediator-dmaap-publish-deletepolicytyp-payloade.json +restapi.dmaap-publish-a1Mediator.createpolicytype-payload.template=a1Mediator-dmaap-publish-createpolicytype-payload.json +restapi.dmaap-publish-a1Mediator.getpolicyinstances-payload.template=a1Mediator-dmaap-publish-getpolicyinstances-payload.json +restapi.dmaap-publish-a1Mediator.getpolicyinstance-payload.template=a1Mediator-dmaap-publish-getpolicyinstance-payload.json +restapi.dmaap-publish-a1Mediator.deletepolicyinstance-payload.template=a1Mediator-dmaap-publish-deletepolicyinstance-payload.json +restapi.dmaap-publish-a1Mediator.createpolicyinstance-payload.template=a1Mediator-dmaap-publish-createpolicyinstance-payload.json +restapi.dmaap-publish-a1Mediator.getpolicyinstancestatus-payload.template=a1Mediator-dmaap-publish-getpolicyinstancestatus-payload.json + + +#DMAAP Publish +dmaap-message-router.url=http://message-router.onap:3904/events +a1Adapter-dmaap-policy-response.topic=/A1-P-RSP +a1Adapter-dmaap-ml-model-response.topic=/A1-ML-RSP +a1Adapter-dmaap-ei-response.topic=/A1-EI-RSP + + +a1Adapter-dmaap.requestID= +a1Adapter-dmaap.aai= +a1Adapter-dmaap.version= + +a1Adapter-dmaap-config-resp.timestamp= +a1Adapter-dmaap-config-resp.apiver= +a1Adapter-dmaap-config-resp.requestID= +a1Adapter-dmaap-config-resp.subrequestID= +a1Adapter-dmaap-config-resp.requesttrack= +a1Adapter-dmaap-config-resp.flags= +a1Adapter-dmaap-config-resp.version= +a1Adapter-dmaap-config-resp.rpc-name.modifyconfiganr= +a1Adapter-dmaap-config-resp.rpc-name.modifyconfig= +a1Adapter-dmaap-config-resp.correlationID= +a1Adapter-dmaap-config-resp.type=response +a1Adapter-dmaap-config-resp.status-code= +a1Adapter-dmaap-config-resp.status-value= diff --git a/platform-logic/a1Adapter-api/pom.xml b/platform-logic/a1Adapter-api/pom.xml new file mode 100644 index 00000000..032613f0 --- /dev/null +++ b/platform-logic/a1Adapter-api/pom.xml @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.onap.ccsdk.distribution</groupId> + <artifactId>distribution-platform-logic</artifactId> + <version>0.7.0-SNAPSHOT</version> + </parent> + + <artifactId>platform-logic-a1Adapterapi</artifactId> + <version>0.7.0-SNAPSHOT</version> + <packaging>pom</packaging> + + <name>ccsdk-distribution :: platform-logic :: ${project.artifactId}</name> + <description>Contains platform-level service logic for a1Adapter to interface with A1 Mediator</description> + + <build> + <plugins> + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <version>2.6</version> + <executions> + <execution> + <id>copy-version</id> + <goals> + <goal>copy-resources</goal> + </goals><!-- here the phase you need --> + <phase>validate</phase> + <configuration> + <outputDirectory>../target/graphs/a1Adapterapi</outputDirectory> + <resources> + <resource> + <directory>src/main/xml</directory> + <includes> + <include>*.xml</include> + </includes> + <filtering>true</filtering> + </resource> + <resource> + <directory>src/main/resources</directory> + <includes> + <include>graph.versions</include> + </includes> + <filtering>true</filtering> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> diff --git a/platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_getHealthCheck.json b/platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_getHealthCheck.json new file mode 100644 index 00000000..e7b79452 --- /dev/null +++ b/platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_getHealthCheck.json @@ -0,0 +1,61 @@ +[ + { + "id": "d160ae95.22121", + "type": "dgstart", + "name": "DGSTART", + "outputs": 1, + "x": 146, + "y": 57, + "z": "3d3f45b8.78bdda", + "wires": [ + [ + "7af2c12d.dfc56" + ] + ] + }, + { + "id": "7af2c12d.dfc56", + "type": "service-logic", + "name": "A1-ADAPTER-API ${project.version}", + "module": "A1-ADAPTER-API", + "version": "${project.version}", + "comments": "", + "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='A1-ADAPTER-API' version='${project.version}'>", + "outputs": 1, + "x": 186, + "y": 123, + "z": "3d3f45b8.78bdda", + "wires": [ + [ + "f4915cbe.123c4" + ] + ] + }, + { + "id": "f4915cbe.123c4", + "type": "method", + "name": "method getHealthCheck", + "xml": "<method rpc='getHealthCheck' mode='sync'>\n", + "comments": "", + "outputs": 1, + "x": 228, + "y": 189, + "z": "3d3f45b8.78bdda", + "wires": [ + [ + "9a26ac28.f0c6b" + ] + ] + }, + { + "id": "9a26ac28.f0c6b", + "type": "set", + "name": "set return message", + "xml": "<set>\n<parameter name='response-code' value='200' />\n<parameter name='response-message' value='A1 Adapter is healthy'/>\n<parameter name='health-status' value='200'/>\n<parameter name='ack-final' value='Y'/>", + "comments": "", + "x": 279, + "y": 269, + "z": "3d3f45b8.78bdda", + "wires": [] + } +]
\ No newline at end of file diff --git a/platform-logic/a1Adapter-api/src/main/resources/graph.versions b/platform-logic/a1Adapter-api/src/main/resources/graph.versions new file mode 100644 index 00000000..a40dd436 --- /dev/null +++ b/platform-logic/a1Adapter-api/src/main/resources/graph.versions @@ -0,0 +1 @@ +A1-ADAPTER-API getHealthCheck ${project.version} sync diff --git a/platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_getHealthCheck.xml b/platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_getHealthCheck.xml new file mode 100644 index 00000000..6a9395a5 --- /dev/null +++ b/platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_getHealthCheck.xml @@ -0,0 +1,12 @@ +<service-logic + xmlns='http://www.onap.org/sdnc/svclogic' + xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='A1-ADAPTER-API' version='${project.version}'> + <method rpc='getHealthCheck' mode='sync'> + <set> + <parameter name='response-code' value='200' /> + <parameter name='response-message' value='A1 Adapter is healthy'/> + <parameter name='health-status' value='200'/> + <parameter name='ack-final' value='Y'/> + </set> + </method> +</service-logic>
\ No newline at end of file diff --git a/platform-logic/pom.xml b/platform-logic/pom.xml index 0205a614..cef7af0c 100644 --- a/platform-logic/pom.xml +++ b/platform-logic/pom.xml @@ -22,6 +22,7 @@ <module>asdc-api</module> <module>sliapi</module> <module>oofpcipoc-api</module> + <module>a1Adapter-api</module> <module>restapi-templates</module> <module>installer</module> </modules> |