Add SO APIs to Nokia VNFM adapter

Change-Id: I7dfc5677144be3df553edb4141e89e543e1b977d
Signed-off-by: Denes Nemeth <denes.nemeth@nokia.com>
Issue-ID: VFC-950

6 files changed, 108 insertions, 8 deletions

diff --git a/nokiav2/driver/src/test/resources/application-direct.properties b/nokiav2/driver/src/test/resources/application-direct.properties
index b9c1c68c..9134f642 100644
--- a/nokiav2/driver/src/test/resources/application-direct.properties
+++ b/nokiav2/driver/src/test/resources/application-direct.properties
@@ -61,6 +61,8 @@ sdcPassword=SDC
 ###############################################################################
 # End of mandatory properties for driver                                      #
 ###############################################################################
+skipLcnSubscription=true
+skipSelfRegistration=true
 ipMap=10.0.14.1->msb.api.simpledemo.onap.org,172.17.0.15->msb.api.simpledemo.onap.org,10.0.1.1->aai.api.simpledemo.onap.org
 vnfmInfoCacheEvictionInMs=600000
 ## for logging begin ##
diff --git a/nokiav2/driver/src/test/resources/application.properties b/nokiav2/driver/src/test/resources/application.properties
index d2732910..29da7577 100644
--- a/nokiav2/driver/src/test/resources/application.properties
+++ b/nokiav2/driver/src/test/resources/application.properties
@@ -61,6 +61,8 @@ sdcPassword=SDC
 ###############################################################################
 # End of mandatory properties for driver                                      #
 ###############################################################################
+skipLcnSubscription=false
+skipSelfRegistration=false
 spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.security.oauth2.OAuth2AutoConfiguration,org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration
 vnfmInfoCacheEvictionInMs=600000
 ## for logging begin ##
diff --git a/nokiav2/driver/src/test/resources/unittests/packageconverter/cbam.full.modified.vnfd.yaml b/nokiav2/driver/src/test/resources/unittests/packageconverter/cbam.full.modified.vnfd.yaml
index f9fe6a25..53fbdba0 100644
--- a/nokiav2/driver/src/test/resources/unittests/packageconverter/cbam.full.modified.vnfd.yaml
+++ b/nokiav2/driver/src/test/resources/unittests/packageconverter/cbam.full.modified.vnfd.yaml
@@ -11,6 +11,11 @@ topology_template:
               onapCsarId: {default: kuku}
               externalVnfmId: {default: kuku}
               vimId: {default: kuku}
+      deployment_flavour:
+        properties:
+          scaling_aspects:
+            aspect1: {max_scale_level: 2}
+            aspect2: {max_scale_level: 3}
     interfaces:
       Basic:
         instantiate:
@@ -67,3 +72,37 @@ topology_template:
                 include: [javascript/cbam.collectConnectionPoints.js]
                 output: operation_result
             additional_parameters: {jobId: kuku}
+  policies:
+  - b: {type: x}
+  - heat_mapping:
+      type: tosca.policies.nfv.HeatMapping
+      properties:
+        static:
+          virtualLinks: {net1: path, net2: path}
+          vdus:
+            vdu1:
+            - {heatResource: path}
+            vdu2:
+            - {heatResource: path}
+          externalConnectionPoints:
+            ecp1: [path]
+            ecp2: [path]
+        aspects:
+          aspect1:
+            vdus:
+              vdu1:
+              - heatResource: any
+                connectionPoints: {cp1: nic_0, cp2: nic_1}
+                virtualStorages: {disk1: disk_0, disk2: disk_1}
+              vdu2:
+              - {heatResource: any}
+              - {heatResource: any}
+            externalConnectionPoints:
+              ecp1: [path]
+              ecp2: [path]
+          aspect2:
+            vdus:
+              vdu2:
+              - {heatResource: any}
+            externalConnectionPoints:
+              ecp2: [path]
diff --git a/nokiav2/driver/src/test/resources/unittests/packageconverter/cbam.full.original.vnfd.yaml b/nokiav2/driver/src/test/resources/unittests/packageconverter/cbam.full.original.vnfd.yaml
index 42569b04..dbe57d0b 100644
--- a/nokiav2/driver/src/test/resources/unittests/packageconverter/cbam.full.original.vnfd.yaml
+++ b/nokiav2/driver/src/test/resources/unittests/packageconverter/cbam.full.original.vnfd.yaml
@@ -10,6 +10,13 @@ topology_template:
             extensions:
               existingAttribute:
                 default: "value"
+      deployment_flavour:
+        properties:
+          scaling_aspects:
+            aspect1:
+              max_scale_level: 2
+            aspect2:
+              max_scale_level: 3
     interfaces:
       Basic:
         instantiate:
@@ -30,4 +37,50 @@ topology_template:
         scale:
       Healable:
         heal:
+  policies:
+    - b:
+        type: x
+    - heat_mapping:
+        type: tosca.policies.nfv.HeatMapping
+        properties:
+          static:
+            virtualLinks:
+              net1: path
+              net2: path
+            vdus:
+              vdu1:
+               - heatResource: path
+              vdu2:
+               - heatResource: path
+            externalConnectionPoints:
+              ecp1:
+                - path
+              ecp2:
+                - path
+          aspects:
+            aspect1:
+              vdus:
+                vdu1:
+                  - heatResource: any
+                    connectionPoints:
+                      cp1: nic_0
+                      cp2: nic_1
+                    virtualStorages:
+                      disk1: disk_0
+                      disk2: disk_1
+                vdu2:
+                  - heatResource: any
+                  - heatResource: any
+              externalConnectionPoints:
+                ecp1:
+                  - path
+                ecp2:
+                  - path
+            aspect2:
+              vdus:
+                vdu2:
+                  - heatResource: any
+              externalConnectionPoints:
+                ecp2:
+                  - path
 
diff --git a/nokiav2/driver/src/test/resources/unittests/packageconverter/cbam.minimal.modified.vnfd.yaml b/nokiav2/driver/src/test/resources/unittests/packageconverter/cbam.minimal.modified.vnfd.yaml
index 256aa9ee..f16f34a9 100644
--- a/nokiav2/driver/src/test/resources/unittests/packageconverter/cbam.minimal.modified.vnfd.yaml
+++ b/nokiav2/driver/src/test/resources/unittests/packageconverter/cbam.minimal.modified.vnfd.yaml
@@ -2,6 +2,15 @@ tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0_nokia
 topology_template:
   substitution_mappings:
     node_type: tosca.nodes.nfv.VNF
+    capabilities:
+      deployment_flavour: {}
+      vnf:
+        properties:
+          modifiable_attributes:
+            extensions:
+              onapCsarId: {default: kuku}
+              externalVnfmId: {default: kuku}
+              vimId: {default: kuku}
     interfaces:
       Basic:
         instantiate:
@@ -28,11 +37,3 @@ topology_template:
                 include: [javascript/cbam.collectConnectionPoints.js]
                 output: operation_result
             additional_parameters: {jobId: kuku}
-    capabilities:
-      vnf:
-        properties:
-          modifiable_attributes:
-            extensions:
-              onapCsarId: {default: kuku}
-              externalVnfmId: {default: kuku}
-              vimId: {default: kuku}
diff --git a/nokiav2/driver/src/test/resources/unittests/packageconverter/cbam.minimal.original.vnfd.yaml b/nokiav2/driver/src/test/resources/unittests/packageconverter/cbam.minimal.original.vnfd.yaml
index 7709793c..057eddae 100644
--- a/nokiav2/driver/src/test/resources/unittests/packageconverter/cbam.minimal.original.vnfd.yaml
+++ b/nokiav2/driver/src/test/resources/unittests/packageconverter/cbam.minimal.original.vnfd.yaml
@@ -3,6 +3,9 @@ tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0_nokia
 topology_template:
   substitution_mappings:
     node_type: tosca.nodes.nfv.VNF
+    capabilities:
+      deployment_flavour:
+        properties:
     interfaces:
       Basic:
         instantiate: