X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=sdnc-a1-controller%2Fnorthbound%2Fnonrt-ric-api%2Fmodel%2Fsrc%2Fmain%2Fyang%2FNONRT-RIC-API.yang;h=40005d21cd607f5cf8e6a19505d9318026b4769f;hb=f3461cb776023b950d62edd25eca148b6d354c9c;hp=986e201763badcfd03f361624098370b494be235;hpb=3185681c9af47e8ff5b235d8d6c51f8f06fd5bce;p=nonrtric.git

diff --git a/sdnc-a1-controller/northbound/nonrt-ric-api/model/src/main/yang/NONRT-RIC-API.yang b/sdnc-a1-controller/northbound/nonrt-ric-api/model/src/main/yang/NONRT-RIC-API.yang
index 986e2017..40005d21 100644
--- a/sdnc-a1-controller/northbound/nonrt-ric-api/model/src/main/yang/NONRT-RIC-API.yang
+++ b/sdnc-a1-controller/northbound/nonrt-ric-api/model/src/main/yang/NONRT-RIC-API.yang
@@ -27,84 +27,38 @@ module A1-ADAPTER-API {
 
     import ietf-yang-types { prefix yang; }
 
-    revision "2019-10-02" {
+    revision "2020-01-22" {
         description
         "A1 adapter";
     }
 
-    //Flattend interface using RPC
-
-    //Get an array of near-rt-ric IDs,
-    //Each item in the returned array will be regarded as one near-rt-ric-id.
-    rpc getNearRT-RICs {
-        output {
-            leaf-list near-rt-ric-id-list {
-                type string;
-            }
-            leaf code {
-                type string;
-            }
-        }
-    }
-
-    //Get health status for a Near-RT-RIC. true - health ok, false - health is not ok.
-    rpc getHealthCheck {
-         input {
-            leaf near-rt-ric-id {
-                type string;
-            }
-        }
-
-        output {
-            leaf health-status {
-                type boolean;
-            }
-            leaf code {
-                type string;
-            }
-        }
-    }
-
     //Get an array of integer policy type ids
     //Each item in the returned array will be regarded as one policy-type-id.
-    rpc getPolicyTypes {
+    rpc getPolicyTypeIdentities {
         input {
-            leaf near-rt-ric-id {
+            leaf near-rt-ric-url {
                 type string;
             }
         }
 
         output {
             leaf-list policy-type-id-list {
-                type uint32;
-            }
-            leaf code {
                 type string;
             }
         }
     }
 
-    //Create a policy type
-    rpc createPolicyType {
+    //Get an array of integer policy ids
+    //Each item in the returned array will be regarded as one policy-id.
+    rpc getPolicyIdentities {
         input {
-            leaf near-rt-ric-id {
-                type string;
-            }
-            leaf policy-type-id {
-                type uint32;
-            }
-            leaf description {
-                type string;
-            }
-            leaf name {
-                type string;
-            }
-            leaf policy-type {
+            leaf near-rt-ric-url {
                 type string;
             }
         }
-       output {
-            leaf code {
+
+        output {
+            leaf-list policy-id-list {
                 type string;
             }
         }
@@ -113,152 +67,50 @@ module A1-ADAPTER-API {
     //Get a policy type
     rpc getPolicyType {
         input {
-            leaf near-rt-ric-id {
+            leaf near-rt-ric-url {
                 type string;
             }
             leaf policy-type-id {
-                type uint32;
-            }
-        }
-        output {
-            leaf description {
-                type string;
-            }
-            leaf name {
-                type string;
-            }
-            leaf policy-type {
-                type string;
-            }
-            leaf code {
                 type string;
             }
         }
-    }
-
-    //Delete a policy type
-    rpc deletePolicyType {
-        input {
-            leaf near-rt-ric-id {
-                type string;
-            }
-            leaf policy-type-id {
-                type uint32;
-            }
-        }
         output {
-            leaf code {
-                type string;
-            }
-        }
-    }
-
-    //Get an array of string policy instance ids
-    //Each item in the returned array will be regarded as one policy-instance-id.
-    rpc getPolicyInstances {
-        input {
-            leaf near-rt-ric-id {
-                type string;
-            }
-            leaf policy-type-id {
-                type uint32;
-            }
-        }
-
-        output {
-            leaf-list policy-instance-id-list {
-                type string;
-            }
-            leaf code {
+            leaf policy-type {
                 type string;
             }
         }
     }
 
-    //Create a policy instance
-    rpc createPolicyInstance {
+    //Create a policy
+    rpc putPolicy {
         input {
-            leaf near-rt-ric-id {
+            leaf near-rt-ric-url {
                 type string;
             }
-            leaf policy-type-id {
-                type uint32;
-            }
-            leaf policy-instance-id {
-                type string;
-            }
-            leaf policy-instance {
-                type string;
-            }
-        }
-        output {
-            leaf code {
-                type string;
-            }
-        }
-    }
-
-    ///Get a policy instance
-    rpc getPolicyInstance {
-        input {
-            leaf near-rt-ric-id {
+            leaf policy-id {
                 type string;
             }
             leaf policy-type-id {
-                type uint32;
-            }
-            leaf policy-instance-id {
-                type string;
-            }
-        }
-        output {
-            leaf policy-instance {
                 type string;
             }
-            leaf code {
-                type string;
-            }
-        }
-    }
-
-    //Delete a policy instance
-    rpc deletePolicyInstance {
-        input {
-            leaf near-rt-ric-id {
-                type string;
-            }
-            leaf policy-type-id {
-                type uint32;
-            }
-            leaf policy-instance-id {
+            leaf policy {
                 type string;
             }
         }
         output {
-            leaf code {
+            leaf returned-policy {
                 type string;
             }
         }
     }
 
-    //Get the status for a policy instance
-    rpc getStatus {
+    //Delete a policy
+    rpc deletePolicy {
         input {
-            leaf near-rt-ric-id {
-                type string;
-            }
-            leaf policy-type-id {
-                type uint32;
-            }
-            leaf policy-instance-id {
-                type string;
-            }
-        }
-        output {
-            leaf status {
+            leaf near-rt-ric-url {
                 type string;
             }
-            leaf code {
+            leaf policy-id {
                 type string;
             }
         }