summaryrefslogtreecommitdiffstats
path: root/installation
diff options
context:
space:
mode:
Diffstat (limited to 'installation')
-rw-r--r--installation/ansible-server/pom.xml2
-rw-r--r--installation/ansible-server/src/main/docker/Dockerfile2
-rw-r--r--installation/ansible-server/src/main/yml/ansible_huawei_postcheck@0.00.yml21
-rw-r--r--installation/ansible-server/src/main/yml/ansible_huawei_precheck@0.00.yml21
-rw-r--r--installation/ansible-server/src/main/yml/ansible_huawei_upgrade@0.00.yml21
-rwxr-xr-xinstallation/dgbuilder/.gitignore1
-rw-r--r--installation/sdnc/src/main/resources/sdnctl.dump13
-rwxr-xr-xinstallation/src/main/properties/aaiclient.properties4
-rw-r--r--installation/src/main/properties/generic-resource-api-dg.properties2
-rw-r--r--installation/src/main/yaml/docker-compose.yml2
10 files changed, 83 insertions, 6 deletions
diff --git a/installation/ansible-server/pom.xml b/installation/ansible-server/pom.xml
index e5e78019..593c5aee 100644
--- a/installation/ansible-server/pom.xml
+++ b/installation/ansible-server/pom.xml
@@ -88,7 +88,7 @@
</goals><!-- here the phase you need -->
<phase>validate</phase>
<configuration>
- <outputDirectory>${basedir}/target/docker-stage/opt/onap/sdnc/Playbooks</outputDirectory>
+ <outputDirectory>${basedir}/target/docker-stage/opt/onap/ccsdk/Playbooks</outputDirectory>
<resources>
<resource>
<directory>src/main/yml</directory>
diff --git a/installation/ansible-server/src/main/docker/Dockerfile b/installation/ansible-server/src/main/docker/Dockerfile
index cc93f12a..ea9e61b7 100644
--- a/installation/ansible-server/src/main/docker/Dockerfile
+++ b/installation/ansible-server/src/main/docker/Dockerfile
@@ -21,7 +21,7 @@ RUN apt-get -y install python-pip
# copy files needed
COPY opt /opt/
-WORKDIR /opt/onap/sdnc
+WORKDIR /opt/onap/ccsdk
#ENTRYPOINT exec startAnsibleServer.sh
#CMD ["/bin/bash"]
diff --git a/installation/ansible-server/src/main/yml/ansible_huawei_postcheck@0.00.yml b/installation/ansible-server/src/main/yml/ansible_huawei_postcheck@0.00.yml
new file mode 100644
index 00000000..975887d7
--- /dev/null
+++ b/installation/ansible-server/src/main/yml/ansible_huawei_postcheck@0.00.yml
@@ -0,0 +1,21 @@
+---
+- hosts: all
+ tasks:
+ - name: create a temporary file for additional data
+ file:
+ path: /tmp/tmp-{{Id}}
+ state: touch
+ become: true
+
+ - name: prepare additional data
+ shell: echo {{additionalData}} > /tmp/tmp-{{Id}}
+ become: true
+
+ - name: execute post-check operation
+ shell: ./swm/upgrade-post-check.sh {{pnfId}} {{oldSwVersion}} {{targetSwVersion}} {{ruleName}} /tmp/tmp-{{Id}}
+
+ - name: remove the temporary file
+ file:
+ path: /tmp/tmp-{{Id}}
+ state: absent
+ become: true
diff --git a/installation/ansible-server/src/main/yml/ansible_huawei_precheck@0.00.yml b/installation/ansible-server/src/main/yml/ansible_huawei_precheck@0.00.yml
new file mode 100644
index 00000000..651974f8
--- /dev/null
+++ b/installation/ansible-server/src/main/yml/ansible_huawei_precheck@0.00.yml
@@ -0,0 +1,21 @@
+---
+- hosts: all
+ tasks:
+ - name: create a temporary file for additional data
+ file:
+ path: /tmp/tmp-{{Id}}
+ state: touch
+ become: true
+
+ - name: prepare additional data
+ shell: echo {{additionalData}} > /tmp/tmp-{{Id}}
+ become: true
+
+ - name: execute pre-check operation
+ shell: ./swm/upgrade-pre-check.sh {{pnfId}} {{oldSwVersion}} {{targetSwVersion}} {{ruleName}} /tmp/tmp-{{Id}}
+
+ - name: remove the temporary file
+ file:
+ path: /tmp/tmp-{{Id}}
+ state: absent
+ become: true
diff --git a/installation/ansible-server/src/main/yml/ansible_huawei_upgrade@0.00.yml b/installation/ansible-server/src/main/yml/ansible_huawei_upgrade@0.00.yml
new file mode 100644
index 00000000..ac2c4054
--- /dev/null
+++ b/installation/ansible-server/src/main/yml/ansible_huawei_upgrade@0.00.yml
@@ -0,0 +1,21 @@
+---
+- hosts: all
+ tasks:
+ - name: create a temporary file for additional data
+ file:
+ path: /tmp/tmp-{{Id}}
+ state: touch
+ become: true
+
+ - name: prepare additional data
+ shell: echo {{additionalData}} > /tmp/tmp-{{Id}}
+ become: true
+
+ - name: execute upgrade software operation
+ shell: ./swm/upgrade-software.sh {{pnfId}} {{oldSwVersion}} {{targetSwVersion}} /tmp/tmp-{{Id}}
+
+ - name: remove the temporary file
+ file:
+ path: /tmp/tmp-{{Id}}
+ state: absent
+ become: true
diff --git a/installation/dgbuilder/.gitignore b/installation/dgbuilder/.gitignore
new file mode 100755
index 00000000..ed7fb70f
--- /dev/null
+++ b/installation/dgbuilder/.gitignore
@@ -0,0 +1 @@
+releases \ No newline at end of file
diff --git a/installation/sdnc/src/main/resources/sdnctl.dump b/installation/sdnc/src/main/resources/sdnctl.dump
index 9949c88c..04a9ad73 100644
--- a/installation/sdnc/src/main/resources/sdnctl.dump
+++ b/installation/sdnc/src/main/resources/sdnctl.dump
@@ -989,6 +989,9 @@ DROP TABLE IF EXISTS `GENERIC_RESOURCE_NAME`;
CREATE TABLE `GENERIC_RESOURCE_NAME` (
`type` varchar(50) NOT NULL,
`name` varchar(255) NOT NULL,
+ `prefix` varchar(255) NULL,
+ `name_index` int(11) NULL,
+ `content_id` varchar(255) NULL,
PRIMARY KEY (`type`,`name`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
/*!40101 SET character_set_client = @saved_cs_client */;
@@ -3295,6 +3298,16 @@ CREATE TABLE `DHCP_MAP` (
PRIMARY KEY (`mac_addr`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+DROP TABLE IF EXISTS `RESOURCE_GROUP_TO_TARGET_NODE_MAPPING`;
+CREATE TABLE `RESOURCE_GROUP_TO_TARGET_NODE_MAPPING` (
+ `group_uuid` varchar(255) NOT NULL,
+ `parent_uuid` varchar(255) NOT NULL,
+ `target_node_uuid` varchar(255) NOT NULL,
+ `target_type` varchar(255) NULL,
+ `table_name` varchar(255) NULL,
+ PRIMARY KEY (`group_uuid`, `parent_uuid`, `target_node_uuid`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
/*!40101 SET character_set_client = @saved_cs_client */;
/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
diff --git a/installation/src/main/properties/aaiclient.properties b/installation/src/main/properties/aaiclient.properties
index 3d24a6ad..65683836 100755
--- a/installation/src/main/properties/aaiclient.properties
+++ b/installation/src/main/properties/aaiclient.properties
@@ -30,8 +30,8 @@ org.onap.ccsdk.sli.adaptors.aai.ssl.trust=/opt/onap/sdnc/data/stores/truststoreO
org.onap.ccsdk.sli.adaptors.aai.ssl.trust.psswd=changeit
org.onap.ccsdk.sli.adaptors.aai.host.certificate.ignore=true
-org.onap.ccsdk.sli.adaptors.aai.client.name=SDNC
-org.onap.ccsdk.sli.adaptors.aai.client.psswd=SDNC
+org.onap.ccsdk.sli.adaptors.aai.client.name=sdnc@sdnc.onap.org
+org.onap.ccsdk.sli.adaptors.aai.client.psswd=demo123456!
org.onap.ccsdk.sli.adaptors.aai.application=openECOMP
#
diff --git a/installation/src/main/properties/generic-resource-api-dg.properties b/installation/src/main/properties/generic-resource-api-dg.properties
index ef99e9d0..f9161d7e 100644
--- a/installation/src/main/properties/generic-resource-api-dg.properties
+++ b/installation/src/main/properties/generic-resource-api-dg.properties
@@ -9,7 +9,7 @@ restapi.trustStoreFileName=/opt/onap/sdnc/data/stores/truststore.openecomp.clien
restapi.trustStorePassword=adminadmin
restapi.keyStoreFileName=/opt/onap/sdnc/data/stores/sdnc.p12
restapi.keyStorePassword=adminadmin
-restapi.connection-oof-url=http://oof.api.simpledemo.onap.org:8698/v1/route
+restapi.connection-oof-url=http://oof.api.simpledemo.onap.org:8698/api/oof/v1/route
naming.gen-name.url=http://{naming-ms-instance-url}
naming.gen-name.user={naming-ms-user}
naming.gen-name.pwd={naming-ms-pwd}
diff --git a/installation/src/main/yaml/docker-compose.yml b/installation/src/main/yaml/docker-compose.yml
index 361e7ea8..38522518 100644
--- a/installation/src/main/yaml/docker-compose.yml
+++ b/installation/src/main/yaml/docker-compose.yml
@@ -27,7 +27,7 @@ services:
depends_on :
- db
container_name: sdnc_ansible_container
- entrypoint: ["/opt/onap/sdnc/startAnsibleServer.sh"]
+ entrypoint: ["/opt/onap/ccsdk/startAnsibleServer.sh"]
ports:
- "8000"
links: