2 files changed, 20 insertions, 20 deletions
diff --git a/tosca/vCPE/infra/MainServiceTemplate.yaml b/tosca/vCPE/infra/MainServiceTemplate.yaml
index 728cb21a..f2c63618 100644
--- a/tosca/vCPE/infra/MainServiceTemplate.yaml
+++ b/tosca/vCPE/infra/MainServiceTemplate.yaml
@@ -52,9 +52,9 @@ topology_template:
       description: dcae collector ip
       default: 10.0.4.102
     dcae_collector_port:
-      type: integer
+      type: string
       description: dcae collector port
-      default: 8080
+      default: "8080"
     nexus_artifact_repo:
       type: string
       description: Root URL for the Nexus repository for Maven artifacts
@@ -299,7 +299,7 @@ topology_template:
           max_number_of_instances: 1
           watchdog: none
         inject_files: #TODO SDC Bug
-          source_path: ../Artifacts/Deployment/Other/authorized_keys #SSH authorized_keys
+          source_path: ../Artifacts/Deployment/OTHER/authorized_keys #SSH authorized_keys
           dest_path: /home/ubuntu/.ssh/authorized_keys
         meta_data:
           vnf_id: { get_input: vnf_id }
@@ -359,7 +359,7 @@ topology_template:
       artifacts:
         sw_image: #TODO need to put glance image name here
           #file: { get_input: vcpe_image_name }
-          file: ../Artifacts/Deployment/Other/image
+          file: ../Artifacts/Deployment/OTHER/image
           type: tosca.artifacts.nfv.SwImage
 
     # vdns related
@@ -427,7 +427,7 @@ topology_template:
           max_number_of_instances: 1
           watchdog: none
         inject_files: # TODO SDC Bug
-          source_path: ../Artifacts/Deployment/Other/authorized_keys #SSH authorized_keys
+          source_path: ../Artifacts/Deployment/OTHER/authorized_keys #SSH authorized_keys
           dest_path: /home/ubuntu/.ssh/authorized_keys
         meta_data:
           vnf_id: { get_input: vnf_id }
@@ -483,7 +483,7 @@ topology_template:
       artifacts:
         sw_image: #TODO need to put glance image name here
           #file: { get_input: vcpe_image_name }
-          file: ../Artifacts/Deployment/Other/image
+          file: ../Artifacts/Deployment/OTHER/image
           type: tosca.artifacts.nfv.SwImage
 
     # vdhcp related
@@ -551,7 +551,7 @@ topology_template:
           max_number_of_instances: 1
           watchdog: none
         inject_files: #SDC Bug
-          source_path: ../Artifacts/Deployment/Other/authorized_keys #SSH authorized_keys
+          source_path: ../Artifacts/Deployment/OTHER/authorized_keys #SSH authorized_keys
           dest_path: /home/ubuntu/.ssh/authorized_keys
         meta_data:
           vnf_id: { get_input: vnf_id }
@@ -611,7 +611,7 @@ topology_template:
       artifacts:
         sw_image: #TODO need to put glance image name here
           #file: { get_input: vcpe_image_name }
-          file: ../Artifacts/Deployment/Other/image
+          file: ../Artifacts/Deployment/OTHER/image
           type: tosca.artifacts.nfv.SwImage
 
     # vweb related
@@ -679,7 +679,7 @@ topology_template:
           max_number_of_instances: 1
           watchdog: none
         inject_files: # TODO SDC bug
-          source_path: ../Artifacts/Deployment/Other/authorized_keys #SSH authorized_keys
+          source_path: ../Artifacts/Deployment/OTHER/authorized_keys #SSH authorized_keys
           dest_path: /home/ubuntu/.ssh/authorized_keys
         meta_data:
           vnf_id: { get_input: vnf_id }
@@ -735,6 +735,6 @@ topology_template:
       artifacts:
         sw_image: #TODO need to put glance image name here
           #file: { get_input: vcpe_image_name }
-          file: ../Artifacts/Deployment/Other/image
+          file: ../Artifacts/Deployment/OTHER/image
           type: tosca.artifacts.nfv.SwImage
 
diff --git a/tosca/vCPE/infra/MainServiceTemplate_sriov.yaml b/tosca/vCPE/infra/MainServiceTemplate_sriov.yaml
index b362d4c2..31c18f5c 100644
--- a/tosca/vCPE/infra/MainServiceTemplate_sriov.yaml
+++ b/tosca/vCPE/infra/MainServiceTemplate_sriov.yaml
@@ -51,9 +51,9 @@ topology_template:
       description: dcae collector ip
       default: 10.0.4.102
     dcae_collector_port:
-      type: integer
+      type: string
       description: dcae collector port
-      default: 8080
+      default: "8080"
     nexus_artifact_repo:
       type: string
       description: Root URL for the Nexus repository for Maven artifacts
@@ -298,7 +298,7 @@ topology_template:
           max_number_of_instances: 1
           watchdog: none
         inject_files: #TODO SDC Bug
-          source_path: ../Artifacts/Deployment/Other/authorized_keys #SSH authorized_keys
+          source_path: ../Artifacts/Deployment/OTHER/authorized_keys #SSH authorized_keys
           dest_path: /home/ubuntu/.ssh/authorized_keys
         meta_data:
           vnf_id: { get_input: vnf_id }
@@ -358,7 +358,7 @@ topology_template:
       artifacts:
         sw_image: #TODO need to put glance image name here
           #file: { get_input: vcpe_image_name }
-          file: ../Artifacts/Deployment/Other/image
+          file: ../Artifacts/Deployment/OTHER/image
           type: tosca.artifacts.nfv.SwImage
 
     # vdns related
@@ -426,7 +426,7 @@ topology_template:
           max_number_of_instances: 1
           watchdog: none
         inject_files: # TODO SDC Bug
-          source_path: ../Artifacts/Deployment/Other/authorized_keys #SSH authorized_keys
+          source_path: ../Artifacts/Deployment/OTHER/authorized_keys #SSH authorized_keys
           dest_path: /home/ubuntu/.ssh/authorized_keys
         meta_data:
           vnf_id: { get_input: vnf_id }
@@ -482,7 +482,7 @@ topology_template:
       artifacts:
         sw_image: #TODO need to put glance image name here
           #file: { get_input: vcpe_image_name }
-          file: ../Artifacts/Deployment/Other/image
+          file: ../Artifacts/Deployment/OTHER/image
           type: tosca.artifacts.nfv.SwImage
 
     # vdhcp related
@@ -550,7 +550,7 @@ topology_template:
           max_number_of_instances: 1
           watchdog: none
         inject_files: #SDC Bug
-          source_path: ../Artifacts/Deployment/Other/authorized_keys #SSH authorized_keys
+          source_path: ../Artifacts/Deployment/OTHER/authorized_keys #SSH authorized_keys
           dest_path: /home/ubuntu/.ssh/authorized_keys
         meta_data:
           vnf_id: { get_input: vnf_id }
@@ -610,7 +610,7 @@ topology_template:
       artifacts:
         sw_image: #TODO need to put glance image name here
           #file: { get_input: vcpe_image_name }
-          file: ../Artifacts/Deployment/Other/image
+          file: ../Artifacts/Deployment/OTHER/image
           type: tosca.artifacts.nfv.SwImage
 
     # vweb related
@@ -678,7 +678,7 @@ topology_template:
           max_number_of_instances: 1
           watchdog: none
         inject_files: # TODO SDC bug
-          source_path: ../Artifacts/Deployment/Other/authorized_keys #SSH authorized_keys
+          source_path: ../Artifacts/Deployment/OTHER/authorized_keys #SSH authorized_keys
           dest_path: /home/ubuntu/.ssh/authorized_keys
         meta_data:
           vnf_id: { get_input: vnf_id }
@@ -734,6 +734,6 @@ topology_template:
       artifacts:
         sw_image: #TODO need to put glance image name here
           #file: { get_input: vcpe_image_name }
-          file: ../Artifacts/Deployment/Other/image
+          file: ../Artifacts/Deployment/OTHER/image
           type: tosca.artifacts.nfv.SwImage