aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorBrian Freeman <bf1936@att.com>2018-11-12 12:37:12 -0500
committerBrian Freeman <bf1936@att.com>2018-11-12 12:37:23 -0500
commitec9fe0e5a07ac2cdb650cd5cc9a9c883122da780 (patch)
tree8e8f72d1abb9b94eb5fefa7dbcdb34fd6a042989 /test
parenta605bc77c111af04e82d84edf41415b0cad46fab (diff)
Fix brg image and usage
Issue-ID: INT-717 Change-Id: Ia3a4247548d820f5f00eaff480cfba07e21008a5 Signed-off-by: Brian Freeman <bf1936@att.com>
Diffstat (limited to 'test')
-rw-r--r--test/vcpe/preload_templates/template.vcpe_brgemu_vfmodule.json140
-rwxr-xr-xtest/vcpe/vcpe.py1
2 files changed, 71 insertions, 70 deletions
diff --git a/test/vcpe/preload_templates/template.vcpe_brgemu_vfmodule.json b/test/vcpe/preload_templates/template.vcpe_brgemu_vfmodule.json
index cf17be0cb..eb684369c 100644
--- a/test/vcpe/preload_templates/template.vcpe_brgemu_vfmodule.json
+++ b/test/vcpe/preload_templates/template.vcpe_brgemu_vfmodule.json
@@ -1,136 +1,136 @@
{
"VNF-API:input": {
"VNF-API:request-information": {
- "VNF-API:notification-url": "https://so.onap.org",
- "VNF-API:order-number": "robot12",
- "VNF-API:order-version": "1.0",
- "VNF-API:request-action": "PreloadVNFRequest",
- "VNF-API:request-id": "robot12",
- "VNF-API:request-sub-action": "SUPP",
+ "VNF-API:notification-url": "https://so.onap.org",
+ "VNF-API:order-number": "robot12",
+ "VNF-API:order-version": "1.0",
+ "VNF-API:request-action": "PreloadVNFRequest",
+ "VNF-API:request-id": "robot12",
+ "VNF-API:request-sub-action": "SUPP",
"VNF-API:source": "VID"
- },
+ },
"VNF-API:sdnc-request-header": {
- "VNF-API:svc-action": "reserve",
- "VNF-API:svc-notification-url": "https://son.onap.org",
+ "VNF-API:svc-action": "reserve",
+ "VNF-API:svc-notification-url": "https://son.onap.org",
"VNF-API:svc-request-id": "robot12"
- },
+ },
"VNF-API:vnf-topology-information": {
- "VNF-API:vnf-assignments": {},
+ "VNF-API:vnf-assignments": {},
"VNF-API:vnf-parameters": [
{
- "vnf-parameter-name": "vcpe_image_name",
- "vnf-parameter-value": "vbrg-casa-base-ubuntu-16-04-new"
- },
+ "vnf-parameter-name": "vcpe_image_name",
+ "vnf-parameter-value": "vbrg-casa-base-ubuntu-16-04"
+ },
{
- "vnf-parameter-name": "vcpe_flavor_name",
+ "vnf-parameter-name": "vcpe_flavor_name",
"vnf-parameter-value": "m1.medium"
- },
+ },
{
- "vnf-parameter-name": "public_net_id",
+ "vnf-parameter-name": "public_net_id",
"vnf-parameter-value": "${public_net_id}"
- },
+ },
{
- "vnf-parameter-name": "vbrgemu_bng_private_net_id",
+ "vnf-parameter-name": "vbrgemu_bng_private_net_id",
"vnf-parameter-value": "${brg_bng_net}"
- },
+ },
{
- "vnf-parameter-name": "vbrgemu_bng_private_subnet_id",
+ "vnf-parameter-name": "vbrgemu_bng_private_subnet_id",
"vnf-parameter-value": "${brg_bng_subnet}"
- },
+ },
{
- "vnf-parameter-name": "onap_private_net_id",
+ "vnf-parameter-name": "onap_private_net_id",
"vnf-parameter-value": "${oam_onap_net}"
- },
+ },
{
- "vnf-parameter-name": "onap_private_subnet_id",
+ "vnf-parameter-name": "onap_private_subnet_id",
"vnf-parameter-value": "${oam_onap_subnet}"
- },
+ },
{
- "vnf-parameter-name": "onap_private_net_cidr",
+ "vnf-parameter-name": "onap_private_net_cidr",
"vnf-parameter-value": "10.0.0.0/16"
- },
+ },
{
- "vnf-parameter-name": "compile_state",
+ "vnf-parameter-name": "compile_state",
"vnf-parameter-value": "done"
- },
+ },
{
- "vnf-parameter-name": "vbrgemu_bng_private_net_cidr",
+ "vnf-parameter-name": "vbrgemu_bng_private_net_cidr",
"vnf-parameter-value": "10.3.0.0/24"
- },
+ },
{
- "vnf-parameter-name": "vbrgemu_private_ip_0",
+ "vnf-parameter-name": "vbrgemu_private_ip_0",
"vnf-parameter-value": "10.3.0.21"
- },
+ },
{
- "vnf-parameter-name": "sdnc_ip",
+ "vnf-parameter-name": "sdnc_ip",
"vnf-parameter-value": "10.0.7.1"
- },
+ },
{
- "vnf-parameter-name": "vbrgemu_name_0",
+ "vnf-parameter-name": "vbrgemu_name_0",
"vnf-parameter-value": "zdcpe1cpe01brgemu01_${suffix}"
- },
+ },
{
- "vnf-parameter-name": "vnf_id",
+ "vnf-parameter-name": "vnf_id",
"vnf-parameter-value": "vCPE_Infrastructure_BGREMU_demo_app_${suffix}"
- },
+ },
{
- "vnf-parameter-name": "vf_module_id",
+ "vnf-parameter-name": "vf_module_id",
"vnf-parameter-value": "vCPE_Customer_BRGEMU_${suffix}"
- },
+ },
{
- "vnf-parameter-name": "repo_url_blob",
+ "vnf-parameter-name": "repo_url_blob",
"vnf-parameter-value": "https://nexus.onap.org/content/sites/raw"
- },
+ },
{
- "vnf-parameter-name": "repo_url_artifacts",
+ "vnf-parameter-name": "repo_url_artifacts",
"vnf-parameter-value": "https://nexus.onap.org/content/groups/staging"
- },
+ },
{
- "vnf-parameter-name": "demo_artifacts_version",
+ "vnf-parameter-name": "demo_artifacts_version",
"vnf-parameter-value": "1.1.1"
- },
+ },
{
- "vnf-parameter-name": "install_script_version",
+ "vnf-parameter-name": "install_script_version",
"vnf-parameter-value": "1.1.1"
- },
+ },
{
- "vnf-parameter-name": "key_name",
+ "vnf-parameter-name": "key_name",
"vnf-parameter-value": "vbrgemu_key"
- },
+ },
{
- "vnf-parameter-name": "pub_key",
+ "vnf-parameter-name": "pub_key",
"vnf-parameter-value": "${pub_key}"
- },
+ },
{
- "vnf-parameter-name": "cloud_env",
+ "vnf-parameter-name": "cloud_env",
"vnf-parameter-value": "openstack"
- },
+ },
{
- "vnf-parameter-name": "vpp_source_repo_url",
+ "vnf-parameter-name": "vpp_source_repo_url",
"vnf-parameter-value": "https://gerrit.fd.io/r/vpp"
- },
+ },
{
- "vnf-parameter-name": "vpp_source_repo_branch",
+ "vnf-parameter-name": "vpp_source_repo_branch",
"vnf-parameter-value": "stable/1704"
- },
+ },
{
- "vnf-parameter-name": "hc2vpp_source_repo_url",
+ "vnf-parameter-name": "hc2vpp_source_repo_url",
"vnf-parameter-value": "https://gerrit.fd.io/r/hc2vpp"
- },
+ },
{
- "vnf-parameter-name": "hc2vpp_source_repo_branch",
+ "vnf-parameter-name": "hc2vpp_source_repo_branch",
"vnf-parameter-value": "stable/1704"
- },
+ },
{
- "vnf-parameter-name": "vpp_patch_url",
+ "vnf-parameter-name": "vpp_patch_url",
"vnf-parameter-value": "https://git.onap.org/demo/plain/vnfs/vCPE/vpp-option-82-for-vbrg/src/patches/VPP-Add-Option82-Nat-Filter-For-vBRG.patch"
}
- ],
+ ],
"vnf-topology-identifier": {
- "generic-vnf-name": "${generic_vnf_name}",
- "generic-vnf-type": "${generic_vnf_type}",
- "service-type": "${service_type}",
- "vnf-name": "${vnf_name}",
+ "generic-vnf-name": "${generic_vnf_name}",
+ "generic-vnf-type": "${generic_vnf_type}",
+ "service-type": "${service_type}",
+ "vnf-name": "${vnf_name}",
"vnf-type": "${vnf_type}"
}
}
diff --git a/test/vcpe/vcpe.py b/test/vcpe/vcpe.py
index b8b7108d1..81e45f334 100755
--- a/test/vcpe/vcpe.py
+++ b/test/vcpe/vcpe.py
@@ -196,6 +196,7 @@ if __name__ == '__main__':
# print(' vcpe.py sdc: Onboard VNFs, design and distribute vCPE services (under development)')
print(' vcpe.py init: Add customer service data to SDNC and SO DBs.')
print(' vcpe.py infra: Deploy infrastructure, including DHCP, AAA, DNS, Web Server, vBNG, vGMUX, vBRG.')
+ print(' vcpe.py brg: Deploy brg only (for testing after infra succeeds).')
print(' vcpe.py customer: Deploy customer service, including vGW and VxLANs')
print(' vcpe.py loop: Test closed loop control')
print('----------------------------------------------------------------------------------------------------')