X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=generic-resource-api%2Fmodel%2Fsrc%2Fmain%2Fyang%2FGENERIC-RESOURCE-API.yang;h=660b2f83e3bc29ca2b4fb588864d1d2d31df18b8;hb=3aedba79059dc208e9e84f4fe9ce844aa70c3b2b;hp=e45447e3aa93a48f76d4b801c41bdfe7b4f02c7a;hpb=d20371cb9c1a5f72f6bdf18e9a63709e07197443;p=sdnc%2Fnorthbound.git

diff --git a/generic-resource-api/model/src/main/yang/GENERIC-RESOURCE-API.yang b/generic-resource-api/model/src/main/yang/GENERIC-RESOURCE-API.yang
index e45447e3..660b2f83 100644
--- a/generic-resource-api/model/src/main/yang/GENERIC-RESOURCE-API.yang
+++ b/generic-resource-api/model/src/main/yang/GENERIC-RESOURCE-API.yang
@@ -51,6 +51,20 @@ module GENERIC-RESOURCE-API {
                }
             }
          }
+         container pnfs {
+            list pnf {
+               key "pnf-id";
+               leaf pnf-id {
+                  type string;
+                  mandatory true;
+               }
+               container pnf-data {
+                  uses pnf-operation-information;
+                  uses pnf-topology;
+                  uses pnf-level-oper-status;
+               }
+            }
+         }
          container vnfs {
             list vnf {
                key "vnf-id";
@@ -385,6 +399,17 @@ module GENERIC-RESOURCE-API {
                type string;
             }
          }
+         container aggregate-route-policy {
+            leaf aggregate-route-policy-name {
+               type string;
+            }
+            leaf ipv4-aggregate-route-level {
+               type string;
+            }
+            leaf ipv6-aggregate-route-level {
+               type string;
+            }
+         }
          uses aggregate-routes;
          uses subnets;
          leaf subnet-key-value {
@@ -429,6 +454,79 @@ module GENERIC-RESOURCE-API {
          uses oper-status-data;
       }
    }
+   grouping pnf-operation-information {
+      uses sdnc-request-header;
+      uses request-information;
+      uses service-information;
+      uses pnf-details;
+      uses pnf-request-input;
+   }
+   grouping pnf-details {
+      container pnf-details {
+         leaf pnf-id {
+            description "pnfId*Identifier of this Pnf information element. CORRELATIONID = PNF-NAME (A&AI)";
+            type string;
+            mandatory true;
+         }
+         leaf pnf-type {
+            description "pnfType (template)*Type of Resource. NEW type: PNF (pre-defined in SDC)";
+            type string;
+         }
+         leaf pnf-name {
+            type string;
+         }
+         uses onap-model-information;
+      }
+   }
+   grouping pnf-request-input {
+      container pnf-request-input {
+         leaf request-version {
+            description "keep this? e.g. 1702";
+            type string;
+         }
+         leaf pnf-name {
+            type string;
+         }
+         uses region-identifier;
+         container pnf-input-parameters {
+            uses param;
+         }
+      }
+   }
+   grouping pnf-topology {
+      container pnf-topology {
+         uses pnf-topology-identifier-structure;
+         uses region-identifier;
+         uses onap-model-information;
+         container pnf-parameters-data {
+            uses param;
+         }
+         leaf sdnc-generated-cloud-resources {
+            description "Indicate if source is sdnc generated cloud param.When true, the parameters are literal HEAT template parameter names;When false, the parameters need to be converted to HEAT format";
+            type boolean;
+         }
+      }
+   }
+   grouping pnf-topology-identifier-structure {
+      container pnf-topology-identifier-structure {
+         leaf pnf-id {
+            type string;
+         }
+         leaf pnf-type {
+            description "In preload tree, this label is used for the vf-module-type";
+            type string;
+         }
+         leaf pnf-name {
+            description "optionally comes from pnf-request-input container or is assigned by sdn-c";
+            type string;
+         }
+      }
+   }
+   grouping pnf-level-oper-status {
+      container pnf-level-oper-status {
+         uses oper-status-data;
+      }
+   }
    grouping vnf-operation-information {
       uses sdnc-request-header;
       uses request-information;
@@ -2368,6 +2466,9 @@ module GENERIC-RESOURCE-API {
                enum "CreateVnfInstance";
                enum "ActivateVnfInstance";
                enum "DeleteVnfInstance";
+               enum "CreatePnfInstance";
+               enum "ActivatePnfInstance";
+               enum "DeletePnfInstance";
                enum "CreateVfModuleInstance";
                enum "ActivateVfModuleInstance";
                enum "DeleteVfModuleInstance";
@@ -2428,6 +2529,23 @@ module GENERIC-RESOURCE-API {
                enum "DeactivateSDWANSiteInstance";
                enum "DeleteSDWANSiteInstance";
                enum "SdwanBandwidthChange";
+               enum "CreateAccessConnectivityInstance";
+               enum "DeleteAccessConnectivityInstance";
+               enum "CreateInternetProfileInstance";
+               enum "ChangeInternetProfileInstance";
+               enum "DeleteInternetProfileInstance";
+               enum "CreateSOTNUnderlayInstance";
+               enum "ActivateSOTNUnderlayInstance";
+               enum "DeactivateSOTNUnderlayInstance";
+               enum "DeleteSOTNUnderlayInstance";
+               enum "CreateSOTNUniInstance";
+               enum "ActivateSOTNUniInstance";
+               enum "DeactivateSOTNUniInstance";
+               enum "DeleteSOTNUniInstance";
+               enum "CreateSOTNL2VpnInstance";
+               enum "ActivateSOTNL2VpnInstance";
+               enum "DeactivateSOTNL2VpnInstance";
+               enum "DeleteSOTNL2VpnInstance";
             }
          }
          leaf source {
@@ -2534,6 +2652,9 @@ module GENERIC-RESOURCE-API {
                description "Resource assignment resolution Capability name";
                type string;
             }
+            leaf payload {
+               type string;
+            }
          }
       }
    }
@@ -2595,12 +2716,15 @@ module GENERIC-RESOURCE-API {
             enum "CreateNetworkInstance";
             enum "ActivateNetworkInstance";
             enum "DeActivateNetworkInstance";
+            enum "DeleteNetworkInstance";
             enum "CreateServiceInstance";
             enum "DeleteServiceInstance";
-            enum "DeleteNetworkInstance";
             enum "CreateVnfInstance";
             enum "ActivateVnfInstance";
             enum "DeleteVnfInstance";
+            enum "CreatePnfInstance";
+            enum "ActivatePnfInstance";
+            enum "DeletePnfInstance";
             enum "CreateVfModuleInstance";
             enum "ActivateVfModuleInstance";
             enum "DeleteVfModuleInstance";
@@ -2660,6 +2784,23 @@ module GENERIC-RESOURCE-API {
             enum "DeactivateSDWANSiteInstance";
             enum "DeleteSDWANSiteInstance";
             enum "SdwanBandwidthChange";
+            enum "CreateAccessConnectivityInstance";
+            enum "DeleteAccessConnectivityInstance";
+            enum "CreateInternetProfileInstance";
+            enum "ChangeInternetProfileInstance";
+            enum "DeleteInternetProfileInstance";
+            enum "CreateSOTNUnderlayInstance";
+            enum "ActivateSOTNUnderlayInstance";
+            enum "DeactivateSOTNUnderlayInstance";
+            enum "DeleteSOTNUnderlayInstance";
+            enum "CreateSOTNUniInstance";
+            enum "ActivateSOTNUniInstance";
+            enum "DeactivateSOTNUniInstance";
+            enum "DeleteSOTNUniInstance";
+            enum "CreateSOTNL2VpnInstance";
+            enum "ActivateSOTNL2VpnInstance";
+            enum "DeactivateSOTNL2VpnInstance";
+            enum "DeleteSOTNL2VpnInstance";
          }
       }
       leaf last-svc-request-id {
@@ -2705,6 +2846,11 @@ module GENERIC-RESOURCE-API {
          uses instance-reference;
       }
    }
+   grouping pnf-response-information {
+      container pnf-response-information {
+         uses instance-reference;
+      }
+   }
    grouping contrail-route-response-information {
       container contrail-route-response-information {
          uses instance-reference;
@@ -3150,6 +3296,16 @@ module GENERIC-RESOURCE-API {
          uses service-response-information;
       }
    }
+   rpc pnf-topology-operation {
+      input {
+         uses pnf-operation-information;
+      }
+      output {
+         uses topology-response-common;
+         uses pnf-response-information;
+         uses service-response-information;
+      }
+   }
    rpc contrail-route-topology-operation {
       input {
          uses contrail-route-operation-information;