| commit | 49fd6e5620f31ab369fb79d328e10dfb6db38281 | [log] [tgz] |
|---|---|---|
| author | marchettim <mmarchetti@sandvine.com> | Thu Oct 26 09:17:18 2017 +0200 |
| committer | Gerrit Code Review <root@osm.etsi.org> | Thu Oct 26 09:17:18 2017 +0200 |
| tree | b6cf4070b3c75bfce081921b56063d7087fa322a | |
| parent | 5c291037559a7bc2998afbc3d1e59df37d0d64f3 [diff] | |
| parent | 9f61130b63ff91366f663a8779b0a3f455ad32a9 [diff] |
Merge "Extended stage_2 pipeline: Allow unittests to be executed in a privileged container by specifing additional arguments for the Jenkins Docker plugin."
diff --git a/descriptor-packages/vnfd/dns_aws_ns/Makefile b/descriptor-packages/nsd/dns_aws_ns/Makefile similarity index 100% rename from descriptor-packages/vnfd/dns_aws_ns/Makefile rename to descriptor-packages/nsd/dns_aws_ns/Makefile
diff --git a/descriptor-packages/vnfd/dns_aws_ns/src/dns_aws_nsd.yaml b/descriptor-packages/nsd/dns_aws_ns/src/dns_aws_nsd.yaml similarity index 100% rename from descriptor-packages/vnfd/dns_aws_ns/src/dns_aws_nsd.yaml rename to descriptor-packages/nsd/dns_aws_ns/src/dns_aws_nsd.yaml
diff --git a/descriptor-packages/vnfd/dns_aws_ns/src/icons/dns.jpg b/descriptor-packages/nsd/dns_aws_ns/src/icons/dns.jpg similarity index 100% rename from descriptor-packages/vnfd/dns_aws_ns/src/icons/dns.jpg rename to descriptor-packages/nsd/dns_aws_ns/src/icons/dns.jpg Binary files differ
diff --git a/descriptor-packages/vnfd/ubuntu_cloudinit_ns/Makefile b/descriptor-packages/nsd/ubuntu_cloudinit_ns/Makefile similarity index 100% rename from descriptor-packages/vnfd/ubuntu_cloudinit_ns/Makefile rename to descriptor-packages/nsd/ubuntu_cloudinit_ns/Makefile
diff --git a/descriptor-packages/vnfd/ubuntu_cloudinit_ns/src/ubuntu_cloudinit_nsd.yaml b/descriptor-packages/nsd/ubuntu_cloudinit_ns/src/ubuntu_cloudinit_nsd.yaml similarity index 100% rename from descriptor-packages/vnfd/ubuntu_cloudinit_ns/src/ubuntu_cloudinit_nsd.yaml rename to descriptor-packages/nsd/ubuntu_cloudinit_ns/src/ubuntu_cloudinit_nsd.yaml
diff --git a/descriptor-packages/nsd/ubuntu_1iface_cloudinit_new_vnf/Makefile b/descriptor-packages/vnfd/ubuntu_1iface_cloudinit_new_vnf/Makefile similarity index 100% rename from descriptor-packages/nsd/ubuntu_1iface_cloudinit_new_vnf/Makefile rename to descriptor-packages/vnfd/ubuntu_1iface_cloudinit_new_vnf/Makefile
diff --git a/descriptor-packages/nsd/ubuntu_1iface_cloudinit_new_vnf/src/cloud_init/cloud_init.cfg b/descriptor-packages/vnfd/ubuntu_1iface_cloudinit_new_vnf/src/cloud_init/cloud_init.cfg similarity index 100% rename from descriptor-packages/nsd/ubuntu_1iface_cloudinit_new_vnf/src/cloud_init/cloud_init.cfg rename to descriptor-packages/vnfd/ubuntu_1iface_cloudinit_new_vnf/src/cloud_init/cloud_init.cfg
diff --git a/descriptor-packages/nsd/ubuntu_1iface_cloudinit_new_vnf/src/icons/ubuntu-logo14.png b/descriptor-packages/vnfd/ubuntu_1iface_cloudinit_new_vnf/src/icons/ubuntu-logo14.png similarity index 100% rename from descriptor-packages/nsd/ubuntu_1iface_cloudinit_new_vnf/src/icons/ubuntu-logo14.png rename to descriptor-packages/vnfd/ubuntu_1iface_cloudinit_new_vnf/src/icons/ubuntu-logo14.png Binary files differ
diff --git a/descriptor-packages/nsd/ubuntu_1iface_cloudinit_new_vnf/src/keys/test4.pem b/descriptor-packages/vnfd/ubuntu_1iface_cloudinit_new_vnf/src/keys/test4.pem similarity index 100% rename from descriptor-packages/nsd/ubuntu_1iface_cloudinit_new_vnf/src/keys/test4.pem rename to descriptor-packages/vnfd/ubuntu_1iface_cloudinit_new_vnf/src/keys/test4.pem
diff --git a/descriptor-packages/nsd/ubuntu_1iface_cloudinit_new_vnf/src/keys/test4.pub b/descriptor-packages/vnfd/ubuntu_1iface_cloudinit_new_vnf/src/keys/test4.pub similarity index 100% rename from descriptor-packages/nsd/ubuntu_1iface_cloudinit_new_vnf/src/keys/test4.pub rename to descriptor-packages/vnfd/ubuntu_1iface_cloudinit_new_vnf/src/keys/test4.pub
diff --git a/descriptor-packages/nsd/ubuntu_1iface_cloudinit_new_vnf/src/ubuntu_1iface_cloudinit_newfile_vnfd.yaml b/descriptor-packages/vnfd/ubuntu_1iface_cloudinit_new_vnf/src/ubuntu_1iface_cloudinit_newfile_vnfd.yaml similarity index 100% rename from descriptor-packages/nsd/ubuntu_1iface_cloudinit_new_vnf/src/ubuntu_1iface_cloudinit_newfile_vnfd.yaml rename to descriptor-packages/vnfd/ubuntu_1iface_cloudinit_new_vnf/src/ubuntu_1iface_cloudinit_newfile_vnfd.yaml
