From 992636fd23ea2853a60145f04ce5bd086578aff7 Mon Sep 17 00:00:00 2001 From: "k.kedron" Date: Wed, 18 Aug 2021 12:31:58 +0200 Subject: Update A1-PE sim configuration To support new CNF settings Issue-ID: INT-1945 Signed-off-by: Krystian Kedron Change-Id: I0172d06a50f94e0c0bfff4ee98bd1b583e33524c --- doc/resources/cells.json | 125 ------------------------------ doc/resources/ue.json | 20 ----- doc/resources/vnf.config | 10 --- docker/Dockerfile | 6 +- docker/resources/cells.json | 125 ++++++++++++++++++++++++++++++ docker/resources/ue.json | 20 +++++ docker/resources/vnf.config | 10 +++ src/main/resources/application.properties | 8 +- 8 files changed, 162 insertions(+), 162 deletions(-) delete mode 100644 doc/resources/cells.json delete mode 100644 doc/resources/ue.json delete mode 100644 doc/resources/vnf.config create mode 100644 docker/resources/cells.json create mode 100644 docker/resources/ue.json create mode 100644 docker/resources/vnf.config diff --git a/doc/resources/cells.json b/doc/resources/cells.json deleted file mode 100644 index 42e94c2..0000000 --- a/doc/resources/cells.json +++ /dev/null @@ -1,125 +0,0 @@ -{ - "cellList": [ - { - "Cell": { - "networkId": "RAN001", - "nodeId": "Cell1", - "physicalCellId": 0, - "pnfName": "ncserver1", - "sectorNumber": 0, - "latitude": "50.11", - "longitude": "19.98" - }, - "neighbor": [ - { - "nodeId": "Cell3", - "blacklisted": "false" - }, - { - "nodeId": "Cell4", - "blacklisted": "false" - }, - { - "nodeId": "Cell2", - "blacklisted": "false" - } - ] - }, - { - "Cell": { - "networkId": "RAN001", - "nodeId": "Cell2", - "physicalCellId": 1, - "pnfName": "ncserver1", - "sectorNumber": 0, - "latitude": "50.06", - "longitude": "20.03" - }, - "neighbor": [ - { - "nodeId": "Cell5", - "blacklisted": "false" - }, - { - "nodeId": "Cell1", - "blacklisted": "false" - }, - { - "nodeId": "Cell3", - "blacklisted": "false" - } - ] - }, - { - "Cell": { - "networkId": "RAN001", - "nodeId": "Cell3", - "physicalCellId": 3, - "pnfName": "ncserver1", - "sectorNumber": 0, - "latitude": "50.06", - "longitude": "19.94" - }, - "neighbor": [ - { - "nodeId": "Cell5", - "blacklisted": "false" - }, - { - "nodeId": "Cell1", - "blacklisted": "false" - }, - { - "nodeId": "Cell4", - "blacklisted": "false" - }, - { - "nodeId": "Cell2", - "blacklisted": "false" - } - ] - }, - { - "Cell": { - "networkId": "RAN001", - "nodeId": "Cell4", - "physicalCellId": 4, - "pnfName": "ncserver1", - "sectorNumber": 0, - "latitude": "50.11", - "longitude": "19.88" - }, - "neighbor": [ - { - "nodeId": "Cell3", - "blacklisted": "false" - }, - { - "nodeId": "Cell1", - "blacklisted": "false" - } - ] - }, - { - "Cell": { - "networkId": "RAN001", - "nodeId": "Cell5", - "physicalCellId": 6, - "pnfName": "ncserver1", - "sectorNumber": 0, - "latitude": "50.01", - "longitude": "19.99" - }, - "neighbor": [ - { - "nodeId": "Cell3", - "blacklisted": "false" - }, - { - "nodeId": "Cell2", - "blacklisted": "false" - } - ] - } - ] -} diff --git a/doc/resources/ue.json b/doc/resources/ue.json deleted file mode 100644 index 2342723..0000000 --- a/doc/resources/ue.json +++ /dev/null @@ -1,20 +0,0 @@ -[ - { - "id": "emergency_samsung_s10_01", - "latitude": "50.09", - "longitude": "19.94", - "cellId": "Cell1" - }, - { - "id": "mobile_samsung_s20_02", - "latitude": "50.05", - "longitude": "19.95", - "cellId": "Cell3" - }, - { - "id": "emergency_police_01", - "latitude": "50.035", - "longitude": "19.97", - "cellId": "Cell3" - } -] diff --git a/doc/resources/vnf.config b/doc/resources/vnf.config deleted file mode 100644 index d14fe7b..0000000 --- a/doc/resources/vnf.config +++ /dev/null @@ -1,10 +0,0 @@ -vesHost=vesconsumer -vesPort=30417 -vesUser=sample1 -vesPassword=sample1 -vnfId=de305d54-75b4-431b-adb2-eb6b9e546014 -vnfName=ibcx0001vm002ssc001 -vnfType=oran_sim_type -ftpHost=localhost -ftpPort=22222 -repPeriod=90 \ No newline at end of file diff --git a/docker/Dockerfile b/docker/Dockerfile index 95ee9a4..3cce571 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -4,12 +4,12 @@ COPY --chown=onap:onap a1-pe-simulator*.jar /a1-pe-simulator/a1-pe-simulator.jar # Create conf directory where vnf.config and topology files will be placed by ONAP controller USER root -RUN mkdir /var/netconf2 && chown onap:onap /var/netconf2 +RUN mkdir /a1-pe-simulator/config && chown onap:onap /a1-pe-simulator/config # Create folder for FTP upload via file system and change owner -RUN mkdir -p /a1pesim/generated_pm_bulks && chown onap:onap /a1pesim/generated_pm_bulks +RUN mkdir -p /a1-pe-simulator/generated_pm_bulks && chown onap:onap /a1-pe-simulator/generated_pm_bulks USER onap -COPY --chown=onap:onap resource/* /var/netconf2/ +COPY --chown=onap:onap resources/ /a1-pe-simulator/config WORKDIR /a1-pe-simulator diff --git a/docker/resources/cells.json b/docker/resources/cells.json new file mode 100644 index 0000000..42e94c2 --- /dev/null +++ b/docker/resources/cells.json @@ -0,0 +1,125 @@ +{ + "cellList": [ + { + "Cell": { + "networkId": "RAN001", + "nodeId": "Cell1", + "physicalCellId": 0, + "pnfName": "ncserver1", + "sectorNumber": 0, + "latitude": "50.11", + "longitude": "19.98" + }, + "neighbor": [ + { + "nodeId": "Cell3", + "blacklisted": "false" + }, + { + "nodeId": "Cell4", + "blacklisted": "false" + }, + { + "nodeId": "Cell2", + "blacklisted": "false" + } + ] + }, + { + "Cell": { + "networkId": "RAN001", + "nodeId": "Cell2", + "physicalCellId": 1, + "pnfName": "ncserver1", + "sectorNumber": 0, + "latitude": "50.06", + "longitude": "20.03" + }, + "neighbor": [ + { + "nodeId": "Cell5", + "blacklisted": "false" + }, + { + "nodeId": "Cell1", + "blacklisted": "false" + }, + { + "nodeId": "Cell3", + "blacklisted": "false" + } + ] + }, + { + "Cell": { + "networkId": "RAN001", + "nodeId": "Cell3", + "physicalCellId": 3, + "pnfName": "ncserver1", + "sectorNumber": 0, + "latitude": "50.06", + "longitude": "19.94" + }, + "neighbor": [ + { + "nodeId": "Cell5", + "blacklisted": "false" + }, + { + "nodeId": "Cell1", + "blacklisted": "false" + }, + { + "nodeId": "Cell4", + "blacklisted": "false" + }, + { + "nodeId": "Cell2", + "blacklisted": "false" + } + ] + }, + { + "Cell": { + "networkId": "RAN001", + "nodeId": "Cell4", + "physicalCellId": 4, + "pnfName": "ncserver1", + "sectorNumber": 0, + "latitude": "50.11", + "longitude": "19.88" + }, + "neighbor": [ + { + "nodeId": "Cell3", + "blacklisted": "false" + }, + { + "nodeId": "Cell1", + "blacklisted": "false" + } + ] + }, + { + "Cell": { + "networkId": "RAN001", + "nodeId": "Cell5", + "physicalCellId": 6, + "pnfName": "ncserver1", + "sectorNumber": 0, + "latitude": "50.01", + "longitude": "19.99" + }, + "neighbor": [ + { + "nodeId": "Cell3", + "blacklisted": "false" + }, + { + "nodeId": "Cell2", + "blacklisted": "false" + } + ] + } + ] +} diff --git a/docker/resources/ue.json b/docker/resources/ue.json new file mode 100644 index 0000000..2342723 --- /dev/null +++ b/docker/resources/ue.json @@ -0,0 +1,20 @@ +[ + { + "id": "emergency_samsung_s10_01", + "latitude": "50.09", + "longitude": "19.94", + "cellId": "Cell1" + }, + { + "id": "mobile_samsung_s20_02", + "latitude": "50.05", + "longitude": "19.95", + "cellId": "Cell3" + }, + { + "id": "emergency_police_01", + "latitude": "50.035", + "longitude": "19.97", + "cellId": "Cell3" + } +] diff --git a/docker/resources/vnf.config b/docker/resources/vnf.config new file mode 100644 index 0000000..d14fe7b --- /dev/null +++ b/docker/resources/vnf.config @@ -0,0 +1,10 @@ +vesHost=vesconsumer +vesPort=30417 +vesUser=sample1 +vesPassword=sample1 +vnfId=de305d54-75b4-431b-adb2-eb6b9e546014 +vnfName=ibcx0001vm002ssc001 +vnfType=oran_sim_type +ftpHost=localhost +ftpPort=22222 +repPeriod=90 \ No newline at end of file diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 581e0cf..0228b87 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -12,7 +12,7 @@ # server.port=9998 -vnf.config.file=/var/a1pesim/vnf.config +vnf.config.file=/a1-pe-simulator/config/vnf.config ves.collector.protocol=https ves.collector.endpoint=/eventListener/v7 ves.pm.maxPoolSize=10 @@ -28,8 +28,8 @@ ftp.server.filepath=upload ftp.server.username=admin ftp.server.password=samsung topology.cell.range=5 -topology.cell.config.file=/var/a1pesim/cells.json -topology.ue.config.file=/var/a1pesim/ue.json +topology.cell.config.file=/a1-pe-simulator/config/cells.json +topology.ue.config.file=/a1-pe-simulator/config/ue.json spring.cache.cache-names=vnfConfig,pmVes,failurePmVes spring.cache.caffeine.spec=maximumSize=10,expireAfterAccess=900s spring.mvc.view.prefix:/ @@ -38,7 +38,7 @@ logging.config=classpath:logback-spring.xml refresher.fixed.rate.ms=60000 restapi.version=v1 # PM Bulk File constants -xml.pm.location=/a1pesim/generated_pm_bulks +xml.pm.location=/a1-pe-simulator/generated_pm_bulks xml.pm.bulk.fileFormatVersion=32.435 V7.0 xml.pm.bulk.vendorName=Samsung xml.pm.bulk.userLabel=ORAN PE Sim -- cgit 1.2.3-korg