Merge "Change node template prefix"
diff --git a/.gitignore b/.gitignore
index 3055c24..8272b99 100644
--- a/.gitignore
+++ b/.gitignore
@@ -163,3 +163,6 @@
sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/testSuites/*
/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/attributes/default.rb
+
+
+/common/openecomp-common-configuration-management/openecomp-configuration-management-cli/dependency-reduced-pom.xml
\ No newline at end of file
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/overlayTunnel/overlayTunnel.yml b/catalog-be/src/main/resources/import/tosca/heat-types/overlayTunnel/overlayTunnel.yml
index eb6dfae..958806a 100644
--- a/catalog-be/src/main/resources/import/tosca/heat-types/overlayTunnel/overlayTunnel.yml
+++ b/catalog-be/src/main/resources/import/tosca/heat-types/overlayTunnel/overlayTunnel.yml
@@ -6,7 +6,7 @@
# *****************************************************************************
metadata:
- id: : overlayTunnelDefinition
+ id: overlayTunnelDefinition
version: 0.1
vendor: ONAP
template_author: ONAP
@@ -23,8 +23,7 @@
org.openecomp.resource.vl.overlaytunnel:
derived_from: tosca.nodes.Root
- description: >-
- This entity represents abstract overlay tunnel end point.
+ description: This entity represents abstract overlay tunnel end point.
properties:
id:
type: string
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/overlayTunnel/overlayTunnel.zip b/catalog-be/src/main/resources/import/tosca/heat-types/overlayTunnel/overlayTunnel.zip
index 99ddf49..e60fcbc 100644
--- a/catalog-be/src/main/resources/import/tosca/heat-types/overlayTunnel/overlayTunnel.zip
+++ b/catalog-be/src/main/resources/import/tosca/heat-types/overlayTunnel/overlayTunnel.zip
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/underlayVpn/underlayVpn.json b/catalog-be/src/main/resources/import/tosca/heat-types/underlayVpn/underlayVpn.json
index 10e2d4c..6107261 100644
--- a/catalog-be/src/main/resources/import/tosca/heat-types/underlayVpn/underlayVpn.json
+++ b/catalog-be/src/main/resources/import/tosca/heat-types/underlayVpn/underlayVpn.json
@@ -1,15 +1,21 @@
{
- "payloadName": "underlayVpn.yml",
- "contactId": "jh0003",
- "name": "VL UNDERLAYVPN",
- "description": "The node represents a underlay vpn entity",
- "resourceIconPath": "network",
- "resourceType": "VL",
- "categories": [{
- "name": "Generic",
- "subcategories": [{
- "name": "Virtual Links"
- }]
- }],
- "tags": ["VL UNDERLAYVPN"]
+ "payloadName": "underlayVpn.yml",
+ "contactId": "jh0003",
+ "name": "VL UNDERLAYVPN",
+ "description": "The node represents a underlay vpn entity",
+ "resourceIconPath": "network",
+ "resourceType": "VL",
+ "categories": [
+ {
+ "name": "Generic",
+ "subcategories": [
+ {
+ "name": "Virtual Links"
+ }
+ ]
+ }
+ ],
+ "tags": [
+ "VL UNDERLAYVPN"
+ ]
}
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/underlayVpn/underlayVpn.yml b/catalog-be/src/main/resources/import/tosca/heat-types/underlayVpn/underlayVpn.yml
index 639e1e5..1e22852 100644
--- a/catalog-be/src/main/resources/import/tosca/heat-types/underlayVpn/underlayVpn.yml
+++ b/catalog-be/src/main/resources/import/tosca/heat-types/underlayVpn/underlayVpn.yml
@@ -1,9 +1,11 @@
tosca_definitions_version: tosca_simple_yaml_1_0
+description: underlay L3 vpn type definitions
# *****************************************************************************
# underlay vpn type definitions
# *****************************************************************************
metadata:
+ id: underlayVpnDefinition
version: 0.1
vendor: ONAP
template_author: ONAP
@@ -19,7 +21,7 @@
# *****************************************************************************
org.openecomp.resource.vl.underlayvpn:
derived_from: tosca.nodes.Root
- description: undelay vpn type definitions
+ description: undelay vpn type definitions
properties:
id:
type: string
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/underlayVpn/underlayVpn.zip b/catalog-be/src/main/resources/import/tosca/heat-types/underlayVpn/underlayVpn.zip
index 0a4f88b..4a0bce0 100644
--- a/catalog-be/src/main/resources/import/tosca/heat-types/underlayVpn/underlayVpn.zip
+++ b/catalog-be/src/main/resources/import/tosca/heat-types/underlayVpn/underlayVpn.zip
Binary files differ
diff --git a/sdc-os-chef/pom.xml b/sdc-os-chef/pom.xml
index 76046fe..41372d5 100644
--- a/sdc-os-chef/pom.xml
+++ b/sdc-os-chef/pom.xml
@@ -236,6 +236,7 @@
<configuration>
<verbose>true</verbose>
<apiVersion>1.23</apiVersion>
+ <registry>nexus3.onap.org:10003</registry>
<images>
diff --git a/sdc-os-chef/scripts/clean_images_except_base.sh b/sdc-os-chef/scripts/clean_images_except_base.sh
new file mode 100644
index 0000000..77e143a
--- /dev/null
+++ b/sdc-os-chef/scripts/clean_images_except_base.sh
@@ -0,0 +1 @@
+docker rmi -f `docker images | grep -v base | awk '{print $3}'`
diff --git a/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/recipes/03-createDoxKeyspace.rb b/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/recipes/03-createDoxKeyspace.rb
index e54932d..68c1870 100644
--- a/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/recipes/03-createDoxKeyspace.rb
+++ b/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/recipes/03-createDoxKeyspace.rb
@@ -1,32 +1,36 @@
template "/tmp/create_dox_keyspace.sh" do
- source "create_dox_keyspace.sh.erb"
- sensitive true
- mode 0755
- variables({
- :cassandra_ip => "HOSTIP",
- :DC_NAME => node['cassandra'][:cluster_name]+node.chef_environment
- })
+ source "create_dox_keyspace.sh.erb"
+ sensitive true
+ mode 0755
+ variables({
+ :cassandra_ip => "HOSTIP",
+ :DC_NAME => node['cassandra'][:cluster_name]+node.chef_environment
+ })
end
-cookbook_file "/tmp/create_dox_db.cql" do
- sensitive true
- source "create_dox_db.cql"
- mode 0755
-end
-
-cookbook_file "/tmp/alter_dox_db.cql" do
- sensitive true
- source "alter_dox_db.cql"
- mode 0755
+remote_directory '/tmp/tools' do
+ source 'tools'
+ mode '0755'
+ files_mode '0755'
+ action :create
end
+bash "onboard-db-schema-creation" do
+ ignore_failure true
+ code <<-EOH
+ cd /tmp/tools/build/scripts
+ chmod +x onboard-db-schema-creation.sh
+ /tmp/tools/build/scripts/onboard-db-schema-creation.sh
+ EOH
+end
+
bash "create-DOX-schema" do
- ignore_failure true
- code <<-EOH
+ ignore_failure true
+ code <<-EOH
cd /tmp
chmod +x /tmp/create_dox_keyspace.sh
/tmp/create_dox_keyspace.sh
- EOH
+ EOH
end
diff --git a/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/templates/default/create_dox_keyspace.sh.erb b/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/templates/default/create_dox_keyspace.sh.erb
index f65bb94..37b7859 100644
--- a/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/templates/default/create_dox_keyspace.sh.erb
+++ b/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/templates/default/create_dox_keyspace.sh.erb
@@ -23,12 +23,12 @@
echo "run create_dox_db.cql"
-chmod 755 /tmp/create_dox_db.cql
-cqlsh -u $CASSANDRA_USER -p $CASSANDRA_PASS -f /tmp/create_dox_db.cql > /dev/null 2>&1
+chmod 755 /tmp/tools/build/scripts/create_dox_db.cql
+cqlsh -u $CASSANDRA_USER -p $CASSANDRA_PASS -f /tmp/tools/build/scripts/create_dox_db.cql > /dev/null 2>&1
sleep 10
echo "run alter_dox_db.cql"
-chmod 755 /tmp/alter_dox_db.cql
-cqlsh -u $CASSANDRA_USER -p $CASSANDRA_PASS -f /tmp/alter_dox_db.cql > /dev/null 2>&1
+chmod 755 /tmp/tools/build/scripts/alter_dox_db.cql
+cqlsh -u $CASSANDRA_USER -p $CASSANDRA_PASS -f /tmp/tools/build/scripts/alter_dox_db.cql > /dev/null 2>&1