Hajj & Umrah

Will a person be a musaafir or muqeem when staying in Makkah and Aziziyyah?

Q: Insha Allah I have intention for Hajj. So we leave on the 28th of April from JHB. 

We'll be 10 days in Makkah

Then 12 days in Azzizia

Then 6 days of Hajj 

Then another 6 days in Azzizia. 

So what I want know is where am I musaafir in this whole trip and where am I muqeem? Do I regard Makkah and Azzizia as 1 or what?