Merge "Add the request-action types"

diff --combined generic-resource-api/model/src/main/yang/GENERIC-RESOURCE-API.yang
index 5e5fc15,a9c5cd6..d94dd8a
--- 1/generic-resource-api/model/src/main/yang/GENERIC-RESOURCE-API.yang
--- 2/generic-resource-api/model/src/main/yang/GENERIC-RESOURCE-API.yang
+++ b/generic-resource-api/model/src/main/yang/GENERIC-RESOURCE-API.yang
@@@ -1977,7 -1977,7 +1977,7 @@@ module GENERIC-RESOURCE-API 
     }\r
  \r
     grouping connection-attachment-topology {\r
 -      container brg-topology {\r
 +      container connection-attachment-topology {\r
           uses allotted-resource-identifiers;\r
           uses onap-model-information;\r
           uses connection-attachment-assignments;\r
@@@ -2268,6 -2268,22 +2268,22 @@@
                 enum "CreateForwardingPathInstance";\r
                 enum "DeleteForwardingPathInstance";\r
                 enum "UpdateForwardingPathInstance";\r
+                enum "CreateSDWANConnectivityInstance";\r
+                enum "ActivateSDWANConnectivityInstance";\r
+                enum "DeactivateSDWANConnectivityInstance";\r
+                enum "DeleteSDWANConnectivityInstance";\r
+                enum "CreateSDWANDeviceInstance";\r
+                enum "ActivateSDWANDeviceInstance";\r
+                enum "DeactivateSDWANDeviceInstance";\r
+                enum "DeleteSDWANDeviceInstance";\r
+                enum "CreateSDWANPortInstance";\r
+                enum "ActivateSDWANPortInstance";\r
+                enum "DeactivateSDWANPortInstance";\r
+                enum "DeleteSDWANPortInstance";\r
+                enum "CreateSDWANAttachmentInstance";\r
+                enum "ActivateSDWANAttachmentInstance";\r
+                enum "DeactivateSDWANAttachmentInstance";\r
+                enum "DeleteSDWANAttachmentInstance";\r
              }\r
           }\r
           leaf source {\r
@@@ -2472,6 -2488,22 +2488,22 @@@
              enum "CreateForwardingPathInstance";\r
              enum "DeleteForwardingPathInstance";\r
              enum "UpdateForwardingPathInstance";\r
+             enum "CreateSDWANConnectivityInstance";\r
+             enum "ActivateSDWANConnectivityInstance";\r
+             enum "DeactivateSDWANConnectivityInstance";\r
+             enum "DeleteSDWANConnectivityInstance";\r
+             enum "CreateSDWANDeviceInstance";\r
+             enum "ActivateSDWANDeviceInstance";\r
+             enum "DeactivateSDWANDeviceInstance";\r
+             enum "DeleteSDWANDeviceInstance";\r
+             enum "CreateSDWANPortInstance";\r
+             enum "ActivateSDWANPortInstance";\r
+             enum "DeactivateSDWANPortInstance";\r
+             enum "DeleteSDWANPortInstance";\r
+             enum "CreateSDWANAttachmentInstance";\r
+             enum "ActivateSDWANAttachmentInstance";\r
+             enum "DeactivateSDWANAttachmentInstance";\r
+             enum "DeleteSDWANAttachmentInstance";\r
           }\r
        }\r
        leaf last-svc-request-id {\r