From: Dan Timoney <dtimoney@att.com>
Date: Tue, 12 Mar 2019 15:02:17 +0000 (+0000)
Subject: Merge "Add dhcp-subnet-assignments container"
X-Git-Tag: 1.5.0~2
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=sdnc%2Fnorthbound.git;a=commitdiff_plain;h=a4f3c51d4b8d9b834cceccb586c8e4fdde8ac3b4;hp=-c

Merge "Add dhcp-subnet-assignments container"
---

a4f3c51d4b8d9b834cceccb586c8e4fdde8ac3b4
diff --combined generic-resource-api/model/src/main/yang/GENERIC-RESOURCE-API.yang
index ac89e023,e45447e3..30da2c32
--- 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,20 -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";
@@@ -443,79 -429,6 +443,79 @@@
           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;
@@@ -794,6 -707,21 +794,21 @@@
              }
           }
           uses vlan-vnfc-instance-groups;
+          container dhcp-subnet-assignments {
+             list dhcp-subnet-assignment {
+                key "neutron-subnet-id";
+                leaf neutron-subnet-id {
+                   description "Same as subnet-id in subnet-data structure";
+                   type string;
+                }
+                leaf network-role {
+                   type string;
+                }
+                leaf ip-version {
+                   type string;
+                }
+             }
+          }
        }
     }
     grouping vm-topology-data {
@@@ -2440,9 -2368,6 +2455,9 @@@
                 enum "CreateVnfInstance";
                 enum "ActivateVnfInstance";
                 enum "DeleteVnfInstance";
 +               enum "CreatePnfInstance";
 +               enum "ActivatePnfInstance";
 +               enum "DeletePnfInstance";
                 enum "CreateVfModuleInstance";
                 enum "ActivateVfModuleInstance";
                 enum "DeleteVfModuleInstance";
@@@ -2670,15 -2595,12 +2685,15 @@@
              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";
@@@ -2783,11 -2705,6 +2798,11 @@@
           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;
@@@ -3233,16 -3150,6 +3248,16 @@@
           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;