Software version URI fix

Tests are using variable SOFTWARE_VERSION_URI and some new tests
are using SOFTWARE_VERSION.

Fixes variable naming to:
    SOFTWARE_VERSION_URI = '/xyz/openbmc_project/software/'

Resolves  openbmc/openbmc-test-automation#785

Change-Id: I902d2defd01aa198024fc445b235b673132580d8
Signed-off-by: George Keishing <gkeishin@in.ibm.com>
diff --git a/extended/test_uploadimage.py b/extended/test_uploadimage.py
index 024c4f0..c9aa338 100644
--- a/extended/test_uploadimage.py
+++ b/extended/test_uploadimage.py
@@ -158,7 +158,7 @@
     image_purpose = get_image_purpose(image_path + "MANIFEST")
     if (image_purpose == var.VERSION_PURPOSE_BMC or
         image_purpose == var.VERSION_PURPOSE_HOST):
-        uri = var.SOFTWARE_VERSION + image_version_id
+        uri = var.SOFTWARE_VERSION_URI + image_version_id
         status, ret_values =\
         grk.run_key("Read Attribute  " + uri + "  Activation")