~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features</groupId>
<artifactId>ccsdk-aafshiro</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>feature</packaging>
<name>ccsdk-features :: aafshiro-features :: ${project.artifactId}</name>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>feature-repo-parent</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features</groupId>
<artifactId>features-aafshiro</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>feature</packaging>
<name>ccsdk-features :: aafshiro-features :: ${project.artifactId}</name>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features</groupId>
<artifactId>aafshiro-features</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-features :: ${project.artifactId}</name>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features</groupId>
<artifactId>aafshiro-installer</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-features :: ${project.artifactId}</name>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features</groupId>
<artifactId>aafshiro</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-features :: ${project.artifactId}</name>
html_theme_options = {
"style_nav_header_background": "white",
"sticky_navigation": "False" }
-html_logo = "_static/logo_onap_2017.png"
+html_logo = "_static/logo_onap_2024.png"
html_favicon = "_static/favicon.ico"
html_static_path = ["_static"]
html_show_sphinx = False
| **Abbreviation** | **Description** |
+====================================+=================================+
| AAF | `Application Authorization |
-| | Framework <https://wiki.onap.or |
-| | g/display/DW/Application+Author |
-| | ization+Framework+Project>`__ |
+| | Framework <https://lf-onap.atla |
+| | ssian.net/wiki/spaces/DW/pages/ |
+| | 16234177/Application+Authorizat |
+| | ion+Framework+Project>`__ |
+------------------------------------+---------------------------------+
| A&AI | `Active & Available |
-| | Inventory <https://wiki.onap.or |
-| | g/display/DW/Active+and+Availab |
-| | le+Inventory+Project>`__ |
+| | Inventory <https://lf-onap.atla |
+| | ssian.net/wiki/spaces/DW/pages/ |
+| | 16230663/Active+and+Available+I |
+| | nventory+Project>`__ |
+------------------------------------+---------------------------------+
| AAA | `Authentication, Authorization |
| | and |
| | Document |
+------------------------------------+---------------------------------+
| APPC | `Application |
-| | Controller <https://wiki.onap.o |
-| | rg/display/DW/Application+Contr |
-| | oller+Project>`__ |
+| | Controller <https://lf-onap.atl |
+| | assian.net/wiki/spaces/DW/pages |
+| | /16230665/Application+Controlle |
+| | r+Project>`__ |
+------------------------------------+---------------------------------+
| BPEL | Business Process Execution |
| | Language |
| CCSDK | Common Controller SDK project |
+------------------------------------+---------------------------------+
| CDAP | `Cask Data Application |
-| | Platform <https://cdap.io/>`__ |
+| | Platform <https://cdap.atlassia |
+| | n.net/wiki/spaces/DOCS/pages/48 |
+| | 0313476/CDAP+Platform+Overvie |
+| | w>`__ |
+------------------------------------+---------------------------------+
| CDR | Charging Data Record |
+------------------------------------+---------------------------------+
| | Management Platform (project) |
+------------------------------------+---------------------------------+
| CLI | `Command Line Interface |
-| | (project) <https://wiki.onap.or |
-| | g/display/DW/Command+Line+Inter |
-| | face+Project>`__ |
+| | (project) <https://lf-onap.atla |
+| | ssian.net/wiki/spaces/DW/pages/ |
+| | 16230629/Command+Line+Interface |
+| | +Project>`__ |
+------------------------------------+---------------------------------+
| CMA | Change Management Application |
| | (within ONAP) |
| | g/wiki/Data_access_object>`__ |
+------------------------------------+---------------------------------+
| DCAE | `Data Collection Analytics and |
-| | Events <https://wiki.onap.org/p |
-| | ages/viewpage.action?pageId=659 |
-| | 2895>`__ |
+| | Events <https://lf-onap.atlassi |
+| | an.net/wiki/spaces/DW/pages/162 |
+| | 30667/Data+Collection+Analytics |
+| | +and+Events+Project>`__ |
+------------------------------------+---------------------------------+
| DDoS | Distributed Denial-of-Service |
| | attack |
| DG Builder | Directed Graph Builder |
+------------------------------------+---------------------------------+
| DMaaP | `Data Movement as a |
-| | Platform <https://wiki.onap.org |
-| | /display/DW/DMaaP>`__ |
+| | Platform <https://lf-onap.atlas |
+| | sian.net/wiki/spaces/DW/pages/1 |
+| | 6232041/Data+Movement+as+a+Plat |
+| | form+Project>`__ |
+------------------------------------+---------------------------------+
| DME | `Direct Messaging Engine |
| | (common service within |
-| | ONAP) <https://wiki.onap.org/di |
-| | splay/DW/Common+Services>`__ |
+| | ONAP) <https://lf-onap.atlassia |
+| | n.net/wiki/spaces/DW/pages/1622 |
+| | 0186/Common+Services>`__ |
+------------------------------------+---------------------------------+
| DMIP | Device Management Interface |
| | Profile |
| | m>`__ |
+------------------------------------+---------------------------------+
| ESR | `External System |
-| | Register <https://wiki.onap.org |
-| | /pages/viewpage.action?pageId=5 |
-| | 734948>`__ |
+| | Register <https://lf-onap.atlas |
+| | sian.net/wiki/spaces/DW/pages/1 |
+| | 6225697/External+System+Registe |
+| | r+5+14+17>`__ |
+------------------------------------+---------------------------------+
| ETSI | `European Telecommunications |
| | Standards |
| | alisation>`__ |
+------------------------------------+---------------------------------+
| EUAG | `ONAP End User Advisory |
-| | Group <https://wiki.lfnetworkin |
-| | g.org/pages/viewpage.action?pag |
-| | eId=2916362>`__ |
+| | Group <https://lf-networking.at |
+| | lassian.net/wiki/spaces/LN/page |
+| | s/15633594/INACTIVE+EUAG+LFN+En |
+| | d+User+Advisory+Group>`__ |
+------------------------------------+---------------------------------+
| FCAPS | Fault Configuration Accounting |
| | Performance Security |
| Glance | OpenStack Image repository |
+------------------------------------+---------------------------------+
| GNFC | `Genric Network Function |
-| | Controller <https://wiki.onap.o |
-| | rg/download/attachments/4530014 |
-| | 8/ONAP_GNF_ControllersSOL003.pp |
-| | tx?version=1&modificationDate=1 |
-| | 548619943000&api=v2>`__ |
+| | Controller <https://lf-onap.atl |
+| | assian.net/wiki/pages/viewpagea |
+| | ttachments.action?pageId=163693 |
+| | 49&preview=%2F16369349%2F172794 |
+| | 24%2FONAP_GNF_ControllersSOL003 |
+| | .pptx>`__ |
+------------------------------------+---------------------------------+
| GUI | `Graphical User |
| | Interface <https://en.wikipedia |
| | ace>`__ |
+------------------------------------+---------------------------------+
| HAS | `Homing and Allocation |
-| | Service <https://wiki.onap.org/ |
-| | pages/viewpage.action?pageId=16 |
-| | 005528>`__ |
+| | Service <https://lf-onap.atlass |
+| | ian.net/wiki/spaces/DW/pages/16 |
+| | 254225/Homing+and+Allocation+Se |
+| | rvice+HAS>`__ |
+------------------------------------+---------------------------------+
| HDFS | Hadoop Distributed File System |
+------------------------------------+---------------------------------+
+------------------------------------+---------------------------------+
| HV VES | `High Volume Virtual function |
| | Event |
-| | Stream <https://wiki.onap.org/d |
-| | isplay/DW/High+Volume+VES+Colle |
-| | ctor>`__ |
+| | Stream <https://lf-onap.atlassi |
+| | an.net/wiki/spaces/DW/pages/163 |
+| | 05357/High+Volume+VES+Collecto |
+| | r>`__ |
+------------------------------------+---------------------------------+
| IAM/IDAM | Identity and Access Management |
+------------------------------------+---------------------------------+
| | rg/wiki/JAR_(file_format)>`__ |
+------------------------------------+---------------------------------+
| JSC | `JavaServiceContainer <https:// |
-| | wiki.onap.org/display/DW/Common |
-| | +Services>`__ |
+| | lf-onap.atlassian.net/wiki/spac |
+| | es/DW/pages/16220186/Common+Ser |
+| | vices>`__ |
+------------------------------------+---------------------------------+
| JSON | JavaScript Object Notation |
+------------------------------------+---------------------------------+
+------------------------------------+---------------------------------+
| LFN CVC | `Linux Foundation Networking |
| | Compliance/Verification |
-| | Committee <https://wiki.onap.or |
-| | g/display/DW/LFN+CVC+Testing+in |
-| | +VNFSDK>`__ |
+| | Committee <https://lf-onap.atla |
+| | ssian.net/wiki/spaces/DW/pages/ |
+| | 16324395/LFN+CVC+Testing+in+VNF |
+| | SDK>`__ |
+------------------------------------+---------------------------------+
| LFN CVP | `Linux Foundation Networking |
| | Compliance/Verification |
-| | Program <https://wiki.onap.org/ |
-| | display/DW/LFN+CVC+Testing+in+V |
-| | NFSDK>`__ |
+| | Program <https://lf-onap.atla |
+| | ssian.net/wiki/spaces/DW/pages/ |
+| | 16324395/LFN+CVC+Testing+in+VNF |
+| | SDK>`__ |
+------------------------------------+---------------------------------+
| LRM | Local Resource Monitor |
+------------------------------------+---------------------------------+
| MSB | Microservice Bus |
+------------------------------------+---------------------------------+
| MSO | `Master Service |
-| | Orchestrator <https://wiki.onap |
-| | .org/pages/viewpage.action?page |
-| | Id=1015834>`__ |
+| | Orchestrator <https://lf-onap.a |
+| | tlassian.net/wiki/spaces/DW/pag |
+| | es/16220168/Master+Service+Orch |
+| | estrator+MSO>`__ |
+------------------------------------+---------------------------------+
| MVP | `Minimum |
| | ViableProduct <https://en.wikip |
| | daylight.org/>`__ |
+------------------------------------+---------------------------------+
| OOM | `ONAP Operations |
-| | Manager <https://wiki.onap.org/ |
-| | display/DW/OOM+User+Guide>`__ |
+| | Manager <https://docs.onap.org/ |
+| | projects/onap-oom/en/latest/sec |
+| | tions/guides/user_guides/oom_us |
+| | er_guide.html>`__ |
+------------------------------------+---------------------------------+
| OpenStack | A cloud operating system |
+------------------------------------+---------------------------------+
| | ICMMS |
+------------------------------------+---------------------------------+
| OSAM | `Open Source Access |
-| | Manager <https://wiki.onap.org/ |
-| | display/DW/OpenSource+Access+Ma |
-| | nager+%28OSAM%29+Use+Case>`__ |
+| | Manager <https://lf-onap.atlass |
+| | ian.net/wiki/spaces/DW/pages/16 |
+| | 258031/OpenSource+Access+Manage |
+| | r+OSAM+Use+Case>`__ |
+------------------------------------+---------------------------------+
| OSC | O-RAN Software Community or |
| | Optical Supervisory Channel |
| PM | Performance Management |
+------------------------------------+---------------------------------+
| PNDA | `OpensourcePlatform for Network |
-| | DataAnalytics <https://wiki.ona |
-| | p.org/display/DW/Integrating+PN |
-| | DA>`__ |
+| | DataAnalytics <https://lf-onap. |
+| | atlassian.net/wiki/spaces/DW/pa |
+| | ges/16299049/Integrating+PND |
+| | A>`__ |
+------------------------------------+---------------------------------+
| PNF | Physical Network Function |
+------------------------------------+---------------------------------+
| PoC | Proof of Concept |
+------------------------------------+---------------------------------+
| POMBA | `Post Orchestration Model Based |
-| | Audit <https://wiki.onap.org/di |
-| | splay/DW/POMBA>`__ |
+| | Audit <https://lf-onap.atlassia |
+| | n.net/wiki/spaces/DW/pages/1628 |
+| | 0439/POMBA>`__ |
+------------------------------------+---------------------------------+
| PRH | Phyiical Network Function |
| | Registration Handler |
+------------------------------------+---------------------------------+
| S3P | `Stability, Security, |
| | Scalability, |
-| | Performance <https://wiki.onap. |
-| | org/pages/viewpage.action?pageI |
-| | d=16003367>`__ |
+| | Performance <https://lf-onap.at |
+| | lassian.net/wiki/spaces/DW/page |
+| | s/16252737/Platform+Maturity+Re |
+| | quirements+S3P>`__ |
+------------------------------------+---------------------------------+
| SDC | Service Design and Creation |
| | (component of ONAP for visual |
| | a.org/wiki/Software-defined_net |
| | working>`__ |
+------------------------------------+---------------------------------+
-| SDN-C | `SDN-Controller <https://wiki.o |
-| | nap.org/display/DW/SDN+Controll |
-| | er+Development+Guide>`__ |
+| SDN-C | `SDN-Controller <https://lf-ona |
+| | p.atlassian.net/wiki/spaces/DW/ |
+| | pages/16254059/SDN+Controller+D |
+| | evelopment+Guide>`__ |
+------------------------------------+---------------------------------+
| SDN-R | `SDN-Radio, Router, ROADM - a |
| | set of model-driven application |
| | based on |
-| | SDN-C <https://wiki.onap.org/di |
-| | splay/DW/SDN-R>`__ |
+| | SDN-C <https://lf-onap.atlassia |
+| | n.net/wiki/spaces/DW/pages/1626 |
+| | 4181/SDN-R>`__ |
+------------------------------------+---------------------------------+
| SDN-GP | Software Defined Network - |
| | Global Platform |
| | Protocol |
+------------------------------------+---------------------------------+
| SO | `Service Orchestrator |
-| | (project) <https://wiki.onap.or |
-| | g/display/DW/Service+Orchestrat |
-| | or+Project>`__ |
+| | (project) <https://lf-onap.atla |
+| | ssian.net/wiki/spaces/DW/pages/ |
+| | 16224571/Service+Orchestrator+5 |
+| | +14+17>`__ |
+------------------------------------+---------------------------------+
| SON | Self-Organizing Networks |
+------------------------------------+---------------------------------+
| TSC | Technical Steering Committee |
+------------------------------------+---------------------------------+
| U-UI | `Usecase |
-| | UserInterface <https://wiki.ona |
-| | p.org/display/DW/Usecase+UI+Pro |
-| | ject>`__ |
+| | UserInterface <https://lf-onap. |
+| | atlassian.net/wiki/spaces/DW/pa |
+| | ges/16230631/Usecase+UI+Projec |
+| | t>`__ |
+------------------------------------+---------------------------------+
| UI | `User |
| | Interface <https://en.wikipedia |
| | example VNF) |
+------------------------------------+---------------------------------+
| VDU | `Virtualisation Deployment |
-| | Unit <https://wiki.onap.org/dis |
-| | play/DW/Comparison+of+Current+R |
-| | 3+Clean+Version+with+IFA011+v2. |
-| | 5.1>`__ |
+| | Unit <https://lf-onap.atlassian |
+| | .net/wiki/spaces/DW/pages/16293 |
+| | 271/Comparison+of+Current+R3+Cl |
+| | ean+Version+with+IFA011+v2.5. |
+| | 1>`__ |
+------------------------------------+---------------------------------+
| VES | Virtual function EventStream |
+------------------------------------+---------------------------------+
| VF | Virtual Function |
+------------------------------------+---------------------------------+
| VFC | `Virtual Function |
-| | Controller <https://wiki.onap.o |
-| | rg/display/DW/Virtual+Function+ |
-| | Controller+Project>`__ |
+| | Controller <https://lf-onap.atl |
+| | assian.net/wiki/spaces/DW/pages |
+| | /16230607/Virtual+Function+Cont |
+| | roller+Project>`__ |
+------------------------------------+---------------------------------+
| VFC | Virtual Function Component |
| | (Resource Onboarding) |
+------------------------------------+---------------------------------+
| VID | `Virtual Infrastructure |
| | Deployment |
-| | (Project) <https://wiki.onap.or |
-| | g/display/DW/Virtual+Infrastruc |
-| | ture+Deployment+Project>`__ |
+| | (Project) <https://lf-onap.atla |
+| | ssian.net/wiki/spaces/DW/pages/ |
+| | 16230625/Virtual+Infrastructure |
+| | +Deployment+Project>`__ |
+------------------------------------+---------------------------------+
| VIM | Virtualized Infrastructure |
| | Manager |
+------------------------------------+---------------------------------+
| VM | Virtual Machine |
+------------------------------------+---------------------------------+
-| VNF | `Virtual Network |
-| | Function <https://www.techtarge |
-| | t.com/searchnetworking/ |
-| | definition/virtual-network- |
-| | functions-VNF>`__ |
+| VNF | Virtual Network |
+| | Function |
+------------------------------------+---------------------------------+
| VNFC | Virtual Network Function |
| | Component |
+------------------------------------+---------------------------------+
| VNFD | `VNF |
-| | Descriptor <https://wiki.onap.o |
-| | rg/pages/viewpage.action?pageId |
-| | =8226059>`__ |
+| | Descriptor <https://lf-onap.atl |
+| | assian.net/wiki/spaces/DW/pages |
+| | /16270397/VNF+Desciptor>`__ |
+------------------------------------+---------------------------------+
| VNFM | VNF Manager |
+------------------------------------+---------------------------------+
| | SDC Demo Guide) |
+------------------------------------+---------------------------------+
| VTP | `VNF Test |
-| | Platform <https://wiki.onap.org |
-| | /pages/viewpage.action?pageId=4 |
-| | 3386304>`__ |
+| | Platform <https://lf-onap.atlas |
+| | sian.net/wiki/spaces/DW/pages/1 |
+| | 6316605/VNF+Test+Platform+VT |
+| | P>`__ |
+------------------------------------+---------------------------------+
| VVP | `VNF Validation |
-| | Program <https://wiki.onap.org/ |
-| | display/DW/VNF+Validation+Progr |
-| | am+Project>`__ |
+| | Program <https://lf-onap.atlass |
+| | ian.net/wiki/spaces/DW/pages/16 |
+| | 232043/VNF+Validation+Program+P |
+| | roject>`__ |
+------------------------------------+---------------------------------+
| WAR | `Web application |
| | Archive <https://en.wikipedia.o |
Configure alarm severity of related alarms, generated by Device Monitor.
-`SDNC-616 <https://jira.onap.org/browse/SDNC-616>`__ - SDN-R WT app need to change alarm severity "Configurable" for ConnectionLossxxx alarm family (received from Mediator) , when it passed to DCAE VES collector.
+`SDNC-616 <https://lf-onap.atlassian.net/browse/SDNC-616>`__ - SDN-R WT app need to change alarm severity "Configurable" for ConnectionLossxxx alarm family (received from Mediator) , when it passed to DCAE VES collector.
Syntax: Parameter=Value
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features</groupId>
<artifactId>ccsdk-features-all</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>feature</packaging>
<name>ccsdk-features :: features :: ${project.artifactId}</name>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>feature-repo-parent</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features</groupId>
<artifactId>features-features</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>feature</packaging>
<name>ccsdk-features :: features :: ${project.artifactId}</name>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features</groupId>
<artifactId>features-installer</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-features :: features :: ${project.artifactId}</name>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features</groupId>
<artifactId>ccsdk-feature-aggregator</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-features :: features</name>
<parent>
<groupId>org.onap.ccsdk.features</groupId>
<artifactId>ccsdk-features</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
~ ============LICENSE_END=======================================================
~
-->
+
<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.features</groupId>
<artifactId>ccsdk-features</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<parent>
<groupId>org.onap.ccsdk.features</groupId>
<artifactId>ccsdk-features</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features</groupId>
<artifactId>ccsdk-features</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-features</name>
--- /dev/null
+---
+distribution_type: 'maven'
+version: '1.8.0'
+project: 'ccsdk-features'
+log_dir: 'ccsdk-features-maven-stage-master/318/'
--- /dev/null
+---
+distribution_type: 'maven'
+version: '2.0.0'
+project: 'ccsdk-features'
+log_dir: 'ccsdk-features-maven-stage-master/319/'
--- /dev/null
+---
+distribution_type: 'maven'
+version: '2.0.1'
+project: 'ccsdk-features'
+log_dir: 'ccsdk-features-maven-stage-master/320/'
--- /dev/null
+---
+distribution_type: 'maven'
+version: '2.1.0'
+project: 'ccsdk-features'
+log_dir: 'ccsdk-features-maven-stage-master/321/'
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>
<artifactId>CMNotify-feature</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>feature</packaging>
<name>ccsdk-features :: sdnr-northbound :: ${project.artifactId}</name>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>
<artifactId>CMNotify-installer</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-features :: sdnr-northbound :: ${project.artifactId}</name>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>
<artifactId>CMNotify-model</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>ccsdk-features :: sdnr-northbound :: ${project.artifactId}</name>
<dependencies>
<dependency>
<groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
- <artifactId>rfc6991</artifactId>
+ <artifactId>rfc6991-ietf-inet-types</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+ <artifactId>rfc6991-ietf-yang-types</artifactId>
</dependency>
</dependencies>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>
<artifactId>CMNotify</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-features :: sdnr-northbound :: ${project.artifactId}</name>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>
<artifactId>CMNotify-provider</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>ccsdk-features :: sdnr-northbound :: ${project.artifactId}</name>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>
<artifactId>addCMHandle-feature</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>feature</packaging>
<name>ccsdk-features :: sdnr-northbound :: ${project.artifactId}</name>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>
<artifactId>addCMHandle-installer</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-features :: sdnr-northbound :: ${project.artifactId}</name>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>
<artifactId>addCMHandle-model</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>ccsdk-features :: sdnr-northbound :: ${project.artifactId}</name>
<dependencies>
+ <!--
<dependency>
<groupId>org.opendaylight.netconf</groupId>
<artifactId>sal-netconf-connector</artifactId>
<scope>provided</scope>
</dependency>
+ -->
<dependency>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>mdsal-binding-dom-codec-api</artifactId>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>
<artifactId>addCMHandle</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-features :: sdnr-northbound :: ${project.artifactId}</name>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>
<artifactId>addCMHandle-provider</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>ccsdk-features :: sdnr-northbound :: ${project.artifactId}</name>
<artifactId>netconf-dom-api</artifactId>
<scope>provided</scope>
</dependency>
+ <!--
<dependency>
<groupId>org.opendaylight.netconf</groupId>
<artifactId>sal-netconf-connector</artifactId>
<scope>provided</scope>
</dependency>
+ -->
<dependency>
<groupId>org.opendaylight.netconf</groupId>
<artifactId>netconf-topology</artifactId>
~ ============LICENSE_END=======================================================
~
-->
+
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" 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.parent</groupId>
<artifactId>feature-repo-parent</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
~ ============LICENSE_END=======================================================
~
-->
+
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" 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.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
~ ============LICENSE_END=======================================================
~
-->
+
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" 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.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
~ ============LICENSE_END=======================================================
~
-->
+
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" 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.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
~ ============LICENSE_END=======================================================
~
-->
+
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" 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.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>
<artifactId>sdnr-northbound-all</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>feature</packaging>
<name>ccsdk-features :: sdnr-northbound :: features :: ${project.artifactId}</name>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>
<artifactId>sdnr-northbound-features-installer</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-features :: sdnr-northbound :: features :: ${project.artifactId}</name>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>
<artifactId>sdnr-northbound-feature-aggregator</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-features :: sdnr-northbound :: features</name>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>
<artifactId>oofpcipoc-consumer</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>ccsdk-features :: sdnr-northbound :: ${project.artifactId}</name>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>
<artifactId>oofpcipoc-feature</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>feature</packaging>
<name>ccsdk-features :: sdnr-northbound :: ${project.artifactId}</name>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>
<artifactId>oofpcipoc-installer</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-features :: sdnr-northbound :: ${project.artifactId}</name>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>
<artifactId>oofpcipoc-model</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>ccsdk-features :: sdnr-northbound :: ${project.artifactId}</name>
<dependencies>
<dependency>
<groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
- <artifactId>rfc6991</artifactId>
+ <artifactId>rfc6991-ietf-inet-types</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+ <artifactId>rfc6991-ietf-yang-types</artifactId>
</dependency>
</dependencies>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>
<artifactId>oofpcipoc</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-features :: sdnr-northbound :: ${project.artifactId}</name>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>
<artifactId>oofpcipoc-provider</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>ccsdk-features :: sdnr-northbound :: ${project.artifactId}</name>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>
<artifactId>sdnr-northbound</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-features :: ${project.artifactId}</name>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>
<artifactId>ranSlice-feature</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>feature</packaging>
<name>ccsdk-features :: sdnr-northbound :: ${project.artifactId}</name>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>
<artifactId>ranSlice-installer</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-features :: sdnr-northbound :: ${project.artifactId}</name>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>
<artifactId>ranSlice-model</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>ccsdk-features :: sdnr-northbound :: ${project.artifactId}</name>
<dependencies>
<dependency>
<groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
- <artifactId>rfc6991</artifactId>
+ <artifactId>rfc6991-ietf-inet-types</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+ <artifactId>rfc6991-ietf-yang-types</artifactId>
</dependency>
</dependencies>
</project>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>
<artifactId>ranSlice</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-features :: sdnr-northbound :: ${project.artifactId}</name>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>
<artifactId>ranSlice-provider</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>ccsdk-features :: sdnr-northbound :: ${project.artifactId}</name>
<artifactId>derby</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbytools</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.onap.ccsdk.sli.core</groupId>
<artifactId>sli-common</artifactId>
<groupId>org.onap.ccsdk.features.sdnr.odlux</groupId>
<artifactId>sdnr-odlux-helpserver-top</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>SDNR ODLUX :: ${project.artifactId}</name>
<groupId>org.onap.ccsdk.features.sdnr.odlux</groupId>
<artifactId>sdnr-odlux-helpserver-provider</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>SDNR ODLUX :: ${project.artifactId}</name>
<groupId>org.onap.ccsdk.features.sdnr.odlux</groupId>
<artifactId>sdnr-odlux-app-apiDemo</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>SDNR ODLUX :: ${project.artifactId}</name>
<groupId>org.onap.ccsdk.features.sdnr.odlux</groupId>
<artifactId>sdnr-odlux-apps-installer</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>SDNR ODLUX :: ${project.artifactId}</name>
<groupId>org.onap.ccsdk.features.sdnr.odlux</groupId>
<artifactId>sdnr-odlux-app-configurationApp</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>SDNR ODLUX :: ${project.artifactId}</name>
flattenViewElements,
getReferencedDataList,
resolveViewDescription,
+ createViewData,
} from '../utilities/viewEngineHelper';
export class EnableValueSelector extends Action {
}
}
+export class UpdateNewData extends Action {
+ constructor(public newData: any) {
+ super();
+ }
+}
+
export const updateNodeIdAsyncActionCreator = (nodeId: string) => async (dispatch: Dispatch, _getState: () => IApplicationStoreState ) => {
dispatch(new UpdateDeviceDescription('', {}, []));
let currentNS: string | null = null;
let defaultNS: string | null = null;
+ let newData: any = null;
+
dispatch(new SetCollectingSelectionData(true));
try {
for (let ind = 0; ind < pathParts.length; ++ind) {
viewElement = viewSpecification.elements[property] || viewSpecification.elements[`${namespace}:${property}`];
if (!viewElement) throw Error('Property [' + property + '] does not exist.');
- if (viewElement.isList && !key) {
- if (pathParts.length - 1 > ind) {
- dispatch(new SetCollectingSelectionData(false));
- throw new Error('No key for list [' + property + ']');
- } else if (vPath.endsWith('[]') && pathParts.length - 1 === ind) {
+ if (newData) {
+ // update view data
+ newData = newData[property];
- // empty key is used for new element
- if (viewElement && 'viewId' in viewElement) viewSpecification = views[+viewElement.viewId];
- const data = Object.keys(viewSpecification.elements).reduce<{ [name: string]: any }>((acc, cur) => {
- const elm = viewSpecification.elements[cur];
- if (elm.default) {
- acc[elm.id] = elm.default || '';
- }
- return acc;
- }, {});
+ } else if (viewElement.isList && !key) {
+ // handle new list element without key
+ if (pathParts[ind][1] === null) {
- // create display specification
- const ds: DisplaySpecification = {
- displayMode: DisplayModeType.displayAsObject,
- viewSpecification: resolveViewDescription(defaultNS, vPath, viewSpecification),
- keyProperty: isViewElementList(viewElement!) && viewElement.key || undefined,
- };
+ // create new data if not already exists
+ newData = getState().configuration.viewDescription.newData;
+ if (!newData && viewElement && 'viewId' in viewElement) {
+ newData = createViewData(namespace, views[+viewElement.viewId], views);
+ dispatch(new UpdateNewData(newData));
+ }
- // update display specification
- return dispatch(postProcessDisplaySpecificationActionCreator(vPath, data, ds));
+ } else if ((pathParts.length) - 1 > ind) {
+ // handle list without key which is not a new element
+ dispatch(new SetCollectingSelectionData(false));
+ throw new Error('No key for list [' + property + ']');
}
+
if (viewElement && isViewElementList(viewElement) && viewSpecification.parentView === '0') {
// check if there is a reference as key
const listSpecification = views[+viewElement.viewId];
}
extractList = true;
} else {
- // normal case & replaces unicode %2C if present
- dataPath += `/${property}${key ? `=${key.replace(/\%2C/g, ',').replace(/\//ig, '%2F')}` : ''}`;
+ dataPath += `/${property}${key ? `=${key.replace(/\//ig, '%2F')}` : ''}`;
// in case of the root element the required namespace will be added later,
// while extracting the data
} else if (viewElement.uiType === 'rpc') {
viewSpecification = views[+(viewElement.inputViewId || 0)];
- // create new instance & flaten
+ // create new instance & flatten
inputViewSpecification = viewElement.inputViewId != null && {
...views[+(viewElement.inputViewId || 0)],
elements: flattenViewElements(defaultNS, '', views[+(viewElement.inputViewId || 0)].elements, views, viewElement.label),
}
}
+ if (newData) {
+ // create display specification
+ const ds: DisplaySpecification = {
+ displayMode: DisplayModeType.displayAsObject,
+ viewSpecification: resolveViewDescription(defaultNS, vPath, viewSpecification),
+ keyProperty: isViewElementList(viewElement!) && viewElement.key || undefined,
+ };
+
+ // update display specification
+ return dispatch(postProcessDisplaySpecificationActionCreator(vPath, newData, ds));
+ }
+
let data: any = {};
// do not get any data from netconf if there is no view specified || this is the root element [0] || this is an rpc
if (viewSpecification && !(viewSpecification.id === '0' || viewElement!.uiType === 'rpc')) {
const restResult = (await restService.getConfigData(dataPath));
- if (!restResult.data) {
+ if (restResult.status === 409) {
+ // special case: if this is a list without any response
+ if (isViewElementList(viewElement!)) {
+ // create display specification
+ const ds: DisplaySpecification = {
+ displayMode: extractList ? DisplayModeType.displayAsList : DisplayModeType.displayAsObject,
+ viewSpecification: resolveViewDescription(defaultNS, vPath, viewSpecification),
+ keyProperty: viewElement.key,
+ };
+ // update display specification
+ return dispatch(postProcessDisplaySpecificationActionCreator(vPath, [], ds));
+ } else {
+ // create display specification
+ const ds: DisplaySpecification = {
+ displayMode: DisplayModeType.displayAsObject,
+ viewSpecification: resolveViewDescription(defaultNS, vPath, viewSpecification),
+ };
+ // update display specification
+ return dispatch(postProcessDisplaySpecificationActionCreator(vPath, { }, ds));
+ }
+
+ } else if (!restResult.data) {
// special case: if this is a list without any response
if (extractList && restResult.status === 404) {
if (!isViewElementList(viewElement!)) {
let currentNS: string | null = null;
let defaultNS: string | null = null;
+ let newData: any = null;
+ let newElement: any = null;
+
dispatch(new SetCollectingSelectionData(true));
try {
for (let ind = 0; ind < pathParts.length; ++ind) {
viewElement = viewSpecification.elements[property] || viewSpecification.elements[`${namespace}:${property}`];
if (!viewElement) throw Error('Property [' + property + '] does not exist.');
- if (isViewElementList(viewElement) && !key) {
+ if (newElement) {
+ // update view data
+ if (pathParts.length - 1 === ind) {
+ newElement[property] = data;
+ return dispatch(new UpdateNewData(newData));
+ } else {
+ newElement[property] = Array.isArray(newElement[property]) ? [ ...newElement[property] ] : { ...newElement[property] };
+ }
+ } else if (isViewElementList(viewElement) && !key) {
embedList = true;
if (viewElement && viewElement.isList && viewSpecification.parentView === '0') {
- throw new Error('Found a list at root level of a module w/o a refenrece key.');
+ throw new Error('Found a list at root level of a module w/o a reference key.');
}
- if (pathParts.length - 1 > ind) {
+
+ if (key === null) {
+ // set new data
+ const stateData = getState().configuration.viewDescription.newData;
+ newElement = newData = Array.isArray(stateData) ? [ ...stateData ] : { ...stateData };
+
+ if (vPath.endsWith('[]') && pathParts.length - 1 === ind) {
+ // handle new element with any number of arguments
+ let keyList = viewElement.key?.split(' ');
+ let dataPathParam = keyList?.map(id => data[id]).join(',');
+ key = viewElement.key && String(dataPathParam) || '';
+ isNew = key;
+ if (!key) {
+ dispatch(new SetCollectingSelectionData(false));
+ throw new Error('No value for key [' + viewElement.key + '] in list [' + property + ']');
+ }
+ }
+
+ } else if (pathParts.length - 1 > ind) {
dispatch(new SetCollectingSelectionData(false));
throw new Error('No key for list [' + property + ']');
- } else if (vPath.endsWith('[]') && pathParts.length - 1 === ind) {
- // handle new element with any number of arguments
- let keyList = viewElement.key?.split(' ');
- let dataPathParam = keyList?.map(id => data[id]).join(',');
- key = viewElement.key && String(dataPathParam) || '';
- isNew = key;
- if (!key) {
- dispatch(new SetCollectingSelectionData(false));
- throw new Error('No value for key [' + viewElement.key + '] in list [' + property + ']');
- }
}
}
const [nsOrName, name] = cur.split(':', 1);
const element = pViewSpecification.elements[cur] || pViewSpecification.elements[nsOrName] || pViewSpecification.elements[name];
if (!element && process.env.NODE_ENV === 'development' ) {
- throw new Error('removeReadOnlyElements: Could not determine elment for data.');
+ throw new Error('removeReadOnlyElements: Could not determine element for data.');
}
if (element && element.config) {
if (element.uiType === 'object') {
: data;
// embed the first element list[key]
- data = isNew
+ data = isNew || newData
? [data]
: data;
}
}
+ if (newData) {
+ dispatch(new UpdateNewData(null));
+ }
+
if (isNew) {
return dispatch(new ReplaceAction(`/configuration/${nodeId}/${vPath.replace(/\[\]$/i, `[${isNew}]`)}`)); // navigate to new element
}
import { IActionHandler } from '../../../../framework/src/flux/action';
-import { UpdateViewDescription, UpdateOutputData } from '../actions/deviceActions';
+import { UpdateViewDescription, UpdateOutputData, UpdateNewData } from '../actions/deviceActions';
import { ViewSpecification } from '../models/uiModels';
export enum DisplayModeType {
export interface IViewDescriptionState {
vPath: string | null;
displaySpecification: DisplaySpecification;
+ newData?: any;
viewData: any;
outputData?: any;
}
...state,
outputData: action.outputData,
};
+ } else if (action instanceof UpdateNewData) {
+ state = {
+ ...state,
+ newData: action.newData,
+ };
}
return state;
};
};
export const isViewElementObject = (viewElement: ViewElement): viewElement is ViewElementObject => {
- return viewElement && viewElement.uiType === 'object' && viewElement.isList === false;
+ return viewElement && viewElement.uiType === 'object' && !viewElement.isList;
};
export const isViewElementList = (viewElement: ViewElement): viewElement is ViewElementList => {
- return viewElement && viewElement.uiType === 'object' && viewElement.isList === true;
+ return viewElement && viewElement.uiType === 'object' && !!viewElement.isList;
};
export const isViewElementObjectOrList = (viewElement: ViewElement): viewElement is ViewElementObject | ViewElementList => {
return viewElement && viewElement.uiType === 'empty';
};
-export const ResolveFunction = Symbol('IsResolved');
+export const ResolveFunction = Symbol('ResolveFunction');
export type ViewSpecification = {
id: string;
parentView?: string;
language: string;
ifFeature?: string;
+ augmentations?: string[];
when?: WhenAST;
uses?: (string[]) & { [ResolveFunction]?: (parent: string) => void };
elements: { [name: string]: ViewElement };
* @param data The data to be updated.
* @returns The written data.
*/
- public setConfigData(path: string, data: any) {
- return requestRestExt<{ [key: string]: any }>(path, { method: 'PUT', body: JSON.stringify(data) });
+ public setConfigData(path: string, data: any, method: 'PUT' | 'POST' = 'PUT') {
+ return requestRestExt<{ [key: string]: any }>(path, { method, body: JSON.stringify(data) });
}
public executeRpc(path: string, data: any) {
isViewElementRpc,
isViewElementChoice,
ViewElementChoiceCase,
+ isViewElementObject,
} from '../models/uiModels';
import { Module } from '../models/yang';
return parts.join('/');
};
-export const splitVPath = (vPath: string, vPathParser : RegExp): [string, string?][] => {
- const pathParts: [string, string?][] = [];
+export const splitVPath = (vPath: string, vPathParser : RegExp): [string, (string | undefined | null)][] => {
+ const pathParts: [string, (string | undefined | null)][] = [];
let partMatch: RegExpExecArray | null;
if (vPath) do {
partMatch = vPathParser.exec(vPath);
if (partMatch) {
- pathParts.push([partMatch[1], partMatch[2] || undefined]);
+ pathParts.push([partMatch[1], partMatch[2] || (partMatch[0].includes('[]') ? null : undefined)]);
}
} while (partMatch);
return pathParts;
}
return acc;
}, Promise.resolve({ ...viewSpecification, elements: {} as { [key: string]: ViewElement } }));
-};
\ No newline at end of file
+};
+
+export const createViewData = (namespace: string | null, viewSpecification: ViewSpecification, views: ViewSpecification[]) => Object.keys(viewSpecification.elements).reduce<{ [name: string]: any }>((acc, cur) => {
+ const elm = viewSpecification.elements[cur];
+ let currentNamespace = namespace;
+ const key = elm.id;
+ if (elm.default) {
+ acc[key] = elm.default || '';
+ } else if (elm.uiType === 'boolean') {
+ acc[key] = false;
+ } else if (elm.uiType === 'number') {
+ acc[key] = 0;
+ } else if (elm.uiType === 'string') {
+ acc[key] = '';
+ } else if (isViewElementObject(elm)) {
+ const view = views[+elm.viewId];
+ if (view) {
+ if (view.ns) {
+ currentNamespace = view.ns;
+ }
+ acc[key] = createViewData(currentNamespace, view, views);
+ }
+ } else if (isViewElementList(elm)) {
+ acc[key] = [];
+ }
+ return acc;
+}, {});
import PostAdd from '@mui/icons-material/PostAdd';
import ArrowBack from '@mui/icons-material/ArrowBack';
import RemoveIcon from '@mui/icons-material/RemoveCircleOutline';
+import CheckIcon from '@mui/icons-material/Check';
import SaveIcon from '@mui/icons-material/Save';
import EditIcon from '@mui/icons-material/Edit';
import Tooltip from '@mui/material/Tooltip';
type ConfigurationApplicationComponentState = {
isNew: boolean;
+ isNewSubElement: boolean;
editMode: boolean;
canEdit: boolean;
viewData: { [key: string]: any } | null;
this.state = {
isNew: false,
+ isNewSubElement: false,
canEdit: false,
editMode: false,
viewData: null,
static getDerivedStateFromProps(nextProps: ConfigurationApplicationComponentProps, prevState: ConfigurationApplicationComponentState & { [OldProps]: ConfigurationApplicationComponentProps }) {
if (!prevState || !prevState[OldProps] || (prevState[OldProps].viewData !== nextProps.viewData)) {
- const isNew: boolean = nextProps.vPath?.endsWith('[]') || false;
+ const isNew: boolean = nextProps.vPath?.includes('[]') || false;
+ const isNewSubElement: boolean = nextProps.vPath?.includes('[]') && !nextProps.vPath?.endsWith('[]') || false;
+
const state = {
...prevState,
isNew: isNew,
editMode: isNew,
+ isNewSubElement: isNewSubElement,
viewData: nextProps.viewData || null,
[OldProps]: nextProps,
choices: nextProps.displaySpecification.displayMode === DisplayModeType.doNotDisplay
? (
<div className={classes.section}>
{sections.references.map(element => (
- <UIElementReference key={element.id} element={element} disabled={editMode || this.isPolicyViewElementForbidden(element, dataPath)} onOpenReference={(elm) => { this.navigate(`/${elm.id}`); }} />
+ <UIElementReference key={element.id} element={element} disabled={!isNew && (editMode || this.isPolicyViewElementForbidden(element, dataPath))} onOpenReference={(elm) => { this.navigate(`/${elm.id}`); }} />
))}
</div>
) : null
ev.preventDefault();
let keyId = '';
if (listKeyProperty && listKeyProperty.split(' ').length > 1) {
- keyId += listKeyProperty.split(' ').map(id => row[id]).join(',');
+ keyId += listKeyProperty.split(' ').map(id => encodeURIComponent(String(row[id]))).join(',');
} else {
- keyId = row[listKeyProperty];
+ keyId = encodeURIComponent(String(row[listKeyProperty]));
}
if (listKeyProperty) {
- navigate(`[${encodeURIComponent(keyId)}]`); // Do not navigate without key.
+ navigate(`[${keyId}]`); // Do not navigate without key.
}
}} ></SelectElementTable>
);
}
private renderBreadCrumps() {
- const { editMode } = this.state;
+ const { editMode, isNew, isNewSubElement } = this.state;
const { displaySpecification, vPath, nodeId } = this.props;
const pathParts = splitVPath(vPath!, /(?:([^\/\["]+)(?:\[([^\]]*)\])?)/g); // 1 = property / 2 = optional key
+
let lastPath = '/configuration';
let basePath = `/configuration/${nodeId}`;
+
return (
<div className={this.props.classes.header}>
<div>
{this.state.editMode && (
<Fab color="secondary" aria-label="back-button" className={this.props.classes.fab} onClick={async () => {
if (this.props.vPath) {
- await this.props.reloadView(this.props.vPath);
+ if (isNewSubElement || isNew) {
+ const index = this.props.vPath.lastIndexOf('[]');
+ const newVPath = this.props.vPath.substring(0, index + ( isNewSubElement ? 2 : 0 ));
+ this.props.history.replace(`/configuration/${nodeId}/${newVPath}`);
+ } else {
+ await this.props.reloadView(this.props.vPath);
+ }
}
this.setState({ editMode: false });
}} ><ArrowBack /></Fab>
{ /* do not show edit if this is a list or it can't be edited */
displaySpecification.displayMode === DisplayModeType.displayAsObject && displaySpecification.viewSpecification.canEdit && (<div>
<Fab color="secondary" aria-label={editMode ? 'save-button' : 'edit-button'} className={this.props.classes.fab} onClick={() => {
- if (this.state.editMode) {
+ if (this.state.editMode && this.props.vPath) {
// ensure only active choices will be contained
const resultingViewData = this.collectData(displaySpecification.viewSpecification.elements);
this.props.onUpdateData(this.props.vPath!, resultingViewData);
+
+ const index = this.props.vPath.lastIndexOf('[]');
+ const newVPath = this.props.vPath.substring(0, index + ( isNewSubElement ? 2 : 0 ));
+ this.props.history.replace(`/configuration/${nodeId}/${newVPath}`);
}
this.setState({ editMode: !editMode });
}}>
- {editMode
- ? <SaveIcon />
+ { editMode
+ ? isNewSubElement
+ ? <CheckIcon />
+ : <SaveIcon />
: <EditIcon />
}
</Fab>
OR = 'OR',
NOT = 'NOT',
EQUALS = 'EQUALS',
+ NOT_EQUALS = 'NOT_EQUALS',
COMMA = 'COMMA',
STRING = 'STRING',
FUNCTION = 'FUNCTION',
value: string;
};
-const isAlpha = (char: string) => /[a-z]/i.test(char);
+const isAlpha = (char: string) => {
+ if (!char) return false;
+ const code = char.charCodeAt(0);
+ return (code >= 65 && code <= 90) || (code >= 97 && code <= 122);
+};
+
+const isAlphaNumeric = (char: string) => {
+ if (!char) return false;
+ const code = char.charCodeAt(0);
+ return (
+ isAlpha(char) ||
+ (code >= 48 && code <= 57) ||
+ code === 95 || // underscore
+ code === 45 || // hyphen
+ code === 47 || // slash
+ code === 58 || // colon
+ code === 46 // dot
+ );
+};
-const isAlphaNumeric = (char: string) => /[A-Za-z0-9_\-/:\.]/i.test(char);
+const isOperator = (char: string) => {
+ if (!char) return false;
+ const code = char.charCodeAt(0);
+ return code === 33 || code === 38 || code === 124 || code === 61;
+};
const lex = (input: string) : Token[] => {
let tokens = [] as any[];
continue;
}
+
if (isAlphaNumeric(char)) {
let value = '';
while (isAlphaNumeric(char)) {
tokens.push({ type: WhenTokenType.IDENTIFIER, value });
continue;
}
+
+ if (isOperator(char)) {
+ let value = '';
+ while (isOperator(char)) {
+ value += char;
+ char = input[++current];
+ }
+
+ switch (value) {
+ case '&&':
+ tokens.push({ type: WhenTokenType.AND });
+ break;
+ case '||':
+ tokens.push({ type: WhenTokenType.OR });
+ break;
+ case '!':
+ tokens.push({ type: WhenTokenType.NOT });
+ break;
+ case '==':
+ tokens.push({ type: WhenTokenType.EQUALS });
+ break;
+ case '!=':
+ tokens.push({ type: WhenTokenType.NOT_EQUALS });
+ break;
+ default:
+ throw new TypeError(`I don't know what this operator is: ${value}`);
+ }
+ continue;
+ }
+
throw new TypeError(`I don't know what this character is: ${char}`);
}
return tokens;
return module;
}
- public postProcess() {
+ private calculateExecutionOrder(moduleName: string, visited: Set<string> = new Set()): number {
+ if (visited.has(moduleName)) {
+ return 0;
+ }
+ visited.add(moduleName);
- // execute all post processes like resolving in proper order
- this._unionsToResolve.forEach(cb => {
+ const module = this.modules[moduleName];
+ const augments = module?.augments || {};
+ const augmentPaths = Object.keys(augments);
+
+ if (augmentPaths.length === 0) {
+ module.executionOrder = 0;
+ return 0;
+ }
+
+ const orders = augmentPaths.map((path) => {
+ const pathParts = path.split('/');
+ const lastPart = pathParts[pathParts.length - 1];
+ const [ns] = lastPart.split(':');
+ const baseModuleOrder = this.calculateExecutionOrder(ns, visited);
+ return baseModuleOrder + 1;
+ });
+
+ const maxOrder = Math.max(...orders);
+ module.executionOrder = maxOrder;
+ return maxOrder;
+ }
+
+ public postProcess() {
+ // process all type refs
+ this._typeRefToResolve.forEach(cb => {
try { cb(); } catch (error) {
console.warn(error.message);
}
}
});
- /**
- * This is to fix the issue for sequential execution of modules based on their child and parent relationship
- * We are sorting the module object based on their augment status
- */
- Object.keys(this.modules)
- .map(elem => {
- if (this.modules[elem].augments && Object.keys(this.modules[elem].augments).length > 0) {
- const { augments, ..._rest } = this.modules[elem];
- const partsOfKeys = Object.keys(augments).map((key) => (key.split('/').length - 1));
- this.modules[elem].executionOrder = Math.max(...partsOfKeys);
- } else {
- this.modules[elem].executionOrder = 0;
- }
- });
+ // process all augmentations
+ Object.keys(this.modules).forEach((moduleName) => {
+ this.calculateExecutionOrder(moduleName);
+ });
- // process all augmentations / sort by namespace changes to ensure proper order
- Object.keys(this.modules).sort((a, b) => this.modules[a].executionOrder! - this.modules[b].executionOrder!).forEach(modKey => {
- const module = this.modules[modKey];
+ const orderedModules = Object.values(this.modules)
+ .filter((m) => m.executionOrder)
+ .sort((a, b) => {
+ return a.executionOrder! - b.executionOrder!;
+ });
+
+ orderedModules.forEach((module) => {
const augmentKeysWithCounter = Object.keys(module.augments).map((key) => {
- const pathParts = splitVPath(key, /(?:(?:([^\/\:]+):)?([^\/]+))/g); // 1 = opt: namespace / 2 = property
+ const pathParts = splitVPath(key, /(?:(?:([^\/\:]+):)?([^\/]+))/g); // 1 = opt: namespace / 2 = property
let nameSpaceChangeCounter = 0;
let currentNS = module.name; // init namespace
pathParts.forEach(([ns, _]) => {
};
});
- const augmentKeys = augmentKeysWithCounter
- .sort((a, b) => a.nameSpaceChangeCounter > b.nameSpaceChangeCounter ? 1 : a.nameSpaceChangeCounter === b.nameSpaceChangeCounter ? 0 : -1)
- .map((a) => a.key);
-
- augmentKeys.forEach(augKey => {
- const augments = module.augments[augKey];
- const viewSpec = this.resolveView(augKey);
- if (!viewSpec) console.warn(`Could not find view to augment [${augKey}] in [${module.name}].`);
- if (augments && viewSpec) {
- augments.forEach(augment => Object.keys(augment.elements).forEach(key => {
- const elm = augment.elements[key];
-
- const when = elm.when && augment.when
- ? {
- type: WhenTokenType.AND,
- left: elm.when,
- right: augment.when,
- }
- : elm.when || augment.when;
-
- const ifFeature = elm.ifFeature
- ? `(${augment.ifFeature}) and (${elm.ifFeature})`
- : augment.ifFeature;
-
- viewSpec.elements[key] = {
- ...augment.elements[key],
- when,
- ifFeature,
- };
- }));
+ const augmentKeys = augmentKeysWithCounter.sort((a, b) => (a.nameSpaceChangeCounter > b.nameSpaceChangeCounter ? 1 : a.nameSpaceChangeCounter === b.nameSpaceChangeCounter ? 0 : -1)).map((a) => a.key);
+
+ augmentKeys.forEach((augKey) => {
+ const viewToAugment = this.resolveView(augKey);
+ const augmentations = module.augments[augKey];
+
+ if (!viewToAugment) {
+ console.warn(`Could not find view to augment [${augKey}] from [${module.name}].`);
+ return;
+ }
+
+ if (augmentations && viewToAugment) {
+ augmentations.forEach(({ id }) => {
+ viewToAugment.augmentations = viewToAugment.augmentations || [];
+ viewToAugment.augmentations.push(id);
+ });
}
});
});
+ // build a map of views with all their augmentation level
+ const viewsWithNestedAugmentations = new Map<ViewSpecification, number>();
+
+ // helper function to get maximum augmentation depth
+ const calculateAugmentationDepth = (view: ViewSpecification): number => {
+ // Return cached value if already calculated
+ if (viewsWithNestedAugmentations.has(view)) {
+ return viewsWithNestedAugmentations.get(view)!;
+ }
+
+ // Base case: no augmentations
+ if (!view.augmentations || view.augmentations.length === 0) {
+ viewsWithNestedAugmentations.set(view, 0);
+ return 0;
+ }
+
+ // Get depths of all child augmentations
+ let maxDepth = 0;
+ for (const augId of view.augmentations) {
+ const augView = this.views[+augId];
+ for (const nestedAugId in augView.elements || {}) {
+ const nestedAug = augView.elements[nestedAugId];
+ if (isViewElementObjectOrList(nestedAug)) {
+ const nestedView = this.views[+nestedAug.viewId];
+ maxDepth = nestedView ? Math.max(maxDepth, calculateAugmentationDepth(nestedView)) : maxDepth;
+ }
+ }
+ }
+
+ // Add 1 for current level and cache result
+ const totalDepth = maxDepth + 1;
+ viewsWithNestedAugmentations.set(view, totalDepth);
+ return totalDepth;
+ };
+
+ // process views from lowest to highest augmentation depth
+ const viewEntries = Object.entries(this.views.filter((v) => v.augmentations && v.augmentations.length > 0))
+ .map(([, view]) => view)
+ .sort((a, b) => calculateAugmentationDepth(a) - calculateAugmentationDepth(b));
+
+ for (const view of viewEntries) {
+ if (!view.augmentations || view.augmentations.length === 0) continue;
+
+ for (const augId of view.augmentations) {
+ const augmentation = this.views[+augId];
+
+ // merge elements from augmentation into main view
+ Object.keys(augmentation.elements).forEach((key) => {
+ const elm = augmentation.elements[key];
+
+ const when =
+ elm.when && augmentation.when
+ ? {
+ type: WhenTokenType.AND,
+ left: elm.when,
+ right: augmentation.when,
+ }
+ : elm.when || augmentation.when;
+
+ const ifFeature = elm.ifFeature ? `(${augmentation.ifFeature}) and (${elm.ifFeature})` : augmentation.ifFeature;
+
+ view.elements[key] = {
+ ...augmentation.elements[key],
+ when,
+ ifFeature,
+ };
+ });
+ }
+ }
+
// process Identities
const traverseIdentity = (identities: Identity[]) => {
const result: Identity[] = [];
const identity = module.identities[idKey];
if (identity.base != null) {
const base = this.resolveIdentity(identity.base, module);
- base.children?.push(identity);
+ base?.children?.push(identity);
} else {
baseIdentities.push(identity);
}
}
});
- this._typeRefToResolve.forEach(cb => {
+ this._modulesToResolve.forEach(cb => {
try { cb(); } catch (error) {
console.warn(error.message);
}
});
- this._modulesToResolve.forEach(cb => {
+ // execute all post processes like resolving in proper order
+ this._unionsToResolve.forEach(cb => {
try { cb(); } catch (error) {
console.warn(error.message);
}
});
+ const knownViews: ViewSpecification[] = [];
// resolve readOnly
const resolveReadOnly = (view: ViewSpecification, parentConfig: boolean) => {
+ if (knownViews.includes(view)) return;
+ knownViews.push(view);
// update view config
view.config = view.config && parentConfig;
return [element, resultPathParts.slice(0, -1).map(p => `${moduleName !== p.ns ? `${moduleName = p.ns}:` : ''}${p.property}${p.ind || ''}`).join('/')];
}
+
+ private resolveViewElement(name: string, referenceView: ViewSpecification): ViewElement | null {
+ let element: ViewElement | null = null;
+ element = referenceView.elements[name];
+
+ if (element) {
+ return element;
+ }
+
+ const augmentViewIds = referenceView.augmentations;
+ if (augmentViewIds) {
+ for (let i = 0; i < augmentViewIds.length; ++i) {
+ const augmentView = this._views[+augmentViewIds[i]];
+ if (augmentView) {
+ element = this.resolveViewElement(name, augmentView);
+ if (element) break;
+ }
+ }
+ }
+ return element;
+ }
+
+
private resolveView(vPath: string) {
const vPathParser = /(?:(?:([^\/\[\]\:]+):)?([^\/\[\]]+)(\[[^\]]+\])?)/g; // 1 = opt: namespace / 2 = property / 3 = opt: indexPath
let element: ViewElement | null = null;
if (partMatch) {
if (element === null) {
moduleName = partMatch[1]!;
- const rootModule = this._modules[moduleName];
- if (!rootModule) return null;
- element = rootModule.elements[`${moduleName}:${partMatch[2]!}`];
+ view = Object.values(this.views).find((v) => v.parentView === '0' && v.ns === moduleName) || null;
+ if (view) {
+ element = this.resolveViewElement(`${moduleName}:${partMatch[2]!}`, view);
+ }
} else if (isViewElementObjectOrList(element)) {
view = this._views[+element.viewId];
if (moduleName !== partMatch[1]) {
moduleName = partMatch[1];
- element = view.elements[`${moduleName}:${partMatch[2]}`];
+ element = this.resolveViewElement(`${moduleName}:${partMatch[2]}`, view);
} else {
- element = view.elements[partMatch[2]];
+ element = this.resolveViewElement(partMatch[2], view);
}
} else {
return null;
<groupId>org.onap.ccsdk.features.sdnr.odlux</groupId>
<artifactId>sdnr-odlux-app-connectApp</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>SDNR ODLUX :: ${project.artifactId}</name>
{ property: 'port', title: 'Port', type: ColumnType.numeric },
{ property: 'isRequired', title: 'Required', type: ColumnType.boolean },
{ property: 'deviceType', title: 'Type', type: ColumnType.text },
- // { property: "coreModelCapability", title: "Core Model", type: ColumnType.text },
{ property: 'deviceFunction', title: 'Function', type: ColumnType.text, width: '25%' },
+ { property: "coreModelCapability", title: "Core Model", type: ColumnType.text },
+ { property: "mountMethod", title: "Mount Method", type: ColumnType.text },
]} idProperty="id" {...this.props.networkElementsActions} {...this.props.networkElementsProperties} asynchronus createContextMenu={rowData => {
return this.getContextMenu(rowData);
capability: string;
}[];
};
+ mountMethod?: string;
};
<groupId>org.onap.ccsdk.features.sdnr.odlux</groupId>
<artifactId>sdnr-odlux-app-demoApp</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>SDNR ODLUX :: ${project.artifactId}</name>
<groupId>org.onap.ccsdk.features.sdnr.odlux</groupId>
<artifactId>sdnr-odlux-app-eventLogApp</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>SDNR ODLUX :: ${project.artifactId}</name>
<groupId>org.onap.ccsdk.features.sdnr.odlux</groupId>
<artifactId>sdnr-odlux-app-faultApp</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>SDNR ODLUX :: ${project.artifactId}</name>
let label =
(data.datasets[tooltipItem.datasetIndex].labels &&
data.datasets[tooltipItem.datasetIndex].labels[
- tooltipItem.index
+ tooltipItem.index
]) ||
data.labels[tooltipItem.index] ||
'';
},
},
onClick: (event: MouseEvent, item: any) => {
- if (item[0]) {
- let connectionStatus = labels[item[0]._index] + '';
- this.props.navigateToApplication('connect', '/connectionStatus/' + connectionStatus);
- }
+ setTimeout(() => {
+ if (item[0]) {
+ let connectionStatus = labels[item[0]._index] + '';
+ this.props.navigateToApplication('connect', '/connectionStatus/' + connectionStatus);
+ }
+ }, 0);
},
};
let label =
(data.datasets[tooltipItem.datasetIndex].labels &&
data.datasets[tooltipItem.datasetIndex].labels[
- tooltipItem.index
+ tooltipItem.index
]) ||
data.labels[tooltipItem.index] ||
'';
},
},
onClick: (event: MouseEvent, item: any) => {
- if (item[0]) {
- let severity = alarmLabels[item[0]._index] + '';
- this.props.navigateToApplication('fault', '/alarmStatus/' + severity);
- }
+ setTimeout(() => {
+ if (item[0]) {
+ let severity = alarmLabels[item[0]._index] + '';
+ this.props.navigateToApplication('fault', '/alarmStatus/' + severity);
+ }
+ }, 0);
},
};
<groupId>org.onap.ccsdk.features.sdnr.odlux</groupId>
<artifactId>sdnr-odlux-app-helpApp</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>SDNR ODLUX :: ${project.artifactId}</name>
<groupId>org.onap.ccsdk.features.sdnr.odlux</groupId>
<artifactId>sdnr-odlux-app-inventoryApp</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>SDNR ODLUX :: ${project.artifactId}</name>
<groupId>org.onap.ccsdk.features.sdnr.odlux</groupId>
<artifactId>sdnr-odlux-app-maintenanceApp</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>SDNR ODLUX :: ${project.artifactId}</name>
<groupId>org.onap.ccsdk.features.sdnr.odlux</groupId>
<artifactId>sdnr-odlux-app-minimumApp</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>SDNR ODLUX :: ${project.artifactId}</name>
<groupId>org.onap.ccsdk.features.sdnr.odlux</groupId>
<artifactId>sdnr-odlux-app-performanceHistoryApp</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>SDNR ODLUX :: ${project.artifactId}</name>
<groupId>org.onap.ccsdk.features.sdnr.odlux</groupId>
<artifactId>sdnr-odlux-framework</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>SDNR ODLUX :: ${project.artifactId}</name>
<properties>
<buildtime>${maven.build.timestamp}</buildtime>
<distversion>ONAP Frankfurt (Neon, mdsal ${odl.mdsal.version})</distversion>
- <buildno>172.b89e2c2b(23/10/04)</buildno>
+ <buildno>179.f46d0ef0(25/03/03)</buildno>
<odlux.version>ONAP SDN-R | ONF Wireless for ${distversion} - Build: ${buildtime} ${buildno} ${project.version}</odlux.version>
</properties>
"faultApp":"##odlux.apps.faultApp.buildno##",
"helpApp":"##odlux.apps.helpApp.buildno##",
"inventoryApp":"##odlux.apps.inventoryApp.buildno##",
- "linkCalculationApp":"##odlux.apps.linkCalculationApp.buildno##",
"maintenanceApp":"##odlux.apps.maintenanceApp.buildno##",
"mediatorApp":"##odlux.apps.mediatorApp.buildno##",
- "networkMapApp":"##odlux.apps.networkMapApp.buildno##",
"permanceHistoryApp":"##odlux.apps.permanceHistoryApp.buildno##"
-
+
}
}
\ No newline at end of file
~
-->
-<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">
+<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>
<groupId>org.onap.ccsdk.features.sdnr.odlux</groupId>
<artifactId>sdnr-odlux-installer</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>SDNR ODLUX :: ${project.artifactId}</name>
odlux.framework.buildno=172.b89e2c2b(23/10/04)
-odlux.apps.configurationApp.buildno=172.b89e2c2b(23/10/04)
+odlux.apps.configurationApp.buildno=179.f46d0ef0(25/03/03)
odlux.apps.connectApp.buildno=172.b89e2c2b(23/10/04)
odlux.apps.eventLogApp.buildno=172.b89e2c2b(23/10/04)
odlux.apps.faultApp.buildno=172.b89e2c2b(23/10/04)
odlux.apps.helpApp.buildno=172.b89e2c2b(23/10/04)
odlux.apps.inventoryApp.buildno=172.b89e2c2b(23/10/04)
-odlux.apps.linkCalculationApp.buildno=171.5e3c222(22/09/30)
odlux.apps.maintenanceApp.buildno=172.b89e2c2b(23/10/04)
odlux.apps.mediatorApp.buildno=172.b89e2c2b(23/10/04)
-odlux.apps.networkMapApp.buildno=172.b89e2c2b(23/10/04)
-odlux.apps.lineOfSightApp.buildno=168.38fd458(22/09/16)
odlux.apps.permanceHistoryApp.buildno=81.1c38886(20/12/04)
-odlux.apps.siteManagerApp=164.e02f116(22/08/12)
<groupId>org.onap.ccsdk.features.sdnr.odlux</groupId>
<artifactId>odlux-top</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>SDNR ODLUX :: ${project.artifactId}</name>
* limitations under the License.
* ============LICENSE_END=========================================================
-->
-<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">
+
+<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>
<groupId>org.onap.ccsdk.features.sdnr.odlux</groupId>
<artifactId>sdnr-odlux</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-sdnr :: micro-services odlux only</name>
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>iana-crypt-hash</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>ccsdk-features :: ${project.artifactId}</name>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>ietf-alarms</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>ccsdk-features :: ${project.artifactId}</name>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>openroadm-pm-types</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>ccsdk-features :: ${project.artifactId}</name>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>sdnr-wt-common-yang</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-features :: ${project.artifactId}</name>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>rfc7317-ietf-system</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>ccsdk-features :: ${project.artifactId}</name>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>rfc8341</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>ccsdk-features :: ${project.artifactId}</name>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>sdnr-wt-test-yang</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>ccsdk-features :: ${project.artifactId}</name>
the specific language governing permissions and ~ limitations under the License.
~ ============LICENSE_END=======================================================
~ -->
+
<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.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>sdnr-wt-yang-utils</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>ccsdk-features :: ${project.artifactId}</name>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.opendaylight.netconf</groupId>
- <artifactId>sal-netconf-connector</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
import org.opendaylight.mdsal.dom.api.DOMEvent;
import org.opendaylight.mdsal.dom.api.DOMNotification;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.DateAndTime;
+
import org.opendaylight.yangtools.yang.binding.*;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
}
- public static <K extends Identifier<V>, V extends Identifiable<K>> Map<K, V> toMap(List<V> list) {
- return list == null || list.isEmpty() ? null : Maps.uniqueIndex(list, Identifiable::key);
+ public static <K extends Key<V>, V extends KeyAware<K>> Map<K, V> toMap(List<V> list) {
+ return list == null || list.isEmpty() ? null : Maps.uniqueIndex(list, KeyAware::key);
}
@SuppressWarnings("unchecked")
import org.onap.ccsdk.features.sdnr.wt.yang.mapper.serialize.ClassDeserializer;
import org.onap.ccsdk.features.sdnr.wt.yang.mapper.serialize.IdentifierDeserializer;
import org.onap.ccsdk.features.sdnr.wt.yang.mapper.serialize.TypeObjectDeserializer;
+import org.opendaylight.yangtools.concepts.Identifier;
import org.opendaylight.yangtools.yang.binding.BaseIdentity;
-import org.opendaylight.yangtools.yang.binding.Identifier;
import org.opendaylight.yangtools.yang.binding.ScalarTypeObject;
import org.opendaylight.yangtools.yang.binding.TypeObject;
import org.slf4j.Logger;
import java.util.Map;
import org.onap.ccsdk.features.sdnr.wt.yang.mapper.YangToolsMapper;
import org.onap.ccsdk.features.sdnr.wt.yang.mapper.YangToolsMapperHelper;
-import org.opendaylight.yangtools.yang.binding.Identifiable;
-import org.opendaylight.yangtools.yang.binding.Identifier;
+import org.opendaylight.yangtools.yang.binding.Key;
+import org.opendaylight.yangtools.yang.binding.KeyAware;
-public class YangtoolsMapDesirializer<K extends Identifier<V>, V extends Identifiable<K>>
+
+public class YangtoolsMapDesirializer<K extends Key<V>, V extends KeyAware<K>>
extends JsonDeserializer<Map<K, V>> {
private final Class<V> clazz;
import java.util.Map;
import org.onap.ccsdk.features.sdnr.wt.yang.mapper.YangToolsMapper;
import org.onap.ccsdk.features.sdnr.wt.yang.mapper.YangToolsMapperHelper;
-import org.opendaylight.yangtools.yang.binding.Identifiable;
-import org.opendaylight.yangtools.yang.binding.Identifier;
+import org.opendaylight.yangtools.yang.binding.Key;
+import org.opendaylight.yangtools.yang.binding.KeyAware;
-public class YangtoolsMapDesirializer2<K extends Identifier<V>, V extends Identifiable<K>>
+
+public class YangtoolsMapDesirializer2<K extends Key<V>, V extends KeyAware<K>>
extends JsonDeserializer<Map<K, V>> {
private final Class<V> clazz;
import java.io.IOException;
import java.util.HashSet;
import java.util.List;
-import java.util.Map;
import java.util.Set;
import org.onap.ccsdk.features.sdnr.wt.yang.mapper.YangToolsMapper;
-import org.onap.ccsdk.features.sdnr.wt.yang.mapper.YangToolsMapperHelper;
-import org.opendaylight.yangtools.yang.binding.Identifiable;
-import org.opendaylight.yangtools.yang.binding.Identifier;
public class SetDeserializer<V>
extends JsonDeserializer<Set<V>> {
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>sdnr-wt-common</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>ccsdk-features :: ${project.artifactId}</name>
<buildtime>${maven.build.timestamp} UTC</buildtime>
<databaseport>49400</databaseport>
<elasticsearch-rest-client.version>6.4.3</elasticsearch-rest-client.version>
+ <elasticsearch.maven.plugin.version>6.29</elasticsearch.maven.plugin.version>
+ <elasticsearch.version>7.17.28</elasticsearch.version>
</properties>
<dependencies>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
- <scope>provided</scope>
+ <!-- <scope>provided</scope>-->
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jdt</groupId>
+ <artifactId>org.eclipse.jdt.annotation</artifactId>
+ <version>2.2.800</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
- <scope>provided</scope>
+<!-- <scope>provided</scope>-->
</dependency>
<dependency>
<groupId>org.elasticsearch.client</groupId>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
- <scope>provided</scope>
+ <!-- <scope>provided</scope>-->
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>annotations</artifactId>
- <scope>provided</scope>
+ <!-- <scope>provided</scope>-->
</dependency>
</dependencies>
<plugin>
<groupId>com.github.alexcojocaru</groupId>
<artifactId>elasticsearch-maven-plugin</artifactId>
+ <version>${elasticsearch.maven.plugin.version}</version>
<configuration>
<skip>${skipTests}</skip>
<clusterName>testCluster</clusterName>
<transportPort>9500</transportPort>
<httpPort>${databaseport}</httpPort>
- <version>7.9.3</version>
+ <version>${elasticsearch.version}</version>
<timeout>120</timeout>
</configuration>
<executions>
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+@Deprecated
public class ExtRestClient {
private static final Logger LOG = LoggerFactory.getLogger(ExtRestClient.class);
* Hint: Elasticsearch index/alias and doctype will be the same value server side restricted since ES 5.0
*
*/
+
+@Deprecated
public class HtDatabaseClient extends ExtRestClient implements DatabaseClient, AutoCloseable {
private static final boolean REFRESH_AFTER_REWRITE_DEFAULT = true;
/**
* Element is a document in the ES database.
*/
+@Deprecated
public interface IsEsObject {
/**
import org.json.JSONObject;
+@Deprecated
public class SearchHit {
private final String index;
import java.util.List;
import java.util.Set;
+@Deprecated
public class SearchResult<T> {
/**
* @author Michael Dürre
*
*/
+@Deprecated
public class AliasesEntry {
private static final String regex = "^([^\\ ]+)[\\ ]+([^\\ ]+)[\\ ]+.*$";
private static final Pattern pattern = Pattern.compile(regex, Pattern.MULTILINE);
* @author Michael Dürre
*
*/
+@Deprecated
public class AliasesEntryList extends ArrayList<AliasesEntry> {
/**
import java.util.List;
import org.onap.ccsdk.features.sdnr.wt.common.database.queries.RangeQueryBuilder;
+@Deprecated
public class DbFilter {
private static final List<String> timestampValueNames = Arrays.asList("timestamp", "start", "end", "date");
* @author Herbert
*
*/
+@Deprecated
public class EsObject implements IsEsObject {
@JsonIgnore
*
* yellow open inventoryequipment-v1 5nNPRbJ3T9arMxqxBbJKyQ 5 1 0 0 1.2kb 1.2kb
*/
+@Deprecated
public class IndicesEntry {
private final String status;
* @author Michael Dürre
*
*/
+@Deprecated
public class IndicesEntryList extends ArrayList<IndicesEntry> {
/**
import org.json.JSONArray;
import org.json.JSONObject;
+@Deprecated
public class BoolQueryBuilder extends QueryBuilder {
private JSONObject inner;
import org.json.JSONArray;
import org.json.JSONObject;
+@Deprecated
public class QueryBuilder {
private JSONObject innerQuery;
import java.util.List;
import org.json.JSONObject;
+@Deprecated
public class QueryBuilders {
public static QueryBuilder matchAllQuery() {
import org.json.JSONObject;
+@Deprecated
public class RangeQueryBuilder extends QueryBuilder {
private Object gtValue = null;
import org.json.JSONObject;
+@Deprecated
public class RegexQueryBuilder extends QueryBuilder {
private JSONObject inner;
*/
package org.onap.ccsdk.features.sdnr.wt.common.database.queries;
+@Deprecated
public enum SortOrder {
ASCENDING("asc"), DESCENDING("desc");
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+@Deprecated
public abstract class BaseRequest {
private static final Logger LOG = LoggerFactory.getLogger(BaseRequest.class);
*/
package org.onap.ccsdk.features.sdnr.wt.common.database.requests;
+@Deprecated
public class ClusterHealthRequest extends BaseRequest {
//https://www.elastic.co/guide/en/elasticsearch/reference/6.8/docs-index_.html
//https://github.com/elastic/elasticsearch/blob/6.8/rest-api-spec/src/main/resources/rest-api-spec/api/cluster.put_settings.json
+@Deprecated
public class ClusterSettingsRequest extends BaseRequest {
private static final boolean DEFAULT_ALLOW_AUTOCREATEINDEX = true;
*/
package org.onap.ccsdk.features.sdnr.wt.common.database.requests;
+@Deprecated
public class CountRequest extends BaseRequest {
package org.onap.ccsdk.features.sdnr.wt.common.database.requests;
//https://github.com/elastic/elasticsearch/blob/6.4/rest-api-spec/src/main/resources/rest-api-spec/api/indices.put_alias.json
+@Deprecated
public class CreateAliasRequest extends BaseRequest {
//https://github.com/elastic/elasticsearch/blob/6.4/rest-api-spec/src/main/resources/rest-api-spec/api/indices.create.json
//https://github.com/elastic/elasticsearch/blob/6.4/rest-api-spec/src/main/resources/rest-api-spec/api/indices.put_mapping.json
+@Deprecated
public class CreateIndexRequest extends BaseRequest {
private JSONObject settings;
* @author Michael Dürre
*
*/
+@Deprecated
public class Delete7Request extends DeleteRequest {
public Delete7Request(String alias, String esId) {
package org.onap.ccsdk.features.sdnr.wt.common.database.requests;
//https://github.com/elastic/elasticsearch/blob/6.4/rest-api-spec/src/main/resources/rest-api-spec/api/indices.delete_alias.json
+@Deprecated
public class DeleteAliasRequest extends BaseRequest {
public DeleteAliasRequest(String index, String alias) {
import org.onap.ccsdk.features.sdnr.wt.common.database.queries.QueryBuilder;
+@Deprecated
public class DeleteByQueryRequest extends BaseRequest {
public DeleteByQueryRequest(String alias) {
package org.onap.ccsdk.features.sdnr.wt.common.database.requests;
//https://github.com/elastic/elasticsearch/blob/6.4/rest-api-spec/src/main/resources/rest-api-spec/api/indices.delete.json
+@Deprecated
public class DeleteIndexRequest extends BaseRequest {
public DeleteIndexRequest(String index) {
*/
package org.onap.ccsdk.features.sdnr.wt.common.database.requests;
+@Deprecated
public class DeleteRequest extends BaseRequest {
private final String alias;
* @author Michael Dürre
*
*/
+@Deprecated
public class Get7Request extends GetRequest {
public Get7Request(String alias, String esId) {
package org.onap.ccsdk.features.sdnr.wt.common.database.requests;
//https://github.com/elastic/elasticsearch/blob/6.4/rest-api-spec/src/main/resources/rest-api-spec/api/indices.exists.json
+@Deprecated
public class GetIndexRequest extends BaseRequest {
public GetIndexRequest(String index) {
package org.onap.ccsdk.features.sdnr.wt.common.database.requests;
//https://github.com/elastic/elasticsearch/blob/6.4/rest-api-spec/src/main/resources/rest-api-spec/api/indices.exists.json
+@Deprecated
public class GetInfoRequest extends BaseRequest {
public GetInfoRequest() {
import javax.annotation.Nonnull;
+@Deprecated
public class GetRequest extends BaseRequest {
private final String alias;
* @author Michael Dürre
*
*/
+@Deprecated
public class Index7Request extends IndexRequest {
public Index7Request(String alias) {
import javax.annotation.Nullable;
+@Deprecated
public class IndexRequest extends BaseRequest {
private final String alias;
*/
package org.onap.ccsdk.features.sdnr.wt.common.database.requests;
+@Deprecated
public class ListAliasesRequest extends BaseRequest {
*/
package org.onap.ccsdk.features.sdnr.wt.common.database.requests;
+@Deprecated
public class ListIndicesRequest extends BaseRequest {
*/
package org.onap.ccsdk.features.sdnr.wt.common.database.requests;
+@Deprecated
public class NodeStatsRequest extends BaseRequest {
*/
package org.onap.ccsdk.features.sdnr.wt.common.database.requests;
+@Deprecated
public class RefreshIndexRequest extends BaseRequest {
public RefreshIndexRequest(String alias) {
* @author Michael Dürre
*
*/
+@Deprecated
public class Search7Request extends SearchRequest {
/**
import org.onap.ccsdk.features.sdnr.wt.common.database.queries.QueryBuilder;
+@Deprecated
public class SearchRequest extends BaseRequest {
private final String alias;
*
* https://github.com/elastic/elasticsearch/blob/7.1/rest-api-spec/src/main/resources/rest-api-spec/api/update.json
*/
+@Deprecated
public class Update7Request extends UpdateRequest {
public Update7Request(String alias, String esId, int retries, boolean refresh) {
* @author Michael Dürre
*
*/
+@Deprecated
public class UpdateByQuery7Request extends UpdateByQueryRequest {
public UpdateByQuery7Request(String alias, boolean refresh) {
import org.onap.ccsdk.features.sdnr.wt.common.database.queries.QueryBuilder;
import org.onap.ccsdk.features.sdnr.wt.common.database.queries.QueryBuilders;
+@Deprecated
public class UpdateByQueryRequest extends BaseRequest {
private JSONObject params;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+@Deprecated
public class UpdateRequest extends BaseRequest {
private static final Logger LOG = LoggerFactory.getLogger(UpdateRequest.class);
import org.elasticsearch.client.Response;
import org.json.JSONObject;
+@Deprecated
public class AcknowledgedResponse extends BaseResponse {
private boolean isAcknowledged;
import java.util.LinkedHashMap;
import java.util.List;
+@Deprecated
public class AggregationEntries extends LinkedHashMap<String, Long> {
private static final long serialVersionUID = 1L;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+@Deprecated
public class BaseResponse {
private static final Logger LOG = LoggerFactory.getLogger(BaseResponse.class);
import org.json.JSONException;
import org.json.JSONObject;
+@Deprecated
public class ClusterHealthResponse extends BaseResponse {
public static final String HEALTHSTATUS_GREEN = "green";
import org.elasticsearch.client.Response;
+@Deprecated
public class ClusterSettingsResponse extends AcknowledgedResponse {
public ClusterSettingsResponse(Response response) {
import org.elasticsearch.client.Response;
+@Deprecated
public class CreateAliasResponse extends AcknowledgedResponse {
public CreateAliasResponse(Response response) {
import org.elasticsearch.client.Response;
+@Deprecated
public class CreateIndexResponse extends AcknowledgedResponse {
public CreateIndexResponse(Response response) {
import org.elasticsearch.client.Response;
+@Deprecated
public class DeleteAliasResponse extends AcknowledgedResponse {
public DeleteAliasResponse(Response response) {
* @author jack
*
*/
+@Deprecated
public class DeleteByQueryResponse extends BaseResponse {
private int deleted;
import org.elasticsearch.client.Response;
+@Deprecated
public class DeleteIndexResponse extends AcknowledgedResponse {
public DeleteIndexResponse(Response response) {
import org.elasticsearch.client.Response;
import org.json.JSONObject;
+@Deprecated
public class DeleteResponse extends BaseResponse {
private boolean isDeleted;
import org.json.JSONObject;
import org.onap.ccsdk.features.sdnr.wt.common.database.data.DatabaseVersion;
+@Deprecated
public class GetInfoResponse extends BaseResponse {
/**
import org.json.JSONObject;
import org.onap.ccsdk.features.sdnr.wt.common.database.SearchHit;
+@Deprecated
public class GetResponse extends BaseResponse {
private boolean found;
import org.elasticsearch.client.Response;
import org.json.JSONObject;
+@Deprecated
public class IndexResponse extends BaseResponse {
private boolean isCreated;
import org.onap.ccsdk.features.sdnr.wt.common.database.data.AliasesEntry;
import org.onap.ccsdk.features.sdnr.wt.common.database.data.AliasesEntryList;
+@Deprecated
public class ListAliasesResponse extends BaseResponse {
/*
import org.onap.ccsdk.features.sdnr.wt.common.database.data.IndicesEntry;
import org.onap.ccsdk.features.sdnr.wt.common.database.data.IndicesEntryList;
+@Deprecated
public class ListIndicesResponse extends BaseResponse {
/*
import org.json.JSONException;
import org.json.JSONObject;
+@Deprecated
public class NodeStatsResponse extends BaseResponse {
private NodesInfo nodesInfo;
* @author jack
*
*/
+@Deprecated
public class RefreshIndexResponse extends BaseResponse {
private boolean succeeded;
import org.json.JSONObject;
import org.onap.ccsdk.features.sdnr.wt.common.database.SearchHit;
+@Deprecated
public class SearchResponse extends BaseResponse {
private long total;
* @author jack
*
*/
+@Deprecated
public class UpdateByQueryResponse extends BaseResponse {
* @author jack
*
*/
+@Deprecated
public class UpdateResponse extends BaseResponse {
private String result;
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>sdnr-wt-data-provider-dblib</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>ccsdk-features :: ${project.artifactId}</name>
<artifactId>jackson-databind</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.opendaylight.netconf</groupId>
- <artifactId>sal-netconf-connector</artifactId>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
<artifactId>rfc6991-ietf-yang-types</artifactId>
<!-- MariaDB end -->
</dependencies>
- <!-- Tests require MariaDB4j , which does not currently support ARM64 -->
- <profiles>
- <profile>
- <id>disable-test-on-ARM64</id>
- <activation>
- <os>
- <arch>aarch64</arch>
- </os>
- </activation>
- <properties>
- <skipTests>true</skipTests>
- </properties>
- </profile>
- </profiles>
-
</project>
}
return this.dbClient.write(query);
} else {
- this.controllerId = data.getString(0);
+ this.controllerId = data.getString(1);
LOG.trace("controllerId already set");
}
return true;
import org.onap.ccsdk.features.sdnr.wt.dataprovider.model.NetconfTimeStamp;
import org.onap.ccsdk.features.sdnr.wt.dataprovider.model.types.NetconfTimeStampImpl;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.entity.input.Filter;
-import io.netty.util.internal.StringUtil;
+
public interface SqlQuery {
}
if (!filters2.isEmpty()) {
sb.append(" WHERE ");
- sb.append(StringUtil.join(" AND ", filters2));
+ sb.append(String.join(" AND ", filters2));
+
}
return sb.toString();
}
package org.onap.ccsdk.features.sdnr.wt.dataprovider.dblib.test;
import ch.vorburger.exec.ManagedProcessException;
+import java.io.File;
import java.io.IOException;
+import java.nio.file.Files;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Arrays;
import org.onap.ccsdk.features.sdnr.wt.dataprovider.model.HtDatabaseMaintenance;
import org.onap.ccsdk.features.sdnr.wt.dataprovider.model.HtUserdataManager;
import org.onap.ccsdk.features.sdnr.wt.yang.mapper.YangToolsMapper;
-import org.opendaylight.netconf.shaded.sshd.common.util.io.IoUtils;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.DateAndTime;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.CmNotificationType;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.CmSourceIndicator;
assertEquals(2, faultCurrents.getData().size());
ReadStatusOutputBuilder status = null;
try {
- EntityInput input=null;
+ EntityInput input = null;
status = dbProvider.readStatus(input);
} catch (IOException e) {
e.printStackTrace();
List<String> nodeList = dbProvider.getAllNodesWithCurrentAlarms();
assertTrue(nodeList.contains(NODEID1));
- assertEquals(1,nodeList.size());
+ assertEquals(1, nodeList.size());
faultCurrent1 = new FaultcurrentBuilder().setNodeId(NODEID1).setCounter(1).setObjectId("obj")
.setProblem(PROBLEM1).setTimestamp(DateAndTime.getDefaultInstance(TIME1))
e.printStackTrace();
fail("unable to update maintenance data");
}
- data = dbProvider.readMaintenanceList(createInput("active","false",1, 20));
+ data = dbProvider.readMaintenanceList(createInput("active", "false", 1, 20));
assertEquals(1, data.getData().size());
DeleteMaintenanceInput delete1 = new DeleteMaintenanceInputBuilder().setId(NODEID1).build();
try {
HtDatabaseMaintenance maintenanceService = dbProvider.getHtDatabaseMaintenance();
MaintenanceEntity e = maintenanceService.createIfNotExists(nodeId);
assertNotNull(e);
- assertEquals(nodeId,e.getNodeId());
+ assertEquals(nodeId, e.getNodeId());
MaintenanceEntity e2 = new CreateMaintenanceInputBuilder(e).setActive(true).build();
e = maintenanceService.setMaintenance(e2);
assertNotNull(e);
- assertEquals(nodeId,e.getNodeId());
+ assertEquals(nodeId, e.getNodeId());
assertTrue(e.getActive());
maintenanceService.deleteIfNotRequired(nodeId);
- data = dbProvider.readMaintenanceList(createInput("node-id",nodeId,1, 20));
+ data = dbProvider.readMaintenanceList(createInput("node-id", nodeId, 1, 20));
assertEquals(0, data.getData().size());
}
ReadStatusOutputBuilder status = null;
try {
- EntityInput input=null;
+ EntityInput input = null;
status = dbProvider.readStatus(input);
} catch (IOException e) {
e.printStackTrace();
assertEquals(0, status.getData().get(0).getNetworkElementConnections().getUndefined().intValue());
assertEquals(0, status.getData().get(0).getNetworkElementConnections().getUnmounted().intValue());
- ReadStatusOutputBuilder status2=null;
+ ReadStatusOutputBuilder status2 = null;
try {
- EntityInput input=createInput("node-id","node2*", 1, 20);
+ EntityInput input = createInput("node-id", "node2*", 1, 20);
status = dbProvider.readStatus(input);
status2 = dbProviderOverall.readStatus(input);
} catch (IOException e) {
assertEquals(0, status.getData().get(0).getNetworkElementConnections().getUnableToConnect().intValue());
assertEquals(0, status.getData().get(0).getNetworkElementConnections().getUndefined().intValue());
assertEquals(0, status.getData().get(0).getNetworkElementConnections().getUnmounted().intValue());
-
+
assertEquals(1, status2.getData().get(0).getNetworkElementConnections().getConnected().intValue());
assertEquals(1, status2.getData().get(0).getNetworkElementConnections().getConnecting().intValue());
assertEquals(0, status2.getData().get(0).getNetworkElementConnections().getDisconnected().intValue());
public void testUserdata() {
HtUserdataManager mgr = dbProvider.getUserManager();
String userdata = mgr.getUserdata(USERNAME);
- assertEquals("{}",userdata);
+ assertEquals("{}", userdata);
JSONObject o = new JSONObject();
o.put("key1", false);
- o.put("key2","value2");
+ o.put("key2", "value2");
boolean result = mgr.setUserdata(USERNAME, o.toString());
assertTrue(result);
userdata = mgr.getUserdata(USERNAME);
o = new JSONObject(userdata);
- assertEquals(false,o.getBoolean("key1"));
- assertEquals("value2",o.getString("key2"));
+ assertEquals(false, o.getBoolean("key1"));
+ assertEquals("value2", o.getString("key2"));
o = new JSONObject();
o.put("enabled", true);
- o.put("name","abcdef");
- result = mgr.setUserdata(USERNAME,"app1",o.toString());
+ o.put("name", "abcdef");
+ result = mgr.setUserdata(USERNAME, "app1", o.toString());
assertTrue(result);
userdata = mgr.getUserdata(USERNAME);
o = new JSONObject(userdata);
- assertEquals(false,o.getBoolean("key1"));
- assertEquals("value2",o.getString("key2"));
+ assertEquals(false, o.getBoolean("key1"));
+ assertEquals("value2", o.getString("key2"));
JSONObject app = o.getJSONObject("app1");
assertNotNull(app);
assertEquals(true, app.getBoolean("enabled"));
assertEquals("abcdef", app.getString("name"));
}
+
@Test
public void testpm15m() {
try {
}
private static String loadFile(String filename) throws IOException {
- return String.join("\n", IoUtils.readAllLines(TestMariaDataProvider.class.getResourceAsStream(filename)));
+ return String.join("\n",
+ Files.readAllLines(new File(TestMariaDataProvider.class.getResource(filename).getFile()).toPath()));
+
}
static EntityInput createInput(String filter, String filterValue, int page, int size) {
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>sdnr-wt-data-provider-feature</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>feature</packaging>
<name>ccsdk-features :: ${project.artifactId}</name>
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>sdnr-wt-data-provider-installer</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-features :: ${project.artifactId}</name>
<dependency>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>installed-odl-bom</artifactId>
- <version>2.7.0-SNAPSHOT</version>
+ <version>3.0.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>sdnr-wt-data-provider-model</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>ccsdk-features :: ${project.artifactId}</name>
</license>
</licenses>
- <properties>
- <maven.javadoc.skip>true</maven.javadoc.skip>
- </properties>
-
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.opendaylight.netconf</groupId>
- <artifactId>sal-netconf-connector</artifactId>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<artifactId>json</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+ <artifactId>rfc6991-ietf-yang-types</artifactId>
+ </dependency>
</dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.jacoco</groupId>
- <artifactId>jacoco-maven-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>**/gen/**</exclude>
- <exclude>**/generated-sources/**</exclude>
- <exclude>**/yang-gen-sal/**</exclude>
- <exclude>**/pax/**</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
import java.util.Map;
import org.eclipse.jdt.annotation.NonNull;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.SortOrder;
-import org.opendaylight.yangtools.yang.binding.Identifiable;
-import org.opendaylight.yangtools.yang.binding.Identifier;
+
+import org.opendaylight.yangtools.yang.binding.Key;
+import org.opendaylight.yangtools.yang.binding.KeyAware;
import org.opendaylight.yangtools.yang.common.Uint16;
import org.opendaylight.yangtools.yang.common.Uint32;
import org.opendaylight.yangtools.yang.common.Uint64;
/**
* Aluminium version
*/
- public static <K extends Identifier<T>,T extends Identifiable<K>> Map<K, T> getListOrMap(Class<K> clazz, List<T> list) {
+ public static <K extends Key<T>,T extends KeyAware<K>> Map<K, T> getListOrMap(Class<K> clazz, List<T> list) {
Map<K,T> map = new HashMap<>();
for(T listelement:list) {
Constructor<K> constructor;
}
return map;
}
- public static <K extends Identifier<T>,T extends Identifiable<K>> Map<K, T> getListOrMap(Class<K> clazz, T listElement) {
+ public static <K extends Key<T>,T extends KeyAware<K>> Map<K, T> getListOrMap(Class<K> clazz, T listElement) {
return getListOrMap(clazz, Arrays.asList(listElement) );
}
public static Uint32 getLongOrUint32(long longVal) {
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>sdnr-wt-data-provider-top</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-features :: ${project.artifactId}</name>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>sdnr-wt-data-provider-provider</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>ccsdk-features :: ${project.artifactId}</name>
<maven.javadoc.skip>true</maven.javadoc.skip>
<databaseport>49402</databaseport>
<initdb>${basedir}/../setup/target/sdnr-wt-data-provider-setup-${project.version}.jar</initdb>
+ <elasticsearch.maven.plugin.version>6.29</elasticsearch.maven.plugin.version>
+ <elasticsearch.version>7.17.28</elasticsearch.version>
</properties>
<dependencies>
</dependency>
<dependency>
<groupId>org.opendaylight.netconf</groupId>
- <artifactId>sal-netconf-connector</artifactId>
- <scope>provided</scope>
+ <artifactId>netconf-client-mdsal</artifactId>
</dependency>
<dependency>
<groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
<artifactId>yang-binding</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.opendaylight.mdsal</groupId>
+ <artifactId>mdsal-binding-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>mdsal-singleton-common-api</artifactId>
<plugin>
<groupId>com.github.alexcojocaru</groupId>
<artifactId>elasticsearch-maven-plugin</artifactId>
+ <version>${elasticsearch.maven.plugin.version}</version>
<configuration>
<skip>${skipTests}</skip>
<clusterName>testCluster</clusterName>
<transportPort>9500</transportPort>
<httpPort>${databaseport}</httpPort>
- <version>7.9.3</version>
+ <version>${elasticsearch.version}</version>
<timeout>120</timeout>
<pathInitScript>${project.build.directory}/EsInit.script</pathInitScript>
</configuration>
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+@Deprecated
public class EsConfig implements Configuration, IEsConfig {
private static final Logger LOG = LoggerFactory.getLogger(EsConfig.class);
*
* @param <T> Yang tools generated class object.
*/
+@Deprecated
public class EsDataObjectReaderWriter2<T extends DataObject> {
private static final Logger LOG = LoggerFactory.getLogger(EsDataObjectReaderWriter2.class);
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+@Deprecated
public class DataObjectAcessor<T extends DataObject> extends EsDataObjectReaderWriter2<T> {
private static final Logger LOG = LoggerFactory.getLogger(DataObjectAcessor.class);
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+@Deprecated
public class DataObjectAcessorInventory<T extends DataObject> extends DataObjectAcessorWithId<T> {
private final Logger LOG = LoggerFactory.getLogger(DataObjectAcessorInventory.class);
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+@Deprecated
public class DataObjectAcessorPm<T extends DataObject> extends DataObjectAcessor<T> {
private final Logger LOG = LoggerFactory.getLogger(DataObjectAcessorPm.class);
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.status.entity.NetworkElementConnectionsBuilder;
import org.opendaylight.yangtools.yang.common.Uint32;
+@Deprecated
public class DataObjectAcessorStatus extends DataObjectAcessor<Data> {
final String ESDATATYPE_FAULTCURRENT_SEVERITY_KEY = "severity";
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+@Deprecated
public class DataObjectAcessorWithId<T extends DataObject> extends DataObjectAcessor<T> {
private static final Logger LOG = LoggerFactory.getLogger(DataObjectAcessorWithId.class);
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.FaultcurrentEntity;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.SeverityType;
+@Deprecated
public class FaultEntityManager {
/**
*
* @author herbert
*/
+@Deprecated
public class HtDatabaseEventsService implements ArchiveCleanProvider, DataProvider {
private static final Logger LOG = LoggerFactory.getLogger(HtDatabaseEventsService.class);
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+@Deprecated
public class HtDatabaseMaintenanceService implements HtDatabaseMaintenance {
private static final Logger LOG = LoggerFactory.getLogger(HtDatabaseMaintenanceService.class);
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+@Deprecated
public class QueryByFilter {
private static final Logger LOG = LoggerFactory.getLogger(DataObjectAcessorPm.class);
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+@Deprecated
class QueryByFilterStatic {
private static final Logger LOG = LoggerFactory.getLogger(DataObjectAcessorPm.class);
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.PaginationOutputG;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.read.connectionlog.list.output.PaginationBuilder;
+@Deprecated
public class QueryResult<T> {
private SearchResult<T> result;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+@Deprecated
public class ElasticSearchDataProvider implements DatabaseDataProvider {
private static final Logger LOG = LoggerFactory.getLogger(ElasticSearchDataProvider.class);
import org.onap.ccsdk.features.sdnr.wt.dataprovider.database.sqldb.data.HtUserdataManagerBase;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.Entity;
+@Deprecated
public class HtUserdataManagerImpl extends HtUserdataManagerBase {
private final HtDatabaseClient dbClient;
if (onapCCSDKVersion == null) {
return def;
}
+ if (onapCCSDKVersion.startsWith("2.7.")) {
+ return "ONAP New Dehli";
+ }
if (onapCCSDKVersion.startsWith("2.6.")) {
return "ONAP Montreal";
}
}
if(odlMdsalVersionLUT==null) {
odlMdsalVersionLUT = new HashMap<>();
+ odlMdsalVersionLUT.put("12.0.4","potassium-SR2 (0.19.2)");
+ odlMdsalVersionLUT.put("12.0.3","potassium-SR1 (0.19.1)");
+ odlMdsalVersionLUT.put("12.0.2","potassium-SR0 (0.19.0)");
+ odlMdsalVersionLUT.put("11.0.15","argon-SR3 (0.18.3)");
odlMdsalVersionLUT.put("11.0.12","argon-SR2 (0.18.2)");
odlMdsalVersionLUT.put("11.0.9","argon-SR1 (0.18.1)");
odlMdsalVersionLUT.put("11.0.7","argon-SR0 (0.18.0)");
import org.onap.ccsdk.features.sdnr.wt.yang.mapper.YangToolsMapper;
import org.onap.ccsdk.features.sdnr.wt.yang.mapper.serialize.IdentifierDeserializer;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev221225.credentials.Credentials;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev221225.credentials.credentials.LoginPasswordBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev240118.credentials.Credentials;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev240118.credentials.credentials.LoginPasswordBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.pmdata.grp.MeasurementKey;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
package org.onap.ccsdk.features.sdnr.wt.dataprovider.test;
import org.junit.Test;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev221225.credentials.Credentials;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev221225.credentials.credentials.LoginPassword;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev221225.credentials.credentials.LoginPasswordBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev240118.credentials.Credentials;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev240118.credentials.credentials.LoginPassword;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev240118.credentials.credentials.LoginPasswordBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev221225.NetconfNode;
import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev221225.NetconfNodeBuilder;
import org.onap.ccsdk.features.sdnr.wt.yang.mapper.YangToolsMapperHelper;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Uri;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.DateAndTime;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev221225.connection.parameters.OdlHelloMessageCapabilitiesBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev221225.credentials.credentials.LoginPasswordBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev240118.connection.parameters.OdlHelloMessageCapabilitiesBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev240118.credentials.credentials.LoginPasswordBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev221225.NetconfNode;
import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev221225.NetconfNodeBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.CreateMediatorServerInputBuilder;
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>sdnr-wt-data-provider-setup</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>ccsdk-features :: ${project.artifactId}</name>
<properties>
<maven.javadoc.skip>true</maven.javadoc.skip>
<databaseport>49404</databaseport>
+ <elasticsearch.maven.plugin.version>6.29</elasticsearch.maven.plugin.version>
+ <elasticsearch.version>7.17.28</elasticsearch.version>
</properties>
<dependencies>
<plugin>
<groupId>com.github.alexcojocaru</groupId>
<artifactId>elasticsearch-maven-plugin</artifactId>
+ <version>${elasticsearch.maven.plugin.version}</version>
<configuration>
<skip>${skipTests}</skip>
<clusterName>testCluster</clusterName>
<transportPort>49504</transportPort>
<httpPort>${databaseport}</httpPort>
- <version>7.9.3</version>
+ <version>${elasticsearch.version}</version>
</configuration>
<executions>
<execution>
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+@Deprecated
public class ElasticsearchDataMigrationProvider implements DataMigrationProviderService {
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>sdnr-wt-devicemanager-core-feature</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>feature</packaging>
<name>ccsdk-features :: ${project.artifactId}</name>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>sdnr-wt-devicemanager-core-installer</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-features :: ${project.artifactId}</name>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>sdnr-wt-devicemanager-core-model</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>ccsdk-features :: ${project.artifactId}</name>
</properties>
<dependencies>
- <dependency>
- <groupId>org.opendaylight.netconf</groupId>
- <artifactId>sal-netconf-connector</artifactId>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>sdnr-wt-data-provider-model</artifactId>
<artifactId>rfc6991-ietf-yang-types</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.opendaylight.netconf</groupId>
+ <artifactId>netconf-topology</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
package org.onap.ccsdk.features.sdnr.wt.devicemanager.types;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev221225.ConnectionOper.ConnectionStatus;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev240118.ConnectionOper.ConnectionStatus;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.ConnectionLogStatus;
public class InternalConnectionStatus {
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>sdnr-wt-devicemanager-core-top</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-features :: ${project.artifactId}</name>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>sdnr-wt-devicemanager-core-provider</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>ccsdk-features :: ${project.artifactId}</name>
<artifactId>ietf-topology</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.opendaylight.netconf</groupId>
- <artifactId>sal-netconf-connector</artifactId>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
<artifactId>rfc6991-ietf-yang-types</artifactId>
<artifactId>annotations</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.opendaylight.netconf</groupId>
+ <artifactId>netconf-topology</artifactId>
+ <scope>provided</scope>
+ </dependency>
<!-- begin for testing -->
<dependency>
<groupId>org.mockito</groupId>
import org.opendaylight.mdsal.binding.api.ReadTransaction;
import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.DateAndTime;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev221225.ConnectionOper.ConnectionStatus;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev240118.ConnectionOper.ConnectionStatus;
import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev221225.NetconfNode;
import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev221225.network.topology.topology.topology.types.TopologyNetconf;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.ConnectionLogStatus;
/**
* (NonConnected) A registration after creation of a mountpoint occured
*
- * @param registrationName of device (mountpoint name)
+ * @param nodeId of device (mountpoint name)
* @param nNode with mountpoint data
*/
@Override
/**
* (Connected) mountpoint state moves to connected
*
- * @param mountpointNodeName uuid that is nodeId or mountpointId
+ * @param nNodeId uuid that is nodeId or mountpointId
* @param deviceType according to assessement
*/
@Override
/**
* (NonConnected) mountpoint state changed.
*
- * @param mountpointNodeName nodeid
+ * @param nodeId nodeid
* @param netconfNode node
*/
public void onStateChangeIndication(NodeId nodeId, NetconfNode netconfNode) {
/**
* (NonConnected) A deregistration after removal of a mountpoint occured.
*
- * @param registrationName Name of the event that is used as key in the database.
+ * @param nodeId Name of the event that is used as key in the database.
*/
@SuppressWarnings("null")
@Override
/**
* Mountpoint state changed .. from connected -> connecting or unable-to-connect or vis-e-versa.
*
- * @param registrationName Name of the event that is used as key in the database.
+ * @param nodeId Name of the event that is used as key in the database.
*/
@Override
public void updateRegistration(NodeId nodeId, String attribute, String attributeNewValue, NetconfNode nNode) {
import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.NetconfNodeConnectListener;
import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.NetconfNodeStateService;
import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvider;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev221225.ConnectionOper.ConnectionStatus;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev240118.ConnectionOper.ConnectionStatus;
import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev221225.NetconfNode;
import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId;
import org.opendaylight.yangtools.concepts.ListenerRegistration;
import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.Capabilities;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Host;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.PortNumber;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev221225.credentials.Credentials;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev221225.credentials.credentials.KeyAuth;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev221225.credentials.credentials.LoginPw;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev221225.credentials.credentials.LoginPwUnencrypted;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev221225.credentials.credentials.login.pw.LoginPassword;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev240118.credentials.Credentials;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev240118.credentials.credentials.KeyAuth;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev240118.credentials.credentials.LoginPw;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev240118.credentials.credentials.LoginPwUnencrypted;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev240118.credentials.credentials.login.pw.LoginPassword;
import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev221225.NetconfNode;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.ConnectionLogStatus;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.NetworkElementConnectionBuilder;
import org.opendaylight.yangtools.concepts.Identifier;
import org.opendaylight.yangtools.yang.binding.DataObject;
import org.opendaylight.yangtools.yang.binding.EventInstantAware;
-import org.opendaylight.yangtools.yang.binding.Identifiable;
+import org.opendaylight.yangtools.yang.binding.KeyAware;
import org.opendaylight.yangtools.yang.binding.Notification;
import org.opendaylight.yangtools.yang.common.QName;
import org.slf4j.Logger;
String keyString;
for (Object listObject : (List<?>) value) {
if (listObject != null) {
- if (Identifiable.class.isAssignableFrom(listObject.getClass())) {
- keyString = getKeyString((Identifiable<?>) listObject);
+ if (KeyAware.class.isAssignableFrom(listObject.getClass())) {
+ keyString = getKeyString((KeyAware<?>) listObject);
} else {
keyString = String.valueOf(idx);
}
*
* @return
*/
- private String getKeyString(Identifiable<?> indentifiableObject) {
+ private String getKeyString(KeyAware<?> indentifiableObject) {
String keyString = (indentifiableObject.key()).toString();
int start = keyString.indexOf("=") + 1;
int end = keyString.length() - 1;
\r
org.onap.ccsdk.sli.adaptors.aai.path.notify=/aai/v13/actions/notify\r
\r
-org.onap.ccsdk.sli.adaptors.aai.notify.selflink.fqdn=/restconf/config/L3SDN-API:services/layer3-service-list/{service-instance-id}\r
+org.onap.ccsdk.sli.adaptors.aai.notify.selflink.fqdn=/rests/data/L3SDN-API:services/layer3-service-list={service-instance-id}?content=config\r
\r
-org.onap.ccsdk.sli.adaptors.aai.notify.selflink.avpn=/restconf/config/L3AVPN-EVC-API:services/service-list/{service-instance-id}/service-data/avpn-logicalchannel-information\r
+org.onap.ccsdk.sli.adaptors.aai.notify.selflink.avpn=/rests/data/L3AVPN-EVC-API:services/service-list={service-instance-id}/service-data/avpn-logicalchannel-information?content=config\r
\r
\r
\r
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>sdnr-wt-devicemanager-o-ran-sc-oran-feature</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>feature</packaging>
<name>ccsdk-features :: ${project.artifactId}</name>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>sdnr-wt-devicemanager-o-ran-sc-oran-installer</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-features :: ${project.artifactId}</name>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>sdnr-wt-devicemanager-o-ran-sc-oran-model</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>ccsdk-features :: ${project.artifactId}</name>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>sdnr-wt-devicemanager-o-ran-sc-oran-top</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-features :: ${project.artifactId}</name>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>sdnr-wt-devicemanager-o-ran-sc-oran-provider</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>ccsdk-features :: ${project.artifactId}</name>
</properties>
<dependencies>
- <dependency>
- <groupId>org.json</groupId>
- <artifactId>json</artifactId>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>sdnr-wt-devicemanager-o-ran-sc-oran-model</artifactId>
<version>${project.version}</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
+
<dependency>
- <groupId>org.opendaylight.netconf</groupId>
- <artifactId>sal-netconf-connector</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>rfc7317-ietf-system</artifactId>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.opendaylight.netconf</groupId>
- <artifactId>callhome-model</artifactId>
- <!-- <scope>provided</scope> -->
+ <groupId>org.opendaylight.mdsal</groupId>
+ <artifactId>mdsal-common-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.opendaylight.mdsal</groupId>
- <artifactId>mdsal-singleton-common-api</artifactId>
+ <artifactId>mdsal-dom-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>rfc7317-ietf-system</artifactId>
- <version>${project.version}</version>
+ <groupId>org.opendaylight.netconf.model</groupId>
+ <artifactId>rfc5277</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.mdsal.model</groupId>
+ <artifactId>ietf-topology</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <!--<dependency>
+ <groupId>org.opendaylight.yangtools</groupId>
+ <artifactId>yang-data-api</artifactId>
+ </dependency>-->
+ <dependency>
+ <groupId>org.opendaylight.netconf</groupId>
+ <artifactId>netconf-topology</artifactId>
+ <scope>provided</scope>
</dependency>
<!-- begin for testing -->
<dependency>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
+ <dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<scope>test</scope>
</dependency>
<!-- end for testing -->
-
+
</dependencies>
<build>
import org.opendaylight.yangtools.yang.binding.CodeHelpers;
import org.opendaylight.yangtools.yang.common.Uint32;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
-import org.opendaylight.yangtools.yang.data.api.schema.AugmentationNode;
import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode;
import org.opendaylight.yangtools.yang.data.api.schema.MapNode;
* @param sys
* @return
*/
- public static Optional<Guicutthrough> getGuicutthrough(@Nullable AugmentationNode onapSysAugData,
+ public static Optional<Guicutthrough> getGuicutthrough(@Nullable ContainerNode sysData,
@NonNull OnapSystem onapSys) {
- if (onapSysAugData != null) {
- String name = ORanDMDOMUtility.getLeafValue(onapSysAugData, onapSys.getName());
+ if (sysData != null) {
+ String name = ORanDMDOMUtility.getLeafValue(sysData, onapSys.getName());
@Nullable
- Uri uri = new Uri(ORanDMDOMUtility.getLeafValue(onapSysAugData, onapSys.getWebUi()));
+ Uri uri = new Uri(ORanDMDOMUtility.getLeafValue(sysData, onapSys.getWebUi()));
if (uri.getValue() != null) {
GuicutthroughBuilder gcBuilder = new GuicutthroughBuilder();
if (name != null) {
}
LOG.warn("Uri not set to invoke a Gui cut through session to the device. Please set the Uri in the device");
}
- LOG.warn("Retrieving augmented System details failed. Gui cut through information not available");
return Optional.empty();
}
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.InstanceIdentifierBuilder;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
-import org.opendaylight.yangtools.yang.data.api.schema.AugmentationNode;
import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode;
import org.opendaylight.yangtools.yang.data.api.schema.MapNode;
getActiveAlarms();
}
if (onapSystem.isPresent()) {
- AugmentationNode gcData = (AugmentationNode) onapSystem.get().getOnapSystemData();
+ ContainerNode gcData = (ContainerNode) onapSystem.get().getOnapSystemData();
Optional<Guicutthrough> oGuicutthrough =
ORanDOMToInternalDataModel.getGuicutthrough(gcData, onapSystem.get());
if (oGuicutthrough.isPresent()) {
import org.opendaylight.mdsal.dom.api.DOMEvent;
import org.opendaylight.mdsal.dom.api.DOMNotification;
import org.opendaylight.yangtools.yang.common.QName;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeWithValue;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
import org.opendaylight.yangtools.yang.data.api.schema.ChoiceNode;
import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
private void recurseDOMData(@NonNull ContainerNode notifContainer, DataContainerChild domData, DataContainerNode cn,
HashMap<String, String> result, String namePath) {
- PathArgument pa1 = domData.getIdentifier();
- namePath += "/" + pa1.getNodeType().getLocalName();
+ NodeIdentifier id = domData.name();
+ namePath += "/" + id.getNodeType().getLocalName();
if (domData.getClass().getSimpleName().equals("ImmutableContainerNode")) {
try {
- ContainerNode cn1 = (ContainerNode) cn.getChildByArg(pa1);
+ ContainerNode cn1 = (ContainerNode) cn.getChildByArg(id);
for (DataContainerChild data1 : cn1.body()) {
recurseDOMData(notifContainer, data1, cn1, result, namePath);
}
} catch (VerifyException ve) {
- LOG.debug("{} does not exist", pa1);
+ LOG.debug("{} does not exist", id);
}
}
if (domData.getClass().getSimpleName().equals("ImmutableChoiceNode")) {
try {
- ChoiceNode cn1 = (ChoiceNode) cn.getChildByArg(pa1);
+ ChoiceNode cn1 = (ChoiceNode) cn.getChildByArg(id);
for (DataContainerChild data1 : cn1.body()) {
// recurseChoiceData(data1, cn1, namePath);
recurseDOMData(notifContainer, data1, cn1, result, namePath);
}
} catch (VerifyException ve) {
- LOG.debug("{} does not exist", pa1);
+ LOG.debug("{} does not exist", id);
}
}
if (domData.getClass().getSimpleName().equals("ImmutableUnkeyedListNode")) {
try {
- UnkeyedListNode cn1 = (UnkeyedListNode) cn.getChildByArg(pa1);
+ UnkeyedListNode cn1 = (UnkeyedListNode) cn.getChildByArg(id);
for (UnkeyedListEntryNode data1 : cn1.body()) {
recurseUnkeyedListEntryNodeData(data1, cn1, result, namePath);
}
} catch (VerifyException ve) {
- LOG.debug("{} does not exist", pa1);
+ LOG.debug("{} does not exist", id);
}
}
if (domData.getClass().getSimpleName().equals("ImmutableMapNode")) {
try {
- MapNode cn1 = (MapNode) cn.getChildByArg(pa1);
+ MapNode cn1 = (MapNode) cn.getChildByArg(id);
for (MapEntryNode data1 : cn1.body()) {
recurseMapEntryNodeData(notifContainer, data1, cn1, result, namePath);
}
} catch (VerifyException ve) {
- LOG.debug("{} does not exist", pa1);
+ LOG.debug("{} does not exist", id);
}
}
if (domData.getClass().getSimpleName().equals("ImmutableLeafSetNode")) {
try {
- LeafSetNode<?> cn1 = (LeafSetNode<?>) cn.getChildByArg(pa1);
+ LeafSetNode<?> cn1 = (LeafSetNode<?>) cn.getChildByArg(id);
for (LeafSetEntryNode<?> data1 : cn1.body()) {
recurseLeafSetEntryNodeData(data1, cn1, result, namePath);
}
} catch (VerifyException ve) {
- LOG.debug("{} does not exist", pa1);
+ LOG.debug("{} does not exist", id);
}
}
private void recurseLeafSetEntryNodeData(LeafSetEntryNode<?> data, LeafSetNode<?> cn1,
HashMap<String, String> result, String namePath) {
- PathArgument pa1 = data.getIdentifier();
+ NodeWithValue<?> pa1 = data.name();
namePath += "/" + pa1.getNodeType().getLocalName();
if (data.getClass().getSimpleName().equals("ImmutableLeafSetEntryNode")) {
private void recurseMapEntryNodeData(@NonNull ContainerNode notifContainer, MapEntryNode data, MapNode cn1,
HashMap<String, String> result, String namePath) {
- PathArgument pa1 = data.getIdentifier();
- NodeIdentifierWithPredicates ni = data.getIdentifier();
+ PathArgument pa1 = data.name();
+ NodeIdentifierWithPredicates ni = data.name();
for (QName qn : ni.keySet()) {
namePath += "/" + ni.getValue(qn);
for (DataContainerChild data1 : data.body()) {
if (data1.getClass().getSimpleName().equals("ImmutableLeafSetNode")) {
try {
- LeafSetNode<?> cn2 = (LeafSetNode<?>) data.getChildByArg(data1.getIdentifier());
+ LeafSetNode<?> cn2 = (LeafSetNode<?>) data.getChildByArg(data1.name());
for (LeafSetEntryNode<?> data2 : cn2.body()) {
recurseLeafSetEntryNodeData(data2, cn2, result, namePath);
}
} catch (VerifyException ve) {
- LOG.debug("{} does not exist", data1.getIdentifier());
+ LOG.debug("{} does not exist", data1.name());
}
} else {
recurseLeafNode(data1, result, namePath);
if (data.getClass().getSimpleName().equals("ImmutableLeafSetNode")) {
try {
- LeafSetNode<?> cn2 = (LeafSetNode<?>) notifContainer.getChildByArg(pa1);
+ LeafSetNode<?> cn2 = (LeafSetNode<?>) notifContainer.getChildByArg((NodeIdentifier) pa1);
for (LeafSetEntryNode<?> data1 : cn2.body()) {
recurseLeafSetEntryNodeData(data1, cn2, result, namePath);
}
private void recurseUnkeyedListEntryNodeData(UnkeyedListEntryNode data, UnkeyedListNode cn1,
HashMap<String, String> result, String namePath) {
- PathArgument pa1 = data.getIdentifier();
+ PathArgument pa1 = data.name();
namePath += "/" + pa1.getNodeType().getLocalName();
if (data.getClass().getSimpleName().equals("ImmutableUnkeyedListEntryNode")) {
}
public void recurseLeafNode(DataContainerChild data, HashMap<String, String> result, String namePath) {
- PathArgument pa1 = data.getIdentifier();
+ PathArgument pa1 = data.name();
if (!(data.getClass().getSimpleName().equals("ImmutableAugmentationNode")))
namePath += "/" + pa1.getNodeType().getLocalName();
if (data.getClass().getSimpleName().equals("ImmutableLeafNode")) {
public void recurseChoiceData(HashMap<String, String> result, DataContainerChild data, ChoiceNode cn,
String namePath) {
- PathArgument pa1 = data.getIdentifier();
+ PathArgument pa1 = data.name();
namePath += "/" + pa1.getNodeType().getLocalName();
// NodeIdentifier nodeId = new NodeIdentifier(pa1.getNodeType());
if (data.getClass().getSimpleName().equals("ImmutableLeafNode")) {
public static final @NonNull QName IETF_HW_COMPONENT_LIST_KEY = QName.create(IETF_HW_MODULE_NAME, "name");
public static final @NonNull QName IETF_HW_COMPONENT_LIST_MFG_NAME = QName.create(IETF_HW_MODULE_NAME, "mfg-name"); //leaf:String
public static final @NonNull QName IETF_HW_COMPONENT_LIST_UUID = QName.create(IETF_HW_MODULE_NAME, "uuid"); //leaf:yang:uuid
- public static final @NonNull QName IETF_HW_COMPONENT_LIST_MODEL_NAME = QName.create(IETF_HW_MODULE_NAME, "model-name"); //leaf:String
+ public static final @NonNull QName IETF_HW_COMPONENT_LIST_MODEL_NAME =
+ QName.create(IETF_HW_MODULE_NAME, "model-name"); //leaf:String
public static final @NonNull QName IETF_HW_COMPONENT_LIST_SER_NUM = QName.create(IETF_HW_MODULE_NAME, "serial-num"); //leaf:String
- public static final @NonNull QName IETF_HW_COMPONENT_LIST_SW_REV = QName.create(IETF_HW_MODULE_NAME, "software-rev"); //leaf:String
+ public static final @NonNull QName IETF_HW_COMPONENT_LIST_SW_REV =
+ QName.create(IETF_HW_MODULE_NAME, "software-rev"); //leaf:String
public static final @NonNull QName IETF_HW_COMPONENT_LIST_ALIAS = QName.create(IETF_HW_MODULE_NAME, "alias"); //leaf:String
public static final @NonNull QName IETF_HW_COMPONENT_LIST_CLASS = QName.create(IETF_HW_MODULE_NAME, "class");
public static final @NonNull QName IETF_HW_COMPONENT_LIST_MFG_DATE = QName.create(IETF_HW_MODULE_NAME, "mfg-date"); //leaf:yang:date-and-time
- public static final @NonNull QName IETF_HW_COMPONENT_LIST_CONTAINS_CHILD = QName.create(IETF_HW_MODULE_NAME, "contains-child"); //leaf-list:leafref
+ public static final @NonNull QName IETF_HW_COMPONENT_LIST_CONTAINS_CHILD =
+ QName.create(IETF_HW_MODULE_NAME, "contains-child"); //leaf-list:leafref
public static final @NonNull QName IETF_HW_COMPONENT_LIST_PARENT = QName.create(IETF_HW_MODULE_NAME, "parent"); //leaf:leafref
public static final @NonNull QName IETF_HW_COMPONENT_LIST_DESC = QName.create(IETF_HW_MODULE_NAME, "description"); //leaf:String
- public static final @NonNull QName IETF_HW_COMPONENT_LIST_HW_REV = QName.create(IETF_HW_MODULE_NAME, "hardware-rev"); //leaf:String
+ public static final @NonNull QName IETF_HW_COMPONENT_LIST_HW_REV =
+ QName.create(IETF_HW_MODULE_NAME, "hardware-rev"); //leaf:String
//odl-netconf-callhome-server.yang
public static final String CALLHOME_SERVER_NS = "urn:opendaylight:params:xml:ns:yang:netconf-callhome-server";
//o-ran-hardware.yang
public static final String ORAN_HW_NS = "urn:o-ran:hardware:1.0";
public static final String ORAN_HW_REVISION = "2019-03-28";
- public static final @NonNull QName ORAN_HW_MODULE = QName.create(ORAN_HW_NS, ORAN_HW_REVISION, "o-ran-hardware").intern();
+ public static final @NonNull QName ORAN_HW_MODULE =
+ QName.create(ORAN_HW_NS, ORAN_HW_REVISION, "o-ran-hardware").intern();
public static final @NonNull QName ORAN_HW_COMPONENT = QName.create(ORAN_HW_MODULE, "O-RAN-HW-COMPONENT");
//ietf-netconf-notifications.yang
public static final String IETF_NETCONF_NOTIFICATIONS_NS = "urn:ietf:params:xml:ns:yang:ietf-netconf-notifications";
public static final String IETF_NETCONF_NOTIFICATIONS_REVISION = "2012-02-06";
- public static final @NonNull QName IETF_NETCONF_NOTIFICATIONS_MODULE = QName.create(IETF_NETCONF_NOTIFICATIONS_NS, IETF_NETCONF_NOTIFICATIONS_REVISION, "ietf-netconf-notifications").intern();
- public static final @NonNull QName IETF_NETCONF_NOTIFICATIONS_NETCONF_CONFIG_CHANGE = QName.create(IETF_NETCONF_NOTIFICATIONS_MODULE, "netconf-config-change");
- public static final @NonNull QName IETF_NETCONF_NOTIFICATIONS_NETCONF_CONFIRMED_COMMIT = QName.create(IETF_NETCONF_NOTIFICATIONS_MODULE, "netconf-confirmed-commit");
- public static final @NonNull QName IETF_NETCONF_NOTIFICATIONS_NETCONF_SESSION_START = QName.create(IETF_NETCONF_NOTIFICATIONS_MODULE, "netconf-session-start");
- public static final @NonNull QName IETF_NETCONF_NOTIFICATIONS_NETCONF_SESSION_END = QName.create(IETF_NETCONF_NOTIFICATIONS_MODULE, "netconf-session-end");
- public static final @NonNull QName IETF_NETCONF_NOTIFICATIONS_NETCONF_CAPABILITY_CHANGE = QName.create(IETF_NETCONF_NOTIFICATIONS_MODULE, "netconf-capability-change");
- public static final @NonNull QName IETF_NETCONF_NOTIFICATIONS_CHANGEDBY = QName.create(IETF_NETCONF_NOTIFICATIONS_MODULE, "changed-by");
- public static final @NonNull QName IETF_NETCONF_NOTIFICATIONS_SERVERORUSER = QName.create(IETF_NETCONF_NOTIFICATIONS_MODULE, "server-or-user");
- public static final @NonNull QName IETF_NETCONF_NOTIFICATIONS_EDITNODE = QName.create(IETF_NETCONF_NOTIFICATIONS_MODULE, "edit");
- public static final @NonNull QName IETF_NETCONF_NOTIFICATIONS_USERNAME = QName.create(IETF_NETCONF_NOTIFICATIONS_MODULE, "username");
- public static final @NonNull QName IETF_NETCONF_NOTIFICATIONS_SESSIONID = QName.create(IETF_NETCONF_NOTIFICATIONS_MODULE, "session-id");
- public static final @NonNull QName IETF_NETCONF_NOTIFICATIONS_OPERATION = QName.create(IETF_NETCONF_NOTIFICATIONS_MODULE, "operation");
- public static final @NonNull QName IETF_NETCONF_NOTIFICATIONS_TARGET = QName.create(IETF_NETCONF_NOTIFICATIONS_MODULE, "target");
- public static final @NonNull QName IETF_NETCONF_NOTIFICATIONS_DATASTORE = QName.create(IETF_NETCONF_NOTIFICATIONS_MODULE, "datastore");
+ public static final @NonNull QName IETF_NETCONF_NOTIFICATIONS_MODULE = QName
+ .create(IETF_NETCONF_NOTIFICATIONS_NS, IETF_NETCONF_NOTIFICATIONS_REVISION, "ietf-netconf-notifications")
+ .intern();
+ public static final @NonNull QName IETF_NETCONF_NOTIFICATIONS_NETCONF_CONFIG_CHANGE =
+ QName.create(IETF_NETCONF_NOTIFICATIONS_MODULE, "netconf-config-change");
+ public static final @NonNull QName IETF_NETCONF_NOTIFICATIONS_NETCONF_CONFIRMED_COMMIT =
+ QName.create(IETF_NETCONF_NOTIFICATIONS_MODULE, "netconf-confirmed-commit");
+ public static final @NonNull QName IETF_NETCONF_NOTIFICATIONS_NETCONF_SESSION_START =
+ QName.create(IETF_NETCONF_NOTIFICATIONS_MODULE, "netconf-session-start");
+ public static final @NonNull QName IETF_NETCONF_NOTIFICATIONS_NETCONF_SESSION_END =
+ QName.create(IETF_NETCONF_NOTIFICATIONS_MODULE, "netconf-session-end");
+ public static final @NonNull QName IETF_NETCONF_NOTIFICATIONS_NETCONF_CAPABILITY_CHANGE =
+ QName.create(IETF_NETCONF_NOTIFICATIONS_MODULE, "netconf-capability-change");
+ public static final @NonNull QName IETF_NETCONF_NOTIFICATIONS_CHANGEDBY =
+ QName.create(IETF_NETCONF_NOTIFICATIONS_MODULE, "changed-by");
+ public static final @NonNull QName IETF_NETCONF_NOTIFICATIONS_SERVERORUSER =
+ QName.create(IETF_NETCONF_NOTIFICATIONS_MODULE, "server-or-user");
+ public static final @NonNull QName IETF_NETCONF_NOTIFICATIONS_EDITNODE =
+ QName.create(IETF_NETCONF_NOTIFICATIONS_MODULE, "edit");
+ public static final @NonNull QName IETF_NETCONF_NOTIFICATIONS_USERNAME =
+ QName.create(IETF_NETCONF_NOTIFICATIONS_MODULE, "username");
+ public static final @NonNull QName IETF_NETCONF_NOTIFICATIONS_SESSIONID =
+ QName.create(IETF_NETCONF_NOTIFICATIONS_MODULE, "session-id");
+ public static final @NonNull QName IETF_NETCONF_NOTIFICATIONS_OPERATION =
+ QName.create(IETF_NETCONF_NOTIFICATIONS_MODULE, "operation");
+ public static final @NonNull QName IETF_NETCONF_NOTIFICATIONS_TARGET =
+ QName.create(IETF_NETCONF_NOTIFICATIONS_MODULE, "target");
+ public static final @NonNull QName IETF_NETCONF_NOTIFICATIONS_DATASTORE =
+ QName.create(IETF_NETCONF_NOTIFICATIONS_MODULE, "datastore");
//o-ran-supervision.yang
public static final String ORAN_SUPERVISION_NS = "urn:o-ran:supervision:1.0";
public static final String ORAN_SUPERVISION_REVISION = "2022-12-05";
- public static final @NonNull QName ORAN_SUPERVISION_MODULE = QName.create(ORAN_SUPERVISION_NS, ORAN_SUPERVISION_REVISION, "o-ran-supervision");
- public static final @NonNull QName ORAN_SUPERVISION_NOTIFICATION = QName.create(ORAN_SUPERVISION_MODULE, "supervision-notification");
+ public static final @NonNull QName ORAN_SUPERVISION_MODULE =
+ QName.create(ORAN_SUPERVISION_NS, ORAN_SUPERVISION_REVISION, "o-ran-supervision");
+ public static final @NonNull QName ORAN_SUPERVISION_NOTIFICATION =
+ QName.create(ORAN_SUPERVISION_MODULE, "supervision-notification");
}
*/
package org.onap.ccsdk.features.sdnr.wt.devicemanager.oran.yangspecs;
-import com.google.common.collect.Sets;
import java.util.Arrays;
import java.util.List;
import java.util.Optional;
import org.opendaylight.yangtools.yang.common.Revision;
import org.opendaylight.yangtools.yang.common.XMLNamespace;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
-import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.AugmentationIdentifier;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.InstanceIdentifierBuilder;
import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
import org.slf4j.Logger;
@NonNull
InstanceIdentifierBuilder ietfSystemIID =
YangInstanceIdentifier.builder().node(ORanDeviceManagerQNames.IETF_SYSTEM_CONTAINER);
- @NonNull
- AugmentationIdentifier onapSystemIID = null;
- if (netconfDomAccessor.getCapabilites().isSupportingNamespaceAndRevision(ONAPSYSTEM_2020_10_26))
- onapSystemIID = YangInstanceIdentifier.AugmentationIdentifier.create(Sets.newHashSet(NAME, WEB_UI));
- else if (netconfDomAccessor.getCapabilites().isSupportingNamespaceAndRevision(ONAPSYSTEM_2022_11_04))
- onapSystemIID = YangInstanceIdentifier.AugmentationIdentifier
- .create(Sets.newHashSet(NAME, WEB_UI, GEOGRAPHICAL_LOCATION));
-
- InstanceIdentifierBuilder augmentedOnapSystem =
- YangInstanceIdentifier.builder(ietfSystemIID.build()).node(onapSystemIID);
Optional<NormalizedNode> res =
- netconfDomAccessor.readDataNode(LogicalDatastoreType.OPERATIONAL, augmentedOnapSystem.build());
+ netconfDomAccessor.readDataNode(LogicalDatastoreType.OPERATIONAL, ietfSystemIID.build());
LOG.debug("Result of System1 = {}", res);
return res.isPresent() ? res.get() : null;
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import com.google.common.collect.Sets;
import java.io.IOException;
import java.io.InputStream;
import java.net.URISyntaxException;
import java.util.Optional;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
+import org.eclipse.jdt.annotation.NonNull;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
import org.opendaylight.yangtools.yang.common.QNameModule;
import org.opendaylight.yangtools.yang.common.Revision;
import org.opendaylight.yangtools.yang.common.XMLNamespace;
-import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
-import org.opendaylight.yangtools.yang.data.api.schema.AugmentationNode;
import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
import org.opendaylight.yangtools.yang.data.api.schema.UnkeyedListEntryNode;
import org.opendaylight.yangtools.yang.data.api.schema.UnkeyedListNode;
+import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizationResult;
import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter;
import org.opendaylight.yangtools.yang.data.codec.xml.XmlParserStream;
import org.opendaylight.yangtools.yang.data.impl.schema.Builders;
import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes;
import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNormalizedNodeStreamWriter;
-import org.opendaylight.yangtools.yang.data.impl.schema.NormalizedNodeResult;
+import org.opendaylight.yangtools.yang.data.impl.schema.NormalizationResultHolder;
import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
import org.opendaylight.yangtools.yang.model.api.stmt.SchemaNodeIdentifier.Absolute;
import org.opendaylight.yangtools.yang.model.util.SchemaInferenceStack.Inference;
*/
final XMLStreamReader reader = UntrustedXML.createXMLStreamReader(resourceAsStream);
- final NormalizedNodeResult result = new NormalizedNodeResult();
+ final NormalizationResultHolder result = new NormalizationResultHolder();
final NormalizedNodeStreamWriter streamWriter = ImmutableNormalizedNodeStreamWriter.from(result);
final XmlParserStream xmlParser = XmlParserStream.create(streamWriter, hwContainerSchema);
xmlParser.flush();
xmlParser.close();
- NormalizedNode transformedInput = result.getResult();
+ NormalizedNode transformedInput = result.getResult().data();
List<Inventory> inventoryList = ORanDOMToInternalDataModel.getInventoryList(nodeId, transformedInput);
assertEquals("All elements", 27, inventoryList.size());
final XMLStreamReader reader = UntrustedXML.createXMLStreamReader(resourceAsStream);
- final NormalizedNodeResult result = new NormalizedNodeResult();
+ final NormalizationResultHolder result = new NormalizationResultHolder();
final NormalizedNodeStreamWriter streamWriter = ImmutableNormalizedNodeStreamWriter.from(result);
final XmlParserStream xmlParser = XmlParserStream.create(streamWriter, systemSchema);
xmlParser.flush();
xmlParser.close();
- NormalizedNode transformedInput = result.getResult();
+ NormalizedNode transformedInput = result.getResult().data();
ContainerNode cn = (ContainerNode) transformedInput;
- AugmentationNode gcData = (AugmentationNode) cn.childByArg(
- YangInstanceIdentifier.AugmentationIdentifier.create(Sets.newHashSet(onapSystem.get().getName(),
- onapSystem.get().getWebUi(), onapSystem.get().getGeoLocation())));
- Optional<Guicutthrough> gc = ORanDOMToInternalDataModel.getGuicutthrough(gcData, onapSystem.get());
+ Optional<Guicutthrough> gc = ORanDOMToInternalDataModel.getGuicutthrough(cn, onapSystem.get());
assertEquals(gc.isPresent(), true);
-
}
@Test
TestORanDOMToInternalDataModel.class.getResourceAsStream("/oran-fm-active-alarm.xml");
final XMLStreamReader reader = UntrustedXML.createXMLStreamReader(resourceAsStream);
- final NormalizedNodeResult result = new NormalizedNodeResult();
+ final NormalizationResultHolder result = new NormalizationResultHolder();
final NormalizedNodeStreamWriter streamWriter = ImmutableNormalizedNodeStreamWriter.from(result);
final XmlParserStream xmlParser = XmlParserStream.create(streamWriter, activeAlarmSchema);
xmlParser.flush();
xmlParser.close();
- NormalizedNode transformedInput = result.getResult();
- ContainerNode cn = (ContainerNode) transformedInput;
+ @NonNull NormalizationResult<?> transformedInput = result.getResult();
+ ContainerNode cn = (ContainerNode) transformedInput.data();
UnkeyedListNode activeAlarmsList =
(UnkeyedListNode) cn.childByArg(new NodeIdentifier(oranfm.get().getFaultActiveAlarmsQName()));
import java.util.ServiceLoader;
import java.util.Set;
import java.util.stream.Collectors;
-
import org.eclipse.jdt.annotation.NonNull;
import org.opendaylight.yangtools.yang.common.QName;
import org.opendaylight.yangtools.yang.common.YangConstants;
import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
+import org.opendaylight.yangtools.yang.model.api.stmt.FeatureSet;
import org.opendaylight.yangtools.yang.model.repo.api.SchemaSourceRepresentation;
import org.opendaylight.yangtools.yang.model.repo.api.YangTextSchemaSource;
import org.opendaylight.yangtools.yang.parser.api.YangParser;
final Set<QName> supportedFeatures, final Collection<? extends SchemaSourceRepresentation> sources) {
final YangParser parser = PARSER_FACTORY.createParser(config);
if (supportedFeatures != null) {
- parser.setSupportedFeatures(supportedFeatures);
+ parser.setSupportedFeatures(FeatureSet.of(supportedFeatures));
}
try {
--- /dev/null
+[ORAN-SUPERVISION]
+supervision-notification-interval=60
+guard-timer-overhead=10
* limitations under the License.
* ============LICENSE_END=========================================================
-->
+
<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>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>sdnr-wt-devicemanager-o-ran-sc</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-sdnr-wireless transport :: O-RAN-SC micro-services</name>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>sdnr-wt-devicemanager-onap-adapter-manager-feature</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>feature</packaging>
<name>ccsdk-features :: ${project.artifactId}</name>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>sdnr-wt-devicemanager-onap-adapter-manager-installer</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-features :: ${project.artifactId}</name>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>sdnr-wt-devicemanager-onap-adapter-manager-model</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>ccsdk-features :: ${project.artifactId}</name>
</license>
</licenses>
- <properties>
- <maven.javadoc.skip>true</maven.javadoc.skip>
- </properties>
-
<dependencies>
+ <dependency>
+ <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+ <artifactId>rfc6991-ietf-yang-types</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+ <artifactId>rfc6991-ietf-inet-types</artifactId>
+ </dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.jacoco</groupId>
- <artifactId>jacoco-maven-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>**/gen/**</exclude>
- <exclude>**/generated-sources/**</exclude>
- <exclude>**/yang-gen-sal/**</exclude>
- <exclude>**/pax/**</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>sdnr-wt-devicemanager-onap-adapter-manager-top</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-features :: ${project.artifactId}</name>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>sdnr-wt-devicemanager-onap-adapter-manager-provider</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>ccsdk-features :: ${project.artifactId}</name>
</properties>
<dependencies>
- <!-- begin for testing -->
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <scope>test</scope>
- </dependency>
-
- <!-- end for testing -->
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>sdnr-wt-devicemanager-onap-adapter-manager-model</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.opendaylight.netconf</groupId>
- <artifactId>sal-netconf-connector</artifactId>
+ <groupId>org.opendaylight.mdsal</groupId>
+ <artifactId>mdsal-singleton-common-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.mdsal.model</groupId>
+ <artifactId>ietf-topology</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.opendaylight.mdsal</groupId>
- <artifactId>mdsal-singleton-common-api</artifactId>
+ <artifactId>mdsal-dom-api</artifactId>
<scope>provided</scope>
</dependency>
+ <!-- begin for testing -->
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.netconf</groupId>
+ <artifactId>netconf-topology</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <!-- end for testing -->
</dependencies>
<build>
<filtering>true</filtering>
</resource>
</resources>
- <plugins>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
</excludes>
</configuration>
</plugin>
- </plugins>
+ </plugins>-->
</build>
</project>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>sdnr-wt-devicemanager-onap-onf12-feature</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>feature</packaging>
<name>ccsdk-features :: ${project.artifactId}</name>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>sdnr-wt-devicemanager-onap-onf12-installer</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-features :: ${project.artifactId}</name>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>sdnr-wt-devicemanager-onap-onf12-model</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>ccsdk-features :: ${project.artifactId}</name>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>sdnr-wt-devicemanager-onap-onf12-top</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-features :: ${project.artifactId}</name>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>sdnr-wt-devicemanager-onap-onf12-provider</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>ccsdk-features :: ${project.artifactId}</name>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+ <artifactId>rfc6991-ietf-yang-types</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+ <artifactId>rfc6991-ietf-inet-types</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.mdsal.model</groupId>
+ <artifactId>ietf-topology</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.mdsal</groupId>
+ <artifactId>mdsal-binding-api</artifactId>
+ </dependency>
<dependency>
<groupId>org.opendaylight.netconf</groupId>
- <artifactId>sal-netconf-connector</artifactId>
- <scope>provided</scope>
+ <artifactId>netconf-topology</artifactId>
</dependency>
- <!-- begin for testing -->
- <dependency>
+ <!-- begin for testing -->
+ <dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>3.4.2</version>
+ <!--<version>3.4.2</version> -->
<scope>test</scope>
</dependency>
<dependency>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>sdnr-wt-devicemanager-onap-onf14-feature</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>feature</packaging>
<name>ccsdk-features :: ${project.artifactId}</name>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>sdnr-wt-devicemanager-onap-onf14-installer</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-features :: ${project.artifactId}</name>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>sdnr-wt-devicemanager-onap-onf14-model</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>ccsdk-features :: ${project.artifactId}</name>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>sdnr-wt-devicemanager-onap-onf14-top</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-features :: ${project.artifactId}</name>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>sdnr-wt-devicemanager-onap-onf14-provider</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>ccsdk-features :: ${project.artifactId}</name>
<buildtime>${maven.build.timestamp} UTC</buildtime>
<databaseport>49400</databaseport>
</properties>
-
+
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>sdnr-wt-devicemanager-core-model</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>sdnr-wt-websocketmanager-model</artifactId>
<artifactId>sdnr-wt-common</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>mdsal-binding-dom-codec-api</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.opendaylight.netconf</groupId>
- <artifactId>sal-netconf-connector</artifactId>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>mdsal-singleton-common-api</artifactId>
<artifactId>rfc6991-ietf-yang-types</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.opendaylight.mdsal.model</groupId>
+ <artifactId>ietf-topology</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.mdsal</groupId>
+ <artifactId>mdsal-common-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.mdsal</groupId>
+ <artifactId>mdsal-dom-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.mdsal</groupId>
+ <artifactId>mdsal-binding-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.netconf.model</groupId>
+ <artifactId>rfc5277</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.yangtools</groupId>
+ <artifactId>yang-data-codec-binfmt</artifactId>
+ </dependency>
<!-- begin for testing -->
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
- </dependency>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.yangtools</groupId>
+ <artifactId>yang-model-util</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.yangtools</groupId>
+ <artifactId>yang-parser-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.yangtools</groupId>
+ <artifactId>yang-data-codec-gson</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.yangtools</groupId>
+ <artifactId>yang-data-codec-xml</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.netconf</groupId>
+ <artifactId>netconf-topology</artifactId>
+ <scope>test</scope>
+ </dependency>
+
<!-- end for testing -->
</dependencies>
<filtering>true</filtering>
</resource>
</resources>
- <pluginManagement><plugins>
- <plugin>
- <groupId>org.opendaylight.yangtools</groupId>
- <artifactId>yang-maven-plugin</artifactId>
- <version>7.0.9</version>
- <executions>
- <execution>
- <id>binding</id>
- <phase>none</phase>
- <goals>
- <goal>generate-sources</goal>
- </goals>
- <configuration>
- <inspectDependencies>true</inspectDependencies>
- </configuration>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>org.opendaylight.mdsal</groupId>
- <artifactId>mdsal-binding-java-api-generator</artifactId>
- <version>8.0.6</version>
- <scope>compile</scope>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </pluginManagement>
<plugins>
- <plugin>
- <groupId>org.jacoco</groupId>
- <artifactId>jacoco-maven-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>**/gen/**</exclude>
- <exclude>**/generated-sources/**</exclude>
- <exclude>**/yang-gen-sal/**</exclude>
- <exclude>**/pax/**</exclude>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>3.0.0</version>
- <executions>
- <execution>
- <id>enforce-maven</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <requireJavaVersion>
- <version>11</version>
- </requireJavaVersion>
- <requireMavenVersion>
- <version>[3.5.0,)</version>
- </requireMavenVersion>
- </rules>
- </configuration>
- </execution>
- <execution>
- <id>enforce-banned-dependencies</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <bannedDependencies>
- <message>Please always use mockito-core instead of mockito-all (see https://bugs.opendaylight.org/show_bug.cgi?id=7662), and spotbugs:annotations instead of findbugs:annotations</message>
- <excludes>
- <exclude>org.mockito:mockito-all</exclude>
- <exclude>com.google.code.findbugs:annotations</exclude>
- </excludes>
- </bannedDependencies>
- </rules>
- <fail>false</fail>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</project>
import org.onap.ccsdk.features.sdnr.wt.devicemanager.onf14.dom.impl.equipment.Onf14DomEquipmentManager;
import org.onap.ccsdk.features.sdnr.wt.devicemanager.onf14.dom.impl.interfaces.Onf14DomInterfacePacManager;
import org.onap.ccsdk.features.sdnr.wt.devicemanager.onf14.dom.impl.interfaces.TechnologySpecificPacKeys;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.onf14.dom.impl.qnames.Onf14DevicemanagerQNames;
import org.onap.ccsdk.features.sdnr.wt.devicemanager.onf14.dom.impl.yangspecs.CoreModel14;
import org.onap.ccsdk.features.sdnr.wt.devicemanager.service.DeviceManagerServiceProvider;
import org.onap.ccsdk.features.sdnr.wt.devicemanager.service.FaultService;
@Override
public void deregister() {
+ faultService.removeAllCurrentProblemsOfNode(netconfDomAccessor.getNodeId());
performanceManager.deRegistration(netconfDomAccessor.getNodeId());
}
}
@Override
- public void warmstart() {}
+ public void warmstart() {
+ int problems = removeAllCurrentProblemsOfNode();
+ log.debug("Removed all {} problems from database at deregistration for {}", problems, netconfDomAccessor.getNodeId().getValue());
+ }
+
+ /**
+ * Remove all entries from list
+ */
+ public int removeAllCurrentProblemsOfNode() {
+ return faultService.removeAllCurrentProblemsOfNode(netconfDomAccessor.getNodeId());
+ }
@Override
public Optional<NetconfAccessor> getAcessor() {
List<Inventory> inventoryList = new ArrayList<>();
for (String uuid : getTopLevelEquipment(controlConstruct)) {
Optional<NormalizedNode> equipment = readEquipmentInstance(netconfDomAccessor, uuid);
+ log.info("Equipment Data is - {}", equipment.get().prettyTree());
MapEntryNode equipmentEntry = (MapEntryNode) equipment.get();
if (equipmentEntry != null) {
collectEquipment(inventoryList, equipmentEntry, null, EQUIPMENTROOTLEVEL);
*/
package org.onap.ccsdk.features.sdnr.wt.devicemanager.onf14.dom.impl.yangspecs;
-import com.google.common.collect.Sets;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.Optional;
-import org.eclipse.jdt.annotation.NonNull;
import org.onap.ccsdk.features.sdnr.wt.devicemanager.onf14.dom.impl.dataprovider.InternalDataModelSeverity;
import org.onap.ccsdk.features.sdnr.wt.devicemanager.onf14.dom.impl.interfaces.TechnologySpecificPacKeys;
import org.onap.ccsdk.features.sdnr.wt.devicemanager.onf14.dom.impl.pm.PerformanceDataAirInterface;
import org.opendaylight.yangtools.yang.common.Revision;
import org.opendaylight.yangtools.yang.common.XMLNamespace;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
-import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.AugmentationIdentifier;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.InstanceIdentifierBuilder;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
-import org.opendaylight.yangtools.yang.data.api.schema.AugmentationNode;
import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode;
import org.opendaylight.yangtools.yang.data.api.schema.MapNode;
this.coreModel14 = coreModel14;
}
- public FaultData readAllCurrentProblems(FaultData resultList,
- List<TechnologySpecificPacKeys> airInterfaceList) {
+ public FaultData readAllCurrentProblems(FaultData resultList, List<TechnologySpecificPacKeys> airInterfaceList) {
int idxStart; // Start index for debug messages
// model
YangInstanceIdentifier layerProtocolIID = coreModel14.getLayerProtocolIId(ltpUuid, localId);
-
- @NonNull
- AugmentationIdentifier airInterfacePacIID =
- YangInstanceIdentifier.AugmentationIdentifier.create(Sets.newHashSet(getQName("air-interface-pac")));
-
- InstanceIdentifierBuilder augmentedAirInterfacePacIID =
- YangInstanceIdentifier.builder(layerProtocolIID).node(airInterfacePacIID);
-
+ InstanceIdentifierBuilder airInterfacePacIID =
+ YangInstanceIdentifier.builder(layerProtocolIID).node(getQName("air-interface-pac"));
+
+ // @NonNull
+ // AugmentationIdentifier airInterfacePacIID =
+ // YangInstanceIdentifier.AugmentationIdentifier.create(Sets.newHashSet(getQName("air-interface-pac")));
+ //
+ // InstanceIdentifierBuilder augmentedAirInterfacePacIID =
+ // YangInstanceIdentifier.builder(layerProtocolIID).node(airInterfacePacIID);
+ //
// reading all the current-problems list for this specific LTP and LP
Optional<NormalizedNode> airInterfacePacDataOpt =
- netconfDomAccessor.readDataNode(LogicalDatastoreType.OPERATIONAL, augmentedAirInterfacePacIID.build());
-
+ netconfDomAccessor.readDataNode(LogicalDatastoreType.OPERATIONAL, airInterfacePacIID.build());
if (airInterfacePacDataOpt.isPresent()) {
- AugmentationNode airInterfacePacData = (AugmentationNode) airInterfacePacDataOpt.get();
+ LOG.info("Air Interface = {}", airInterfacePacDataOpt.get().prettyTree());
+ }
+ if (airInterfacePacDataOpt.isPresent()) {
+ ContainerNode airInterfacePacData = (ContainerNode) airInterfacePacDataOpt.get();
MapNode airInterfaceCurrentProblemsList =
(MapNode) airInterfacePacData.childByArg(new NodeIdentifier(getQName("current-problem-list")));
if (airInterfaceCurrentProblemsList != null) {
// model
YangInstanceIdentifier layerProtocolIID = coreModel14.getLayerProtocolIId(ltpUuid, localId);
-
- @NonNull
- AugmentationIdentifier airInterfacePacIID = YangInstanceIdentifier.AugmentationIdentifier
- .create(Sets.newHashSet(Onf14DevicemanagerQNames.AIR_INTERFACE_PAC));
-
- InstanceIdentifierBuilder augmentedAirInterfacePacIID =
- YangInstanceIdentifier.builder(layerProtocolIID).node(airInterfacePacIID);
-
- // reading historical performance list for this specific LTP and LP
- Optional<NormalizedNode> airInterfacePacDataOpt =
- netconfDomAccessor.readDataNode(LogicalDatastoreType.OPERATIONAL, augmentedAirInterfacePacIID.build());
- LOG.debug("Performance Data = {}", airInterfacePacDataOpt.get().body());
- if (airInterfacePacDataOpt.isPresent()) {
- AugmentationNode airInterfacePacData = (AugmentationNode) airInterfacePacDataOpt.get();
- ContainerNode cn = (ContainerNode) airInterfacePacData
- .childByArg(new NodeIdentifier(Onf14DevicemanagerQNames.AIR_INTERFACE_PAC));
- if (cn != null) {
- ContainerNode airIntfHistPerf = (ContainerNode) cn
- .childByArg(new NodeIdentifier(Onf14DevicemanagerQNames.AIR_INTERFACE_HISTORICAL_PERFORMANCES));
- if (airIntfHistPerf != null) {
- MapNode airInterfaceHistoricalPerformanceList = (MapNode) airIntfHistPerf.childByArg(
- new NodeIdentifier(Onf14DevicemanagerQNames.AIR_INTERFACE_HISTORICAL_PERFORMANCES_LIST));
- if (airInterfaceHistoricalPerformanceList != null) {
- Collection<MapEntryNode> airInterfaceHistoricalPerfCollection =
- airInterfaceHistoricalPerformanceList.body();
- for (MapEntryNode airInterfaceHistPerf : airInterfaceHistoricalPerfCollection) {
- res.add(new PerformanceDataAirInterface(netconfDomAccessor.getNodeId(), ltpUuid, localId,
- airInterfaceHistPerf));
+ InstanceIdentifierBuilder airInterfacePacIID =
+ YangInstanceIdentifier.builder(layerProtocolIID).node(getQName("air-interface-pac"));
+
+ // @NonNull
+ // AugmentationIdentifier airInterfacePacIID = YangInstanceIdentifier.AugmentationIdentifier
+ // .create(Sets.newHashSet(Onf14DevicemanagerQNames.AIR_INTERFACE_PAC));
+ //
+ // InstanceIdentifierBuilder augmentedAirInterfacePacIID =
+ // YangInstanceIdentifier.builder(layerProtocolIID).node(airInterfacePacIID);
+ //
+ // // reading historical performance list for this specific LTP and LP
+ Optional<NormalizedNode> airInterfacePacDataOpt =
+ netconfDomAccessor.readDataNode(LogicalDatastoreType.OPERATIONAL, airInterfacePacIID.build());
+ LOG.debug("Performance Data = {}", airInterfacePacDataOpt.get().body());
+ if (airInterfacePacDataOpt.isPresent()) {
+ ContainerNode airInterfacePacData = (ContainerNode) airInterfacePacDataOpt.get();
+ ContainerNode cn = (ContainerNode) airInterfacePacData
+ .childByArg(new NodeIdentifier(Onf14DevicemanagerQNames.AIR_INTERFACE_PAC));
+ if (cn != null) {
+ ContainerNode airIntfHistPerf = (ContainerNode) cn
+ .childByArg(new NodeIdentifier(Onf14DevicemanagerQNames.AIR_INTERFACE_HISTORICAL_PERFORMANCES));
+ if (airIntfHistPerf != null) {
+ MapNode airInterfaceHistoricalPerformanceList = (MapNode) airIntfHistPerf.childByArg(
+ new NodeIdentifier(Onf14DevicemanagerQNames.AIR_INTERFACE_HISTORICAL_PERFORMANCES_LIST));
+ if (airInterfaceHistoricalPerformanceList != null) {
+ Collection<MapEntryNode> airInterfaceHistoricalPerfCollection =
+ airInterfaceHistoricalPerformanceList.body();
+ for (MapEntryNode airInterfaceHistPerf : airInterfaceHistoricalPerfCollection) {
+ res.add(new PerformanceDataAirInterface(netconfDomAccessor.getNodeId(), ltpUuid, localId,
+ airInterfaceHistPerf));
+ }
+ return res;
+ } else {
+ LOG.debug("DBRead Id {} empty CurrentProblemList", ltpUuid);
+ }
}
- return res;
- } else {
- LOG.debug("DBRead Id {} empty CurrentProblemList", ltpUuid);
}
}
- }
- }
return null;
}
*/
package org.onap.ccsdk.features.sdnr.wt.devicemanager.onf14.dom.impl.yangspecs;
-import com.google.common.collect.Sets;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import org.opendaylight.yangtools.yang.common.Revision;
import org.opendaylight.yangtools.yang.common.XMLNamespace;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
-import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.AugmentationIdentifier;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.InstanceIdentifierBuilder;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
-import org.opendaylight.yangtools.yang.data.api.schema.AugmentationNode;
import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode;
import org.opendaylight.yangtools.yang.data.api.schema.MapNode;
YangInstanceIdentifier alarmsPacIID =
YangInstanceIdentifier.builder().node(coreModel14.getControlConstructQName()).build();
-
- @NonNull
- AugmentationIdentifier alarmsContainerIID =
- YangInstanceIdentifier.AugmentationIdentifier.create(Sets.newHashSet(ALARM_PAC));
-
- InstanceIdentifierBuilder augmentedAlarmsIID =
- YangInstanceIdentifier.builder(alarmsPacIID).node(alarmsContainerIID);
-
- // reading all the alarms
+ InstanceIdentifierBuilder alarmsContainerIID = YangInstanceIdentifier.builder(alarmsPacIID).node(ALARM_PAC);
+
+ // @NonNull
+ // AugmentationIdentifier alarmsContainerIID =
+ // YangInstanceIdentifier.AugmentationIdentifier.create(Sets.newHashSet(ALARM_PAC));
+ //
+ // InstanceIdentifierBuilder augmentedAlarmsIID =
+ // YangInstanceIdentifier.builder(alarmsPacIID).node(alarmsContainerIID);
+ //
+ // // reading all the alarms
Optional<NormalizedNode> alarms =
- this.getNetconfDomAccessor().readDataNode(LogicalDatastoreType.OPERATIONAL, augmentedAlarmsIID.build());
+ this.getNetconfDomAccessor().readDataNode(LogicalDatastoreType.OPERATIONAL, alarmsContainerIID.build());
FaultData resultList = new FaultData();
if (alarms.isPresent()) {
- AugmentationNode alarmsDataNode = (AugmentationNode) alarms.get();
+ ContainerNode alarmsDataNode = (ContainerNode) alarms.get();
ContainerNode alarmsContainer = (ContainerNode) alarmsDataNode.childByArg(new NodeIdentifier(ALARM_PAC));
ContainerNode currentAlarmsContainer =
(ContainerNode) alarmsContainer.childByArg(new NodeIdentifier(CURRENT_ALARMS));
}
}
return resultList;
+
}
public boolean isSupported(Capabilities capabilites) {
return module.getRevision().get().toString();
}
- @Override
- public QName getQName(String localName) {
- return QName.create(module, localName);
- }
-
public QName getControlConstructQName() {
return CONTROL_CONSTRUCT;
}
*/
package org.onap.ccsdk.features.sdnr.wt.devicemanager.onf14.dom.impl.yangspecs;
-import com.google.common.collect.Sets;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.Optional;
-import org.eclipse.jdt.annotation.NonNull;
import org.onap.ccsdk.features.sdnr.wt.devicemanager.onf14.dom.impl.dataprovider.InternalDataModelSeverity;
import org.onap.ccsdk.features.sdnr.wt.devicemanager.onf14.dom.impl.interfaces.TechnologySpecificPacKeys;
import org.onap.ccsdk.features.sdnr.wt.devicemanager.onf14.dom.impl.util.Debug;
import org.opendaylight.yangtools.yang.common.Revision;
import org.opendaylight.yangtools.yang.common.XMLNamespace;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
-import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.AugmentationIdentifier;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.InstanceIdentifierBuilder;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
-import org.opendaylight.yangtools.yang.data.api.schema.AugmentationNode;
+import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode;
import org.opendaylight.yangtools.yang.data.api.schema.MapNode;
import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
// constructing the IID needs the augmentation exposed by the
// ethernet-container-2-0 model
YangInstanceIdentifier layerProtocolIID = coreModel14.getLayerProtocolIId(ltpUuid, localId);
-
- @NonNull
- AugmentationIdentifier ethernetContainerIID = YangInstanceIdentifier.AugmentationIdentifier
- .create(Sets.newHashSet(getQName("ethernet-container-pac")));
-
- InstanceIdentifierBuilder augmentedEthernetContainerConfigurationIID =
- YangInstanceIdentifier.builder(layerProtocolIID).node(ethernetContainerIID);
-
- // reading all the current-problems list for this specific LTP and LP
+ InstanceIdentifierBuilder ethernetContainerIID = YangInstanceIdentifier.builder(layerProtocolIID).node(getQName("ethernet-container-pac"));
+// @NonNull
+// AugmentationIdentifier ethernetContainerIID = YangInstanceIdentifier.AugmentationIdentifier
+// .create(Sets.newHashSet(getQName("ethernet-container-pac")));
+//
+// InstanceIdentifierBuilder augmentedEthernetContainerConfigurationIID =
+// YangInstanceIdentifier.builder(layerProtocolIID).node(ethernetContainerIID);
+//
+// // reading all the current-problems list for this specific LTP and LP
Optional<NormalizedNode> etherntContainerConfigurationOpt = netconfDomAccessor
- .readDataNode(LogicalDatastoreType.OPERATIONAL, augmentedEthernetContainerConfigurationIID.build());
+ .readDataNode(LogicalDatastoreType.OPERATIONAL, ethernetContainerIID.build());
if (etherntContainerConfigurationOpt.isPresent()) {
- AugmentationNode etherntContainerConfiguration = (AugmentationNode) etherntContainerConfigurationOpt.get();
+ ContainerNode etherntContainerConfiguration = (ContainerNode) etherntContainerConfigurationOpt.get();
MapNode ethernetContainerCurrentProblemsList = (MapNode) etherntContainerConfiguration
.childByArg(new NodeIdentifier(getQName("current-problem-list")));
if (ethernetContainerCurrentProblemsList != null) {
*/
package org.onap.ccsdk.features.sdnr.wt.devicemanager.onf14.dom.impl.yangspecs;
-import com.google.common.collect.Sets;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.Optional;
-import org.eclipse.jdt.annotation.NonNull;
import org.onap.ccsdk.features.sdnr.wt.devicemanager.onf14.dom.impl.dataprovider.InternalDataModelSeverity;
import org.onap.ccsdk.features.sdnr.wt.devicemanager.onf14.dom.impl.interfaces.TechnologySpecificPacKeys;
import org.onap.ccsdk.features.sdnr.wt.devicemanager.onf14.dom.impl.qnames.Onf14DevicemanagerQNames;
import org.opendaylight.yangtools.yang.common.Revision;
import org.opendaylight.yangtools.yang.common.XMLNamespace;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
-import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.AugmentationIdentifier;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.InstanceIdentifierBuilder;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
-import org.opendaylight.yangtools.yang.data.api.schema.AugmentationNode;
+import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode;
import org.opendaylight.yangtools.yang.data.api.schema.MapNode;
import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
// constructing the IID needs the augmentation exposed by the wire-interface-2-0
// model
YangInstanceIdentifier layerProtocolIID = coreModel14.getLayerProtocolIId(ltpUuid, localId);
-
- @NonNull
- AugmentationIdentifier wireInterfacePacIID = YangInstanceIdentifier.AugmentationIdentifier
- .create(Sets.newHashSet(Onf14DevicemanagerQNames.WIRE_INTERFACE_PAC));
-
- InstanceIdentifierBuilder augmentedWireInterfaceConfigurationIID =
- YangInstanceIdentifier.builder(layerProtocolIID).node(wireInterfacePacIID);
+ InstanceIdentifierBuilder wireInterfacePacIID =
+ YangInstanceIdentifier.builder(layerProtocolIID).node(Onf14DevicemanagerQNames.WIRE_INTERFACE_PAC);
+ // @NonNull
+ // YangInstanceIdentifier wireInterfacePacIID =
+ // YangInstanceIdentifier.of(Onf14DevicemanagerQNames.WIRE_INTERFACE_PAC);
+ //
+ // InstanceIdentifierBuilder augmentedWireInterfaceConfigurationIID =
+ // YangInstanceIdentifier.builder(layerProtocolIID).node(wireInterfacePacIID.getLastPathArgument());
// reading all the current-problems list for this specific LTP and LP
- Optional<NormalizedNode> wireInterfaceConfigurationOpt = netconfDomAccessor
- .readDataNode(LogicalDatastoreType.OPERATIONAL, augmentedWireInterfaceConfigurationIID.build());
+ Optional<NormalizedNode> wireInterfaceConfigurationOpt =
+ netconfDomAccessor.readDataNode(LogicalDatastoreType.OPERATIONAL, wireInterfacePacIID.build());
if (wireInterfaceConfigurationOpt.isPresent()) {
- AugmentationNode wireInterfaceConfiguration = (AugmentationNode) wireInterfaceConfigurationOpt.get();
+ ContainerNode wireInterfaceConfiguration = (ContainerNode) wireInterfaceConfigurationOpt.get();
MapNode wireInterfaceCurrentProblemsList = (MapNode) wireInterfaceConfiguration
.childByArg(new NodeIdentifier(Onf14DevicemanagerQNames.WIRE_INTERFACE_CURRENT_PROBLEMS_LIST));
if (wireInterfaceCurrentProblemsList != null) {
return resultList;
}
- public FaultData readAllCurrentProblems(FaultData resultList,
- List<TechnologySpecificPacKeys> wireInterfaceList) {
+ public FaultData readAllCurrentProblems(FaultData resultList, List<TechnologySpecificPacKeys> wireInterfaceList) {
int idxStart; // Start index for debug messages
Onf14DomToInternalDataModel model = new Onf14DomToInternalDataModel();
ContainerNode cn = (ContainerNode) Onf14DomTestUtils.getNormalizedNodeFromJson();
+ System.out.println("Container Node = "+cn);
MapNode equipmentMap = (MapNode) cn.getChildByArg(new NodeIdentifier(QName.create(qnm, "equipment")));
List<Inventory> inventoryList = new ArrayList<Inventory>();
import org.opendaylight.yangtools.yang.common.Revision;
import org.opendaylight.yangtools.yang.common.XMLNamespace;
import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
+import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizationResult;
import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter;
+
import org.opendaylight.yangtools.yang.data.codec.gson.JSONCodecFactory;
import org.opendaylight.yangtools.yang.data.codec.gson.JSONCodecFactorySupplier;
import org.opendaylight.yangtools.yang.data.codec.gson.JsonParserStream;
import org.opendaylight.yangtools.yang.data.codec.xml.XmlParserStream;
import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNormalizedNodeStreamWriter;
-import org.opendaylight.yangtools.yang.data.impl.schema.NormalizedNodeResult;
+import org.opendaylight.yangtools.yang.data.impl.schema.NormalizationResultHolder;
import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
-import org.opendaylight.yangtools.yang.model.util.SchemaInferenceStack.Inference;
+
//import org.opendaylight.yangtools.yang.model.util.SchemaInferenceStack.Inference; //Yangtool 8.0
+import org.opendaylight.yangtools.yang.model.util.SchemaInferenceStack.Inference;
import org.xml.sax.SAXException;
public class Onf14DomTestUtils {
loadTextFile(new File(Onf14DomTestUtils.class.getResource("/ControlConstruct-data-test.json").toURI()));
final JsonReader reader = new JsonReader(new StringReader(streamAsString));
- NormalizedNodeResult result = new NormalizedNodeResult();
+ NormalizationResultHolder result = new NormalizationResultHolder();
// StreamWriter which attaches NormalizedNode under parent
final NormalizedNodeStreamWriter streamWriter = ImmutableNormalizedNodeStreamWriter.from(result);
}
// Finally build the node
- transformedInput = result.getResult();
+ transformedInput = result.getResult().data();
return transformedInput;
}
*/
final XMLStreamReader reader = UntrustedXML.createXMLStreamReader(resourceAsStream);
- final NormalizedNodeResult result = new NormalizedNodeResult();
+ final NormalizationResultHolder result = new NormalizationResultHolder();
final NormalizedNodeStreamWriter streamWriter = ImmutableNormalizedNodeStreamWriter.from(result);
final XmlParserStream xmlParser = XmlParserStream.create(streamWriter, hwContainerSchema);
xmlParser.flush();
xmlParser.close();
- transformedInput = result.getResult();
+ transformedInput = result.getResult().data();
return transformedInput;
}
*/
final XMLStreamReader reader = UntrustedXML.createXMLStreamReader(resourceAsStream);
- final NormalizedNodeResult result = new NormalizedNodeResult();
+ final NormalizationResultHolder result = new NormalizationResultHolder();
final NormalizedNodeStreamWriter streamWriter = ImmutableNormalizedNodeStreamWriter.from(result);
final XmlParserStream xmlParser = XmlParserStream.create(streamWriter, hwContainerSchema);
xmlParser.flush();
xmlParser.close();
- transformedInput = result.getResult();
+ transformedInput = result.getResult().data();
return transformedInput;
}
import java.util.ServiceLoader;
import java.util.Set;
import java.util.stream.Collectors;
-
import org.eclipse.jdt.annotation.NonNull;
import org.opendaylight.yangtools.yang.common.QName;
import org.opendaylight.yangtools.yang.common.YangConstants;
import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
+import org.opendaylight.yangtools.yang.model.api.stmt.FeatureSet;
import org.opendaylight.yangtools.yang.model.repo.api.SchemaSourceRepresentation;
import org.opendaylight.yangtools.yang.model.repo.api.YangTextSchemaSource;
import org.opendaylight.yangtools.yang.parser.api.YangParser;
final Set<QName> supportedFeatures, final Collection<? extends SchemaSourceRepresentation> sources) {
final YangParser parser = PARSER_FACTORY.createParser(config);
if (supportedFeatures != null) {
- parser.setSupportedFeatures(supportedFeatures);
+ parser.setSupportedFeatures(FeatureSet.of(supportedFeatures));
}
try {
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>sdnr-wt-devicemanager-onap-openroadm-feature</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>feature</packaging>
<name>ccsdk-features :: ${project.artifactId}</name>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>sdnr-wt-devicemanager-onap-openroadm-installer</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-features :: ${project.artifactId}</name>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>sdnr-wt-devicemanager-onap-openroadm-model</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>ccsdk-features :: ${project.artifactId}</name>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>sdnr-wt-devicemanager-onap-openroadm-top</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-features :: ${project.artifactId}</name>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>sdnr-wt-devicemanager-onap-openroadm-provider</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>ccsdk-features :: ${project.artifactId}</name>
</license>
</licenses>
- <properties>
- <maven.javadoc.skip>true</maven.javadoc.skip>
- <maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
- <buildtime>${maven.build.timestamp} UTC</buildtime>
- </properties>
-
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
- <dependency>
+ <!-- <dependency>
<groupId>org.opendaylight.netconf</groupId>
<artifactId>sal-netconf-connector</artifactId>
<scope>provided</scope>
- </dependency>
+ </dependency> -->
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>3.2.4</version>
+ <!-- <version>3.2.4</version>-->
<scope>test</scope>
</dependency>
<dependency>
<artifactId>byte-buddy</artifactId>
<groupId>net.bytebuddy</groupId>
+ <version>1.14.9</version>
<scope>test</scope>
</dependency>
<dependency>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
-
+ <dependency>
+ <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+ <artifactId>rfc6991-ietf-inet-types</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+ <artifactId>rfc6991-ietf-yang-types</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.netconf.model</groupId>
+ <artifactId>rfc6241</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.netconf.model</groupId>
+ <artifactId>rfc6470</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.mdsal</groupId>
+ <artifactId>mdsal-common-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.mdsal</groupId>
+ <artifactId>mdsal-binding-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.mdsal</groupId>
+ <artifactId>mdsal-dom-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.mdsal.model</groupId>
+ <artifactId>ietf-topology</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.netconf</groupId>
+ <artifactId>netconf-topology</artifactId>
+ <scope>provided</scope>
+ </dependency>
<!-- end for testing -->
</dependencies>
<filtering>true</filtering>
</resource>
</resources>
- <plugins>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
</excludes>
</configuration>
</plugin>
- </plugins>
+ </plugins>-->
</build>
</project>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>sdnr-wt-devicemanager-onap-openroadm71-feature</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>feature</packaging>
<name>ccsdk-features :: ${project.artifactId}</name>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>sdnr-wt-devicemanager-onap-openroadm71-installer</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-features :: ${project.artifactId}</name>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>sdnr-wt-devicemanager-onap-openroadm71-model</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>ccsdk-features :: ${project.artifactId}</name>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>sdnr-wt-devicemanager-onap-openroadm71-top</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-features :: ${project.artifactId}</name>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>sdnr-wt-devicemanager-onap-openroadm71-provider</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>ccsdk-features :: ${project.artifactId}</name>
</license>
</licenses>
- <properties>
- <maven.javadoc.skip>true</maven.javadoc.skip>
- <maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
- <buildtime>${maven.build.timestamp} UTC</buildtime>
- </properties>
-
<dependencies>
-
+
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>ietf-alarms</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
- <dependency>
+ <!-- <dependency>
<groupId>org.opendaylight.netconf</groupId>
<artifactId>sal-netconf-connector</artifactId>
<scope>provided</scope>
- </dependency>
+ </dependency> -->
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<dependency>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>sdnr-wt-yang-utils</artifactId>
- <version>${project.version}</version>
- <scope>compile</scope>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+ <artifactId>rfc6991-ietf-inet-types</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+ <artifactId>rfc6991-ietf-yang-types</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.netconf.model</groupId>
+ <artifactId>rfc6241</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.netconf.model</groupId>
+ <artifactId>rfc6470</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.mdsal</groupId>
+ <artifactId>mdsal-common-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.mdsal</groupId>
+ <artifactId>mdsal-binding-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.mdsal</groupId>
+ <artifactId>mdsal-dom-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.mdsal.model</groupId>
+ <artifactId>ietf-topology</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.netconf</groupId>
+ <artifactId>netconf-topology</artifactId>
+ <scope>provided</scope>
</dependency>
<!-- end for testing -->
</dependencies>
* limitations under the License.
* ============LICENSE_END=========================================================
-->
+
<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>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>sdnr-wt-devicemanager-onap</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-sdnr-wireless transport :: ONAP micro-services</name>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>sdnr-wt-feature-aggregator-devicemanager-base</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>feature</packaging>
<name>ccsdk-features :: ${project.artifactId}</name>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>sdnr-wt-feature-aggregator-devicemanager</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>feature</packaging>
<name>ccsdk-features :: ${project.artifactId}</name>
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>sdnr-wt-feature-aggregator-oauth</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>feature</packaging>
<name>ccsdk-features :: ${project.artifactId}</name>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>sdnr-wt-feature-aggregator</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>feature</packaging>
<name>ccsdk-features :: ${project.artifactId}</name>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>sdnr-wt-feature-aggregator-installer</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-features :: ${project.artifactId}</name>
<properties>
<application.name>sdnr-wt-installer</application.name>
</properties>
-
+ <!-- <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.onap.ccsdk.parent</groupId>
+ <artifactId>installed-odl-bom</artifactId>
+ <version>3.0.0</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+
+ </dependencies>
+ </dependencyManagement> -->
<dependencies>
+ <!-- <dependency>
+ <groupId>jakarta.activation</groupId>
+ <artifactId>jakarta.activation-api</artifactId>
+ <version>2.0.1</version>
+ <scope>provided</scope>
+ </dependency> -->
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>sdnr-wt-feature-aggregator</artifactId>
<type>xml</type>
<classifier>features</classifier>
</dependency>
- <dependency>
+ <dependency>
<groupId>${project.groupId}</groupId>
<artifactId>sdnr-wt-feature-aggregator-oauth</artifactId>
<version>${project.version}</version>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>sdnr-wt-feature-aggregator-top</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-features :: ${project.artifactId}</name>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>sdnr-wt-mountpoint-registrar-feature</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>feature</packaging>
<name>ccsdk-features :: ${project.artifactId}</name>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>sdnr-wt-mountpoint-registrar-installer</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-features :: ${project.artifactId}</name>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>sdnr-wt-mountpoint-registrar-model</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>ccsdk-features :: ${project.artifactId}</name>
<dependencies>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.jacoco</groupId>
- <artifactId>jacoco-maven-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>**/gen/**</exclude>
- <exclude>**/generated-sources/**</exclude>
- <exclude>**/yang-gen-sal/**</exclude>
- <exclude>**/pax/**</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>sdnr-wt-mountpoint-registrar-top</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-features :: ${project.artifactId}</name>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>sdnr-wt-mountpoint-registrar-provider</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>ccsdk-features :: ${project.artifactId}</name>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.opendaylight.netconf</groupId>
- <artifactId>sal-netconf-connector</artifactId>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
<artifactId>rfc6991-ietf-yang-types</artifactId>
* ============LICENSE_END==========================================================================
*/
+
package org.onap.ccsdk.features.sdnr.wt.mountpointregistrar.config;
import org.onap.ccsdk.features.sdnr.wt.common.configuration.Configuration;
@Override
public void onConfigChanged() {
if (generalConfig == null) { // Included as NullPointerException observed once in docker logs
- LOG.warn("onConfigChange cannot be handled. Unexpected Null");
+ LOG.warn("onConfigChange cannot be handled. Unexpected Null for generalConfig");
+ return;
+ }
+ if (strimziKafkaConfig == null) { // Included as NullPointerException observed once in docker logs
+ LOG.warn("onConfigChange cannot be handled. Unexpected Null for strimziKafkaConfig");
return;
}
LOG.info("Service configuration state changed. Enabled: {}", strimziKafkaConfig.getEnabled());
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>sdnr-wt-mountpoint-state-provider-feature</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>feature</packaging>
<name>ccsdk-features :: ${project.artifactId}</name>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>sdnr-wt-mountpoint-state-provider-installer</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-features :: ${project.artifactId}</name>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>sdnr-wt-mountpoint-state-provider-top</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-features :: ${project.artifactId}</name>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>sdnr-wt-mountpoint-state-provider-provider</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>ccsdk-features :: ${project.artifactId}</name>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.opendaylight.netconf</groupId>
- <artifactId>sal-netconf-connector</artifactId>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
<artifactId>rfc6991-ietf-yang-types</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+ <artifactId>rfc6991-ietf-inet-types</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.netconf</groupId>
+ <artifactId>netconf-topology</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.mdsal.model</groupId>
+ <artifactId>ietf-topology</artifactId>
+ </dependency>
+
<!-- end for testing -->
</dependencies>
boolean vesCollectorEnabled = vesCollectorService.getConfig().isVESCollectorEnabled();
if (vesCollectorEnabled) {
+ vesCollectorEnabledCV = true;
startPublishing();
}
}
public VESMessage createVESMessage(JSONObject obj) {
if (LOG.isDebugEnabled()) {
- LOG.debug("JSON Object to format to VES is - {0}", obj);
+ LOG.debug("JSON Object to format to VES is - {}", obj);
}
MountpointStateVESMessageFormatter.incrSequenceNo();
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.PortNumber;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev221225.ConnectionOper.ConnectionStatus;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev240118.ConnectionOper.ConnectionStatus;
import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev221225.NetconfNode;
import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId;
import org.opendaylight.yangtools.yang.common.Uint16;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.PortNumber;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev221225.ConnectionOper.ConnectionStatus;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev240118.ConnectionOper.ConnectionStatus;
import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev221225.NetconfNode;
import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId;
import org.opendaylight.yangtools.yang.common.Uint16;
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>sdnr-wt-netconfnode-state-service-feature</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>feature</packaging>
<name>ccsdk-features :: ${project.artifactId}</name>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>sdnr-wt-netconfnode-state-service-installer</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-features :: ${project.artifactId}</name>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>sdnr-wt-netconfnode-state-service-model</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>ccsdk-features :: ${project.artifactId}</name>
</properties>
<dependencies>
- <dependency>
- <groupId>org.opendaylight.netconf</groupId>
- <artifactId>sal-netconf-connector</artifactId>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>mdsal-binding-dom-codec-api</artifactId>
<dependency>
<groupId>org.opendaylight.netconf</groupId>
<artifactId>netconf-topology</artifactId>
- <version>5.0.6</version>
- <scope>compile</scope>
+ <scope>provided</scope>
</dependency>
</dependencies>
import java.util.Optional;
import javax.annotation.Nullable;
import org.eclipse.jdt.annotation.NonNull;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev221225.connection.oper.AvailableCapabilities;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev221225.connection.oper.UnavailableCapabilities;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev221225.connection.oper.available.capabilities.AvailableCapability;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev221225.connection.oper.unavailable.capabilities.UnavailableCapability;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev240118.connection.oper.AvailableCapabilities;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev240118.connection.oper.UnavailableCapabilities;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev240118.connection.oper.available.capabilities.AvailableCapability;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev240118.connection.oper.unavailable.capabilities.UnavailableCapability;
import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev221225.NetconfNode;
import org.opendaylight.yangtools.yang.common.QName;
import org.opendaylight.yangtools.yang.common.QNameModule;
import static org.mockito.Mockito.when;
import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.Capabilities;
import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.NetconfAccessor;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev221225.connection.oper.AvailableCapabilities;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev221225.connection.oper.AvailableCapabilitiesBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev221225.connection.oper.UnavailableCapabilitiesBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev221225.connection.oper.available.capabilities.AvailableCapability;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev221225.connection.oper.available.capabilities.AvailableCapabilityBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev221225.connection.oper.unavailable.capabilities.UnavailableCapability;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev221225.connection.oper.unavailable.capabilities.UnavailableCapabilityBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev240118.connection.oper.AvailableCapabilities;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev240118.connection.oper.AvailableCapabilitiesBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev240118.connection.oper.UnavailableCapabilitiesBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev240118.connection.oper.available.capabilities.AvailableCapability;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev240118.connection.oper.available.capabilities.AvailableCapabilityBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev240118.connection.oper.unavailable.capabilities.UnavailableCapability;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev240118.connection.oper.unavailable.capabilities.UnavailableCapabilityBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev221225.NetconfNodeBuilder;
import org.opendaylight.yangtools.yang.common.QName;
import org.opendaylight.yangtools.yang.common.Revision;
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>sdnr-wt-netconfnode-state-service-top</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-features :: ${project.artifactId}</name>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>sdnr-wt-netconfnode-state-service-provider</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>ccsdk-features :: ${project.artifactId}</name>
</license>
</licenses>
- <properties>
<maven.javadoc.skip>true</maven.javadoc.skip>
<maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
<buildtime>${maven.build.timestamp} UTC</buildtime>
- </properties>
+ </properties>-->
<dependencies>
<dependency>
<artifactId>netconf-dom-api</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
+ <!--<dependency>
<groupId>org.opendaylight.netconf</groupId>
<artifactId>sal-netconf-connector</artifactId>
<scope>provided</scope>
- </dependency>
+ </dependency>-->
<!-- akka -->
<dependency>
<groupId>com.typesafe</groupId>
<artifactId>sdnr-wt-netconfnode-state-service-model</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.opendaylight.netconf</groupId>
+ <artifactId>netconf-topology</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.mdsal</groupId>
+ <artifactId>mdsal-binding-dom-codec</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
import org.opendaylight.mdsal.dom.api.DOMMountPointService;
import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvider;
import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceRegistration;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev221225.ConnectionOper.ConnectionStatus;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev221225.connection.oper.ClusteredConnectionStatus;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev240118.ConnectionOper.ConnectionStatus;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev240118.connection.oper.ClusteredConnectionStatus;
import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev221225.NetconfNode;
import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev221225.network.topology.topology.topology.types.TopologyNetconf;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.netconfnode.state.rev191011.GetStatusInput;
import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.impl.NetconfNodeStateServiceImpl;
import org.opendaylight.mdsal.binding.api.DataBroker;
import org.opendaylight.mdsal.dom.api.DOMDataBroker;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev221225.ConnectionOper.ConnectionStatus;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev240118.ConnectionOper.ConnectionStatus;
import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev221225.NetconfNode;
import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId;
import org.slf4j.Logger;
import java.io.InputStream;
import java.io.InputStreamReader;
import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
+import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizationResult;
import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter;
import org.opendaylight.yangtools.yang.data.codec.gson.JSONCodecFactory;
import org.opendaylight.yangtools.yang.data.codec.gson.JSONCodecFactorySupplier;
import org.opendaylight.yangtools.yang.data.codec.gson.JsonParserStream;
import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNormalizedNodeStreamWriter;
-import org.opendaylight.yangtools.yang.data.impl.schema.NormalizedNodeResult;
+import org.opendaylight.yangtools.yang.data.impl.schema.NormalizationResultHolder;
import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
public class DomParser {
* @param schemaContext schema context
* @return created {@link NormalizedNode}
*/
- public static NormalizedNode parseJsonFile(final String path, final EffectiveModelContext schemaContext) {
+ public static NormalizationResult<?> parseJsonFile(final String path, final EffectiveModelContext schemaContext) {
final JSONCodecFactory codecFactory = JSONCodecFactorySupplier.RFC7951.createSimple(schemaContext);
- final NormalizedNodeResult resultHolder = new NormalizedNodeResult();
+ final NormalizationResultHolder resultHolder = new NormalizationResultHolder();
try (NormalizedNodeStreamWriter writer = ImmutableNormalizedNodeStreamWriter.from(resultHolder);
JsonParserStream jsonParser = JsonParserStream.create(writer, codecFactory);
InputStream inputStream = NetconfDomAccessorImpl.class.getResourceAsStream(path);
+++ /dev/null
-#
-# ============LICENSE_START=======================================================
-# ONAP : ccsdk features
-# ================================================================================
-# Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
-# ================================================================================
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ============LICENSE_END=======================================================
-#
-#
-
-# Properties filled in by maven during build process
-version = ${project.version}
-build = ${buildtime}
import org.opendaylight.mdsal.binding.dom.codec.impl.BindingCodecContext;
import org.opendaylight.mdsal.binding.runtime.spi.BindingRuntimeHelpers;
import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvider;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev221225.ConnectionOper.ConnectionStatus;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev240118.ConnectionOper.ConnectionStatus;
import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev221225.NetconfNode;
import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev221225.NetconfNodeBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.netconfnode.state.rev191011.AttributeChangeNotification;
package org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.test.example;
import java.io.IOException;
-import java.net.URI;
import java.util.Objects;
import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.DomContext;
import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.impl.access.dom.DomParser;
import org.opendaylight.yangtools.yang.common.Revision;
import org.opendaylight.yangtools.yang.common.XMLNamespace;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
-import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
+import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizationResult;
import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
import org.opendaylight.yangtools.yang.model.repo.api.YangTextSchemaSource;
import org.opendaylight.yangtools.yang.parser.api.YangParser;
import org.opendaylight.yangtools.yang.parser.api.YangParserException;
-import org.opendaylight.yangtools.yang.model.repo.api.YangTextSchemaSource;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
final EffectiveModelContext schemaContext = parser.buildEffectiveModel();
// (2) parsing of configuration into binding-independent format
- final NormalizedNode data = DomParser.parseJsonFile("/example.json", schemaContext);
+ final NormalizationResult<?> data = DomParser.parseJsonFile("/example.json", schemaContext);
// (3) conversion into binding-aware format (md-sal codec needs to know about path on which data is placed)
- final Configuration config = (Configuration) domContext.getBindingNormalizedNodeSerializer().fromNormalizedNode(CONFIGURATION_PATH, data)
+ final Configuration config = (Configuration) domContext.getBindingNormalizedNodeSerializer().fromNormalizedNode(CONFIGURATION_PATH, data.data())
.getValue();
// (4) printing some useful information
import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.impl.access.NetconfAccessorImpl;
import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.impl.access.NetconfCommunicatorManager;
import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.impl.access.dom.DomContextImpl;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev221225.ConnectionOper.ConnectionStatus;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev221225.connection.oper.AvailableCapabilitiesBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev221225.connection.oper.available.capabilities.AvailableCapabilityBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev240118.ConnectionOper.ConnectionStatus;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev240118.connection.oper.AvailableCapabilitiesBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev240118.connection.oper.available.capabilities.AvailableCapabilityBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev221225.NetconfNode;
import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev221225.NetconfNodeBuilder;
import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId;
/**
* Provide a test node.
- * @param nodeIdString
+ * @param nodeId
+ * @param capabilityString
*/
public static Node getTestNode(NodeId nodeId, String capabilityString) {
NetconfNodeBuilder netconfNodeBuilder = new NetconfNodeBuilder();
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>sdnr-wt-oauth-core</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>ccsdk-features :: ${project.artifactId}</name>
<artifactId>rfc6991-ietf-yang-types</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.opendaylight.netconf</groupId>
- <artifactId>sal-netconf-connector</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>sdnr-wt-oauth-realm</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>ccsdk-features :: ${project.artifactId}</name>
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>sdnr-wt-oauth-web</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>ccsdk-features :: ${project.artifactId}</name>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>sdnr-wt-oauth-provider-top</artifactId>
- <version>1.6.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-features :: ${project.artifactId}</name>
* limitations under the License.
* ============LICENSE_END=========================================================
-->
+
<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.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>sdnr-wt</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-sdnr-wireless transport :: micro-services</name>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>sdnr-wt-websocketmanager-feature</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>feature</packaging>
<name>ccsdk-features :: ${project.artifactId}</name>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>sdnr-wt-websocketmanager-installer</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-features :: ${project.artifactId}</name>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>sdnr-wt-websocketmanager-model</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>ccsdk-features :: ${project.artifactId}</name>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>sdnr-wt-websocketmanager-top</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-features :: ${project.artifactId}</name>
~ ============LICENSE_END=======================================================
~
-->
+
<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.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>2.6.1</version>
+ <version>3.2.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
<artifactId>sdnr-wt-websocketmanager-provider</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>ccsdk-features :: ${project.artifactId}</name>
# because they are used in Jenkins, whose plug-in doesn't support
-release_name=1
-sprint_number=7
+release_name=2
+sprint_number=2
feature_revision=0
base_version=${release_name}.${sprint_number}.${feature_revision}
Code Review / ccsdk / features.git / commitdiff
