From c5f7f5e4d905171c1f0663bcb64ee050985a2d0b Mon Sep 17 00:00:00 2001
From: morganrol <morgan.richomme@orange.com>
Date: Wed, 31 Mar 2021 19:07:11 +0200
Subject: [CLAMP] Integrate basic_clamp

Some regressions occured and old files were used
This patch update the different components with the right versions
It also renames the vnf-service in basic_clamp-services.yaml
It creates the entry point and the scenario to integrate the test in xtesting

Issue-ID: INT-1819

Signed-off-by: morganrol <morgan.richomme@orange.com>
Change-Id: I7a9e49d8ddc2c5bd0625a4a5ed940c10aed74f81
---
 .../vnf-services/basic_clamp-service.yaml          | 39 ++++++++++++++++++++++
 .../vnf-services/ubuntu18agent-service.yaml        | 39 ----------------------
 2 files changed, 39 insertions(+), 39 deletions(-)
 create mode 100644 src/onaptests/templates/vnf-services/basic_clamp-service.yaml
 delete mode 100644 src/onaptests/templates/vnf-services/ubuntu18agent-service.yaml

(limited to 'src/onaptests/templates')

diff --git a/src/onaptests/templates/vnf-services/basic_clamp-service.yaml b/src/onaptests/templates/vnf-services/basic_clamp-service.yaml
new file mode 100644
index 0000000..f5fe653
--- /dev/null
+++ b/src/onaptests/templates/vnf-services/basic_clamp-service.yaml
@@ -0,0 +1,39 @@
+---
+basicclamp:
+    vnfs:
+        - vnf_name: basicclamp
+          heat_files_to_upload: onaptests/templates/heat-files/ubuntu18/ubuntu18agent.zip
+          vnf_parameters: [
+              {"name": "ubuntu18_image_name",
+               "value": "ubuntu-agent"
+              },
+              {"name": "ubuntu18_key_name",
+               "value": "cleouverte"
+              },
+              {"name": "ubuntu18_pub_key",
+               "value": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAA\
+BAQDY15cdBmIs2XOpe4EiFCsaY6bmUmK/GysMoLl4UG51JCfJwvwoWCoA+6mDIbymZxhxq9IGx\
+ilp/yTA6WQ9s/5pBag1cUMJmFuda9PjOkXl04jgqh5tR6I+GZ97AvCg93KAECis5ubSqw1xOCj4\
+utfEUtPoF1OuzqM/lE5mY4N6VKXn+fT7pCD6cifBEs6JHhVNvs5OLLp/tO8Pa3kKYQOdyS0xc3r\
+h+t2lrzvKUSWGZbX+dLiFiEpjsUL3tDqzkEMNUn4pdv69OJuzWHCxRWPfdrY9Wg0j3mJesP29EBh\
+t+w+EC9/kBKq+1VKdmsXUXAcjEvjovVL8l1BrX3BY0R8D imported-openssh-key"
+              },
+              {"name": "ubuntu18_flavor_name",
+               "value": "m1.smaller"
+              },
+              {"name": "VM_name",
+               "value": "ubuntu18agent-VM-01"
+              },
+              {"name": "vnf_id",
+               "value": "ubuntu18agent-VNF-instance"
+              },
+              {"name": "vf_module_id",
+               "value": "ubuntu18agent-vfmodule-instance"
+              },
+              {"name": "vnf_name",
+               "value": "ubuntu18agent-VNF"
+              },
+              {"name": "admin_plane_net_name",
+               "value": "admin"
+              }
+          ]
diff --git a/src/onaptests/templates/vnf-services/ubuntu18agent-service.yaml b/src/onaptests/templates/vnf-services/ubuntu18agent-service.yaml
deleted file mode 100644
index f5fe653..0000000
--- a/src/onaptests/templates/vnf-services/ubuntu18agent-service.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
----
-basicclamp:
-    vnfs:
-        - vnf_name: basicclamp
-          heat_files_to_upload: onaptests/templates/heat-files/ubuntu18/ubuntu18agent.zip
-          vnf_parameters: [
-              {"name": "ubuntu18_image_name",
-               "value": "ubuntu-agent"
-              },
-              {"name": "ubuntu18_key_name",
-               "value": "cleouverte"
-              },
-              {"name": "ubuntu18_pub_key",
-               "value": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAA\
-BAQDY15cdBmIs2XOpe4EiFCsaY6bmUmK/GysMoLl4UG51JCfJwvwoWCoA+6mDIbymZxhxq9IGx\
-ilp/yTA6WQ9s/5pBag1cUMJmFuda9PjOkXl04jgqh5tR6I+GZ97AvCg93KAECis5ubSqw1xOCj4\
-utfEUtPoF1OuzqM/lE5mY4N6VKXn+fT7pCD6cifBEs6JHhVNvs5OLLp/tO8Pa3kKYQOdyS0xc3r\
-h+t2lrzvKUSWGZbX+dLiFiEpjsUL3tDqzkEMNUn4pdv69OJuzWHCxRWPfdrY9Wg0j3mJesP29EBh\
-t+w+EC9/kBKq+1VKdmsXUXAcjEvjovVL8l1BrX3BY0R8D imported-openssh-key"
-              },
-              {"name": "ubuntu18_flavor_name",
-               "value": "m1.smaller"
-              },
-              {"name": "VM_name",
-               "value": "ubuntu18agent-VM-01"
-              },
-              {"name": "vnf_id",
-               "value": "ubuntu18agent-VNF-instance"
-              },
-              {"name": "vf_module_id",
-               "value": "ubuntu18agent-vfmodule-instance"
-              },
-              {"name": "vnf_name",
-               "value": "ubuntu18agent-VNF"
-              },
-              {"name": "admin_plane_net_name",
-               "value": "admin"
-              }
-          ]
-- 
cgit 1.2.3-korg