diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/assoc-asa1000v.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/assoc-asa1000v.xml
index 3cccba822c4..b0249db741b 100644
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/assoc-asa1000v.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/assoc-asa1000v.xml
@@ -1,13 +1,31 @@
+
-
-
-
+
+
+
-
-
-
-
-
+
+
+
+
+
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/associate-dhcp-policy.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/associate-dhcp-policy.xml
index 7ca6b8e8b3d..e866f51e366 100644
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/associate-dhcp-policy.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/associate-dhcp-policy.xml
@@ -1,16 +1,34 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/associate-dhcp-server.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/associate-dhcp-server.xml
index 9a1197ae1e4..930e4ec77a2 100644
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/associate-dhcp-server.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/associate-dhcp-server.xml
@@ -1,14 +1,32 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/associate-nat-policy-set.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/associate-nat-policy-set.xml
index a16c8aeb9cb..a92c8f5d7fa 100644
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/associate-nat-policy-set.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/associate-nat-policy-set.xml
@@ -1,19 +1,37 @@
-
+
-
-
-
-
-
+
+
+
+
+
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/associate-route-policy.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/associate-route-policy.xml
index acc5ddba381..8884a1b9686 100644
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/associate-route-policy.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/associate-route-policy.xml
@@ -1,3 +1,21 @@
+
@@ -18,4 +35,4 @@
\ No newline at end of file
+--!>
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-acl-policy-set.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-acl-policy-set.xml
index f2045a1d3ad..b475d2ca564 100755
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-acl-policy-set.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-acl-policy-set.xml
@@ -1,13 +1,31 @@
+
+ descr="%descr%"
+ dn="%aclpolicysetdn%"
+ name="%aclpolicysetname%"
+ status="created"/>
@@ -15,4 +33,4 @@
\ No newline at end of file
+--!>
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-acl-policy.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-acl-policy.xml
index 61970119f0b..e71cd429858 100755
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-acl-policy.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-acl-policy.xml
@@ -1,3 +1,21 @@
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-dnat-rule.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-dnat-rule.xml
index 8b2842abece..bd8dbff6d32 100755
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-dnat-rule.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-dnat-rule.xml
@@ -1,4 +1,21 @@
+
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-edge-device-profile.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-edge-device-profile.xml
index bccf0582cc0..c4bdd026186 100644
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-edge-device-profile.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-edge-device-profile.xml
@@ -1,14 +1,32 @@
+
-
-
+
+
-
+ status="created"
+ vpn=""/>
+
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-edge-device-route-policy.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-edge-device-route-policy.xml
index d111bd112f8..69f4a5f7bfd 100644
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-edge-device-route-policy.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-edge-device-route-policy.xml
@@ -1,3 +1,21 @@
+
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-edge-firewall.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-edge-firewall.xml
index e44dc1e44d6..e5447e39e63 100644
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-edge-firewall.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-edge-firewall.xml
@@ -1,3 +1,21 @@
+
@@ -58,14 +76,14 @@
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-edge-security-profile.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-edge-security-profile.xml
index 5b32cbf05e0..e2f5eaf0686 100644
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-edge-security-profile.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-edge-security-profile.xml
@@ -1,6 +1,24 @@
+
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-ingress-acl-rule-for-pf.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-ingress-acl-rule-for-pf.xml
index f81f0bcdd90..1a1d9cbf3e2 100755
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-ingress-acl-rule-for-pf.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-ingress-acl-rule-for-pf.xml
@@ -1,3 +1,21 @@
+
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-ingress-acl-rule.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-ingress-acl-rule.xml
index 23f05d02b67..be704836497 100755
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-ingress-acl-rule.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-ingress-acl-rule.xml
@@ -1,3 +1,21 @@
+
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-ip-pool.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-ip-pool.xml
index 264b149da31..4cf0451c33d 100755
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-ip-pool.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-ip-pool.xml
@@ -1,4 +1,21 @@
+
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-nat-policy-ref.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-nat-policy-ref.xml
index 07964a20998..450d40c9d6d 100755
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-nat-policy-ref.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-nat-policy-ref.xml
@@ -1,3 +1,21 @@
+
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-nat-policy-set.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-nat-policy-set.xml
index 523f65a50fd..090caf15cb4 100644
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-nat-policy-set.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-nat-policy-set.xml
@@ -1,4 +1,22 @@
-
+
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-nat-policy.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-nat-policy.xml
index b7539fe4301..0b556f42a84 100755
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-nat-policy.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-nat-policy.xml
@@ -1,3 +1,21 @@
+
@@ -12,4 +30,4 @@
-
\ No newline at end of file
+
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-pf-rule.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-pf-rule.xml
index 9a63ac78fa7..a8a631f5d7f 100755
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-pf-rule.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-pf-rule.xml
@@ -1,4 +1,21 @@
+
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-port-pool.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-port-pool.xml
index 9f6a1688b65..e1b7be024f7 100755
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-port-pool.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-port-pool.xml
@@ -1,4 +1,21 @@
+
@@ -52,4 +69,4 @@
portpoolname="ddd"
startport="22"
endport="22"
---!>
\ No newline at end of file
+--!>
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-source-nat-pool.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-source-nat-pool.xml
index da5a7bdee9b..2ad1e8798a5 100644
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-source-nat-pool.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-source-nat-pool.xml
@@ -1,41 +1,58 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-source-nat-rule.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-source-nat-rule.xml
index 0e411a34ecb..a3ee9875e19 100644
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-source-nat-rule.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-source-nat-rule.xml
@@ -1,3 +1,21 @@
+
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-tenant.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-tenant.xml
index 272b2169420..085b7a2e533 100644
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-tenant.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-tenant.xml
@@ -1,11 +1,29 @@
+
-
-
-
-
+ inHierarchical="false">
+
+
+
+
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-vdc.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-vdc.xml
index 1b4d3317d90..4cb805ecf7e 100644
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-vdc.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-vdc.xml
@@ -1,12 +1,30 @@
+
-
-
+
+
-
+ dn="%dn%"
+ name="%name%"
+ status="created"/>
+
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/delete-acl-policy-set.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/delete-acl-policy-set.xml
index 186c99ad64f..2c5578659c7 100755
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/delete-acl-policy-set.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/delete-acl-policy-set.xml
@@ -1,3 +1,21 @@
+
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/delete-acl-policy.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/delete-acl-policy.xml
index 695d6965d57..b1a27650419 100755
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/delete-acl-policy.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/delete-acl-policy.xml
@@ -1,4 +1,21 @@
+
@@ -13,4 +30,4 @@
-
\ No newline at end of file
+
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/delete-edge-firewall.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/delete-edge-firewall.xml
index 62859042c87..992d6a1ab62 100755
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/delete-edge-firewall.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/delete-edge-firewall.xml
@@ -1,3 +1,21 @@
+
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/delete-edge-security-profile.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/delete-edge-security-profile.xml
index 6589df5a8c2..f394fe91d9e 100755
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/delete-edge-security-profile.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/delete-edge-security-profile.xml
@@ -1,3 +1,21 @@
+
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/delete-nat-policy-set.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/delete-nat-policy-set.xml
index a9580a126c6..3f4c08d747f 100755
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/delete-nat-policy-set.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/delete-nat-policy-set.xml
@@ -1,12 +1,30 @@
+
+ dn="%natpolicysetdn%"
+ name="%natpolicysetname%"
+ status="deleted,modified"/>
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/delete-nat-policy.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/delete-nat-policy.xml
index ae3322c5f16..6c3ed7b9f48 100755
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/delete-nat-policy.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/delete-nat-policy.xml
@@ -1,4 +1,21 @@
+
@@ -13,4 +30,4 @@
-
\ No newline at end of file
+
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/delete-rule.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/delete-rule.xml
index 2c8da08beab..e56e9190496 100755
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/delete-rule.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/delete-rule.xml
@@ -1,3 +1,21 @@
+
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/delete-tenant.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/delete-tenant.xml
index e02abd0bb73..05bef9a2906 100755
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/delete-tenant.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/delete-tenant.xml
@@ -1,3 +1,21 @@
+
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/delete-vdc.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/delete-vdc.xml
index 58bc94220f9..fbc2312c208 100755
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/delete-vdc.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/delete-vdc.xml
@@ -1,3 +1,21 @@
+
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/disassoc-asa1000v.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/disassoc-asa1000v.xml
index 4264477ab02..448b65f0d53 100755
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/disassoc-asa1000v.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/disassoc-asa1000v.xml
@@ -1,3 +1,21 @@
+
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-acl-policies.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-acl-policies.xml
index 9d10da54ab8..aec800e9f4a 100755
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-acl-policies.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-acl-policies.xml
@@ -1,14 +1,31 @@
+
-
-
+
+
\ No newline at end of file
+--!>
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-children.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-children.xml
index cc98e648998..f272999a76c 100755
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-children.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-children.xml
@@ -1,3 +1,21 @@
+
-
\ No newline at end of file
+
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-nat-policies.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-nat-policies.xml
index ec1765c4181..720ced06d8a 100755
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-nat-policies.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-nat-policies.xml
@@ -1,14 +1,31 @@
+
-
-
+
+
\ No newline at end of file
+--!>
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-policyrefs-in-policyset.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-policyrefs-in-policyset.xml
new file mode 100755
index 00000000000..c53af90369d
--- /dev/null
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-policyrefs-in-policyset.xml
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-tenants.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-tenants.xml
index 6f912ea3a93..63ae848b3e1 100644
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-tenants.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-tenants.xml
@@ -1,8 +1,26 @@
+
-
-
+ cookie="%cookie%"
+ classId="orgTenant"
+ inDn="org-root"
+ inHierarchical="false">
+
+
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-unassigned-asa1000v.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-unassigned-asa1000v.xml
index 27f701bd63e..539f330da8a 100644
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-unassigned-asa1000v.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-unassigned-asa1000v.xml
@@ -1,15 +1,33 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+