From f5f166728d2834cf0068e44ce959115206dcb0b3 Mon Sep 17 00:00:00 2001
From: Jim Minter <jminter@redhat.com>
Date: Tue, 17 Dec 2019 07:54:57 -0600
Subject: [PATCH] CI runner fixes and python logic fix

---
 .github/workflows/pull_request-test-go.yaml      | 2 +-
 .github/workflows/pull_request-test-python.yaml  | 8 ++++++++
 python/az/aro/azext_aro/_validators.py           | 2 +-
 python/az/aro/azext_aro/tests/__init__.py        | 1 -
 python/az/aro/azext_aro/tests/latest/__init__.py | 1 -
 5 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/pull_request-test-go.yaml b/.github/workflows/pull_request-test-go.yaml
index 678aa43a0..701dfd613 100644
--- a/.github/workflows/pull_request-test-go.yaml
+++ b/.github/workflows/pull_request-test-go.yaml
@@ -8,7 +8,7 @@ jobs:
   test:
     runs-on: ubuntu-latest
     env:
-      GOPATH: /home/runner/work/rp/go
+      GOPATH: /home/runner/work/ARO-RP/go
     steps:
     - name: Set up Go
       uses: actions/setup-go@v1
diff --git a/.github/workflows/pull_request-test-python.yaml b/.github/workflows/pull_request-test-python.yaml
index 7594b35b2..4f2467948 100644
--- a/.github/workflows/pull_request-test-python.yaml
+++ b/.github/workflows/pull_request-test-python.yaml
@@ -7,6 +7,8 @@ on:
 jobs:
   test:
     runs-on: ubuntu-latest
+    env:
+      GOPATH: /home/runner/work/ARO-RP/go
     strategy:
       matrix:
         python-version:
@@ -20,8 +22,14 @@ jobs:
       uses: actions/setup-python@v1
       with:
         python-version: ${{ matrix.python-version }}
+    - name: Set up Go
+      uses: actions/setup-go@v1
+      with:
+        go-version: 1.13
     - name: Check out source
       uses: actions/checkout@v1
+      with:
+        path: go/src/github.com/Azure/ARO-RP
     - name: Test
       run: |
         set -x
diff --git a/python/az/aro/azext_aro/_validators.py b/python/az/aro/azext_aro/_validators.py
index b2ff689a7..046a31e3d 100644
--- a/python/az/aro/azext_aro/_validators.py
+++ b/python/az/aro/azext_aro/_validators.py
@@ -157,7 +157,7 @@ def validate_vnet(cmd, namespace):
 
 def validate_vnet_resource_group_name(namespace):
     if not namespace.vnet_resource_group_name:
-        namespace.vnet_resource_group_name = namespace.validate_vnet_resource_group_name
+        namespace.vnet_resource_group_name = namespace.resource_group_name
 
 
 def validate_worker_count(namespace):
diff --git a/python/az/aro/azext_aro/tests/__init__.py b/python/az/aro/azext_aro/tests/__init__.py
index d8445f2b6..1778c9802 100644
--- a/python/az/aro/azext_aro/tests/__init__.py
+++ b/python/az/aro/azext_aro/tests/__init__.py
@@ -1,3 +1,2 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the Apache License 2.0.
-
diff --git a/python/az/aro/azext_aro/tests/latest/__init__.py b/python/az/aro/azext_aro/tests/latest/__init__.py
index d8445f2b6..1778c9802 100644
--- a/python/az/aro/azext_aro/tests/latest/__init__.py
+++ b/python/az/aro/azext_aro/tests/latest/__init__.py
@@ -1,3 +1,2 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the Apache License 2.0.
-