update sdc logic for new types

update sdc conformance level and add logic to package onap normatives.

Change-Id: I321eeb0cccf662346eb36cb42420fd8fca72ae32
Issue-ID: SDC-1380
Signed-off-by: Michael Lando <ml636r@att.com>

2 files changed, 94 insertions, 27 deletions

diff --git a/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/recipes/04-importComformance.rb b/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/recipes/04-importComformance.rb
index 3b293e88b9..6841175902 100644
--- a/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/recipes/04-importComformance.rb
+++ b/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/recipes/04-importComformance.rb
@@ -14,7 +14,7 @@ bash "import-Comformance" do
 
     cd /tmp/sdctool/scripts
     /bin/chmod +x sdcSchemaFileImport.sh
-    echo "execute /tmp/sdctool/scripts/sdcSchemaFileImport.sh ${tosca_dir} #{cl_release} ${cl_version} ${conf_dir} "
+    echo "execute /tmp/sdctool/scripts/sdcSchemaFileImport.sh ${tosca_dir} #{cl_release} ${cl_version} ${conf_dir} onap"
     ./sdcSchemaFileImport.sh ${tosca_dir} #{cl_release} ${cl_version} ${conf_dir}
   EOH
 end
\ No newline at end of file
diff --git a/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/templates/default/configuration.yaml.erb b/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/templates/default/configuration.yaml.erb
index 75a5d756c3..d6e4c11b11 100644
--- a/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/templates/default/configuration.yaml.erb
+++ b/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/templates/default/configuration.yaml.erb
@@ -16,13 +16,17 @@ beHttpPort: <%= @catalog_port %>
 beContext: /sdc/rest/config/get
 
 # catalog backend protocol
+<% if node[:disableHttp] -%>
+beProtocol: https
+<% else %>
 beProtocol: http
+<% end -%>
 
 # catalog backend ssl port
 beSslPort: <%= @ssl_port %>
 version: 1.0
 released: 2012-11-30
-toscaConformanceLevel: 5.0
+toscaConformanceLevel: 10.0
 minToscaConformanceLevel: 3.0
 
 titanCfgFile: <%= @titan_Path %>/titan.properties
@@ -130,6 +134,7 @@ artifactTypes:
    - SNMP_POLL
    - SNMP_TRAP
    - GUIDE
+   - PLAN
 
 licenseTypes:
    - User
@@ -146,23 +151,9 @@ resourceTypes: &allResourceTypes
   - Abstract
   - CVFC
 
-# validForResourceTypes usage
-#     validForResourceTypes:
-#        - VF
-#        - VL
+
 deploymentResourceArtifacts:
-#  heat:
-#      displayName: "Base HEAT Template"
-#      type: HEAT
-#      validForResourceTypes: *allResourceTypes
-#  heatVol:
-#      displayName: "Volume HEAT Template"
-#      type: HEAT_VOL
-#      validForResourceTypes: *allResourceTypes
-#  heatNet:
-#      displayName: "Network HEAT Template"
-#      type: HEAT_NET
-#      validForResourceTypes: *allResourceTypes
+
 
 deploymentResourceInstanceArtifacts:
   heatEnv:
@@ -193,7 +184,7 @@ toscaArtifacts:
 excludeResourceCategory:
   - Generic
 excludeResourceType:
-  - PNF  
+  - PNF
 informationalResourceArtifacts:
   features:
       displayName: Features
@@ -283,7 +274,7 @@ serviceApiArtifacts:
 additionalInformationMaxNumberOfKeys: 50
 
 systemMonitoring:
-    enabled: true
+    enabled: false
     isProxy: false
     probeIntervalInSeconds: 15
 
@@ -302,9 +293,6 @@ serviceDeploymentArtifacts:
     MODEL_QUERY_SPEC:
         acceptedTypes:
             - xml
-    UCPE_LAYER_2_CONFIGURATION:
-        acceptedTypes:
-            - xml
 
 #AAI Artifacts
     AAI_SERVICE_MODEL:
@@ -316,9 +304,17 @@ serviceDeploymentArtifacts:
     AAI_VF_INSTANCE_MODEL:
         acceptedTypes:
             - xml
+    UCPE_LAYER_2_CONFIGURATION:
+        acceptedTypes:
+            - xml
     OTHER:
         acceptedTypes:
 
+#PLAN
+    PLAN:
+        acceptedTypes:
+            - xml
+
 resourceDeploymentArtifacts:
     HEAT:
         acceptedTypes:
@@ -436,6 +432,14 @@ resourceDeploymentArtifacts:
         acceptedTypes:
         validForResourceTypes: *allResourceTypes
 
+#PLAN
+    PLAN:
+        acceptedTypes:
+            - xml
+        validForResourceTypes:
+            - VF
+            - VFC
+
 resourceInstanceDeploymentArtifacts:
     HEAT_ENV:
         acceptedTypes:
@@ -473,6 +477,11 @@ resourceInstanceDeploymentArtifacts:
         acceptedTypes:
         validForResourceTypes: *allResourceTypes
 
+#PLAN
+    PLAN:
+        acceptedTypes:
+            - xml
+
 resourceInformationalArtifacts:
     CHEF:
         acceptedTypes:
@@ -503,7 +512,7 @@ resourceInformationalArtifacts:
         validForResourceTypes: *allResourceTypes
     OTHER:
         acceptedTypes:
-        validForResourceTypes: 
+        validForResourceTypes:
             - VFC
             - CVFC
             - CP
@@ -583,9 +592,9 @@ applicationL1Cache:
         pollIntervalInSec: 60
 
 applicationL2Cache:
-    enabled: true
+    enabled: false
     catalogL1Cache:
-        enabled: true
+        enabled: false
         resourcesSizeInCache: 300
         servicesSizeInCache: 200
         productsSizeInCache: 100
@@ -637,4 +646,62 @@ environmentContext:
        - Important_Non-Revenue
        - Needed_Non-Revenue
        - Useful_Non-Revenue
-       - General_Non-Revenue
\ No newline at end of file
+       - General_Non-Revenue
+
+dmaapConsumerConfiguration:
+    hosts: localhost:3905
+    consumerGroup: sdc
+    consumerId: mama
+    timeoutMs: 15000
+    limit: 1
+    pollingInterval: 2
+    topic: topic
+    latitude: 32.109333
+    longitude: 34.855499
+    version: 1.0
+    serviceName: localhost/events
+    environment: TEST
+    partner: BOT_R
+    routeOffer: MR1
+    protocol: https
+    contenttype: application/json
+    dme2TraceOn: true
+    aftEnvironment: AFTUAT
+    aftDme2ConnectionTimeoutMs: 15000
+    aftDme2RoundtripTimeoutMs: 240000
+    aftDme2ReadTimeoutMs: 50000
+    dme2preferredRouterFilePath: DME2preferredRouter.txt
+    timeLimitForNotificationHandleMs: 120000
+    credential:
+        username: user
+        password:
+
+dmeConfiguration:
+    dme2Search: DME2SEARCH
+    dme2Resolve: DME2RESOLVE
+
+excludedPolicyTypesMapping:
+   # VF:
+    #  - a.b.c
+    #  - c.d.e
+    #CR:
+    #  - x.y.z
+
+excludedGroupTypesMapping:
+    CR:
+       - org.openecomp.groups.VfModule
+       - org.openecomp.groups.heat.HeatStack
+       - tosca.groups.Root
+    VF:
+       - org.openecomp.groups.VfModule
+       - org.openecomp.groups.heat.HeatStack
+       - tosca.groups.Root
+    Service:
+       - org.openecomp.groups.VfModule
+       - org.openecomp.groups.heat.HeatStack
+       - tosca.groups.Root
+
+healthStatusExclude:
+   - DE
+   - DMAPP
+   - DCAE