Check vm-capabilites on vnf-level OS requests

New per-vm capabilities checking is introduced for vnf-level OpenStack actions
Additional changes per initial review.
Additional changes in TestVnfc.java per second review.

Change-Id: Idd1d834df076c1e525f596b788b69ed63ba9e66b
Issue-ID: APPC-1380
Signed-off-by: Lori Keighron <lk2924@att.com>

1 files changed, 34 insertions, 2 deletions

diff --git a/appc-sequence-generator/appc-sequence-generator-model/src/main/yang/sequence-generator.yang b/appc-sequence-generator/appc-sequence-generator-model/src/main/yang/sequence-generator.yang
index f9bd92150..259d2c98f 100644
--- a/appc-sequence-generator/appc-sequence-generator-model/src/main/yang/sequence-generator.yang
+++ b/appc-sequence-generator/appc-sequence-generator-model/src/main/yang/sequence-generator.yang
@@ -105,6 +105,9 @@ module sequence-generator {
                         leaf vnfc-name {
                             type string;
                         }
+                        leaf vnfc-function-code {
+                            type string;
+                        }
                     }
                 }
             }
@@ -155,8 +158,37 @@ module sequence-generator {
             leaf-list vf-module {
                 type string;
             }
-            leaf-list vm {
-                type string;
+            container vm {
+                leaf-list AttachVolume {
+                    type string;
+                }
+                leaf-list DetachVolume {
+                    type string;
+                }
+                leaf-list Evacuate {
+                    type string;
+                }
+                leaf-list Migrate {
+                    type string;
+                }
+                leaf-list Reboot {
+                    type string;
+                }
+                leaf-list Rebuild {
+                    type string;
+                }
+                leaf-list Restart {
+                    type string;
+                }
+                leaf-list Snapshot {
+                    type string;
+                }
+                leaf-list Start {
+                    type string;
+                }
+                leaf-list Stop {
+                    type string;
+                }
             }
             leaf-list vnfc {
                 type string;