From 34d72239b8f4a8a9dee9c4fb43faab7dd51207b8 Mon Sep 17 00:00:00 2001 From: Andy Bavier Date: Wed, 28 May 2014 10:00:11 -0400 Subject: [PATCH] Three network templates: Private, Public dedicated IPv4, Public shared IPv4 --- planetstack/core/fixtures/initial_data.json | 30 +++++---------------- 1 file changed, 7 insertions(+), 23 deletions(-) diff --git a/planetstack/core/fixtures/initial_data.json b/planetstack/core/fixtures/initial_data.json index 1b888f2..21630cc 100644 --- a/planetstack/core/fixtures/initial_data.json +++ b/planetstack/core/fixtures/initial_data.json @@ -9659,28 +9659,12 @@ "model": "core.networktemplate", "fields": { "guaranteedBandwidth": 0, - "description": "Connect a sliver to the public network using dedicated public IPv4 address", + "description": "Connect a sliver to the public network using a dedicated public IPv4 address", "created": "2013-12-09T14:15:16.899Z", - "sharedNetworkName": "", + "sharedNetworkName": "ext-net", "updated": "2013-12-09T14:15:16.899Z", "visibility": "private", - "name": "dedicated-public-IPv4", - "translation": "none", - "sharedNetworkId": "", - "enacted": null - } -}, -{ - "pk": 2, - "model": "core.networktemplate", - "fields": { - "guaranteedBandwidth": 0, - "description": "For PlanetLab compatibility: connect to the public network by sharing the node's public IP address.", - "created": "2013-12-09T14:16:12.358Z", - "sharedNetworkName": "", - "updated": "2013-12-09T14:16:12.358Z", - "visibility": "public", - "name": "planetlab-legacy", + "name": "Public dedicated IPv4", "translation": "none", "sharedNetworkId": "", "enacted": null @@ -9691,14 +9675,14 @@ "model": "core.networktemplate", "fields": { "guaranteedBandwidth": 0, - "description": "Connect a sliver to the public network via NAT", + "description": "Connect a sliver to the public network via NAT", "created": "2013-12-09T14:17:29.551Z", "sharedNetworkName": "nat-net", "updated": "2013-12-09T14:17:29.551Z", "visibility": "private", - "name": "private-IPv4-plus-NAT", + "name": "Public shared IPv4", "translation": "NAT", - "sharedNetworkId": "51d641ba-9e1e-46f5-8069-bf4a929f851f", + "sharedNetworkId": "", "enacted": null } }, @@ -9712,7 +9696,7 @@ "sharedNetworkName": "", "updated": "2013-12-09T14:18:02.336Z", "visibility": "private", - "name": "private-virtual", + "name": "Private", "translation": "none", "sharedNetworkId": "", "enacted": null -- 2.43.0