nova-net: Stop mocking the instance network cache

This has been tying us to nova-network. This should be a one line change
but it has a large knock-on effect due to lots of samples using it. We
just need to suck it up and deal with it, unfortunately.

Change-Id: I09c88e0fdf3635683c56901637fc3c0a9084d482
Signed-off-by: Stephen Finucane <sfinucan@redhat.com>
This commit is contained in:
Stephen Finucane
2019-10-03 18:21:39 +01:00
parent 59d00aac7c
commit 337c90808e
79 changed files with 110 additions and 109 deletions
@@ -1,6 +1,6 @@
{
"addFloatingIp" : {
"address": "10.10.10.10",
"fixed_address": "192.168.0.3"
"fixed_address": "192.168.1.30"
}
}
@@ -6,7 +6,7 @@
"addresses": {
"private": [
{
"addr": "192.168.0.3",
"addr": "192.168.1.30",
"version": 4
}
]
+2 -2
View File
@@ -5,8 +5,8 @@
"addresses": {
"private": [
{
"addr": "192.168.0.3",
"OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff",
"addr": "192.168.1.30",
"OS-EXT-IPS-MAC:mac_addr": "00:0c:29:0d:11:74",
"OS-EXT-IPS:type": "fixed",
"version": 4
}
@@ -6,7 +6,7 @@
"addresses": {
"private": [
{
"addr": "192.168.0.3",
"addr": "192.168.1.30",
"version": 4
}
]
@@ -6,8 +6,8 @@
"addresses": {
"private": [
{
"addr": "192.168.0.3",
"OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff",
"addr": "192.168.1.30",
"OS-EXT-IPS-MAC:mac_addr": "00:0c:29:0d:11:74",
"OS-EXT-IPS:type": "fixed",
"version": 4
}
@@ -3,8 +3,8 @@
"addresses": {
"private": [
{
"addr": "192.168.0.3",
"OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff",
"addr": "192.168.1.30",
"OS-EXT-IPS-MAC:mac_addr": "00:0c:29:0d:11:74",
"OS-EXT-IPS:type": "fixed",
"version": 4
}
@@ -4,8 +4,8 @@
"addresses": {
"private": [
{
"addr": "192.168.0.3",
"OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff",
"addr": "192.168.1.30",
"OS-EXT-IPS-MAC:mac_addr": "00:0c:29:0d:11:74",
"OS-EXT-IPS:type": "fixed",
"version": 4
}
@@ -5,7 +5,7 @@
"addresses": {
"private": [
{
"addr": "192.168.0.3",
"addr": "192.168.1.30",
"version": 4
}
]
@@ -5,9 +5,9 @@
"addresses": {
"private": [
{
"OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff",
"OS-EXT-IPS-MAC:mac_addr": "00:0c:29:0d:11:74",
"OS-EXT-IPS:type": "fixed",
"addr": "192.168.0.3",
"addr": "192.168.1.30",
"version": 4
}
]
@@ -6,7 +6,7 @@
"addresses": {
"private": [
{
"addr": "192.168.0.3",
"addr": "192.168.1.30",
"version": 4
}
]
@@ -6,9 +6,9 @@
"addresses": {
"private": [
{
"OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff",
"OS-EXT-IPS-MAC:mac_addr": "00:0c:29:0d:11:74",
"OS-EXT-IPS:type": "fixed",
"addr": "192.168.0.3",
"addr": "192.168.1.30",
"version": 4
}
]
@@ -5,7 +5,7 @@
"addresses": {
"private": [
{
"addr": "192.168.0.3",
"addr": "192.168.1.30",
"version": 4
}
]
@@ -5,8 +5,8 @@
"addresses": {
"private": [
{
"addr": "192.168.0.3",
"OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff",
"addr": "192.168.1.30",
"OS-EXT-IPS-MAC:mac_addr": "00:0c:29:0d:11:74",
"OS-EXT-IPS:type": "fixed",
"version": 4
}
@@ -6,8 +6,8 @@
"addresses": {
"private": [
{
"addr": "192.168.0.3",
"OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff",
"addr": "192.168.1.30",
"OS-EXT-IPS-MAC:mac_addr": "00:0c:29:0d:11:74",
"OS-EXT-IPS:type": "fixed",
"version": 4
}
@@ -5,7 +5,7 @@
"addresses": {
"private": [
{
"addr": "192.168.0.3",
"addr": "192.168.1.30",
"version": 4
}
]
@@ -22,9 +22,9 @@
"addresses": {
"private": [
{
"OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff",
"OS-EXT-IPS-MAC:mac_addr": "00:0c:29:0d:11:74",
"OS-EXT-IPS:type": "fixed",
"addr": "192.168.0.3",
"addr": "192.168.1.30",
"version": 4
}
]
@@ -6,7 +6,7 @@
"addresses": {
"private": [
{
"addr": "192.168.0.3",
"addr": "192.168.1.30",
"version": 4
}
]
@@ -23,9 +23,9 @@
"addresses": {
"private": [
{
"OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff",
"OS-EXT-IPS-MAC:mac_addr": "00:0c:29:0d:11:74",
"OS-EXT-IPS:type": "fixed",
"addr": "192.168.0.3",
"addr": "192.168.1.30",
"version": 4
}
]
@@ -22,9 +22,9 @@
"addresses": {
"private": [
{
"OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff",
"OS-EXT-IPS-MAC:mac_addr": "00:0c:29:0d:11:74",
"OS-EXT-IPS:type": "fixed",
"addr": "192.168.0.3",
"addr": "192.168.1.30",
"version": 4
}
]
@@ -23,9 +23,9 @@
"addresses": {
"private": [
{
"OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff",
"OS-EXT-IPS-MAC:mac_addr": "00:0c:29:0d:11:74",
"OS-EXT-IPS:type": "fixed",
"addr": "192.168.0.3",
"addr": "192.168.1.30",
"version": 4
}
]
@@ -5,7 +5,7 @@
"addresses": {
"private": [
{
"addr": "192.168.0.3",
"addr": "192.168.1.30",
"version": 4
}
]
@@ -5,7 +5,7 @@
"addresses": {
"private": [
{
"addr": "192.168.0.3",
"addr": "192.168.1.30",
"version": 4
}
]
@@ -6,7 +6,7 @@
"addresses": {
"private": [
{
"addr": "192.168.0.3",
"addr": "192.168.1.30",
"version": 4
}
]
@@ -22,9 +22,9 @@
"addresses": {
"private": [
{
"OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff",
"OS-EXT-IPS-MAC:mac_addr": "00:0c:29:0d:11:74",
"OS-EXT-IPS:type": "fixed",
"addr": "192.168.0.3",
"addr": "192.168.1.30",
"version": 4
}
]
@@ -6,7 +6,7 @@
"addresses": {
"private": [
{
"addr": "192.168.0.3",
"addr": "192.168.1.30",
"version": 4
}
]
@@ -23,9 +23,9 @@
"addresses": {
"private": [
{
"OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff",
"OS-EXT-IPS-MAC:mac_addr": "00:0c:29:0d:11:74",
"OS-EXT-IPS:type": "fixed",
"addr": "192.168.0.3",
"addr": "192.168.1.30",
"version": 4
}
]
@@ -23,7 +23,7 @@
"addresses": {
"private": [
{
"OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff",
"OS-EXT-IPS-MAC:mac_addr": "00:0c:29:0d:11:74",
"OS-EXT-IPS:type": "fixed",
"addr": "192.168.0.1",
"version": 4
@@ -6,7 +6,7 @@
"addresses": {
"private": [
{
"addr": "192.168.0.3",
"addr": "192.168.1.30",
"version": 4
}
]
@@ -22,9 +22,9 @@
"addresses": {
"private": [
{
"OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff",
"OS-EXT-IPS-MAC:mac_addr": "00:0c:29:0d:11:74",
"OS-EXT-IPS:type": "fixed",
"addr": "192.168.0.3",
"addr": "192.168.1.30",
"version": 4
}
]
@@ -6,7 +6,7 @@
"addresses": {
"private": [
{
"addr": "192.168.0.3",
"addr": "192.168.1.30",
"version": 4
}
]
@@ -6,7 +6,7 @@
"addresses": {
"private": [
{
"addr": "192.168.0.3",
"addr": "192.168.1.30",
"version": 4
}
]
@@ -22,9 +22,9 @@
"addresses": {
"private": [
{
"OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff",
"OS-EXT-IPS-MAC:mac_addr": "00:0c:29:0d:11:74",
"OS-EXT-IPS:type": "fixed",
"addr": "192.168.0.3",
"addr": "192.168.1.30",
"version": 4
}
]
@@ -85,4 +85,4 @@
"updated": "2019-04-23T15:19:11Z",
"user_id": "fake"
}
}
}
@@ -6,7 +6,7 @@
"addresses": {
"private": [
{
"addr": "192.168.0.3",
"addr": "192.168.1.30",
"version": 4
}
]
@@ -23,9 +23,9 @@
"addresses": {
"private": [
{
"OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff",
"OS-EXT-IPS-MAC:mac_addr": "00:0c:29:0d:11:74",
"OS-EXT-IPS:type": "fixed",
"addr": "192.168.0.3",
"addr": "192.168.1.30",
"version": 4
}
]
@@ -21,9 +21,9 @@
"addresses": {
"private": [
{
"OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff",
"OS-EXT-IPS-MAC:mac_addr": "00:0c:29:0d:11:74",
"OS-EXT-IPS:type": "fixed",
"addr": "192.168.0.3",
"addr": "192.168.1.30",
"version": 4
}
]
@@ -22,9 +22,9 @@
"addresses": {
"private": [
{
"OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff",
"OS-EXT-IPS-MAC:mac_addr": "00:0c:29:0d:11:74",
"OS-EXT-IPS:type": "fixed",
"addr": "192.168.0.3",
"addr": "192.168.1.30",
"version": 4
}
]
@@ -5,8 +5,8 @@
"addresses": {
"private": [
{
"addr": "192.168.0.3",
"OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff",
"addr": "192.168.1.30",
"OS-EXT-IPS-MAC:mac_addr": "00:0c:29:0d:11:74",
"OS-EXT-IPS:type": "fixed",
"version": 4
}
@@ -6,8 +6,8 @@
"addresses": {
"private": [
{
"addr": "192.168.0.3",
"OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff",
"addr": "192.168.1.30",
"OS-EXT-IPS-MAC:mac_addr": "00:0c:29:0d:11:74",
"OS-EXT-IPS:type": "fixed",
"version": 4
}