Merge "add data-provider v2 for openroadm"

4 files changed, 8 insertions, 33 deletions

diff --git a/sdnr/wt/data-provider/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/model/DataProvider.java b/sdnr/wt/data-provider/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/model/DataProvider.java
index f4578d5dc..639fe301b 100644
--- a/sdnr/wt/data-provider/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/model/DataProvider.java
+++ b/sdnr/wt/data-provider/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/model/DataProvider.java
@@ -102,10 +102,13 @@ public interface DataProvider extends ArchiveCleanProvider {
     /**
      * @param list
      */
-    void doWritePerformanceData(List<PmdataEntity> list);
+    void  doWritePerformanceData(List<PmdataEntity> list);
+
+    void doWritePerformanceData2(List<org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.v2.rev200702.PmdataEntity> list);
+
 
     /**
-     * @return
+     * @return raw database client
      */
     HtDatabaseClient getRawClient();
 
diff --git a/sdnr/wt/data-provider/model/src/main/java/org/opendaylight/yang/gen/v1/http/org/openroadm/pm/types/rev200327/PmDataTypeBuilder.java b/sdnr/wt/data-provider/model/src/main/java/org/opendaylight/yang/gen/v1/http/org/openroadm/pm/types/rev191129/PmDataTypeBuilder.java
index f470fb6ba..98e93c363 100644
--- a/sdnr/wt/data-provider/model/src/main/java/org/opendaylight/yang/gen/v1/http/org/openroadm/pm/types/rev200327/PmDataTypeBuilder.java
+++ b/sdnr/wt/data-provider/model/src/main/java/org/opendaylight/yang/gen/v1/http/org/openroadm/pm/types/rev191129/PmDataTypeBuilder.java
@@ -1,4 +1,4 @@
-package org.opendaylight.yang.gen.v1.http.org.openroadm.pm.types.rev200327;
+package org.opendaylight.yang.gen.v1.http.org.openroadm.pm.types.rev191129;
 import java.lang.String;
 import java.lang.UnsupportedOperationException;
 
diff --git a/sdnr/wt/data-provider/model/src/main/yang/data-provider-v2@2020-07-02.yang b/sdnr/wt/data-provider/model/src/main/yang/data-provider-v2@2020-07-02.yang
index 358e30c8b..47cc009f1 100644
--- a/sdnr/wt/data-provider/model/src/main/yang/data-provider-v2@2020-07-02.yang
+++ b/sdnr/wt/data-provider/model/src/main/yang/data-provider-v2@2020-07-02.yang
@@ -6,6 +6,7 @@ module data-provider-v2 {
 
   import org-openroadm-pm-types {
     prefix org-openroadm-pm-types;
+    revision-date 2019-11-29;
     reference
       "OpenROADM: YANG definitions of performance management types";
   }
diff --git a/sdnr/wt/data-provider/model/src/main/yang/org-openroadm-pm-types@2020-03-27.yang b/sdnr/wt/data-provider/model/src/main/yang/org-openroadm-pm-types@2019-11-29.yang
index 1fbd72e0f..78dd8934e 100644
--- a/sdnr/wt/data-provider/model/src/main/yang/org-openroadm-pm-types@2020-03-27.yang
+++ b/sdnr/wt/data-provider/model/src/main/yang/org-openroadm-pm-types@2019-11-29.yang
@@ -35,10 +35,6 @@ module org-openroadm-pm-types {
       ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
       POSSIBILITY OF SUCH DAMAGE";
 
-  revision 2020-03-27 {
-    description
-      "Version 7.0.0";
-  }
   revision 2019-11-29 {
     description
       "Version 6.1.0";
@@ -643,31 +639,6 @@ module org-openroadm-pm-types {
         description
           "unavailable Seconds Count on TCM6 down direction.";
       }
-      enum fecCorrectedCodewords {
-        value 120;
-        description
-          "FEC Corrected Codewords Counter";
-      }
-      enum fecUncorrectedCodewords {
-        value 121;
-        description
-          "FEC Uncorrected Codewords Counter";
-      }
-      enum fecSymbolErrors {
-        value 122;
-        description
-          "FEC Symbol Error Counter";
-      }
-      enum localFaultSeconds {
-        value 123;
-        description
-          "Local Fault Seconds";
-      }
-      enum remoteFaultSeconds {
-        value 124;
-        description
-          "Remote Fault Seconds";
-      }
     }
   }
 
@@ -706,4 +677,4 @@ module org-openroadm-pm-types {
          name not found in pm-names-enum";
     }
   }
-}
\ No newline at end of file
+}