Skip to content

Changed 'identifier' to 'identity' to be consistent with error messag… #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
EmDV wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Changed 'identifier' to 'identity' to be consistent with error messag… #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions murano_device_simulator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@
PYTHON = 3

# -----------------------------------------------------------------
# EXOSITE PRODUCT ID / SERIAL NUMBER IDENTIFIER / CONFIGURATION
# EXOSITE PRODUCT ID / DEVICE IDENTITY / CONFIGURATION
# -----------------------------------------------------------------
UNSET_PRODUCT_ID = 'YOUR_PRODUCT_ID_HERE'
productid = os.getenv('SIMULATOR_PRODUCT_ID', UNSET_PRODUCT_ID)
identifier = os.getenv('SIMULATOR_DEVICE_ID', '000001') # default identifier
identity = os.getenv('SIMULATOR_DEVICE_ID', '000001') # default identity

SHOW_HTTP_REQUESTS = False
PROMPT_FOR_PRODUCTID_AND_SN = os.getenv('SIMULATOR_SHOULD_PROMPT', '1') == '1'
Expand Down Expand Up @@ -116,7 +116,7 @@ def ACTIVATE():
try:
# print("attempt to activate on Murano")

http_body = 'vendor=' + productid + '&model=' + productid + '&sn=' + identifier
http_body = 'vendor=' + productid + '&model=' + productid + '&sn=' + identity
# BUILD HTTP PACKET
http_packet = ""
http_packet += 'POST /provision/activate HTTP/1.1\r\n'
Expand All @@ -138,7 +138,7 @@ def ACTIVATE():
print("Activation Response: Device Aleady Activated, there is no new CIK")
elif response.status == 404:
print("Activation Response: Device Identity ({}) activation not available or check Product Id ({})".format(
identifier,
identity,
productid
))
else:
Expand All @@ -154,7 +154,7 @@ def ACTIVATE():
def GET_STORED_CIK():
print("get stored CIK from non-volatile memory")
try:
f = open(productid + "_" + identifier + "_cik", "r+") # opens file to store CIK
f = open(productid + "_" + identity + "_cik", "r+") # opens file to store CIK
local_cik = f.read()
f.close()
print("Stored cik: {} ..............................".format(local_cik[0:10]))
Expand All @@ -166,7 +166,7 @@ def GET_STORED_CIK():

def STORE_CIK(cik_to_store):
print("storing new CIK to non-volatile memory")
f = open(productid + "_" + identifier + "_cik", "w") # opens file that stores CIK
f = open(productid + "_" + identity + "_cik", "w") # opens file that stores CIK
f.write(cik_to_store)
f.close()
return True
Expand Down Expand Up @@ -319,18 +319,18 @@ def LONG_POLL_WAIT(READ_PARAMS):
# if hostok != "":
# host_address = hostok

print("The default Device Identity is: {}".format(identifier))
print("The default Device Identity is: {}".format(identity))
identityok = input("If OK, hit return, if you prefer a different Identity, type it here: ")
if identityok != "":
identifier = identityok
identity = identityok
else:
host_address = productid + '.' + host_address_base

start_time = int(time.time())
print("\r\n-----")
print("Murano Example Smart Lightbulb Device Simulator booting...")
print("Product Id: {}".format(productid))
print("Device Identity: {}".format(identifier))
print("Device Identity: {}".format(identity))
print("Product Unique Host: {}".format(host_address))
print("-----")
cik = GET_STORED_CIK()
Expand Down