aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--heat/vFW/base_vfw_openstack.yaml36
-rw-r--r--heat/vFW/base_vfw_rackspace.yaml36
-rw-r--r--heat/vLB/.DS_Storebin6148 -> 0 bytes
-rw-r--r--heat/vLB/base_vlb_rackspace.yaml36
-rw-r--r--heat/vLB/dnsscaling_rackspace.yaml36
-rw-r--r--heat/vLB/packet_gen_vlb_rackspace.env1
-rw-r--r--heat/vLB/packet_gen_vlb_rackspace.yaml42
-rw-r--r--vnfs/vLB/scripts/set_gre_tunnel.sh5
-rw-r--r--vnfs/vLB/scripts/v_dns_install.sh14
-rwxr-xr-xvnfs/vLB/scripts/v_lb_init.sh28
-rw-r--r--vnfs/vLB/scripts/v_lb_install.sh21
-rw-r--r--vnfs/vLB/scripts/v_packetgen_for_dns_demo_init.sh44
-rw-r--r--vnfs/vLB/scripts/v_packetgen_install.sh1
13 files changed, 277 insertions, 23 deletions
diff --git a/heat/vFW/base_vfw_openstack.yaml b/heat/vFW/base_vfw_openstack.yaml
index 27ebb22b..6ef33cca 100644
--- a/heat/vFW/base_vfw_openstack.yaml
+++ b/heat/vFW/base_vfw_openstack.yaml
@@ -1,7 +1,37 @@
+##########################################################################
+#
+#==================LICENSE_START==========================================
+#
+#
+# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+#==================LICENSE_END============================================
+#
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
+#
+##########################################################################
+
heat_template_version: 2013-05-23
description: Heat template that deploys vFirewall demo app for ONAP
+##############
+# #
+# PARAMETERS #
+# #
+##############
+
parameters:
vfw_image_name:
type: string
@@ -128,6 +158,12 @@ parameters:
label: Cloud environment
description: Cloud environment (e.g., openstack, rackspace)
+#############
+# #
+# RESOURCES #
+# #
+#############
+
resources:
random-str:
type: OS::Heat::RandomString
diff --git a/heat/vFW/base_vfw_rackspace.yaml b/heat/vFW/base_vfw_rackspace.yaml
index 868ebc38..01d6c441 100644
--- a/heat/vFW/base_vfw_rackspace.yaml
+++ b/heat/vFW/base_vfw_rackspace.yaml
@@ -1,7 +1,37 @@
+##########################################################################
+#
+#==================LICENSE_START==========================================
+#
+#
+# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+#==================LICENSE_END============================================
+#
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
+#
+##########################################################################
+
heat_template_version: 2013-05-23
description: Heat template that deploys vFirewall demo app for ONAP
+##############
+# #
+# PARAMETERS #
+# #
+##############
+
parameters:
vfw_image_name:
type: string
@@ -128,6 +158,12 @@ parameters:
label: Cloud environment
description: Cloud environment (e.g., openstack, rackspace)
+#############
+# #
+# RESOURCES #
+# #
+#############
+
resources:
random-str:
type: OS::Heat::RandomString
diff --git a/heat/vLB/.DS_Store b/heat/vLB/.DS_Store
deleted file mode 100644
index 5008ddfc..00000000
--- a/heat/vLB/.DS_Store
+++ /dev/null
Binary files differ
diff --git a/heat/vLB/base_vlb_rackspace.yaml b/heat/vLB/base_vlb_rackspace.yaml
index f32bd29b..0bd138be 100644
--- a/heat/vLB/base_vlb_rackspace.yaml
+++ b/heat/vLB/base_vlb_rackspace.yaml
@@ -1,7 +1,37 @@
+##########################################################################
+#
+#==================LICENSE_START==========================================
+#
+#
+# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+#==================LICENSE_END============================================
+#
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
+#
+##########################################################################
+
heat_template_version: 2013-05-23
description: Heat template to deploy vLoadBalancer/vDNS demo app for ONAP
+##############
+# #
+# PARAMETERS #
+# #
+##############
+
parameters:
vlb_image_name:
type: string
@@ -104,6 +134,12 @@ parameters:
label: Cloud environment
description: Cloud environment (e.g., openstack, rackspace)
+#############
+# #
+# RESOURCES #
+# #
+#############
+
resources:
random-str:
diff --git a/heat/vLB/dnsscaling_rackspace.yaml b/heat/vLB/dnsscaling_rackspace.yaml
index 966a5155..c2043dd5 100644
--- a/heat/vLB/dnsscaling_rackspace.yaml
+++ b/heat/vLB/dnsscaling_rackspace.yaml
@@ -1,7 +1,37 @@
+##########################################################################
+#
+#==================LICENSE_START==========================================
+#
+#
+# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+#==================LICENSE_END============================================
+#
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
+#
+##########################################################################
+
heat_template_version: 2013-05-23
description: Heat template to deploy a vDNS for ONAP (scaling-up scenario)
+##############
+# #
+# PARAMETERS #
+# #
+##############
+
parameters:
vlb_image_name:
type: string
@@ -84,6 +114,12 @@ parameters:
label: Cloud environment
description: Cloud environment (e.g., openstack, rackspace)
+#############
+# #
+# RESOURCES #
+# #
+#############
+
resources:
random-str:
diff --git a/heat/vLB/packet_gen_vlb_rackspace.env b/heat/vLB/packet_gen_vlb_rackspace.env
index 43d7dca7..91002fed 100644
--- a/heat/vLB/packet_gen_vlb_rackspace.env
+++ b/heat/vLB/packet_gen_vlb_rackspace.env
@@ -10,4 +10,3 @@ parameters:
install_script_version: 1.1.0-SNAPSHOT
key_name: dns_packetgen_key
pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN
- cloud_env: rackspace
diff --git a/heat/vLB/packet_gen_vlb_rackspace.yaml b/heat/vLB/packet_gen_vlb_rackspace.yaml
index 94776fc6..fea9a770 100644
--- a/heat/vLB/packet_gen_vlb_rackspace.yaml
+++ b/heat/vLB/packet_gen_vlb_rackspace.yaml
@@ -1,6 +1,37 @@
+##########################################################################
+#
+#==================LICENSE_START==========================================
+#
+#
+# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+#==================LICENSE_END============================================
+#
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
+#
+##########################################################################
+
heat_template_version: 2013-05-23
+
description: Heat template to deploy a packet generator for the vLoadBalancer/vDNS demo app for ONAP
+##############
+# #
+# PARAMETERS #
+# #
+##############
+
parameters:
public_net_id:
type: string
@@ -46,11 +77,12 @@ parameters:
type: string
label: Artifacts version used in demo vnfs
description: Artifacts (jar, tar.gz) version used in demo vnfs
- cloud_env:
- type: string
- label: Cloud environment
- description: Cloud environment (e.g., openstack, rackspace)
+#############
+# #
+# RESOURCES #
+# #
+#############
resources:
@@ -90,7 +122,6 @@ resources:
__vlb_ipaddr__: { get_param: vlb_ipaddr }
__demo_artifacts_version__ : { get_param: demo_artifacts_version }
__install_script_version__ : { get_param: install_script_version }
- __cloud_env__ : { get_param: cloud_env }
template: |
#!/bin/bash
@@ -101,7 +132,6 @@ resources:
echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt
echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt
echo "__install_script_version__" > /opt/config/install_script_version.txt
- echo "__cloud_env__" > /opt/config/cloud_env.txt
# Download and run install script
curl -k __repo_url_blob__/org.openecomp.demo/vnfs/vlb/__install_script_version__/v_packetgen_install.sh -o /opt/v_packetgen_install.sh
diff --git a/vnfs/vLB/scripts/set_gre_tunnel.sh b/vnfs/vLB/scripts/set_gre_tunnel.sh
index 2fa6c64e..aaad66c1 100644
--- a/vnfs/vLB/scripts/set_gre_tunnel.sh
+++ b/vnfs/vLB/scripts/set_gre_tunnel.sh
@@ -9,13 +9,14 @@ fi
LB_PUBLIC_IP=$1
LB_PRIVATE_IP=$(cat /opt/config/lb_private_ipaddr.txt)
MY_PRIVATE_IP=$(cat /opt/config/local_private_ipaddr.txt)
+OLD_GW=$(route -n | grep "^0.0.0.0" | awk '{print $2}')
sed -i "s/x.x.x.x/"$LB_PUBLIC_IP"/g" /etc/bind/named.conf.options
ip tunnel add gre123 mode gre remote $LB_PRIVATE_IP local $MY_PRIVATE_IP ttl 255
ip link set gre123 up
-ip addr add $LB_PUBLIC_IP"/24" dev gre123
-ifconfig eth0 down
+ip addr add $LB_PUBLIC_IP"/32" dev gre123
+route del default gw $OLD_GW
route add default dev gre123
service bind9 restart
diff --git a/vnfs/vLB/scripts/v_dns_install.sh b/vnfs/vLB/scripts/v_dns_install.sh
index be2c5ed3..5e1d55bf 100644
--- a/vnfs/vLB/scripts/v_dns_install.sh
+++ b/vnfs/vLB/scripts/v_dns_install.sh
@@ -6,6 +6,20 @@ DEMO_ARTIFACTS_VERSION=$(cat /opt/config/demo_artifacts_version.txt)
INSTALL_SCRIPT_VERSION=$(cat /opt/config/install_script_version.txt)
CLOUD_ENV=$(cat /opt/config/cloud_env.txt)
+# OpenStack network configuration
+if [[ $CLOUD_ENV == "openstack" ]]
+then
+ echo 127.0.0.1 $(hostname) >> /etc/hosts
+
+ VDNS_PRIVATE_IP_O=$(cat /opt/config/local_private_ipaddr.txt)
+ echo "auto eth1" >> /etc/network/interfaces
+ echo "iface eth1 inet static" >> /etc/network/interfaces
+ echo " address $VDNS_PRIVATE_IP_O" >> /etc/network/interfaces
+ echo " netmask 255.255.255.0" >> /etc/network/interfaces
+
+ ifup eth1
+fi
+
# Download required dependencies
add-apt-repository -y ppa:openjdk-r/ppa
apt-get update
diff --git a/vnfs/vLB/scripts/v_lb_init.sh b/vnfs/vLB/scripts/v_lb_init.sh
index d130c1ec..e41c4ef3 100755
--- a/vnfs/vLB/scripts/v_lb_init.sh
+++ b/vnfs/vLB/scripts/v_lb_init.sh
@@ -4,6 +4,30 @@
start vpp
sleep 1
+# Compute the network CIDR from the Netmask
+mask2cidr() {
+ nbits=0
+ IFS=.
+ for dec in $1 ; do
+ case $dec in
+ 255) let nbits+=8;;
+ 254) let nbits+=7;;
+ 252) let nbits+=6;;
+ 248) let nbits+=5;;
+ 240) let nbits+=4;;
+ 224) let nbits+=3;;
+ 192) let nbits+=2;;
+ 128) let nbits+=1;;
+ 0);;
+ *) echo "Error: $dec is not recognized"; exit 1
+ esac
+ done
+ echo "$nbits"
+}
+
+IPADDR1_MASK=$(ifconfig eth0 | grep "Mask" | awk '{print $4}' | awk -F ":" '{print $2}')
+IPADDR1_CIDR=$(mask2cidr $IPADDR1_MASK)
+
# Configure VPP for vPacketGenerator
IPADDR1=$(ifconfig eth0 | grep "inet addr" | tr -s ' ' | cut -d' ' -f3 | cut -d':' -f2)
IPADDR2=$(ifconfig eth1 | grep "inet addr" | tr -s ' ' | cut -d' ' -f3 | cut -d':' -f2)
@@ -11,14 +35,14 @@ HWADDR1=$(ifconfig eth0 | grep HWaddr | tr -s ' ' | cut -d' ' -f5)
HWADDR2=$(ifconfig eth1 | grep HWaddr | tr -s ' ' | cut -d' ' -f5)
FAKE_HWADDR1=$(echo -n 00; dd bs=1 count=5 if=/dev/urandom 2>/dev/null |hexdump -v -e '/1 ":%02X"')
FAKE_HWADDR2=$(echo -n 00; dd bs=1 count=5 if=/dev/urandom 2>/dev/null |hexdump -v -e '/1 ":%02X"')
-GW=$(route | grep default | awk '{print $2}')
+GW=$(route -n | grep "^0.0.0.0" | awk '{print $2}')
ifconfig eth0 down
ifconfig eth0 hw ether $FAKE_HWADDR1
ip addr flush dev eth0
ifconfig eth0 up
vppctl tap connect tappub hwaddr $HWADDR1
-vppctl set int ip address tap-0 $IPADDR1"/24"
+vppctl set int ip address tap-0 $IPADDR1"/"$IPADDR1_CIDR
vppctl set int state tap-0 up
brctl addbr br0
brctl addif br0 tappub
diff --git a/vnfs/vLB/scripts/v_lb_install.sh b/vnfs/vLB/scripts/v_lb_install.sh
index 5b84f21e..8bfe9fcd 100644
--- a/vnfs/vLB/scripts/v_lb_install.sh
+++ b/vnfs/vLB/scripts/v_lb_install.sh
@@ -6,6 +6,27 @@ DEMO_ARTIFACTS_VERSION=$(cat /opt/config/demo_artifacts_version.txt)
INSTALL_SCRIPT_VERSION=$(cat /opt/config/install_script_version.txt)
CLOUD_ENV=$(cat /opt/config/cloud_env.txt)
+# OpenStack network configuration
+if [[ $CLOUD_ENV == "openstack" ]]
+then
+ echo 127.0.0.1 $(hostname) >> /etc/hosts
+
+ VLB_PRIVATE_IP_O=$(cat /opt/config/local_private_ipaddr.txt)
+ echo "auto eth1" >> /etc/network/interfaces
+ echo "iface eth1 inet static" >> /etc/network/interfaces
+ echo " address $VLB_PRIVATE_IP_O" >> /etc/network/interfaces
+ echo " netmask 255.255.255.0" >> /etc/network/interfaces
+
+ VLB_PRIVATE_IP_1=$(cat /opt/config/oam_private_ipaddr.txt)
+ echo "auto eth2" >> /etc/network/interfaces
+ echo "iface eth2 inet static" >> /etc/network/interfaces
+ echo " address $VLB_PRIVATE_IP_1" >> /etc/network/interfaces
+ echo " netmask 255.255.255.0" >> /etc/network/interfaces
+
+ ifup eth1
+ ifup eth2
+fi
+
# Download required dependencies
add-apt-repository -y ppa:openjdk-r/ppa
apt-get update
diff --git a/vnfs/vLB/scripts/v_packetgen_for_dns_demo_init.sh b/vnfs/vLB/scripts/v_packetgen_for_dns_demo_init.sh
index 0968b5fa..9e7879bc 100644
--- a/vnfs/vLB/scripts/v_packetgen_for_dns_demo_init.sh
+++ b/vnfs/vLB/scripts/v_packetgen_for_dns_demo_init.sh
@@ -4,19 +4,43 @@
start vpp
sleep 1
+# Compute the network CIDR from the Netmask
+mask2cidr() {
+ nbits=0
+ IFS=.
+ for dec in $1 ; do
+ case $dec in
+ 255) let nbits+=8;;
+ 254) let nbits+=7;;
+ 252) let nbits+=6;;
+ 248) let nbits+=5;;
+ 240) let nbits+=4;;
+ 224) let nbits+=3;;
+ 192) let nbits+=2;;
+ 128) let nbits+=1;;
+ 0);;
+ *) echo "Error: $dec is not recognized"; exit 1
+ esac
+ done
+ echo "$nbits"
+}
+
+IPADDR1_MASK=$(ifconfig eth0 | grep "Mask" | awk '{print $4}' | awk -F ":" '{print $2}')
+IPADDR1_CIDR=$(mask2cidr $IPADDR1_MASK)
+
# Configure VPP for vPacketGenerator
IPADDR1=$(ifconfig eth0 | grep "inet addr" | tr -s ' ' | cut -d' ' -f3 | cut -d':' -f2)
HWADDR1=$(ifconfig eth0 | grep HWaddr | tr -s ' ' | cut -d' ' -f5)
FAKE_HWADDR1=$(echo -n 00; dd bs=1 count=5 if=/dev/urandom 2>/dev/null | hexdump -v -e '/1 ":%02X"')
VLB_IPADDR=$(cat /opt/config/vlb_ipaddr.txt)
-GW=$(route | grep default | awk '{print $2}')
+GW=$(route -n | grep "^0.0.0.0" | awk '{print $2}')
ifconfig eth0 down
ifconfig eth0 hw ether $FAKE_HWADDR1
ip addr flush dev eth0
ifconfig eth0 up
vppctl tap connect tap111 hwaddr $HWADDR1
-vppctl set int ip address tap-0 $IPADDR1"/24"
+vppctl set int ip address tap-0 $IPADDR1"/"$IPADDR1_CIDR
vppctl set int state tap-0 up
brctl addbr br0
brctl addif br0 tap111
@@ -26,9 +50,9 @@ vppctl ip route add 0.0.0.0/0 via $GW
sleep 1
-#Let's set br0 with public IP and valid MAC so that Linux will have public network access
+# Set br0 with public IP and valid MAC so that Linux will have public network access
ifconfig br0 hw ether $HWADDR1
-ifconfig br0 $IPADDR1 netmask 255.255.255.0
+ifconfig br0 $IPADDR1 netmask $IPADDR1_MASK
route add default gw $GW
#Adding static arp entry for VPP so that it will be able to send packets to default GW
@@ -38,15 +62,15 @@ sleep 3
GW_MAC=$(arp -n | grep -w $GW | tr -s ' ' | cut -d' ' -f3)
VLB_MAC=$(arp -n | grep -w $VLB_IPADDR | tr -s ' ' | cut -d' ' -f3)
-#if VLB in our network, we will use its mac
-if [ ! -z "$VLB_MAC" ]; then
-vppctl set ip arp tap-0 $VLB_IPADDR $VLB_MAC
+# If VLB is in our network, we will use its MAC
+if [ ! -z "$VLB_MAC" ]
+then
+ vppctl set ip arp tap-0 $VLB_IPADDR $VLB_MAC
fi
-# in any case let's add arp entry for default gw
+# Add arp entry for default GW
vppctl set ip arp tap-0 $GW $GW_MAC
-
# Install packet streams
sed -i -e "0,/UDP/ s/UDP:.*/UDP: "$IPADDR1" -> "$VLB_IPADDR"/" /opt/dns_streams/stream_dns1
sed -i -e "0,/UDP/ s/UDP:.*/UDP: "$IPADDR1" -> "$VLB_IPADDR"/" /opt/dns_streams/stream_dns2
@@ -59,8 +83,6 @@ sed -i -e "0,/UDP/ s/UDP:.*/UDP: "$IPADDR1" -> "$VLB_IPADDR"/" /opt/dns_streams/
sed -i -e "0,/UDP/ s/UDP:.*/UDP: "$IPADDR1" -> "$VLB_IPADDR"/" /opt/dns_streams/stream_dns9
sed -i -e "0,/UDP/ s/UDP:.*/UDP: "$IPADDR1" -> "$VLB_IPADDR"/" /opt/dns_streams/stream_dns10
-#sed -i -e "s/.*-> 53.*/ UDP: $RANDOM -> 53/" /opt/dns_streams/stream_dns*
-
sed -i -e "s/.*-> 53.*/ UDP: $RANDOM -> 53/" /opt/dns_streams/stream_dns1
sed -i -e "s/.*-> 53.*/ UDP: $RANDOM -> 53/" /opt/dns_streams/stream_dns2
sed -i -e "s/.*-> 53.*/ UDP: $RANDOM -> 53/" /opt/dns_streams/stream_dns3
diff --git a/vnfs/vLB/scripts/v_packetgen_install.sh b/vnfs/vLB/scripts/v_packetgen_install.sh
index bf08f63e..34503491 100644
--- a/vnfs/vLB/scripts/v_packetgen_install.sh
+++ b/vnfs/vLB/scripts/v_packetgen_install.sh
@@ -4,7 +4,6 @@ REPO_URL_BLOB=$(cat /opt/config/repo_url_blob.txt)
REPO_URL_ARTIFACTS=$(cat /opt/config/repo_url_artifacts.txt)
DEMO_ARTIFACTS_VERSION=$(cat /opt/config/demo_artifacts_version.txt)
INSTALL_SCRIPT_VERSION=$(cat /opt/config/install_script_version.txt)
-CLOUD_ENV=$(cat /opt/config/cloud_env.txt)
# Download required dependencies
add-apt-repository -y ppa:openjdk-r/ppa