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=ac89e02381c16deead79c9b754cc20baf7dfd91d;hpb=dd6ec30e6a0141de5a4489b1c7c058419927d689;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 ac89e023..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
@@ -399,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 {
@@ -794,6 +805,21 @@ module GENERIC-RESOURCE-API {
             }
          }
          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 {
@@ -2503,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 {
@@ -2609,6 +2652,9 @@ module GENERIC-RESOURCE-API {
                description "Resource assignment resolution Capability name";
                type string;
             }
+            leaf payload {
+               type string;
+            }
          }
       }
    }
@@ -2738,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 {